Merge pull request #33612 from fare-patches/master
Update gambit and gerbil
This commit is contained in:
commit
18ca43f339
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gambit-${version}";
|
name = "gambit-${version}";
|
||||||
version = "4.8.8-415-g29ed48bb";
|
version = "4.8.8-427-g37b111a5";
|
||||||
bootstrap = import ./bootstrap.nix ( pkgs );
|
bootstrap = import ./bootstrap.nix ( pkgs );
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/feeley/gambit.git";
|
url = "https://github.com/feeley/gambit.git";
|
||||||
rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec";
|
rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24";
|
||||||
sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr";
|
sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl git autoconf bootstrap ];
|
buildInputs = [ openssl git autoconf bootstrap ];
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gerbil-${version}";
|
name = "gerbil-${version}";
|
||||||
|
|
||||||
version = "0.12-DEV-836-gcde6802";
|
version = "0.12-DEV-1030-gbbed3bc";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/vyzo/gerbil.git";
|
url = "https://github.com/vyzo/gerbil.git";
|
||||||
rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5";
|
rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928";
|
||||||
sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18";
|
sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
|
||||||
# Enable all optional libraries
|
# Enable all optional libraries
|
||||||
substituteInPlace "src/std/build-features.ss" --replace '#f' '#t'
|
substituteInPlace "src/std/build-features.ss" --replace '#f' '#t'
|
||||||
|
|
||||||
|
# gxprof testing uses $HOME/.cache/gerbil/gxc
|
||||||
|
export HOME=$$PWD
|
||||||
|
|
||||||
# Build, replacing make by build.sh
|
# Build, replacing make by build.sh
|
||||||
( cd src && sh build.sh )
|
( cd src && sh build.sh )
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue