Merge branch 'master' into staging

3 files changed, 6 insertions, 59 deletions

diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix b/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
deleted file mode 100644
index 571df924e1f8..000000000000
--- a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index f08a2e563429..ab6f505bff37 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/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 = ''
@@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    python27
-    beautifulsoup
-    mkdocs
-    mkdocs-exclude
+    python3
+    (with python3.pkgs; [ beautifulsoup4 markdown ])
     which
     findutils
   ];
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix b/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
deleted file mode 100644
index d8c79e33dffb..000000000000
--- a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
+++ /dev/null
@@ -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;
-}