diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index 23757278b6f0..d092b4057e50 100644 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -1,16 +1,13 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "9.0.3"; + version = "9.1.0"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx"; + sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pz"; }; - patches = [ - ./fix-pythonpath.patch - ./9.0.3-i686-fix.patch - ]; + patches = [ ./fix-pythonpath.patch ]; }) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index cfc020b107d2..8c169f131ed2 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -206,10 +206,10 @@ stdenv.mkDerivation { ] ++ optional (versionAtLeast version "9.0.2") [ (mkWith true "man-pages" null) (mkWith true "systemd-libexec-dir" "\${out}/libexec") - ] ++ optional (versionOlder version "10.0.0") [ + ] ++ optional (versionOlder version "9.1.0") [ (mkWith (optLibs3 != null) "system-libs3" null) (mkWith true "rest-bench" null) - ] ++ optional (versionAtLeast version "10.0.0") [ + ] ++ optional (versionAtLeast version "9.1.0") [ (mkWith true "rgw-user" "rgw") (mkWith true "rgw-group" "rgw") (mkWith true "systemd-unit-dir" "\${out}/etc/systemd/system")