diff options
author | Francois-Rene Rideau <fare@tunes.org> | 2023-11-03 03:41:33 -0400 |
---|---|---|
committer | Francois-Rene Rideau <fare@tunes.org> | 2023-12-05 21:32:26 -0500 |
commit | 8859b057e3a97448cb9282521b25eb084841b7dd (patch) | |
tree | 8cd8be7e2df4a0759192d9f9e92da67fd8a745c0 /pkgs/development/compilers/gerbil | |
parent | edd85e866c7655f7ebd0d99d8442928d815582a7 (diff) | |
download | nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar.gz nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar.bz2 nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar.lz nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar.xz nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.tar.zst nixlib-8859b057e3a97448cb9282521b25eb084841b7dd.zip |
gerbil: 0.18 -> 0.18.1
Diffstat (limited to 'pkgs/development/compilers/gerbil')
-rw-r--r-- | pkgs/development/compilers/gerbil/build.nix | 24 | ||||
-rw-r--r-- | pkgs/development/compilers/gerbil/default.nix | 14 |
2 files changed, 14 insertions, 24 deletions
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 9ce26d0b21b2..a0922ff9ccac 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -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 = [ diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 29e6d3575088..148bf7451675 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -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"; } |