diff options
| author | r-vdp <ramses@well-founded.dev> | 2025-01-13 12:34:59 +0100 |
|---|---|---|
| committer | r-vdp <ramses@well-founded.dev> | 2025-02-01 12:05:19 +0100 |
| commit | adf609a8d710b156922b0e626eaccd7e38b60bfe (patch) | |
| tree | 38755856361b57e87a7a4c8ba3b30bef7acfd781 | |
| parent | fish: don't generate man pages in the test VM (diff) | |
| download | nixpkgs-origin/fish.tar.gz | |
fish: sync with the to-be-released branchorigin/fish
| -rw-r--r-- | pkgs/by-name/fi/fish/package.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 4d1e6f2b58b1..2502cb8a4d8b 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -155,8 +155,11 @@ let src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; - tag = finalAttrs.version; - hash = "sha256-O5xZHXNrJMpjTA2mrTqzMtU/55UArwoc2adc0R6pVl0="; + # TODO: uncomment and remove rev once the stable version is released + #tag = finalAttrs.version; + # Last commit on the Integration_4.0.0 branch + rev = "2f2ea729a7ffa04d8aa13f158d81c44fa30f380a"; + hash = "sha256-LqrGTSODDgcfe14QPfWYiq8y+gGRqimk6EzMRBb3884="; }; env = { @@ -167,7 +170,7 @@ let cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-jTVZKzX/Uy2RtyMbeQmatLLrOO+5S5jXrYKMGXNMcV4="; + hash = "sha256-j1HCj1iZ5ZV8nfMmJq5ggPD4s+5V8IretDdoz+G3wWU="; }; patches = [ @@ -287,6 +290,7 @@ let preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh + patchShebangs ./tests/test_driver.py '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export CMAKE_PREFIX_PATH= |