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

ceph: Major Update 0.94.4 -> 9.2.0

This commit is contained in:
William A. Kennington III 2015-11-05 18:22:36 -08:00
parent cf802b8075
commit 452f1736d5
5 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
View File

@ -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)

13
pkgs/tools/filesystems/ceph/9.nix Normal file
View File

@ -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 ];
})

1
pkgs/tools/filesystems/ceph/default.nix
View File

@ -1 +0,0 @@
0.94.nix

13
pkgs/tools/filesystems/ceph/default.nix Normal file
View File

@ -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 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc";
};
patches = [ ./fix-pythonpath.patch ];
})

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

@ -1,13 +0,0 @@
{ 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 ];
})

1
pkgs/tools/filesystems/ceph/dev.nix Symbolic link
View File

@ -0,0 +1 @@
9.nix

1
pkgs/top-level/all-packages.nix
View File

@ -1027,6 +1027,7 @@ let
libceph = ceph.lib;
ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
ceph-9 = callPackage ../tools/filesystems/ceph/9.nix { };
ceph = callPackage ../tools/filesystems/ceph { };
ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });