diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
| commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
| tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /pkgs/tools/filesystems | |
| parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
| parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
| download | nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/mergerfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/snapraid/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 431be3b79d77..f7e830f3211d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "11.0"; + version = "11.1"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI="; + sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ="; }; inherit buildInputs propagatedBuildInputs; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index e2e6e28e3b62..6ee1d96eaf49 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; + sha256 = "sha256-eENtsN9OqPpUQM+O8tPTBzDk26/F/zc2hZ4ZiXiDp2I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 9ce1461ffaee..d945a4a40094 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = true; + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; |