pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #17831 from bendlas/update-pixie

pixie: 1352 -> 1356

authored by Rok Garbas and committed by GitHub 33c09c9f 1efedc6c

+13 -7
unified split
+12 -6
pkgs/development/interpreters/pixie/default.nix
··· 3 3 variant ? "jit", buildWithPypy ? false }: 4 4 5 5 let 6 - commit-count = "1352"; 6 + commit-count = "1356"; 7 7 common-flags = "--thread --gcrootfinder=shadowstack --continuation"; 8 8 variants = { 9 9 jit = { flags = "--opt=jit"; target = "target.py"; }; ··· 13 13 }; 14 14 pixie-src = fetchgit { 15 15 url = "https://github.com/pixie-lang/pixie.git"; 16 - rev = "dd754fe9f329e9e176eeaedae1095c85cde65028"; 17 - sha256 = "1jf3nkd1jzvxrw9ql2r74drsirrxfihc125x0wmk45jyl5q24vdd"; 16 + rev = "d2a4267ea088f711af36a74928e8dfd8360584ad"; 17 + sha256 = "1asf6yx7zy9cx4bsg8iai57dy3r3m45xcmkmw2vix70xvfy23ryf"; 18 18 }; 19 - pypy-tag = "81254"; 19 + pypy-tag = "91db1a9"; 20 20 pypy-src = fetchurl { 21 21 name = "pypy-src-${pypy-tag}"; 22 22 url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2"; 23 - sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn"; 23 + sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; 24 24 }; 25 25 libs = [ libffi libedit libuv boost.dev boost.out zlib ]; 26 26 include-path = stdenv.lib.concatStringsSep ":" ··· 63 63 mkdir -p $out/share $out/bin 64 64 cp pixie-src/pixie-vm $out/share/pixie-vm 65 65 cp -R pixie-src/pixie $out/share/pixie 66 - makeWrapper $out/share/pixie-vm $out/bin/pxi \ 66 + makeWrapper $out/share/pixie-vm $out/bin/pixie-vm \ 67 67 --prefix LD_LIBRARY_PATH : ${library-path} \ 68 68 --prefix C_INCLUDE_PATH : ${include-path} \ 69 69 --prefix LIBRARY_PATH : ${library-path} \ 70 70 --prefix PATH : ${bin-path} 71 + cat > $out/bin/pxi <<EOF 72 + #!$shell 73 + >&2 echo "[\$\$] WARNING: 'pxi' is a deprecated alias for 'pixie-vm', please update your scripts." 74 + exec $out/bin/pixie-vm "\$@" 75 + EOF 76 + chmod +x $out/bin/pxi 71 77 ''; 72 78 meta = { 73 79 description = "A clojure-like lisp, built with the pypy vm toolkit";
+1 -1
pkgs/development/interpreters/pixie/dust.nix
··· 11 11 buildInputs = [ pixie ]; 12 12 patches = [ ./make-paths-configurable.patch ]; 13 13 configurePhase = '' 14 - pixiePath="${pixie}/bin/pxi" \ 14 + pixiePath="${pixie}/bin/pixie-vm" \ 15 15 basePath="$out/share/dust" \ 16 16 substituteAll dust.in dust 17 17 chmod +x dust