tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
noweb: 2.12 -> 2.13
authored by
Eric Bailey
and committed by
Eric Bailey
82c1f488
9a17fe4f
+15
-12
+6
-5
pkgs/development/tools/literate-programming/noweb/default.nix
+6
-5
pkgs/development/tools/literate-programming/noweb/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
2
2
3
-
stdenv.mkDerivation (finalAttrs: rec {
3
+
stdenv.mkDerivation (finalAttrs: {
4
4
pname = "noweb";
5
-
version = "2.12";
5
+
version = "2.13";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "nrnrnr";
9
9
repo = "noweb";
10
-
rev = "v${builtins.replaceStrings ["."] ["_"] version}";
11
-
sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95";
10
+
rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
11
+
sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs=";
12
12
};
13
13
14
-
sourceRoot = "${src.name}/src";
14
+
sourceRoot = "${finalAttrs.src.name}/src";
15
15
16
16
patches = [
17
17
# Remove FAQ
···
20
20
21
21
postPatch = ''
22
22
substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
23
+
substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}'
23
24
'';
24
25
25
26
nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];
+9
-7
pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
+9
-7
pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
···
1
-
--- a/Makefile 2006-06-12 22:14:20.000000000 +0200
2
-
+++ b/Makefile 2010-06-17 11:30:11.804018145 +0200
3
-
@@ -198,7 +198,7 @@
4
-
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
5
-
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
1
+
diff --git a/Makefile b/Makefile
2
+
index 1897c09..770e108 100644
3
+
--- a/Makefile
4
+
+++ b/Makefile
5
+
@@ -195,7 +195,7 @@ install-elisp:
6
6
7
+
uninstall-elisp:
8
+
rm -f $(ELISP)/noweb-mode.el
7
9
-source: FAQ
8
10
+source:
9
-
for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
11
+
for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) CPIF=">" $@); done
10
12
sleep 1
11
-
for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
13
+
for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) touch); done