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

Merge pull request #272397 from MuKnIO/devel

Browse Source 
Gerbil v0.18.1
This commit is contained in:
7c6f434c 2023-12-10 18:14:38 +00:00 committed by GitHub
commit 2f480818d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 57 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ callPackage, fetchFromGitHub, gambit-support }:
callPackage ./build.nix rec {
version = "unstable-2023-10-07";
git-version = "4.9.5-59-g342399c7";
stampYmd = 20231007;
stampHms = 170745;
rev = "342399c736ec560c0ff4faeaeb9599b45633f26c";
version = "unstable-2023-12-04";
git-version = "4.9.5-84-g6b19d0c9";
stampYmd = 20231204;
stampHms = 204859;
rev = "6b19d0c9084341306bbb7d6895321090a82988a0";
src = fetchFromGitHub {
owner = "gambit";
repo = "gambit";
inherit rev;
sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f";
sha256 = "0njcz9krak8nfyk3x6bc6m1rixzsjc1fyzhbz2g3aq5v8kz9mkl5";
};
gambit-params = gambit-support.unstable-params;
}

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

@ -24,17 +24,16 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs_libraries;
postPatch = ''
echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ;
patchShebangs . ;
grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ;
done ;
substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ;
substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ;
#rmdir src/gambit
#cp -a ${pkgs.gambit-unstable.src} ./src/gambit
chmod -R u+w ./src/gambit
( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} )
cat > MANIFEST <<EOF
gerbil_stamp_version=v${git-version}
gambit_stamp_version=v${gambit-git-version}
gambit_stamp_ymd=${gambit-stampYmd}
gambit_stamp_hms=${gambit-stampHms}
EOF
for f in src/bootstrap/gerbil/compiler/driver__0.scm \
src/build/build-libgerbil.ss \
src/gerbil/compiler/driver.ss ; do
@ -58,8 +57,7 @@ stdenv.mkDerivation rec {
"--enable-zlib"
"--enable-sqlite"
"--enable-shared"
"--disable-deprecated"
"--enable-march=" # Avoid non-portable invalid instructions
"--enable-march=" # Avoid non-portable invalid instructions. Use =native if local build only.
];
configurePhase = ''
@ -70,15 +68,7 @@ stdenv.mkDerivation rec {
LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \
XMKMF=${coreutils}/bin/false
unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
(cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms})
./configure ${builtins.concatStringsSep " " configureFlags}
(cd src/gambit ;
substituteInPlace config.status \
${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable)
''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \
--replace "/usr/local/opt/openssl" "${lib.getLib openssl}"
./config.status
)
'';
extraLdOptions = [

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

@ -1,18 +1,18 @@
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
callPackage ./build.nix rec {
version = "0.18";
git-version = "0.18";
version = "0.18.1";
git-version = "0.18.1";
src = fetchFromGitHub {
owner = "mighty-gerbils";
repo = "gerbil";
rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9";
sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8=";
rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d";
sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k";
fetchSubmodules = true;
};
inherit gambit-support;
gambit-params = gambit-support.unstable-params;
gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version
gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd
gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms
gambit-git-version = "4.9.5-78-g8b18ab69";
gambit-stampYmd = "20231029";
gambit-stampHms = "163035";
}

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

@ -2,8 +2,8 @@
{
pname = "ftw";
version = "unstable-2022-01-14";
git-version = "8ba16b3";
version = "unstable-2023-11-15";
git-version = "e5e2f56";
softwareName = "FTW: For The Web!";
gerbil-package = "drewc/ftw";
@ -13,8 +13,8 @@
fun = fetchFromGitHub;
owner = "drewc";
repo = "ftw";
rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9";
sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h";
rev = "e5e2f56e90bf072ddf9c2987ddfac45f048e8a04";
sha256 = "04164190vv1fzfk014mgqqmy5cml5amh63df31q2yc2kzvfajfc3";
};
meta = with lib; {

8
pkgs/development/compilers/gerbil/gerbil-crypto.nix
View File

@ -2,8 +2,8 @@
{
pname = "gerbil-crypto";
version = "unstable-2023-09-27";
git-version = "0.0-23-g341e09d";
version = "unstable-2023-11-29";
git-version = "0.1-1-g4197bfa";
gerbil-package = "clan/crypto";
gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ];
nativeBuildInputs = [ pkgs.pkg-config ];
@ -15,8 +15,8 @@
fun = fetchFromGitHub;
owner = "mighty-gerbils";
repo = "gerbil-crypto";
rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f";
sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j";
rev = "4197bfa71dc55657f79efd5cc21fe59839e840f2";
sha256 = "1jdfz5x24dfvpwyfxalkhv83gf9ylyaqii1kg8rjl8dzickawrix";
};
meta = with lib; {

10
pkgs/development/compilers/gerbil/gerbil-ethereum.nix
View File

@ -2,8 +2,8 @@
rec {
pname = "gerbil-ethereum";
version = "unstable-2023-10-06";
git-version = "0.1-1-g08b08fc";
version = "unstable-2023-12-04";
git-version = "0.2-11-g124ec58";
softwareName = "Gerbil-ethereum";
gerbil-package = "clan/ethereum";
version-path = "version";
@ -15,8 +15,8 @@ rec {
fun = fetchFromGitHub;
owner = "mighty-gerbils";
repo = "gerbil-ethereum";
rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab";
sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b";
rev = "124ec585157e2c505cd3c449a389c124ca6da9e9";
sha256 = "0xg07k421r5p0qx98id66k0k2l3vi1is875857sd8q3h6bks0z54";
};
postInstall = ''
@ -34,7 +34,7 @@ rec {
export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH
exec ${gerbil}/bin/gxi "\$0" "\$@"
|#
(import :clan/ethereum/scripts/run-ethereum-test-net :clan/multicall)
(import :clan/ethereum/scripts/run-ethereum-test-net :std/lib/multicall)
(apply call-entry-point (cdr (command-line)))
EOF
chmod a+x $out/bin/run-ethereum-test-net

8
pkgs/development/compilers/gerbil/gerbil-persist.nix
View File

@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, gerbilPackages, ... }:
{
pname = "gerbil-persist";
version = "unstable-2023-10-07";
git-version = "0.1.1-1-g3ce1d4a";
version = "unstable-2023-11-29";
git-version = "0.2-6-g8a5e40d";
softwareName = "Gerbil-persist";
gerbil-package = "clan/persist";
version-path = "version";
@ -13,8 +13,8 @@
fun = fetchFromGitHub;
owner = "mighty-gerbils";
repo = "gerbil-persist";
rev = "3ce1d4a4b1d7be290e54f884d780c02ceee8f10e";
sha256 = "1kzvgpqkpq4wlc0hlfxy314fbv6215aksrrlrrpq9w97wdibmv7x";
rev = "8a5e40deb01140b9c8d03c6cc985e47a9d7123d8";
sha256 = "1c1h1yp7gf23r3asxppgga4j4jmy4l9rlbb7vw9jcwvl8d30yrab";
};
meta = with lib; {

8
pkgs/development/compilers/gerbil/gerbil-poo.nix
View File

@ -2,8 +2,8 @@
{
pname = "gerbil-poo";
version = "unstable-2023-10-07";
git-version = "0.1-1-g367ab43";
version = "unstable-2023-11-29";
git-version = "0.2-5-gacf654e";
softwareName = "Gerbil-POO";
gerbil-package = "clan/poo";
version-path = "version";
@ -14,8 +14,8 @@
fun = fetchFromGitHub;
owner = "mighty-gerbils";
repo = "gerbil-poo";
rev = "367ab4376fdd6fc0b0892da2becef35a5039c583";
sha256 = "0ci88zqi7gb55ahl0n7dk1ihij2j6dn8jb6rzfiilck773x46kdh";
rev = "acf654eb040c548da260a7a5d52bafb057d23541";
sha256 = "1pxv1j6hwcgjj67bb7vvlnyl3123r43ifldm6alm76v2mfp2vs81";
};
meta = with lib; {

8
pkgs/development/compilers/gerbil/gerbil-utils.nix
View File

@ -2,8 +2,8 @@
{
pname = "gerbil-utils";
version = "unstable-2023-10-08";
git-version = "0.3-3-g2914428";
version = "unstable-2023-12-06";
git-version = "0.4-13-g9398865";
softwareName = "Gerbil-utils";
gerbil-package = "clan";
version-path = "version";
@ -12,8 +12,8 @@
fun = fetchFromGitHub;
owner = "mighty-gerbils";
repo = "gerbil-utils";
rev = "29144289b40ce624adf30eab23b796ddd6b6b55d";
sha256 = "0qysw2zs5acgri3wrjb3ngnnhd17xpr9hcdr4ya383k8k7jacr8a";
rev = "939886579508ff34b58a0d65bbb7d666125d0551";
sha256 = "0dga03qq7iy12bnpxr6d40qhvihsvn3y87psf2w2clnpypjb3blx";
};
meta = with lib; {

8
pkgs/development/compilers/gerbil/glow-lang.nix
View File

@ -2,8 +2,8 @@
rec {
pname = "glow-lang";
version = "unstable-2023-10-06";
git-version = "0.3.2-232-ga1a7a9e5";
version = "unstable-2023-12-04";
git-version = "0.3.2-237-g08d849ad";
softwareName = "Glow";
gerbil-package = "mukn/glow";
version-path = "version";
@ -17,8 +17,8 @@ rec {
fun = fetchFromGitHub;
owner = "Glow-Lang";
repo = "glow";
rev = "a1a7a9e51ba9a466d91c397d9da55af90076110c";
sha256 = "0wgav4gbg6mlxgisjjbyhvhz94b29vv2rkjkjy1jl7v0hs3wbm52";
rev = "08d849adef94ae9deead34e6981e77d47806c6e3";
sha256 = "0dq0s8y3rgx0wa5wsgcdjs0zijnbgff3y4w2mkh5a04gz4lrhl50";
};
postPatch = ''

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

@ -1,18 +1,19 @@
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
callPackage ./build.nix rec {
version = "unstable-2023-10-13";
git-version = "0.18-2-g8ed012ff";
version = "unstable-2023-12-06";
git-version = "0.18.1";
src = fetchFromGitHub {
owner = "mighty-gerbils";
repo = "gerbil";
rev = "8ed012ff9571fcfebcc07815813001a3f356150d";
sha256 = "056kmjn7sd0hjwikmg7v3a1kvgsgvfi7pi9xcx3ixym9g3bqa4mx";
rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d";
sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k";
fetchSubmodules = true;
};
inherit gambit-support;
gambit-params = gambit-support.unstable-params;
gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version
gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd
gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms
# These are available in pkgs.gambit-unstable.passthru.git-version, etc.
gambit-git-version = "4.9.5-78-g8b18ab69";
gambit-stampYmd = "20231029";
gambit-stampHms = "163035";
}