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

Merge pull request #50741 from fare-patches/master

Browse Source 
Update gambit and gerbil to new upstream releases
This commit is contained in:
Jörg Thalheim 2018-11-21 18:29:30 +00:00 committed by GitHub
commit 44f8603993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
pkgs/development/compilers/gambit/build.nix
View File

@ -1,8 +1,8 @@
{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }: { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gambit-${version}"; name = "gambit-${version}";
src = SRC; inherit src;
bootstrap = import ./bootstrap.nix ( pkgs ); bootstrap = import ./bootstrap.nix ( pkgs );

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

@ -1,11 +1,10 @@
{ stdenv, callPackage, fetchurl }: { stdenv, callPackage, fetchurl }:
callPackage ./build.nix { callPackage ./build.nix {
version = "4.9.0"; version = "4.9.1";
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_0-devel.tgz"; sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
sha256 = "0wyfpjs244zrbrdil9rfkdgcawvms84z0r77qwhwadghma4dqgjf";
}; };
inherit stdenv; inherit stdenv;
} }

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

@ -1,12 +1,13 @@
{ stdenv, callPackage, fetchgit }: { stdenv, callPackage, fetchFromGitHub }:
callPackage ./build.nix { callPackage ./build.nix {
version = "unstable-2018-09-03"; version = "unstable-2018-11-19";
# git-version = "4.9.0"; # git-version = "4.9.1-8-g61c6cb50";
SRC = fetchgit { src = fetchFromGitHub {
url = "https://github.com/feeley/gambit.git"; owner = "feeley";
rev = "7cdc7e7b9194b2c088c0667efaf7686a4ffd0d8a"; repo = "gambit";
sha256 = "06mmi8jkinihfirz4gjfw2lhxhskiqf3d47sihzx10r60asyqcxg"; rev = "61c6cb500f4756be1e52095d5ab4501752525a70";
sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn";
}; };
inherit stdenv; inherit stdenv;
} }

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

@ -1,20 +1,20 @@
{ stdenv, makeStaticLibraries, { stdenv, makeStaticLibraries,
coreutils, rsync, bash, coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
version, git-version, GAMBIT, SRC }: version, git-version, gambit, src }:
# TODO: distinct packages for gerbil-release and gerbil-devel # TODO: distinct packages for gerbil-release and gerbil-devel
# TODO: make static compilation work # TODO: make static compilation work
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gerbil-${version}"; name = "gerbil-${version}";
src = SRC; inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries # Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
buildInputs = [ GAMBIT coreutils rsync bash ] buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries; ++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
@ -66,9 +66,9 @@ EOF
export GERBIL_HOME=$out export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then if [[ \$# = 0 ]] ; then
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
else else
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi fi
EOF EOF
runHook postInstall runHook postInstall

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

@ -1,12 +1,14 @@
{ stdenv, callPackage, fetchurl, gambit }: { stdenv, callPackage, fetchFromGitHub, gambit }:
callPackage ./build.nix { callPackage ./build.nix rec {
version = "0.13"; version = "0.14";
git-version = "0.13"; git-version = "0.14";
GAMBIT = gambit; inherit gambit;
SRC = fetchurl { src = fetchFromGitHub {
url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz"; owner = "vyzo";
sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l"; repo = "gerbil";
rev = "v${version}";
sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
}; };
inherit stdenv; inherit stdenv;
} }

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

@ -1,13 +1,14 @@
{ stdenv, callPackage, fetchgit, gambit-unstable }: { stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
callPackage ./build.nix { callPackage ./build.nix {
version = "unstable-2018-09-06"; version = "unstable-2018-11-19";
git-version = "0.14-DEV"; git-version = "0.15-DEV-2-g7d09a4ce";
GAMBIT = gambit-unstable; gambit = gambit-unstable;
SRC = fetchgit { src = fetchFromGitHub {
url = "https://github.com/vyzo/gerbil.git"; owner = "vyzo";
rev = "184cb635c82517d5d75d7966dcdf1d25ad863dac"; repo = "gerbil";
sha256 = "1ljzbpc36i9zpzfwra5hpfbgzj1dyzzp50h5jf976n8qr9x4l7an"; rev = "7d09a4cebe03d755a1791e77279e156a74e07685";
sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa";
}; };
inherit stdenv; inherit stdenv;
} }