diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
| commit | 916793cf130a8269bbda881e9081370d74595538 (patch) | |
| tree | 11c9e5d14f3178c6daf5a9c0a85f8a9e469ac356 /pkgs/tools/filesystems/ceph/0.94.nix | |
| parent | 026c31dd9d6570fc6d7475c0102745cbfb0d6972 (diff) | |
| parent | 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 (diff) | |
| download | nixlib-916793cf130a8269bbda881e9081370d74595538.tar nixlib-916793cf130a8269bbda881e9081370d74595538.tar.gz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.bz2 nixlib-916793cf130a8269bbda881e9081370d74595538.tar.lz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.xz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.zst nixlib-916793cf130a8269bbda881e9081370d74595538.zip | |
Merge branch 'master' into systemd-219
Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/filesystems/ceph/0.94.nix')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/0.94.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 4dca90e5f273..f564e28c5a3b 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,16 +1,13 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.2"; + version = "0.94.3"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l"; + sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy"; }; - patches = [ - ./fix-pgrefdebugging.patch - ./boost-158.patch - ]; + patches = [ ./fix-pgrefdebugging.patch ]; }) |