diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
| commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
| tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/tools/system/plan9port | |
| parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
| parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
| download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip | |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/tools/system/plan9port')
| -rw-r--r-- | nixpkgs/pkgs/tools/system/plan9port/default.nix | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch | 41 |
2 files changed, 5 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix index 9a4a22385584..54e88f5d0699 100644 --- a/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/nixpkgs/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 ]; @@ -81,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://9fans.github.io/plan9port/; + homepage = "https://9fans.github.io/plan9port/"; description = "Plan 9 from User Space"; longDescription = '' Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs @@ -90,7 +89,7 @@ stdenv.mkDerivation { license = licenses.lpl-102; maintainers = with maintainers; [ AndersonTorres bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; + platforms = remove "aarch64-linux" platforms.unix; }; } # TODO: investigate the mouse chording support patch diff --git a/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch b/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch deleted file mode 100644 index e8200a177a27..000000000000 --- a/nixpkgs/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 - |