public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redo-apenwarr: 0.42 -> 0.42a; use python3 and fixed building manpage

Browse Source 
Removed dependency to mkdoc, which is only needed to build the webpage.
This commit is contained in:
Christian Kögler 2020-03-22 13:16:19 +01:00
parent 28cb73749b
commit 4c9bd5d52a
3 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
View File

@ -1,20 +0,0 @@
{ pythonPackages, isPy3k, pkgs }:
pythonPackages.buildPythonPackage rec {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
}

25
pkgs/development/tools/build-managers/redo-apenwarr/default.nix
View File

@ -1,27 +1,16 @@
{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils { stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils
, perl , perl
, doCheck ? true , doCheck ? true
}: let }: stdenv.mkDerivation rec {
# copy from
# pkgs/applications/networking/pyload/beautifulsoup.nix
beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix {
pythonPackages = python27.pkgs;
};
mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix {
pythonPackages = python27.pkgs;
};
in stdenv.mkDerivation rec {
pname = "redo-apenwarr"; pname = "redo-apenwarr";
version = "0.42"; version = "0.42a";
src = fetchFromGitHub rec { src = fetchFromGitHub rec {
owner = "apenwarr"; owner = "apenwarr";
repo = "redo"; repo = "redo";
rev = "${repo}-${version}"; rev = "${repo}-${version}";
sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm"; sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php";
}; };
postPatch = '' postPatch = ''
@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
python27 python3
beautifulsoup (with python3.pkgs; [ beautifulsoup4 markdown ])
mkdocs
mkdocs-exclude
which which
findutils findutils
]; ];

20
pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
View File

@ -1,20 +0,0 @@
{ pythonPackages, isPy3k, pkgs }:
pythonPackages.buildPythonPackage rec {
name = "mkdocs-exclude";
disabled = isPy3k;
src = pkgs.fetchFromGitHub {
owner = "apenwarr";
repo = "mkdocs-exclude";
rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae";
sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd";
};
buildInputs = with pkgs; [
mkdocs
];
# error: invalid command 'test'
doCheck = false;
}