diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-05 18:22:36 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-05 18:22:48 -0800 |
| commit | 452f1736d509b0896cf6e91e641b6b664097e8a6 (patch) | |
| tree | 52962261c4d750680b297f06018cefb9a03995db /pkgs/tools/filesystems | |
| parent | cf802b8075d2c9684fc2b5d7b47af3c5977e0f61 (diff) | |
| download | nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar.gz nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar.bz2 nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar.lz nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar.xz nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.tar.zst nixlib-452f1736d509b0896cf6e91e641b6b664097e8a6.zip | |
ceph: Major Update 0.94.4 -> 9.2.0
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/9.nix | 13 | ||||
| -rw-r--r--[l---------] | pkgs/tools/filesystems/ceph/default.nix | 14 | ||||
| l---------[-rw-r--r--] | pkgs/tools/filesystems/ceph/dev.nix | 14 |
4 files changed, 27 insertions, 39 deletions
diff --git a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch deleted file mode 100644 index 142bcabec544..000000000000 --- a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001 -From: Kefu Chai <kchai@redhat.com> -Date: Fri, 17 Jul 2015 01:12:03 +0800 -Subject: [PATCH] cls: fix the build on i386 - -this is a leftover of 0dae022 - -Signed-off-by: Kefu Chai <kchai@redhat.com> ---- - src/cls/cephfs/cls_cephfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h -index 3cee0db..d4a5f23 100644 ---- a/src/cls/cephfs/cls_cephfs.h -+++ b/src/cls/cephfs/cls_cephfs.h -@@ -118,7 +118,7 @@ class AccumulateResult - // Largest object seen - uint64_t max_obj_size; - // Highest mtime seen -- time_t max_mtime; -+ int64_t max_mtime; - - AccumulateResult() - : ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0) diff --git a/pkgs/tools/filesystems/ceph/9.nix b/pkgs/tools/filesystems/ceph/9.nix new file mode 100644 index 000000000000..f3d15a252cb8 --- /dev/null +++ b/pkgs/tools/filesystems/ceph/9.nix @@ -0,0 +1,13 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "9.2.0"; + + src = fetchgit { + url = "https://github.com/ceph/ceph.git"; + rev = "refs/tags/v${version}"; + sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pa"; + }; + + patches = [ ./fix-pythonpath.patch ]; +}) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 31d5e95359c2..a82867e59a21 120000..100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1 +1,13 @@ -0.94.nix \ No newline at end of file +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "9.2.0"; + + src = fetchgit { + url = "https://github.com/ceph/ceph.git"; + rev = "refs/tags/v${version}"; + sha256 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc"; + }; + + patches = [ ./fix-pythonpath.patch ]; +}) diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index d092b4057e50..0f6f2dfda1d1 100644..120000 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -1,13 +1 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "9.1.0"; - - src = fetchgit { - url = "https://github.com/ceph/ceph.git"; - rev = "refs/tags/v${version}"; - sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pz"; - }; - - patches = [ ./fix-pythonpath.patch ]; -}) +9.nix \ No newline at end of file |