about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2018-01-11 09:38:08 +0000
committerGitHub <noreply@github.com>2018-01-11 09:38:08 +0000
commit18ca43f3393d8df0d330b8bb8a75e7b18e24f076 (patch)
treed9a574eae81b8b78fb125eb0e335b21977a51395
parentd4917695b57dc7c60b9501b960169862e92c264e (diff)
parent699c8cc832fa55c52bcd0e62739e6fd4949c840f (diff)
downloadnixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar.gz
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar.bz2
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar.lz
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar.xz
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.tar.zst
nixlib-18ca43f3393d8df0d330b8bb8a75e7b18e24f076.zip
Merge pull request #33612 from fare-patches/master
Update gambit and gerbil
-rw-r--r--pkgs/development/compilers/gambit/default.nix6
-rw-r--r--pkgs/development/compilers/gerbil/default.nix9
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index b70d3649bb9a..01463f091c29 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.8.8-415-g29ed48bb";
+  version = "4.8.8-427-g37b111a5";
   bootstrap = import ./bootstrap.nix ( pkgs );
 
   src = fetchgit {
     url = "https://github.com/feeley/gambit.git";
-    rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec";
-    sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr";
+    rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24";
+    sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50";
   };
 
   buildInputs = [ openssl git autoconf bootstrap ];
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 23089ddda4e8..9bd23aebfc43 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
   name    = "gerbil-${version}";
 
-  version = "0.12-DEV-836-gcde6802";
+  version = "0.12-DEV-1030-gbbed3bc";
   src = fetchgit {
     url = "https://github.com/vyzo/gerbil.git";
-    rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5";
-    sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18";
+    rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928";
+    sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r";
   };
 
   buildInputs = [
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     # Enable all optional libraries
     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
     ( cd src && sh build.sh )