diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-08-06 01:51:34 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-09-29 17:29:31 -0300 |
commit | 8572e8818f5a995901ca6df9684adbd5ca8af8ff (patch) | |
tree | 4b46d001565d43a72f303c10dd11277069ecf4d6 /pkgs/development/interpreters/guile | |
parent | af62264e5c3cd88e3e42915b55fd474bbfd8de4d (diff) |
guile 2.0: rename and reformat
Diffstat (limited to 'pkgs/development/interpreters/guile')
-rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 176 | ||||
-rw-r--r-- | pkgs/development/interpreters/guile/setup-hook-2.0.sh | 12 |
2 files changed, 109 insertions, 79 deletions
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b93ec556cd436..8214ca2adcda1 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -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 - - # 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 + 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 ]; 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"; - - 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}" - - # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" - "--with-libunistring-prefix=${libunistring}" - - # See below. - "--without-threads" - ]; + 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=${lib.getDev gmp}" + + # Same for these (?). + "--with-libreadline-prefix=${lib.getDev readline}" + "--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. + # 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; }; -}) +} // diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index 288f7e242f988..d83f9c6470573 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -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 } |