git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127998 from ehmry/plan9port

plan9port: 2020-01-08 -> 2021-04-22

commitd4826151d4461aecf5eeda12cea75e77df7f72e9 authorAnderson Torres <torres.anderson.85@protonmail.com> dateFri 25 Jun 2021, 11:06 (5 years ago) parenta40b1a6f524f88
3 files changed+12−82
pkgs/tools/system/plan9port/darwin-cfframework.patch−24 pkgs/tools/system/plan9port/darwin-sw_vers.patch−47 pkgs/tools/system/plan9port/default.nix+12−11
pkgs/tools/system/plan9port/darwin-cfframework.patchdeleted−24
@@ -1,24 +0,0 @@
1−From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001
2−From: Jason Felice <jason.m.felice@gmail.com>
3−Date: Tue, 2 Jul 2019 13:19:23 -0400
4−Subject: [PATCH] Need CoreFoundation
5−
6−---
7− src/cmd/devdraw/cocoa-screen.m | 1 +
8− 1 file changed, 1 insertion(+)
9−
10−diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m
11−index 97128da2..0e380dd3 100644
12−--- a/src/cmd/devdraw/cocoa-screen.m
13−+++ b/src/cmd/devdraw/cocoa-screen.m
14−@@ -56,6 +56,7 @@
15− #endif
16−
17− AUTOFRAMEWORK(Cocoa)
18−+AUTOFRAMEWORK(CoreFoundation)
19−
20− #define LOG if(0)NSLog
21− #define panic sysfatal
22−--
23−2.21.0
24−
pkgs/tools/system/plan9port/darwin-sw_vers.patchdeleted−47
@@ -1,47 +0,0 @@
1−From d21d082275f04f88eabcc8ecdb03ee932c71ebf1 Mon Sep 17 00:00:00 2001
2−From: Jason Felice <jason.m.felice@gmail.com>
3−Date: Mon, 1 Jul 2019 15:23:19 -0400
4−Subject: [PATCH 2/3] Build for 10.12
5−
6−---
7− bin/osxvers | 3 +--
8− src/cmd/devdraw/mkwsysrules.sh | 4 ++--
9− 2 files changed, 3 insertions(+), 4 deletions(-)
10−
11−diff --git a/bin/osxvers b/bin/osxvers
12−index 4af44da2..3be7e6e9 100755
13−--- a/bin/osxvers
14−+++ b/bin/osxvers
15−@@ -2,6 +2,5 @@
16−
17− u=`uname`
18− case "$u" in
19−-Darwin)
20−- sw_vers | awk '$1 == "ProductVersion:" {print $2}' | awk -F. '{printf("CFLAGS=$CFLAGS -DOSX_VERSION=%d%02d%02d\n", $1, $2, $3)}'
21−+Darwin) printf 'CFLAGS=$CFLAGS -DOSX_VERSION=101200\n';;
22− esac
23−diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
24−index e94afbd3..40e632db 100644
25−--- a/src/cmd/devdraw/mkwsysrules.sh
26−+++ b/src/cmd/devdraw/mkwsysrules.sh
27−@@ -22,7 +22,7 @@ fi
28−
29− if [ "x$WSYSTYPE" = "x" ]; then
30− if [ "x`uname`" = "xDarwin" ]; then
31−- if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then
32−+ if false; then
33− echo 1>&2 'OS X 10.5 and older are not supported'
34− exit 1
35− else
36−@@ -54,7 +54,7 @@ if [ $WSYSTYPE = x11 ]; then
37− XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'`
38− echo 'WSYSOFILES=$WSYSOFILES '$XO
39− elif [ $WSYSTYPE = osx-cocoa ]; then
40−- if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh.
41−+ if false; then
42− echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc'
43− echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o'
44− else
45−--
46−2.21.0
47−
pkgs/tools/system/plan9port/default.nix+12−11
@@ -11,20 +11,15 @@
1111
1212stdenv.mkDerivation {
1313 pname = "plan9port";
14− version = "2020-01-08";
14+ version = "2021-04-22";
1515
1616 src = fetchFromGitHub {
1717 owner = "9fans";
1818 repo = "plan9port";
19− rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e";
20− sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g";
19+ rev = "70cc6e5ba7798b315c3fb3aae19620a01604a459";
20+ hash = "sha256-HCn8R9YSocHrpw/xK5n8gsCLSAbAQgw0NtjO9vYIbKo=";
2121 };
2222
23− patches = [
24− ./darwin-sw_vers.patch
25− ./darwin-cfframework.patch
26− ];
27−
2823 postPatch = ''
2924 #hardcoded path
3025 substituteInPlace src/cmd/acme/acme.c \
@@ -86,10 +81,16 @@ stdenv.mkDerivation {
8681 Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs
8782 from their native Plan 9 environment to Unix-like operating systems.
8883 '';
89− license = licenses.lpl-102;
90− maintainers = with maintainers; [ AndersonTorres bbarker
91− ftrvxmtrx kovirobi ];
84+ license = licenses.mit;
85+ maintainers = with maintainers; [
86+ AndersonTorres
87+ bbarker
88+ ehmry
89+ ftrvxmtrx
90+ kovirobi
91+ ];
9292 platforms = platforms.unix;
93+ broken = stdenv.isDarwin;
9394 };
9495}
9596# TODO: investigate the mouse chording support patch