git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #86843 from fare-patches/fare

Enhanced support for Gerbil, Gambit

commit4961e598233796c83d165c51c9361cd3b2e868d1 authorMichael Raskin <7c6f434c@mail.ru> dateSun 17 May 2020, 23:22 (7 years ago) parent6feee800d0f475
11 files changed+242−110
pkgs/development/compilers/gambit/bootstrap.nix+11−11 pkgs/development/compilers/gambit/build.nix+37−26 pkgs/development/compilers/gambit/default.nix+3−3 pkgs/development/compilers/gambit/gambit-support.nix+33 pkgs/development/compilers/gambit/unstable.nix+6−6 pkgs/development/compilers/gerbil/build.nix+44−45 pkgs/development/compilers/gerbil/default.nix+4−6 pkgs/development/compilers/gerbil/gerbil-support.nix+64 pkgs/development/compilers/gerbil/gerbil-utils.nix+24 pkgs/development/compilers/gerbil/unstable.nix+9−9 pkgs/top-level/all-packages.nix+7−4
pkgs/development/compilers/gambit/bootstrap.nix+11−11
@@ -1,6 +1,10 @@
1−{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }:
1+# This derivation is a reduced-functionality variant of Gambit stable,
2+# used to compile the full version of Gambit stable *and* unstable.
23
3−stdenv.mkDerivation {
4+{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }:
5+# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better
6+
7+gccStdenv.mkDerivation {
48 pname = "gambit-bootstrap";
59 version = "4.9.3";
610
@@ -16,29 +20,25 @@ stdenv.mkDerivation {
1620 CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
1721 XMKMF=${coreutils}/bin/false
1822 unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
19− ./configure --prefix=$out
23+ ./configure --prefix=$out/gambit
2024 '';
2125
2226 buildPhase = ''
2327 # Copy the (configured) sources now, not later, so we don't have to filter out
2428 # all the intermediate build products.
25− mkdir -p $out ; cp -rp . $out/
29+ mkdir -p $out/gambit ; cp -rp . $out/gambit/
2630
2731 # build the gsc-boot* compiler
28− make bootstrap
32+ make -j$NIX_BUILD_CORES bootstrap
2933 '';
3034
3135 installPhase = ''
32− cp -fa ./ $out/
36+ cp -fa ./ $out/gambit/
3337 '';
3438
3539 forceShare = [ "info" ];
3640
37− meta = {
41+ meta = gambit-support.meta // {
3842 description = "Optimizing Scheme to C compiler, bootstrap step";
39− homepage = "http://gambitscheme.org";
40− license = stdenv.lib.licenses.lgpl2;
41− platforms = stdenv.lib.platforms.unix;
42− maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
4343 };
4444}
pkgs/development/compilers/gambit/build.nix+37−26
@@ -1,11 +1,13 @@
1−{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }:
1+{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep,
2+ src, version, git-version,
3+ gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }:
24
35# Note that according to a benchmark run by Marc Feeley on May 2018,
46# clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling
57# Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30,
68# the numbers were still heavily in favor of GCC in October 2019.
79# Thus we use GCC over clang, even on macOS.
8−
10+#
911# Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks
1012# with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark.
1113# The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%,
@@ -13,29 +15,34 @@
1315# However, -Os seems more consistent in winning slightly against both -O1 and -O2,
1416# and is overall 15% faster than -O2. As for compile times, -O1 is fastest,
1517# -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1.
16−# Overall, -Os seems like the best choice, and that's what we now use.
18+#
19+# Overall, -Os seems like the best choice, but I care more about compile-time,
20+# so I stick with -O1 (in the defaults above), which is also the default for Gambit.
1721
18−stdenv.mkDerivation rec {
19− pname = "gambit";
20− inherit version;
21− inherit src;
22+gccStdenv.mkDerivation rec {
2223
23− bootstrap = import ./bootstrap.nix ( pkgs );
24+ pname = "gambit";
25+ inherit src version git-version;
26+ bootstrap = gambit-support.gambit-bootstrap;
2427
2528 # TODO: if/when we can get all the library packages we depend on to have static versions,
2629 # we could use something like (makeStaticLibraries openssl) to enable creation
2730 # of statically linked binaries by gsc.
2831 buildInputs = [ git autoconf bootstrap openssl ];
2932
33+ # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more?
34+ # Or wrap relevant programs to add a suitable PATH ?
35+ #runtimeDeps = [ gnused gnugrep ];
36+
3037 configureFlags = [
3138 "--enable-single-host"
32− "--enable-c-opt=-Os"
39+ "--enable-c-opt=${optimizationSetting}"
3340 "--enable-gcc-opts"
3441 "--enable-shared"
3542 "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
3643 "--enable-poll"
3744 "--enable-openssl"
38− "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O
45+ "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
3946 # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
4047 # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing
4148 # "--enable-guide"
@@ -53,11 +60,17 @@ stdenv.mkDerivation rec {
5360 ];
5461
5562 configurePhase = ''
56− export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
57− CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
63+ export CC=${gcc}/bin/gcc \
64+ CXX=${gcc}/bin/g++ \
65+ CPP=${gcc}/bin/cpp \
66+ CXXCPP=${gcc}/bin/cpp \
67+ LD=${gcc}/bin/ld \
5868 XMKMF=${coreutils}/bin/false
5969 unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
60− ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags}
70+
71+ ${gambit-params.fix-stamp git-version}
72+
73+ ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags}
6174
6275 # OS-specific paths are hardcoded in ./configure
6376 substituteInPlace config.status \
@@ -69,28 +82,26 @@ stdenv.mkDerivation rec {
6982 buildPhase = ''
7083 # Make bootstrap compiler, from release bootstrap
7184 mkdir -p boot &&
72− cp -rp ${bootstrap}/. boot/. &&
85+ cp -rp ${bootstrap}/gambit/. boot/. &&
7386 chmod -R u+w boot &&
7487 cd boot &&
75− cp ../gsc/makefile.in ../gsc/*.scm gsc && # */
88+ cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */
7689 ./configure &&
77− for i in lib gsi gsc ; do (cd $i ; make ) ; done &&
90+ for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done &&
7891 cd .. &&
7992 cp boot/gsc/gsc gsc-boot &&
8093
8194 # Now use the bootstrap compiler to build the real thing!
82− make -j2 from-scratch
95+ make -j$NIX_BUILD_CORES from-scratch
96+ '';
97+
98+ postInstall = ''
99+ mkdir $out/bin
100+ cd $out/bin
101+ ln -s ../gambit/bin/* .
83102 '';
84103
85104 doCheck = true;
86105
87− meta = {
88− description = "Optimizing Scheme to C compiler";
89− homepage = "http://gambitscheme.org";
90− license = stdenv.lib.licenses.lgpl2;
91− # NB regarding platforms: only actually tested on Linux, *should* work everywhere,
92− # but *might* need adaptation e.g. on macOS.
93− platforms = stdenv.lib.platforms.unix;
94− maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
95− };
106+ meta = gambit-support.meta;
96107}
pkgs/development/compilers/gambit/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, callPackage, fetchurl }:
1+{ callPackage, fetchurl }:
22
3−callPackage ./build.nix {
3+callPackage ./build.nix rec {
44 version = "4.9.3";
5+ git-version = version;
56 src = fetchurl {
67 url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz";
78 sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk";
89 };
9− inherit stdenv;
1010}
pkgs/development/compilers/gambit/gambit-support.nixnew file+33
@@ -0,0 +1,33 @@
1+{ pkgs, lib }:
2+
3+rec {
4+ stable-params = {
5+ defaultRuntimeOptions = "f8,-8,t8";
6+ buildRuntimeOptions = "f8,-8,t8";
7+ fix-stamp = git-version : "";
8+ };
9+
10+ unstable-params = {
11+ defaultRuntimeOptions = "iL,fL,-L,tL";
12+ buildRuntimeOptions = "i8,f8,-8,t8";
13+ fix-stamp = git-version : ''
14+ substituteInPlace configure \
15+ --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \
16+ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ;
17+ '';
18+ };
19+
20+ export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;";
21+
22+ gambit-bootstrap = import ./bootstrap.nix ( pkgs );
23+
24+ meta = {
25+ description = "Optimizing Scheme to C compiler";
26+ homepage = "http://gambitscheme.org";
27+ license = lib.licenses.lgpl21; # dual, also asl20
28+ # NB regarding platforms: continuously tested on Linux,
29+ # tested on macOS once in a while, *should* work everywhere.
30+ platforms = lib.platforms.unix;
31+ maintainers = with lib.maintainers; [ thoughtpolice raskin fare ];
32+ };
33+}
pkgs/development/compilers/gambit/unstable.nix+6−6
@@ -1,13 +1,13 @@
1−{ stdenv, callPackage, fetchFromGitHub }:
1+{ callPackage, fetchFromGitHub, gambit-support }:
22
33callPackage ./build.nix {
4− version = "unstable-2020-02-24";
5−# git-version = "4.9.3-979-gc69e9f70";
4+ version = "unstable-2020-05-15";
5+ git-version = "4.9.3-1109-g3c4d40de";
66 src = fetchFromGitHub {
77 owner = "feeley";
88 repo = "gambit";
9− rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc";
10− sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k";
9+ rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c";
10+ sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr";
1111 };
12− inherit stdenv;
12+ gambit-params = gambit-support.unstable-params;
1313}
pkgs/development/compilers/gerbil/build.nix+44−45
@@ -1,34 +1,34 @@
1−{ stdenv, makeStaticLibraries,
2− coreutils, rsync, bash,
1+{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries,
32 openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
4− version, git-version, gambit, src }:
3+ version, git-version,
4+ gambit-support,
5+ gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }:
6+
7+# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix
8+let stdenv = gccStdenv; in
59
610stdenv.mkDerivation rec {
711 pname = "gerbil";
812 inherit version;
913 inherit src;
1014
11− # Use makeStaticLibraries to enable creation of statically linked binaries
1215 buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
13− buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
1416
15− buildInputs = [ gambit rsync bash ]
16− ++ buildInputs_libraries ++ buildInputs_staticLibraries;
17+ # TODO: either fix all of Gerbil's dependencies to provide static libraries,
18+ # or give up and delete all tentative support for static libraries.
19+ #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
20+
21+ buildInputs = [ gambit ]
22+ ++ buildInputs_libraries; # ++ buildInputs_staticLibraries;
1723
1824 NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";
1925
2026 postPatch = ''
21− echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
22−
23− patchShebangs .
24−
27+ echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ;
28+ patchShebangs . ;
2529 grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
26− substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
27− done
28− grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do
29− substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"'
30− done
31− substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\""
30+ substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ;
31+ done ;
3232'';
3333
3434## TODO: make static compilation work.
@@ -47,22 +47,31 @@ stdenv.mkDerivation rec {
4747# LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a
4848# EOF
4949
50+ configurePhase = ''
51+ (cd src && ./configure \
52+ --prefix=$out/gerbil \
53+ --with-gambit=${gambit}/gambit \
54+ --enable-libxml \
55+ --enable-libyaml \
56+ --enable-zlib \
57+ --enable-sqlite \
58+ --enable-mysql \
59+ --enable-lmdb \
60+ --enable-leveldb)
61+ '';
62+
5063 buildPhase = ''
5164 runHook preBuild
5265
53− # Enable all optional libraries
54− substituteInPlace "src/std/build-features.ss" --replace '#f' '#t'
55−
56− # Enable autodetection of a default GERBIL_HOME
57− for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do
58− substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")"
59− done
60− for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do
61− substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")"
62− done
63−
6466 # gxprof testing uses $HOME/.cache/gerbil/gxc
65− export HOME=$$PWD
67+ export HOME=$PWD
68+ export GERBIL_BUILD_CORES=$NIX_BUILD_CORES
69+ export GERBIL_GXC=$PWD/bin/gxc
70+ export GERBIL_BASE=$PWD
71+ export GERBIL_HOME=$PWD
72+ export GERBIL_PATH=$PWD/lib
73+ export PATH=$PWD/bin:$PATH
74+ ${gambit-support.export-gambopt gambit-params}
6675
6776 # Build, replacing make by build.sh
6877 ( cd src && sh build.sh )
@@ -72,19 +81,9 @@ stdenv.mkDerivation rec {
7281
7382 installPhase = ''
7483 runHook preInstall
75− mkdir -p $out/
76− cp -fa bin lib etc doc $out/
77−
78− cat > $out/bin/gxi <<EOF
79−#!${bash}/bin/bash -e
80−export GERBIL_HOME=$out
81−case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
82−if [[ \$# = 0 ]] ; then
83− exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive -
84−else
85− exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
86−fi
87−EOF
84+ mkdir -p $out/gerbil $out/bin
85+ (cd src; ./install)
86+ (cd $out/bin ; ln -s ../gerbil/bin/* .)
8887 runHook postInstall
8988 '';
9089
@@ -93,10 +92,10 @@ EOF
9392 meta = {
9493 description = "Gerbil Scheme";
9594 homepage = "https://github.com/vyzo/gerbil";
96− license = stdenv.lib.licenses.lgpl2;
95+ license = lib.licenses.lgpl21; # also asl20, like Gambit
9796 # NB regarding platforms: regularly tested on Linux, only occasionally on macOS.
9897 # Please report success and/or failure to fare.
99− platforms = stdenv.lib.platforms.unix;
100− maintainers = with stdenv.lib.maintainers; [ fare ];
98+ platforms = lib.platforms.unix;
99+ maintainers = with lib.maintainers; [ fare ];
101100 };
102101}
pkgs/development/compilers/gerbil/default.nix+4−6
@@ -1,14 +1,12 @@
1−{ stdenv, callPackage, fetchFromGitHub, gambit }:
1+{ callPackage, fetchFromGitHub }:
22
33callPackage ./build.nix rec {
4− version = "0.15.1";
5− git-version = "0.15.1";
6− inherit gambit;
4+ version = "0.16";
5+ git-version = version;
76 src = fetchFromGitHub {
87 owner = "vyzo";
98 repo = "gerbil";
109 rev = "v${version}";
11− sha256 = "0qpqms66hz41wwhxb1z0fnzj96ivkm7qi9h9d7lhlr3fsxm1kp1n";
10+ sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f";
1211 };
13− inherit stdenv;
1412}
pkgs/development/compilers/gerbil/gerbil-support.nixnew file+64
@@ -0,0 +1,64 @@
1+{ pkgs, gccStdenv, callPackage, fetchFromGitHub }:
2+# See ../gambit/build.nix regarding gccStdenv
3+
4+rec {
5+ # Gerbil libraries
6+ gerbilPackages-unstable = {
7+ gerbil-utils = callPackage ./gerbil-utils.nix { };
8+ };
9+
10+ # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH.
11+ gerbilLoadPath =
12+ gerbilInputs : builtins.concatStringsSep ":" (map (x : x + "/gerbil/lib") gerbilInputs);
13+
14+ # Use this function to create a Gerbil library. See gerbil-utils as an example.
15+ gerbilPackage = {
16+ pname, version, src, meta, package,
17+ git-version ? "", version-path ? "config/version.ss",
18+ gerbil ? pkgs.gerbil-unstable,
19+ gambit-params ? pkgs.gambit-support.stable-params,
20+ gerbilInputs ? [],
21+ buildInputs ? [],
22+ softwareName ? "" } :
23+ let buildInputs_ = buildInputs; in
24+ gccStdenv.mkDerivation rec {
25+ inherit src meta pname version;
26+ buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_;
27+ postPatch = ''
28+ set -e ;
29+ if [ -n "${version-path}" ] ; then
30+ echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}"
31+ fi
32+ patchShebangs . ;
33+ '';
34+
35+ postConfigure = ''
36+ export GERBIL_BUILD_CORES=$NIX_BUILD_CORES
37+ export GERBIL_PATH=$PWD/.build
38+ export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs}
39+ ${pkgs.gambit-support.export-gambopt gambit-params}
40+ '';
41+
42+ buildPhase = ''
43+ runHook preBuild
44+ ./build.ss
45+ runHook postBuild
46+ '';
47+
48+ installPhase = ''
49+ runHook preInstall
50+ mkdir -p $out/gerbil/lib
51+ cp -fa .build/lib $out/gerbil/
52+ bins=(.build/bin/*)
53+ if [ 0 -lt ''${#bins} ] ; then
54+ cp -fa .build/bin $out/gerbil/
55+ mkdir $out/bin
56+ cd $out/bin
57+ ln -s ../gerbil/bin/* .
58+ fi
59+ runHook postInstall
60+ '';
61+
62+ dontFixup = true;
63+ };
64+}
pkgs/development/compilers/gerbil/gerbil-utils.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
2+
3+gerbil-support.gerbilPackage {
4+ pname = "gerbil-utils";
5+ version = "unstable-2020-05-17";
6+ git-version = "33ef720";
7+ package = "clan";
8+ gerbil = gerbil-unstable;
9+ gambit-params = gambit-support.unstable-params;
10+ version-path = "";
11+ src = fetchFromGitHub {
12+ owner = "fare";
13+ repo = "gerbil-utils";
14+ rev = "33ef720799ba98dc9eec773c662f070af4bac016";
15+ sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf";
16+ };
17+ meta = {
18+ description = "Gerbil Clan: Community curated Collection of Common Utilities";
19+ homepage = "https://github.com/fare/gerbil-utils";
20+ license = lib.licenses.lgpl21;
21+ platforms = lib.platforms.unix;
22+ maintainers = with lib.maintainers; [ fare ];
23+ };
24+}
pkgs/development/compilers/gerbil/unstable.nix+9−9
@@ -1,15 +1,15 @@
1−{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }:
1+{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }:
22
3−callPackage ./build.nix {
4− version = "unstable-2020-02-27";
5− git-version = "0.16-DEV-493-g1ffb74db";
6− #gambit = gambit-unstable;
7− gambit = gambit;
3+callPackage ./build.nix rec {
4+ version = "unstable-2020-05-17";
5+ git-version = "0.16-1-g36a31050";
86 src = fetchFromGitHub {
97 owner = "vyzo";
108 repo = "gerbil";
11− rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41";
12− sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097";
9+ rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698";
10+ sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv";
1311 };
14− inherit stdenv;
12+ inherit gambit-support;
13+ gambit = gambit-unstable;
14+ gambit-params = gambit-support.unstable-params;
1515}
pkgs/top-level/all-packages.nix+7−4
@@ -8202,10 +8202,13 @@ in
82028202
82038203 fpc = callPackage ../development/compilers/fpc { };
82048204
8205− gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; };
8206− gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; };
8207− gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
8208− gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
8205+ gambit = callPackage ../development/compilers/gambit { };
8206+ gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };
8207+ gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { };
8208+ gerbil = callPackage ../development/compilers/gerbil { };
8209+ gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { };
8210+ gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { };
8211+ gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
82098212
82108213 gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9);
82118214 gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9;