Merge https://github.com/NixOS/nixpkgs

1 files changed, 6 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/shells/fish/plugins/pure.nix b/nixpkgs/pkgs/shells/fish/plugins/pure.nix
index dae5cf783010..04334f14fa99 100644
--- a/nixpkgs/pkgs/shells/fish/plugins/pure.nix
+++ b/nixpkgs/pkgs/shells/fish/plugins/pure.nix
@@ -1,29 +1,21 @@
-{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape }:
+{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape_3 }:
 
 buildFishPlugin rec {
   pname = "pure";
-  version = "4.1.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
     rev = "v${version}";
-    sha256 = "1x1h65l8582p7h7w5986sc9vfd7b88a7hsi68dbikm090gz8nlxx";
+    hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw=";
   };
 
-  # The tests aren't passing either on the project's CI.
-  # The release notes of the program for v3.5.0 say:
-  # > Tests are going crazy at the moment, should be fixed once fishtape 3.0
-  # > is released, and we do the switch.
-  # This is tracked in https://github.com/pure-fish/pure/issues/272
-  # and https://github.com/pure-fish/pure/pull/275.
-  doCheck = false;
-
   nativeCheckInputs = [ git ];
-  checkPlugins = [ fishtape ];
+  checkPlugins = [ fishtape_3 ];
   checkPhase = ''
-    # https://github.com/rafaelrinaldi/pure/issues/264
-    rm tests/_pure_string_width.test.fish
+    rm tests/pure_tools_installer.test.fish
+    rm tests/_pure_uninstall.test.fish
 
     fishtape tests/*.test.fish
   '';