colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

noweb: 2.12 -> 2.13

Browse Source
This commit is contained in:
Eric Bailey 2023-11-24 00:59:45 -06:00 committed by Eric Bailey
parent 9a17fe4f33
commit 82c1f488b8
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/literate-programming/noweb/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }: { lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
stdenv.mkDerivation (finalAttrs: rec { stdenv.mkDerivation (finalAttrs: {
pname = "noweb"; pname = "noweb";
version = "2.12"; version = "2.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nrnrnr"; owner = "nrnrnr";
repo = "noweb"; repo = "noweb";
rev = "v${builtins.replaceStrings ["."] ["_"] version}"; rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs=";
}; };
sourceRoot = "${src.name}/src"; sourceRoot = "${finalAttrs.src.name}/src";
patches = [ patches = [
# Remove FAQ # Remove FAQ
@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec {
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}'
''; '';
nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ]; nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];

16
pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
View File

@ -1,11 +1,13 @@
--- a/Makefile 2006-06-12 22:14:20.000000000 +0200 diff --git a/Makefile b/Makefile
+++ b/Makefile 2010-06-17 11:30:11.804018145 +0200 index 1897c09..770e108 100644
@@ -198,7 +198,7 @@ --- a/Makefile
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el) +++ b/Makefile
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw @@ -195,7 +195,7 @@ install-elisp:
uninstall-elisp:
rm -f $(ELISP)/noweb-mode.el
-source: FAQ -source: FAQ
+source: +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 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