diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-16 16:44:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-16 16:44:46 -0700 |
| commit | b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51 (patch) | |
| tree | 897393a91ab799e3258efcdbade56be4b1774c04 | |
| parent | 21bb385af51e4728301bd4ca7506e59e9520619d (diff) | |
| download | nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar.gz nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar.bz2 nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar.lz nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar.xz nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.tar.zst nixlib-b7c3a9647ab70b4a1377b5e094ccfa5667d3cf51.zip | |
ceph-dev: 9.0.3 -> 9.1.0
| -rw-r--r-- | pkgs/tools/filesystems/ceph/dev.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 4 |
2 files changed, 5 insertions, 8 deletions
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") |