Skip to content

Commit

Permalink
Merge pull request #83134 from ck3d/redo-apenwarr-python3
Browse files Browse the repository at this point in the history
redo-apenwarr: switch to python3 and fix building man
  • Loading branch information
markuskowa committed Mar 22, 2020
2 parents 6c48c7b + 4c9bd5d commit ca7f78a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 59 deletions.

This file was deleted.

25 changes: 6 additions & 19 deletions pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,27 +1,16 @@
{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils
{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils
, perl
, doCheck ? true
}: let

# 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 {
}: stdenv.mkDerivation rec {

pname = "redo-apenwarr";
version = "0.42";
version = "0.42a";

src = fetchFromGitHub rec {
owner = "apenwarr";
repo = "redo";
rev = "${repo}-${version}";
sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php";
};

postPatch = ''
Expand Down Expand Up @@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
];

nativeBuildInputs = [
python27
beautifulsoup
mkdocs
mkdocs-exclude
python3
(with python3.pkgs; [ beautifulsoup4 markdown ])
which
findutils
];
Expand Down

This file was deleted.

0 comments on commit ca7f78a

Please sign in to comment.