diff --git a/pkgs/by-name/co/cockpit-zfs/package.nix b/pkgs/by-name/co/cockpit-zfs/package.nix index 99de320d99f9..5ead4c6b4786 100644 --- a/pkgs/by-name/co/cockpit-zfs/package.nix +++ b/pkgs/by-name/co/cockpit-zfs/package.nix @@ -46,28 +46,22 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit-zfs"; - version = "1.2.27-3"; + version = "1.2.30"; src = fetchFromGitHub { owner = "45Drives"; repo = "cockpit-zfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-7hx9FJxFN7xsozMvAb0fdRTX2hAcxtJc5wdgrs2PGJc="; + hash = "sha256-G24xNoKoBnlXxxyo9IJIoQW3PrktQxsx37/cX6QYfyE="; }; - patches = [ - # Remove after upstream updates to Yarn 4.14 - # https://github.com/45Drives/cockpit-zfs/blob/main/package.json#L13 - ./yarn-4.14-support.patch - ]; - missingHashes = ./missing-hashes.json; # Use buildPackages for cross-compilation support offlineCache = yarnBerryForBuild.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-Tdxe5bXN9psSrnUXL1f+1nh4WPzuvOI7j0I+VPU2/1s="; + inherit (finalAttrs) src missingHashes; + hash = "sha256-nm3iHf9Rm5JFKzH0HAvglkQPFIV6Fl1e9WvNdqevTug="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch b/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch deleted file mode 100644 index 2d23ed3e118c..000000000000 --- a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10c0 -