diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 33391c156969..60b9fb792d2f 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -5,7 +5,8 @@ stampYmd ? 0, stampHms ? 0, gambit-support, optimizationSetting ? "-O1", - gambit-params ? pkgs.gambit-support.stable-params }: + gambit-params ? pkgs.gambit-support.stable-params, + rev ? git-version }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling @@ -30,6 +31,11 @@ gccStdenv.mkDerivation rec { inherit src version git-version; bootstrap = gambit-support.gambit-bootstrap; + passthru = { + inherit src version git-version rev stampYmd stampHms optimizationSetting openssl; + }; + + nativeBuildInputs = [ git autoconf ]; # TODO: if/when we can get all the library packages we depend on to have static versions, @@ -47,6 +53,7 @@ gccStdenv.mkDerivation rec { "--enable-c-opt=${optimizationSetting}" "--enable-c-opt-rts=-O2" "--enable-gcc-opts" + "--enable-trust-c-tco" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" @@ -70,6 +77,9 @@ gccStdenv.mkDerivation rec { # "--enable-char-size=1" # default is 4 # "--enable-march=native" # Nope, makes it not work on machines older than the builder ] ++ gambit-params.extraOptions + # TODO: pick an appropriate architecture to optimize on on x86-64? + # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options + # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index cb4f5f9501ca..a0f95192cbfc 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -2,7 +2,7 @@ callPackage ./build.nix rec { version = "4.9.5"; - git-version = version; + git-version = "v${version}"; src = fetchurl { url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix index 6e42b9252f24..1209ca10aa16 100644 --- a/pkgs/development/compilers/gambit/gambit-support.nix +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -13,16 +13,17 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; substituteInPlace include/makefile.in \ - --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; + --replace "\$\$(\$(GIT) describe --tag --always | sed 's/-bootstrap\$\$//')" "v${git-version}" \ + --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"v${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; + grep -i ' version=\|echo..#define ___STAMP_VERSION' include/makefile.in # XXX DEBUG -- REMOVE ME ''; modules = true; - #extraOptions = []; - extraOptions = ["--enable-trust-c-tco" "CFLAGS=-foptimize-sibling-calls"]; + extraOptions = ["CFLAGS=-foptimize-sibling-calls"]; }; unstable-params = stable-params // { stable = false; - extraOptions = ["--enable-trust-c-tco"]; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable + extraOptions = []; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 092cbdb72483..597cbedb13e3 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,15 +1,16 @@ { callPackage, fetchFromGitHub, gambit-support }: -callPackage ./build.nix { - version = "unstable-2023-08-06"; - git-version = "4.9.5-5-gf1fbe9aa"; - stampYmd = 20230806; - stampHms = 195822; +callPackage ./build.nix rec { + version = "unstable-2023-10-07"; + git-version = "4.9.5-59-g342399c7"; + stampYmd = 20231007; + stampHms = 170745; + rev = "342399c736ec560c0ff4faeaeb9599b45633f26c"; src = fetchFromGitHub { owner = "gambit"; repo = "gambit"; - rev = "f1fbe9aa0f461e89f2a91bc050c1373ee6d66482"; - sha256 = "0b0gd6cwj8zxwcqglpsnmanysiq4mvma2mrgdfr6qy99avhbhzxm"; + inherit rev; + sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f"; }; gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 227f11b7c584..9ce26d0b21b2 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,8 +1,11 @@ { pkgs, gccStdenv, lib, coreutils, - openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, + openssl, zlib, sqlite, + version, git-version, src, gambit-support, - gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: + gambit-git-version, + gambit-stampYmd, + gambit-stampHms, + gambit-params }: # We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix let stdenv = gccStdenv; in @@ -12,16 +15,13 @@ stdenv.mkDerivation rec { inherit version; inherit src; - buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; + buildInputs_libraries = [ openssl zlib sqlite ]; # TODO: either fix all of Gerbil's dependencies to provide static libraries, # or give up and delete all tentative support for static libraries. #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit ] - ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; - - env.NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; + buildInputs = buildInputs_libraries; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; @@ -29,6 +29,17 @@ stdenv.mkDerivation rec { 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} ) + for f in src/bootstrap/gerbil/compiler/driver__0.scm \ + src/build/build-libgerbil.ss \ + src/gerbil/compiler/driver.ss ; do + substituteInPlace "$f" --replace '"gcc"' '"${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"' ; + done ''; ## TODO: make static compilation work. @@ -40,26 +51,42 @@ stdenv.mkDerivation rec { # OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! # ZLIB=${makeStaticLibraries zlib}/lib/libz.a # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! -# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! -# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! -# MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a -# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! -# LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + configureFlags = [ + "--prefix=$out/gerbil" + "--enable-zlib" + "--enable-sqlite" + "--enable-shared" + "--disable-deprecated" + "--enable-march=" # Avoid non-portable invalid instructions + ]; + configurePhase = '' - (cd src && ./configure \ - --prefix=$out/gerbil \ - --with-gambit=${gambit}/gambit \ - --enable-libxml \ - --enable-libyaml \ - --enable-zlib \ - --enable-sqlite \ - --enable-mysql \ - --enable-lmdb \ - --enable-leveldb) + export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ + CXX=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}g++ \ + CPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + CXXCPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + 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 = [ + "-L${zlib}/lib" + "-L${openssl.out}/lib" + "-L${sqlite.out}/lib" + ]; + buildPhase = '' runHook preBuild @@ -68,7 +95,7 @@ stdenv.mkDerivation rec { export GERBIL_BUILD_CORES=$NIX_BUILD_CORES export GERBIL_GXC=$PWD/bin/gxc export GERBIL_BASE=$PWD - export GERBIL_HOME=$PWD + export GERBIL_PREFIX=$PWD export GERBIL_PATH=$PWD/lib export PATH=$PWD/bin:$PATH ${gambit-support.export-gambopt gambit-params} @@ -76,13 +103,17 @@ stdenv.mkDerivation rec { # Build, replacing make by build.sh ( cd src && sh build.sh ) + f=build/lib/libgerbil.so.ldd ; [ -f $f ] && : + substituteInPlace "$f" --replace '(' \ + '(${lib.strings.concatStrings (map (x: "\"${x}\" " ) extraLdOptions)}' + runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/gerbil $out/bin - (cd src; ./install) + ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall ''; @@ -98,4 +129,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fare ]; }; + + outputsToInstall = [ "out" ]; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eeafde520de9..29e6d3575088 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,12 +1,18 @@ -{ callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: callPackage ./build.nix rec { - version = "0.17"; - git-version = version; + version = "0.18"; + git-version = "0.18"; src = fetchFromGitHub { - owner = "vyzo"; + owner = "mighty-gerbils"; repo = "gerbil"; - rev = "v${version}"; - sha256 = "0xzi9mhrmzcajhlz5qcnz4yjlljvbkbm9426iifgjn47ac0965zw"; + rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9"; + sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8="; + 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 } diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 3d53c4da879e..dd06417d1a85 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -2,8 +2,8 @@ { pname = "gerbil-crypto"; - version = "unstable-2023-03-27"; - git-version = "0.0-18-ge57f887"; + version = "unstable-2023-09-27"; + git-version = "0.0-23-g341e09d"; gerbil-package = "clan/crypto"; gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ]; nativeBuildInputs = [ pkgs.pkg-config ]; @@ -13,10 +13,10 @@ pre-src = { fun = fetchFromGitHub; - owner = "fare"; + owner = "mighty-gerbils"; repo = "gerbil-crypto"; - rev = "e57f88742d9b41640b4a7d9bd3e86c688d4a83f9"; - sha256 = "08hrk3s82hbigvza75vgx9kc7qf64yhhn3xm5calc859sy6ai4ka"; + rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f"; + sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index d2d95284f09d..521447593d4a 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,24 +2,25 @@ rec { pname = "gerbil-ethereum"; - version = "unstable-2023-05-30"; - git-version = "0.0-375-g989a5ca"; + version = "unstable-2023-10-06"; + git-version = "0.1-1-g08b08fc"; softwareName = "Gerbil-ethereum"; - gerbil-package = "mukn/ethereum"; + gerbil-package = "clan/ethereum"; version-path = "version"; - gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist ]; + gerbilInputs = with gerbilPackages; [ + gerbil-utils gerbil-crypto gerbil-poo gerbil-persist gerbil-leveldb ]; pre-src = { fun = fetchFromGitHub; - owner = "fare"; + owner = "mighty-gerbils"; repo = "gerbil-ethereum"; - rev = "989a5ca78958e42c4a1ec242786ade89f1887e48"; - sha256 = "0bs2knhx3hy3k72yidgaplwjd48y86arqscdik8hgxwmhm9z8kwp"; + rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab"; + sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b"; }; postInstall = '' - cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/mukn/ethereum/scripts/ + cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/clan/ethereum/scripts/ mkdir -p $out/bin cat > $out/bin/run-ethereum-test-net <