From ce9d71e62b5374ed9e4328d093e45da4a6c0da7b Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 19 Mar 2024 12:22:25 +0530 Subject: [PATCH 1/2] fish: 3.7.0 -> 3.7.1 Diff: https://github.com/fish-shell/fish-shell/compare/3.7.0...3.7.1 Changelog: https://github.com/fish-shell/fish-shell/releases/tag/3.7.1 Signed-off-by: Muhammad Falak R Wani --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 3703644a73ae..91b3ce0b0eb9 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-3xtzeLcU8GkLKF7Z5OWK/icKyY28nKWDlYnBr8yjOrE="; + hash = "sha256-YUyfVkPNB5nfOROV+mu8NklCe7g5cizjsRTTu8GjslA="; }; # Fix FHS paths in tests From f3a20533b7f75b03f350ef3b4d51b0b829b1d33d Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Wed, 20 Mar 2024 10:24:40 +0530 Subject: [PATCH 2/2] fish: fix passthru tests for darwin Signed-off-by: Muhammad Falak R Wani --- pkgs/shells/fish/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 91b3ce0b0eb9..0013c205f31f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -308,7 +308,7 @@ let passthru = { shellPath = "/bin/fish"; tests = { - nixos = nixosTests.fish; + nixos = lib.optionalAttrs stdenv.isLinux nixosTests.fish; # Test the fish_config tool by checking the generated splash page. # Since the webserver requires a port to run, it is not started. @@ -322,18 +322,17 @@ let # if we don't set `delete=False`, the file will get cleaned up # automatically (leading the test to fail because there's no # tempfile to check) - sed -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py + ${lib.getExe gnused} -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py + ${lib.getExe gnused} -e '/fileurl =/q' -i webconfig.py echo "print(fileurl)" >> webconfig.py # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - # cannot test the http server because it needs a localhost port + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | ${lib.getExe gnused} -e 's|file://||' \ + ) | ${lib.getExe gnugrep} -q 'a href="http://localhost.*Start the Fish Web config' ''; in runCommand "test-web-config" { } ''