From 31d1ce7e643ae60cc3d801252408fbbc06781b34 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 9 Jan 2019 23:50:35 -0600 Subject: [PATCH 1/4] icon-lang: rework to support darwin and building without graphics --- .../interpreters/icon-lang/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 3bec73ea0369..56becd3d6c94 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, libX11, libXt }: +{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { name = "icon-lang-${version}"; version = "9.5.1"; src = fetchFromGitHub { - rev = "39d7438e8d23ccfe20c0af8bbbf61e34d9c715e9"; owner = "gtownsend"; repo = "icon"; + rev = "rel${builtins.replaceStrings ["."] [""] version}"; sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw"; }; - buildInputs = [ libX11 libXt ]; - configurePhase = '' - make X-Configure name=linux - ''; + buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + + configurePhase = + let + _name = if stdenv.isDarwin then "macintosh" else "linux"; + in + '' + make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name} + ''; installPhase = '' make Install dest=$out @@ -21,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + maintainers = with maintainers; [ vrthra yurrriq ]; + platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; homepage = https://www.cs.arizona.edu/icon/; }; From 67aaa70a5b1ac4f97a6d55c04d266de1a90ac701 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 9 Jan 2019 23:52:22 -0600 Subject: [PATCH 2/4] noweb: 2.11b -> 2.12 - fetchurl -> fetchFromGitHub - Support building with icon (useIcon, default: false) - Support darwin - Configure for texlive - Flesh out meta - Build man pages - Pass through tex package --- .../literate-programming/noweb/default.nix | 94 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 73 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e1534..333491d9a3d2 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,29 +1,75 @@ -{stdenv, fetchurl, gawk}: +{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: -stdenv.mkDerivation { - name = "noweb-2.11b"; - src = fetchurl { - urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz" - "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz" - ]; - sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; +let noweb = stdenv.mkDerivation rec { + pname = "noweb"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "nrnrnr"; + repo = "noweb"; + rev = "v${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; - preBuild = '' - mkdir -p $out/lib/noweb - cd src - makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" - ''; - preInstall=''mkdir -p $out/share/texmf/tex/latex''; - postInstall= '' - substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" "" - for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \ - $out/lib/noweb/{toroff,btdefn,totex,noidx,unmarkup,toascii,tohtml,emptydefn}; do - substituteInPlace $f --replace "nawk" "${gawk}/bin/awk" - done - ''; + patches = [ ./no-FAQ.patch ]; - meta = { - platforms = stdenv.lib.platforms.linux; + nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + + preBuild = '' + mkdir -p "$out/lib/noweb" + cd src + ''; + + makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + "LIBSRC=icon" + "ICONC=icont" + ]; + + installFlags = [ + "BIN=$(out)/bin" + "ELISP=$(out)/share/emacs/site-lisp" + "LIB=$(out)/lib/noweb" + "MAN=$(out)/share/man" + "TEXINPUTS=$(tex)/tex/latex/noweb" + ]; + + preInstall = '' + mkdir -p "$tex/tex/latex/noweb" + ''; + + installTargets = "install-code install-tex install-elisp"; + + postInstall = '' + substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" + + for f in $out/bin/no{index,roff,roots,untangle,web} \ + $out/lib/noweb/to{ascii,html,roff,tex} \ + $out/lib/noweb/{bt,empty}defn \ + $out/lib/noweb/{noidx,unmarkup}; do + # NOTE: substituteInPlace breaks Icon binaries, so make sure the script + # uses (n)awk before calling. + if grep -q nawk "$f"; then + substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + fi + done + + # HACK: This is ugly, but functional. + PATH=$out/bin:$PATH make -BC xdoc + make $installFlags install-man + + ln -s "$tex" "$out/share/texmf" + ''; + + outputs = [ "out" "tex" ]; + + tlType = "run"; + passthru.pkgs = [ noweb.tex ]; + + meta = with stdenv.lib; { + description = "A simple, extensible literate-programming tool"; + homepage = https://www.cs.tufts.edu/~nr/noweb; + license = licenses.bsd2; + maintainers = with maintainers; [ yurrriq ]; + platforms = with platforms; linux ++ darwin; }; -} +}; in noweb diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96737537c9ba..ee3fc2477eed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9684,7 +9684,9 @@ in gconf = pkgs.gnome2.GConf; }; - noweb = callPackage ../development/tools/literate-programming/noweb { }; + noweb = noweb_icon; + noweb_awk = noweb_icon.override { icon-lang = null; }; + noweb_icon = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; From 3f2ba625d676f96ddbfd4a83480997989e61f183 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 13 Aug 2019 11:21:44 +0200 Subject: [PATCH 3/4] noweb: use clang on darwin --- pkgs/development/tools/literate-programming/noweb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 333491d9a3d2..43cb6e6c2c75 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -23,6 +23,8 @@ let noweb = stdenv.mkDerivation rec { makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ "LIBSRC=icon" "ICONC=icont" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CC=clang" ]; installFlags = [ From 6db22bca4b39fe9a95e7afc3a0c1078c01eb1257 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 13 Aug 2019 13:06:01 +0200 Subject: [PATCH 4/4] noweb: remove noweb_awk --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee3fc2477eed..6b65d2441b96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9684,9 +9684,9 @@ in gconf = pkgs.gnome2.GConf; }; - noweb = noweb_icon; - noweb_awk = noweb_icon.override { icon-lang = null; }; - noweb_icon = callPackage ../development/tools/literate-programming/noweb { }; + # NOTE: Override and set icon-lang = null to use Awk instead of Icon. + noweb = callPackage ../development/tools/literate-programming/noweb { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nrfutil = callPackage ../development/tools/misc/nrfutil { };