diff options
| author | Jason Felice <jason.m.felice@gmail.com> | 2020-04-10 11:46:48 -0400 |
|---|---|---|
| committer | Jason Felice <jason.m.felice@gmail.com> | 2020-04-10 11:46:48 -0400 |
| commit | a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c (patch) | |
| tree | 5a6985c56bc8fd996d3858a0806f75a11a807d8c /pkgs/tools/system | |
| parent | f601ab37c2fb7e5f65989a92df383bcd6942567a (diff) | |
| download | nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar.gz nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar.bz2 nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar.lz nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar.xz nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.tar.zst nixlib-a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c.zip | |
plan9port: 2019-02-25 -> 2020-01-08
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/system/plan9port/tmpdir.patch | 41 |
2 files changed, 3 insertions, 45 deletions
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9a4a22385584..1541e988c1ef 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -11,17 +11,16 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "2019-02-25"; + version = "2020-01-08"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; - sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; + rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e"; + sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g"; }; patches = [ - ./tmpdir.patch ./darwin-sw_vers.patch ./darwin-cfframework.patch ]; diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/pkgs/tools/system/plan9port/tmpdir.patch deleted file mode 100644 index e8200a177a27..000000000000 --- a/pkgs/tools/system/plan9port/tmpdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001 -From: Jason Felice <jason.m.felice@gmail.com> -Date: Mon, 1 Jul 2019 15:01:21 -0400 -Subject: [PATCH] Use $TMPDIR if available - -NixOS sandboxed builds (at least on Mac) don't have access to /tmp, -and this should be better POSIX. ---- - bin/9c | 2 +- - bin/9l | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/9c b/bin/9c -index 3ffb716c..88c47887 100755 ---- a/bin/9c -+++ b/bin/9c -@@ -133,7 +133,7 @@ case "$tag" in - esac - - # N.B. Must use temp file to avoid pipe; pipe loses status. --xtmp=/tmp/9c.$$.$USER.out -+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out - $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp - status=$? - quiet $xtmp -diff --git a/bin/9l b/bin/9l -index 6195815f..717a540a 100755 ---- a/bin/9l -+++ b/bin/9l -@@ -346,7 +346,7 @@ then - echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks - fi - --xtmp=/tmp/9l.$$.$USER.out -+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out" - xxout() { - sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | - egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' --- -2.21.0 - |