public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph-dev: 9.0.3 -> 9.1.0

Browse Source
This commit is contained in:
William A. Kennington III 2015-10-16 16:44:46 -07:00
parent 21bb385af5
commit b7c3a9647a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/filesystems/ceph/dev.nix
View File

@ -1,16 +1,13 @@
{ callPackage, fetchgit, ... } @ args: { callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "9.0.3"; version = "9.1.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/ceph/ceph.git"; url = "https://github.com/ceph/ceph.git";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx"; sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pz";
}; };
patches = [ patches = [ ./fix-pythonpath.patch ];
./fix-pythonpath.patch
./9.0.3-i686-fix.patch
];
}) })

4
pkgs/tools/filesystems/ceph/generic.nix
View File

@ -206,10 +206,10 @@ stdenv.mkDerivation {
] ++ optional (versionAtLeast version "9.0.2") [ ] ++ optional (versionAtLeast version "9.0.2") [
(mkWith true "man-pages" null) (mkWith true "man-pages" null)
(mkWith true "systemd-libexec-dir" "\${out}/libexec") (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 (optLibs3 != null) "system-libs3" null)
(mkWith true "rest-bench" 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-user" "rgw")
(mkWith true "rgw-group" "rgw") (mkWith true "rgw-group" "rgw")
(mkWith true "systemd-unit-dir" "\${out}/etc/systemd/system") (mkWith true "systemd-unit-dir" "\${out}/etc/systemd/system")