diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/compilers/gambit | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/gambit')
3 files changed, 12 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/gambit/build.nix b/nixpkgs/pkgs/development/compilers/gambit/build.nix index c6a48bd744e7..a4b884147db1 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -35,6 +35,7 @@ gccStdenv.mkDerivation rec { #runtimeDeps = [ gnused gnugrep ]; configureFlags = [ + "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" @@ -94,6 +95,7 @@ gccStdenv.mkDerivation rec { # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch + ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; postInstall = '' diff --git a/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index 0e78831f2e4e..be745367ec03 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -2,12 +2,16 @@ rec { stable-params = { + stable = true; defaultRuntimeOptions = "f8,-8,t8"; buildRuntimeOptions = "f8,-8,t8"; fix-stamp = git-version : ""; + targets = "java,js,php,python,ruby"; + modules = false; }; unstable-params = { + stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; fix-stamp = git-version : '' @@ -15,6 +19,8 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; ''; + targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest + modules = false; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; diff --git a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 7284e5b531d8..a689991a1e13 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-07-29"; - git-version = "4.9.3-1232-gbba388b8"; + version = "unstable-2020-09-20"; + git-version = "4.9.3-1234-g6acd87df"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "bba388b80ca62a77883a8936d64b03316808696a"; - sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; + rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; + sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; }; gambit-params = gambit-support.unstable-params; } |