nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-03 03:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139858 from AndersonTorres/new-guile

Browse Source 
guile: init at 3.0

Plus cosmetical rewrites of guile expressions.
This commit is contained in:
Anderson Torres 2021-09-30 19:40:08 -03:00 committed by GitHub
commit ce78887806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 399 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pkgs/development/interpreters/guile/1.8.nix
View File

@ -1,13 +1,22 @@
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkg-config
, libtool, readline, gmp
{ lib
, stdenv
, fetchurl
, buildPackages
, gawk
, gmp
, libtool
, makeWrapper
, pkg-config
, pkgsBuildBuild
, readline
}:
stdenv.mkDerivation rec {
name = "guile-1.8.8";
pname = "guile";
version = "1.8.8";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.gz";
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
};
@ -15,18 +24,28 @@ stdenv.mkDerivation rec {
setOutputFlags = false; # $dev gets into the library otherwise
# GCC 4.6 raises a number of set-but-unused warnings.
configureFlags = [ "--disable-error-on-warning" ]
# Guile needs patching to preset results for the configure tests about
# pthreads, which work only in native builds.
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-threads=no";
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool ];
configureFlags = [
"--disable-error-on-warning"
]
# Guile needs patching to preset results for the configure tests about
# pthreads, which work only in native builds.
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-threads=no";
depsBuildBuild = [
buildPackages.stdenv.cc
]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];
buildInputs = [
libtool
readline
];
propagatedBuildInputs = [
gmp
@ -38,7 +57,9 @@ stdenv.mkDerivation rec {
];
patches = [
# Fix doc snarfing with GCC 4.5.
./cpp-4.5.patch
# Self explanatory
./CVE-2016-8605.patch
];
@ -46,13 +67,12 @@ stdenv.mkDerivation rec {
sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
'';
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
''
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
@ -65,19 +85,21 @@ stdenv.mkDerivation rec {
doCheck = false;
doInstallCheck = doCheck;
setupHook = ./setup-hook.sh;
setupHook = ./setup-hook-1.8.sh;
meta = {
meta = with lib; {
homepage = "https://www.gnu.org/software/guile/";
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.ludo ];
platforms = lib.platforms.unix;
longDescription = ''
GNU Guile is an interpreter for the Scheme programming language,
packaged as a library that can be embedded into programs to make
them extensible. It supports many SRFIs.
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard and a
large subset of R6RS, Guile includes a module system, full access to POSIX
system calls, networking support, multiple threads, dynamic linking, a
foreign function call interface, and powerful string processing.
'';
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ludo ];
platforms = platforms.all;
};
}

168
pkgs/development/interpreters/guile/2.0.nix
View File

@ -1,88 +1,123 @@
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
{ lib
, stdenv
, fetchurl
, fetchpatch
, boehmgc
, buildPackages
, coverageAnalysis ? null
, gawk
, gmp
, libffi
, libtool
, libunistring
, makeWrapper
, pkg-config
, pkgsBuildBuild
, readline
}:
# Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation)
(rec {
name = "guile-2.0.13";
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation;
in
builder rec {
pname = "guile";
version = "2.0.13";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.xz";
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
};
outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
depsBuildBuild = [
buildPackages.stdenv.cc
]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [
makeWrapper
gawk
pkg-config
];
buildInputs = [
readline
libtool
libunistring
libffi
];
propagatedBuildInputs = [
gmp boehmgc
boehmgc
gmp
# XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
# flags for them without corresponding '-L' flags. Adding them here will add
# the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,
# see below.
libtool libunistring
# These ones aren't normally needed here, but `libguile*.la' has '-l'
# flags for them without corresponding '-L' flags. Adding them here will
# add the needed `-L' flags. As for why the `.la' file lacks the `-L'
# flags, see below.
libtool
libunistring
];
enableParallelBuilding = true;
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
patches = [
# Small fixes to Clang compiler
./clang.patch
# Self-explanatory
./disable-gc-sensitive-tests.patch
# Read the header of the patch to more info
./eai_system.patch
# RISC-V endianness
./riscv.patch
# Fixes stability issues with 00-repl-server.test
(fetchpatch {
# Fixes stability issues with 00-repl-server.test
url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
})] ++
(lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
++ lib.optionals stdenv.isDarwin [
./filter-mkostemp-darwin.patch
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
})
./riscv.patch
] ++
(lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
++ lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
})
./filter-mkostemp-darwin.patch
];
];
# Explicitly link against libgcc_s, to work around the infamous
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
# don't have "libgcc_s.so.1" on darwin
LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
LDFLAGS = lib.optionalString
(!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
configureFlags = [ "--with-libreadline-prefix" ]
++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${gmp.dev}"
configureFlags = [
"--with-libreadline-prefix"
] ++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${lib.getDev gmp}"
# Same for these (?).
"--with-libreadline-prefix=${readline.dev}"
"--with-libunistring-prefix=${libunistring}"
# Same for these (?).
"--with-libreadline-prefix=${lib.getDev readline}"
"--with-libunistring-prefix=${libunistring}"
# See below.
"--without-threads"
];
# See below.
"--without-threads"
];
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
''
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
@ -90,7 +125,7 @@
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"
'';
'';
# make check doesn't work on darwin
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
@ -99,24 +134,23 @@
setupHook = ./setup-hook-2.0.sh;
meta = {
meta = with lib; {
homepage = "https://www.gnu.org/software/guile/";
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ ludo lovek323 ];
platforms = lib.platforms.all;
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard
and a large subset of R6RS, Guile includes a module system, full access
to POSIX system calls, networking support, multiple threads, dynamic
linking, a foreign function call interface, and powerful string
processing.
'';
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard and
a large subset of R6RS, Guile includes a module system, full access to
POSIX system calls, networking support, multiple threads, dynamic
linking, a foreign function call interface, and powerful string
processing.
'';
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ludo lovek323 vrthra ];
platforms = platforms.all;
};
})
}
//

123
pkgs/development/interpreters/guile/default.nix → pkgs/development/interpreters/guile/2.2.nix
View File

@ -1,41 +1,65 @@
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
{ lib
, stdenv
, fetchurl
, fetchpatch
, boehmgc
, buildPackages
, coverageAnalysis ? null
, gawk
, gmp
, libffi
, libtool
, libunistring
, makeWrapper
, pkg-config
, pkgsBuildBuild
, readline
}:
# Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation)
(rec {
name = "guile-${version}";
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation;
in
builder rec {
pname = "guile";
version = "2.2.7";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.xz";
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd";
};
outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
depsBuildBuild = [
buildPackages.stdenv.cc
]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];
buildInputs = [
libffi
libtool
libunistring
readline
];
propagatedBuildInputs = [
gmp boehmgc
boehmgc
gmp
# XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
# flags for them without corresponding '-L' flags. Adding them here will add
# the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,
# see below.
libtool libunistring
libtool
libunistring
];
# According to Bernhard M. Wiedemann <bwiedemann suse de> on
@ -47,9 +71,11 @@
enableParallelBuilding = false;
patches = [
# Read the header of the patch to more info
./eai_system.patch
] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
++ lib.optional stdenv.isDarwin (fetchpatch {
++ lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
});
@ -61,27 +87,28 @@
LDFLAGS = lib.optionalString
(!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${gmp.dev}"
configureFlags = [
"--with-libreadline-prefix=${lib.getDev readline}"
] ++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${lib.getDev gmp}"
# Same for these (?).
"--with-libunistring-prefix=${libunistring}"
# Same for these (?).
"--with-libunistring-prefix=${libunistring}"
# See below.
"--without-threads"
];
# See below.
"--without-threads"
];
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
''
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
@ -89,7 +116,7 @@
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"
'';
'';
# make check doesn't work on darwin
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
@ -98,21 +125,19 @@
setupHook = ./setup-hook-2.2.sh;
meta = {
meta = with lib; {
homepage = "https://www.gnu.org/software/guile/";
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];
platforms = lib.platforms.all;
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard
and a large subset of R6RS, Guile includes a module system, full access
to POSIX system calls, networking support, multiple threads, dynamic
linking, a foreign function call interface, and powerful string
processing.
environments. In addition to implementing the R5RS Scheme standard and a
large subset of R6RS, Guile includes a module system, full access to POSIX
system calls, networking support, multiple threads, dynamic linking, a
foreign function call interface, and powerful string processing.
'';
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ludo lovek323 vrthra ];
platforms = platforms.all;
};
})
}

141
pkgs/development/interpreters/guile/3.0.nix Normal file
View File

@ -0,0 +1,141 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, boehmgc
, buildPackages
, coverageAnalysis ? null
, gawk
, gmp
, libffi
, libtool
, libunistring
, makeWrapper
, pkg-config
, pkgsBuildBuild
, readline
}:
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation;
in
builder rec {
pname = "guile";
version = "3.0.7";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc=";
};
outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [
buildPackages.stdenv.cc
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];
buildInputs = [
libffi
libtool
libunistring
readline
];
propagatedBuildInputs = [
boehmgc
gmp
# These ones aren't normally needed here, but `libguile*.la' has '-l'
# flags for them without corresponding '-L' flags. Adding them here will
# add the needed `-L' flags. As for why the `.la' file lacks the `-L'
# flags, see below.
libtool
libunistring
];
# According to Bernhard M. Wiedemann <bwiedemann suse de> on
# #reproducible-builds on irc.oftc.net, (2020-01-29): they had to build
# Guile without parallel builds to make it reproducible.
#
# re: https://issues.guix.gnu.org/issue/20272
# re: https://build.opensuse.org/request/show/732638
enableParallelBuilding = false;
patches = [
./eai_system.patch
] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
++ lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
});
# Explicitly link against libgcc_s, to work around the infamous
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
# don't have "libgcc_s.so.1" on darwin
LDFLAGS = lib.optionalString
(!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
configureFlags = [
"--with-libreadline-prefix=${lib.getDev readline}"
] ++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${lib.getDev gmp}"
# Same for these (?).
"--with-libunistring-prefix=${libunistring}"
# See below.
"--without-threads"
];
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
''
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"
'';
# make check doesn't work on darwin
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
doCheck = false;
doInstallCheck = doCheck;
setupHook = ./setup-hook-3.0.sh;
meta = with lib; {
homepage = "https://www.gnu.org/software/guile/";
description = "Embeddable Scheme implementation";
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard and a
large subset of R6RS, Guile includes a module system, full access to POSIX
system calls, networking support, multiple threads, dynamic linking, a
foreign function call interface, and powerful string processing.
'';
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ludo lovek323 vrthra ];
platforms = platforms.all;
};
}

3
pkgs/development/interpreters/guile/setup-hook.sh → pkgs/development/interpreters/guile/setup-hook-1.8.sh
View File

@ -1,6 +1,5 @@
addGuileLibPath () {
if test -d "$1/share/guile/site"
then
if test -d "$1/share/guile/site"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
fi
}

12
pkgs/development/interpreters/guile/setup-hook-2.0.sh
View File

@ -1,21 +1,17 @@
addGuileLibPath () {
if test -d "$1/share/guile/site/2.0"
then
if test -d "$1/share/guile/site/2.0"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
elif test -d "$1/share/guile/site"
then
elif test -d "$1/share/guile/site"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
if test -d "$1/lib/guile/2.0/ccache"
then
if test -d "$1/lib/guile/2.0/ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/ccache"
fi
if test -d "$1/lib/guile/2.0/site-ccache"
then
if test -d "$1/lib/guile/2.0/site-ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/site-ccache"
fi
}

12
pkgs/development/interpreters/guile/setup-hook-2.2.sh
View File

@ -1,21 +1,17 @@
addGuileLibPath () {
if test -d "$1/share/guile/site/2.2"
then
if test -d "$1/share/guile/site/2.2"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
elif test -d "$1/share/guile/site"
then
elif test -d "$1/share/guile/site"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
if test -d "$1/lib/guile/2.2/ccache"
then
if test -d "$1/lib/guile/2.2/ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/ccache"
fi
if test -d "$1/lib/guile/2.2/site-ccache"
then
if test -d "$1/lib/guile/2.2/site-ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/site-ccache"
fi
}

19
pkgs/development/interpreters/guile/setup-hook-3.0.sh Normal file
View File

@ -0,0 +1,19 @@
addGuileLibPath () {
if test -d "$1/share/guile/site/3.0"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"
elif test -d "$1/share/guile/site"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
if test -d "$1/lib/guile/3.0/ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/ccache"
fi
if test -d "$1/lib/guile/3.0/site-ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache"
fi
}
addEnvHooks "$hostOffset" addGuileLibPath

4
pkgs/top-level/all-packages.nix
View File

@ -13330,7 +13330,9 @@ with pkgs;
# Needed for autogen
guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
guile_2_2 = callPackage ../development/interpreters/guile { };
guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { };
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
guile = guile_2_2;