diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/development/interpreters/ngn-k/default.nix index e70ac2992146..dfd6b17f65fa 100644 --- a/pkgs/development/interpreters/ngn-k/default.nix +++ b/pkgs/development/interpreters/ngn-k/default.nix @@ -13,14 +13,14 @@ in useStdenv.mkDerivation { pname = "ngn-k"; - version = "unstable-2021-08-30"; + version = "unstable-2021-12-17"; src = fetchFromGitea { domain = "codeberg.org"; owner = "ngn"; repo = "k"; - rev = "3e2bcb81c723e268015818570f2805547114b5dd"; - sha256 = "0b16971xgf0sgx7qf41dilrpz02jnas61gfwkyvbxv18874w5vap"; + rev = "26f83645e9ed4798b43390fb9dcdfa0ab8245a8f"; + sha256 = "sha256-VcJcLcL1C8yQH6xvpKR0R0gMrhSfsU4tW+Yy0rGdSSw="; }; patches = [ @@ -28,8 +28,7 @@ useStdenv.mkDerivation { ]; postPatch = '' - # make self-reference for LICENSE - substituteAllInPlace repl.k + patchShebangs a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh # don't use hardcoded /bin/sh for f in repl.k m.c;do @@ -38,14 +37,18 @@ useStdenv.mkDerivation { ''; makeFlags = [ "-e" ]; - buildFlags = [ "k" ]; + buildFlags = [ "k" "libk.so" ]; checkTarget = "t"; inherit doCheck; + outputs = [ "out" "dev" "lib" ]; + installPhase = '' runHook preInstall install -Dm755 k "$out/bin/k" install -Dm755 repl.k "$out/bin/k-repl" + install -Dm755 libk.so "$lib/lib/libk.so" + install -Dm644 k.h "$dev/include/k.h" install -Dm644 LICENSE -t "$out/share/ngn-k" substituteInPlace "$out/bin/k-repl" --replace "#!k" "#!$out/bin/k" runHook postInstall diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/development/interpreters/ngn-k/repl-license-path.patch index 1b0ce708f0c3..6b5d1e4fb6ae 100644 --- a/pkgs/development/interpreters/ngn-k/repl-license-path.patch +++ b/pkgs/development/interpreters/ngn-k/repl-license-path.patch @@ -1,14 +1,10 @@ -diff --git a/repl.k b/repl.k -index e4071e6..70ae276 100755 --- a/repl.k +++ b/repl.k -@@ -3,8 +3,7 @@ repl.banner:"ngn/k, (c) 2019-2021 ngn, GNU AGPLv3. type \\ for more info\n" - repl.prompt:," " - repl.cmds:""!() - repl.cmds["vf"]:{` 0:($!h),'":",'`k'. h:(&(x~"v")=^`o`p`q`r`u`v`w?@'h)#h:``repl_.:0#`} --repl.cmds["a"]:{` 1:1:repl.basename[`argv 0],"/LICENSE";} --repl.basename:{$[#x:"/"/-1_"/"\x;x;,"."]} -+repl.cmds["a"]:{` 1:1:"@out@/share/ngn-k/LICENSE";} +@@ -1,6 +1,6 @@ + #!k + `1:"ngn/k, (c) 2019-2021 ngn, GNU AGPLv3. type \\ for more info\n",repl.prompt:," " +-repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"LICENSE";} ++repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"../share/ngn-k/LICENSE";} + repl.dirname:{$[#x:"/"/-1_"/"\x;x;,"."]} + repl.joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} repl.fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]} - repl.line:{$[#x;;:0];x:-1_x;$[(3>#x)&("\\"=*x)&~^(!repl.cmds)?x 1;repl.cmds[x 1]x 1;.[` 1:repl.fmt@.:;,x;`epr@]];` 1:repl.prompt;1} - {repl.cmds[x[1]1]:{y;` 0:x}2_x}'{(&x~\:80#"-")_x:(1+*&x~\:,"/")_-1_x}@0:`argv 1;