diff options
| author | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2022-05-17 12:47:56 +0900 |
|---|---|---|
| committer | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2022-05-17 14:52:18 +0900 |
| commit | 7d85b91eba6bafd180965ef94d221474ce41dead (patch) | |
| tree | c32d5d47136cd873fb1506e870eb332b5ed9e51f /pkgs/tools/text/discount | |
| parent | 1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502 (diff) | |
| download | nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar.gz nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar.bz2 nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar.lz nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar.xz nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.tar.zst nixlib-7d85b91eba6bafd180965ef94d221474ce41dead.zip | |
discount: 2.2.7 -> 2.2.7b
Also install man pages and sample programs
Diffstat (limited to 'pkgs/tools/text/discount')
| -rw-r--r-- | pkgs/tools/text/discount/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/tools/text/discount/parallel-make.patch | 15 |
2 files changed, 8 insertions, 31 deletions
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 44d50c0c9634..7422b445d818 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,36 +1,28 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.7"; + version = "2.2.7b"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = pname; rev = "v${version}"; - sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7"; + sha256 = "sha256-S6OVKYulhvEPRqNXBsvZ7m2W4cbdnrpZKPAo3SfD+9s="; }; - patches = [ - ./fix-configure-path.patch - - # Fix parallel make depends: - # - https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch - # - https://github.com/Orc/discount/pull/245 - ./parallel-make.patch - ]; + patches = [ ./fix-configure-path.patch ]; configureScript = "./configure.sh"; - configureFlags = [ - "--enable-all-features" - "--pkg-config" "--shared" - "--with-fenced-code" - # Use deterministic mangling - "--debian-glitch" + "--debian-glitch" # use deterministic mangling + "--pkg-config" + "--h1-title" ]; enableParallelBuilding = true; + installTargets = [ "install.everything" ]; + doCheck = true; postFixup = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/text/discount/parallel-make.patch b/pkgs/tools/text/discount/parallel-make.patch deleted file mode 100644 index 583622a9152f..000000000000 --- a/pkgs/tools/text/discount/parallel-make.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/Orc/discount/pull/245 -https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch - -Fix parallel make failure: add missing pandoc_headers dependency. ---- a/Makefile.in -+++ b/Makefile.in -@@ -139,7 +139,7 @@ test: $(PGMS) $(TESTFRAMEWORK) verify - - pandoc_headers.o: tools/pandoc_headers.c config.h - $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c --pandoc_headers: pandoc_headers.o -+pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB) - $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown - - branch.o: tools/branch.c config.h |