JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #44847 from fare-patches/master

Browse Source 
Update Gambit and Gerbil
This commit is contained in:
Michael Raskin 2018-08-12 08:34:04 +00:00 committed by GitHub
commit f4f93d6dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/gambit/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchurl }:
{ stdenv, callPackage, fetchurl }:
callPackage ./build.nix {
version = "4.8.9";
@ -7,4 +7,5 @@ callPackage ./build.nix {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
};
inherit stdenv;
}

10
pkgs/development/compilers/gambit/unstable.nix
View File

@ -1,10 +1,12 @@
{ callPackage, fetchgit }:
{ stdenv, callPackage, fetchgit }:
callPackage ./build.nix {
version = "unstable-2018-05-30";
version = "unstable-2018-08-06";
# git-version = "4.8.9-77-g91a4ad2c";
SRC = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q";
rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f";
sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p";
};
inherit stdenv;
}

3
pkgs/development/compilers/gerbil/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchurl, gambit }:
{ stdenv, callPackage, fetchurl, gambit }:
callPackage ./build.nix {
version = "0.12-RELEASE";
@ -8,4 +8,5 @@ callPackage ./build.nix {
url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz";
sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq";
};
inherit stdenv;
}

11
pkgs/development/compilers/gerbil/unstable.nix
View File

@ -1,12 +1,13 @@
{ callPackage, fetchgit, gambit-unstable }:
{ stdenv, callPackage, fetchgit, gambit-unstable }:
callPackage ./build.nix {
version = "unstable-2018-05-12";
git-version = "0.13-DEV-437-gaefdb47f";
version = "unstable-2018-08-11";
git-version = "0.13-DEV-542-g274e1a22";
GAMBIT = gambit-unstable;
SRC = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436";
sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms";
rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686";
sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s";
};
inherit stdenv;
}

8
pkgs/top-level/all-packages.nix
View File

@ -6344,10 +6344,10 @@ with pkgs;
fpc = callPackage ../development/compilers/fpc { };
gambit = callPackage ../development/compilers/gambit { };
gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };
gerbil = callPackage ../development/compilers/gerbil { };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { };
gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; };
gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; };
gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
gccFun = callPackage ../development/compilers/gcc/7;
gcc = gcc7;