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

Merge pull request #54632 from fare-patches/master

Browse Source 
Update gambit and gerbil from upstream
This commit is contained in:
Michael Raskin 2019-01-28 10:33:29 +00:00 committed by GitHub
commit 545cbf1bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,15 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gambit-bootstrap-${version}"; name = "gambit-bootstrap-${version}";
version = "4.9.1"; version = "4.9.2";
tarball_version = "v4_9_1"; tarball_version = "v4_9_2";
src = fetchurl { src = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz"; url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}.tgz";
sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; sha256 = "1cpganh3jgjdw6qsapcbwxdbp1xwgx5gvdl4ymwf8p2c5k018dwy";
}; };
buildInputs = [ autoconf git ]; buildInputs = [ autoconf ];
configurePhase = '' configurePhase = ''
./configure --prefix=$out ./configure --prefix=$out

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

@ -1,10 +1,10 @@
{ stdenv, callPackage, fetchurl }: { stdenv, callPackage, fetchurl }:
callPackage ./build.nix { callPackage ./build.nix {
version = "4.9.1"; version = "4.9.2";
src = fetchurl { src = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz"; url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_2-devel.tgz";
sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7"; sha256 = "1xpjm3m1pxwj3n0g36lbb3p6wx2nc1iry95xc22pnq3m2374gjxv";
}; };
inherit stdenv; inherit stdenv;
} }

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

@ -1,13 +1,13 @@
{ stdenv, callPackage, fetchFromGitHub }: { stdenv, callPackage, fetchFromGitHub }:
callPackage ./build.nix { callPackage ./build.nix {
version = "unstable-2018-11-19"; version = "unstable-2019-01-18";
# git-version = "4.9.1-8-g61c6cb50"; # git-version = "4.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "feeley"; owner = "feeley";
repo = "gambit"; repo = "gambit";
rev = "61c6cb500f4756be1e52095d5ab4501752525a70"; rev = "cf5688ecf35d85b9355c645f535c1e057b3064e7";
sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn"; sha256 = "1xr7j4iws6hlrdbvlii4n98apr78k4adbnmy4ggzyik65bynh1kl";
}; };
inherit stdenv; inherit stdenv;
} }

6
pkgs/development/compilers/gerbil/build.nix
View File

@ -24,9 +24,13 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
done done
grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do
substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"'
done
substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\""
cat > etc/gerbil_static_libraries.sh <<EOF cat > etc/gerbil_static_libraries.sh <<EOF
#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! #OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!

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

@ -1,14 +1,14 @@
{ stdenv, callPackage, fetchFromGitHub, gambit }: { stdenv, callPackage, fetchFromGitHub, gambit }:
callPackage ./build.nix rec { callPackage ./build.nix rec {
version = "0.14"; version = "0.15";
git-version = "0.14"; git-version = "0.15";
inherit gambit; inherit gambit;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vyzo"; owner = "vyzo";
repo = "gerbil"; repo = "gerbil";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7"; sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66";
}; };
inherit stdenv; inherit stdenv;
} }

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

@ -1,14 +1,14 @@
{ stdenv, callPackage, fetchFromGitHub, gambit-unstable }: { stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
callPackage ./build.nix { callPackage ./build.nix {
version = "unstable-2018-11-19"; version = "unstable-2019-01-25";
git-version = "0.15-DEV-2-g7d09a4ce"; git-version = "0.15";
gambit = gambit-unstable; gambit = gambit-unstable;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vyzo"; owner = "vyzo";
repo = "gerbil"; repo = "gerbil";
rev = "7d09a4cebe03d755a1791e77279e156a74e07685"; rev = "8c1aa2ca129a380de9cf668a7f3f6d56e56cbf94";
sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa"; sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66";
}; };
inherit stdenv; inherit stdenv;
} }