pyrox.dev
lol
gerbil: 0.18 -> 0.18.1
+14
-24
+7
-17
pkgs/development/compilers/gerbil/build.nix
+7
-17
pkgs/development/compilers/gerbil/build.nix
···
24
24
buildInputs = buildInputs_libraries;
25
25
26
26
postPatch = ''
27
-
echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ;
28
27
patchShebangs . ;
29
28
grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
30
29
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ;
31
30
done ;
32
-
substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ;
33
-
substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ;
34
-
#rmdir src/gambit
35
-
#cp -a ${pkgs.gambit-unstable.src} ./src/gambit
36
-
chmod -R u+w ./src/gambit
37
-
( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} )
31
+
cat > MANIFEST <<EOF
32
+
gerbil_stamp_version=v${git-version}
33
+
gambit_stamp_version=v${gambit-git-version}
34
+
gambit_stamp_ymd=${gambit-stampYmd}
35
+
gambit_stamp_hms=${gambit-stampHms}
36
+
EOF
38
37
for f in src/bootstrap/gerbil/compiler/driver__0.scm \
39
38
src/build/build-libgerbil.ss \
40
39
src/gerbil/compiler/driver.ss ; do
···
58
57
"--enable-zlib"
59
58
"--enable-sqlite"
60
59
"--enable-shared"
61
-
"--disable-deprecated"
62
-
"--enable-march=" # Avoid non-portable invalid instructions
60
+
"--enable-march=" # Avoid non-portable invalid instructions. Use =native if local build only.
63
61
];
64
62
65
63
configurePhase = ''
···
70
68
LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \
71
69
XMKMF=${coreutils}/bin/false
72
70
unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
73
-
(cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms})
74
71
./configure ${builtins.concatStringsSep " " configureFlags}
75
-
(cd src/gambit ;
76
-
substituteInPlace config.status \
77
-
${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable)
78
-
''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \
79
-
--replace "/usr/local/opt/openssl" "${lib.getLib openssl}"
80
-
./config.status
81
-
)
82
72
'';
83
73
84
74
extraLdOptions = [
+7
-7
pkgs/development/compilers/gerbil/default.nix
+7
-7
pkgs/development/compilers/gerbil/default.nix
···
1
1
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
2
2
3
3
callPackage ./build.nix rec {
4
-
version = "0.18";
5
-
git-version = "0.18";
4
+
version = "0.18.1";
5
+
git-version = "0.18.1";
6
6
src = fetchFromGitHub {
7
7
owner = "mighty-gerbils";
8
8
repo = "gerbil";
9
-
rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9";
10
-
sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8=";
9
+
rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d";
10
+
sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k";
11
11
fetchSubmodules = true;
12
12
};
13
13
inherit gambit-support;
14
14
gambit-params = gambit-support.unstable-params;
15
-
gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version
16
-
gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd
17
-
gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms
15
+
gambit-git-version = "4.9.5-78-g8b18ab69";
16
+
gambit-stampYmd = "20231029";
17
+
gambit-stampHms = "163035";
18
18
}