diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-13 00:38:07 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-13 00:38:07 +0000 |
| commit | 8e038835fea7ead66eab0cbf3885a6710d6b3f1d (patch) | |
| tree | 536f160fe9a100d889946191cd51d1f0410488ce /pkgs/development/interpreters | |
| parent | cd20c0c426cc7d5cbba6fdeeda19166787809500 (diff) | |
| parent | 54dce4f0ac3334c35093d38b17fe3799eab929b4 (diff) | |
| download | nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar.gz nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar.bz2 nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar.lz nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar.xz nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.tar.zst nixlib-8e038835fea7ead66eab0cbf3885a6710d6b3f1d.zip | |
Merge remote-tracking branch 'upstream/master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/gauche/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/scsh/default.nix | 19 |
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 301cd9db7830..aa58be639b9d 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "R7RS Scheme scripting engine"; homepage = "https://practical-scheme.net/gauche/"; + mainProgram = "gosh"; maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index b3b7db8537a2..7587236487c1 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,30 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, unstableGitUpdater }: stdenv.mkDerivation { pname = "scsh"; - version = "0.7pre"; + version = "0.7-unstable-2024-03-09"; src = fetchFromGitHub { owner = "scheme"; repo = "scsh"; - rev = "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052"; - sha256 = "sha256-92NtMK5nVd6+WtHj/Rk6iQEkGsNEZySTVZkkbqKrLYY="; + rev = "6770db21b08edd907d1c9bd962297ff55664e3fe"; + hash = "sha256-U95Rc/Ks5AytB5UwbzQLI3/Sj4TYybrp8/45fu9krSU="; fetchSubmodules = true; }; - patches = [ - # Don't not include util.h if libutil.h is available - # https://github.com/scheme/scsh/pull/49 - (fetchpatch { - url = "https://github.com/scheme/scsh/commit/b04e902de983761d7f432b2cfa364ca5d162a364.patch"; - hash = "sha256-XSHzzCOBkraqW2re1ePoFl9tKQB81iQ0W9wvv83iGdA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A Scheme shell"; homepage = "http://www.scsh.net/"; |