diff options
| author | Christina Sørensen <christina@cafkafk.com> | 2023-10-20 06:56:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 09:56:50 +0300 |
| commit | 028081ad5b4d7a4b94b092779efeef4b6a24b7a9 (patch) | |
| tree | 746c4cde24ef62de70baa239c5d4356fb60e6699 /pkgs/development/interpreters | |
| parent | b1dc14bacafae91a852075b19f89f055eb2c7a23 (diff) | |
| download | nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar.gz nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar.bz2 nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar.lz nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar.xz nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.tar.zst nixlib-028081ad5b4d7a4b94b092779efeef4b6a24b7a9.zip | |
janet: 1.31 -> 1.32.1 (#261147)
Co-authored-by: lucasew <lucas59356@gmail.com> Co-authored-by: Artturi <Artturin@artturin.com>
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/janet/default.nix | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 3c44239dc2fa..f186021eb3d6 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -1,19 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, nix-update-script +, runCommand +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.31.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "janet-lang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Dj2fj1dsdAMl/H0vNKTf9qjPB4GVRpgWPVR+PuZWZMc="; + repo = "janet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-24d9N59pTfQATWmAZN4dAFT8RTTlUlBPKokcQ/Fd2No="; }; postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ + '' + lib.optionalString stdenv.isDarwin '' + # error: Socket is not connected + substituteInPlace meson.build \ + --replace "'test/suite-ev.janet'," "" ''; nativeBuildInputs = [ meson ninja ]; @@ -29,6 +40,21 @@ stdenv.mkDerivation rec { $out/bin/janet -e '(+ 1 2 3)' ''; + passthru = { + tests.run = runCommand "janet-test-run" { + nativeBuildInputs = [finalAttrs.finalPackage]; + } '' + echo "(+ 1 2 3)" | janet | tail -n 1 > arithmeticTest.txt; + diff -U3 --color=auto <(cat arithmeticTest.txt) <(echo "6"); + + echo "(print \"Hello, World!\")" | janet | tail -n 2 > ioTest.txt; + diff -U3 --color=auto <(cat ioTest.txt) <(echo -e "Hello, World!\nnil"); + + touch $out; + ''; + updateScript = nix-update-script {}; + }; + meta = with lib; { description = "Janet programming language"; homepage = "https://janet-lang.org/"; @@ -36,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; }; -} +}) |