git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #83134 from ck3d/redo-apenwarr-python3

redo-apenwarr: switch to python3 and fix building man

commitca7f78ad03b44a139f508916be640a77f0cfd3d6 authormarkuskowa <markus.kowalewski@gmail.com> dateSun 22 Mar 2020, 21:20 (7 years ago) parent6c48c7b4c9bd5d
3 files changed+6−59
pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix−20 pkgs/development/tools/build-managers/redo-apenwarr/default.nix+6−19 pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix−20
pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ pythonPackages, isPy3k, pkgs }:
2−
3−pythonPackages.buildPythonPackage rec {
4− name = "beautifulsoup-3.2.1";
5− disabled = isPy3k;
6−
7− src = pkgs.fetchurl {
8− url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
9− sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
10− };
11−
12− # error: invalid command 'test'
13− doCheck = false;
14−
15− meta = {
16− homepage = http://www.crummy.com/software/BeautifulSoup/;
17− license = "bsd";
18− description = "Undemanding HTML/XML parser";
19− };
20−}
pkgs/development/tools/build-managers/redo-apenwarr/default.nix+6−19
@@ -1,27 +1,16 @@
1−{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils
1+{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils
22, perl
33, doCheck ? true
4−}: let
5−
6− # copy from
7− # pkgs/applications/networking/pyload/beautifulsoup.nix
8− beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix {
9− pythonPackages = python27.pkgs;
10− };
11−
12− mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix {
13− pythonPackages = python27.pkgs;
14− };
15−in stdenv.mkDerivation rec {
4+}: stdenv.mkDerivation rec {
165
176 pname = "redo-apenwarr";
18− version = "0.42";
7+ version = "0.42a";
198
209 src = fetchFromGitHub rec {
2110 owner = "apenwarr";
2211 repo = "redo";
2312 rev = "${repo}-${version}";
24− sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
13+ sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php";
2514 };
2615
2716 postPatch = ''
@@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
6049 ];
6150
6251 nativeBuildInputs = [
63− python27
64− beautifulsoup
65− mkdocs
66− mkdocs-exclude
52+ python3
53+ (with python3.pkgs; [ beautifulsoup4 markdown ])
6754 which
6855 findutils
6956 ];
pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ pythonPackages, isPy3k, pkgs }:
2−
3−pythonPackages.buildPythonPackage rec {
4− name = "mkdocs-exclude";
5− disabled = isPy3k;
6−
7− src = pkgs.fetchFromGitHub {
8− owner = "apenwarr";
9− repo = "mkdocs-exclude";
10− rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae";
11− sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd";
12− };
13−
14− buildInputs = with pkgs; [
15− mkdocs
16− ];
17−
18− # error: invalid command 'test'
19− doCheck = false;
20−}