From 47de48f600470d0185f5ece640b42443f08d922f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 12 Dec 2020 02:50:37 +0700 Subject: [PATCH] gauche: 0.9.9 -> 0.9.10 --- pkgs/development/interpreters/gauche/boot.nix | 43 +++++++++++++++++++ .../interpreters/gauche/default.nix | 23 ++++++---- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/interpreters/gauche/boot.nix diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix new file mode 100644 index 00000000000..7fbc66406e6 --- /dev/null +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, pkg-config, texinfo, libiconv, gdbm, openssl, zlib +, mbedtls, cacert }: + +stdenv.mkDerivation rec { + pname = "gauche-bootstrap"; + version = "0.9.9"; + + src = fetchurl { + url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; + sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac"; + }; + + nativeBuildInputs = [ pkg-config texinfo ]; + + buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + + postPatch = '' + patchShebangs . + ''; + + configureFlags = [ + "--with-iconv=${libiconv}" + "--with-dbm=gdbm" + "--with-zlib=${zlib}" + "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" + # TODO: Enable slib + # Current slib in nixpkgs is specialized to Guile + # "--with-slib=${slibGuile}/lib/slib" + ]; + + enableParallelBuilding = true; + + # TODO: Fix tests that fail in sandbox build + doCheck = false; + + meta = with lib; { + description = "R7RS Scheme scripting engine"; + homepage = "https://practical-scheme.net/gauche/"; + maintainers = with maintainers; [ mnacamura ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 58653fae890..75a931c5562 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib -, mbedtls, cacert -}: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo +, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: stdenv.mkDerivation rec { pname = "gauche"; - version = "0.9.9"; + version = "0.9.10"; - src = fetchurl { - url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac"; + src = fetchFromGitHub { + owner = "shirok"; + repo = pname; + rev = "release${lib.replaceChars [ "." ] [ "_" ] version}"; + sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ gaucheBootstrap pkg-config texinfo autoreconfHook ]; buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + autoreconfPhase = '' + ./DIST gen + ''; + postPatch = '' patchShebangs . ''; @@ -34,7 +39,7 @@ stdenv.mkDerivation rec { # TODO: Fix tests that fail in sandbox build doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "R7RS Scheme scripting engine"; homepage = "https://practical-scheme.net/gauche/"; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26eb622ab9d..bc9fb4bf97b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21214,6 +21214,8 @@ in ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; + gauche = callPackage ../development/interpreters/gauche { }; gcal = callPackage ../applications/misc/gcal { };