diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 8e9525e33842..aae7c61c6f9f 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "gambit-bootstrap-${version}"; - version = "4.9.1"; - tarball_version = "v4_9_1"; + version = "4.9.2"; + tarball_version = "v4_9_2"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz"; - sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}.tgz"; + sha256 = "1cpganh3jgjdw6qsapcbwxdbp1xwgx5gvdl4ymwf8p2c5k018dwy"; }; - buildInputs = [ autoconf git ]; + buildInputs = [ autoconf ]; configurePhase = '' ./configure --prefix=$out diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 19297a6e68eb..275d4785a2ca 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ { stdenv, callPackage, fetchurl }: callPackage ./build.nix { - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz"; - sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_2-devel.tgz"; + sha256 = "1xpjm3m1pxwj3n0g36lbb3p6wx2nc1iry95xc22pnq3m2374gjxv"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 15db82fc9fb2..a907de017408 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { stdenv, callPackage, fetchFromGitHub }: callPackage ./build.nix { - version = "unstable-2018-11-19"; -# git-version = "4.9.1-8-g61c6cb50"; + version = "unstable-2019-01-18"; +# git-version = "4.9.2"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "61c6cb500f4756be1e52095d5ab4501752525a70"; - sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn"; + rev = "cf5688ecf35d85b9355c645f535c1e057b3064e7"; + sha256 = "1xr7j4iws6hlrdbvlii4n98apr78k4adbnmy4ggzyik65bynh1kl"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 7ebd3f69cbf4..b20d6f9c47ef 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -24,9 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . - find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' done + grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do + substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' + done + substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" cat > etc/gerbil_static_libraries.sh <