diff options
| author | Eric Bailey <eric@ericb.me> | 2023-11-24 00:59:45 -0600 |
|---|---|---|
| committer | Eric Bailey <yurrriq@users.noreply.github.com> | 2023-11-24 19:00:29 -0600 |
| commit | 82c1f488b87eeedcf583fd9ae8cb2ada7d496d5d (patch) | |
| tree | 415778bbbb0a6eb5ec2548cee88af65244a1e067 /pkgs | |
| parent | 9a17fe4f337f6a61468eff38d92baed8bc70f3f6 (diff) | |
noweb: 2.12 -> 2.13
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/literate-programming/noweb/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/literate-programming/noweb/no-FAQ.patch | 16 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 6b4452a391892..26ce4d6891af3 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "noweb"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "nrnrnr"; repo = "noweb"; - rev = "v${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; + rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; + sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; patches = [ # Remove FAQ @@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec { postPatch = '' substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' + substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}' ''; nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ]; diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch index 2fa601d35c838..7fa5c475c4007 100644 --- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch +++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch @@ -1,11 +1,13 @@ ---- a/Makefile 2006-06-12 22:14:20.000000000 +0200 -+++ b/Makefile 2010-06-17 11:30:11.804018145 +0200 -@@ -198,7 +198,7 @@ - (cd elisp; ci -l $(CINAME) $(CIMSG) *.el) - ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw +diff --git a/Makefile b/Makefile +index 1897c09..770e108 100644 +--- a/Makefile ++++ b/Makefile +@@ -195,7 +195,7 @@ install-elisp: + uninstall-elisp: + rm -f $(ELISP)/noweb-mode.el -source: FAQ +source: - for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done + for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) CPIF=">" $@); done sleep 1 - for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done + for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) touch); done |