summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-11-19 14:18:28 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-11-19 14:25:16 +0100
commitadde71ea6eae60cee2f9c7768b5ecaf75a1642df (patch)
tree0b91fd32a04d1f8c2256400f4f0dc0759971c98a
parentdec09c2220c92a83604400aa10c3a31c77cd5602 (diff)
downloadnixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar.gz
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar.bz2
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar.lz
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar.xz
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.tar.zst
nixpkgs-adde71ea6eae60cee2f9c7768b5ecaf75a1642df.zip
ceph: Remove old and git versions
-rw-r--r--pkgs/tools/filesystems/ceph/0.80.nix17
-rw-r--r--pkgs/tools/filesystems/ceph/0.94.nix13
-rw-r--r--pkgs/tools/filesystems/ceph/git.nix13
-rw-r--r--pkgs/top-level/all-packages.nix3
4 files changed, 0 insertions, 46 deletions
diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
deleted file mode 100644
index ffb52f3fa5b..00000000000
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "0.80.10";
-
-  src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
-  };
-
-  patches = [
-    ./0001-Cleanup-boost-optionals.patch
-    ./fix-pgrefdebugging.patch
-    ./boost-158.patch
-  ];
-})
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
deleted file mode 100644
index abaea41b8c5..00000000000
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "0.94.5";
-
-  src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0xjbs26c06awpsas4ywdqvql7hdx37slk49zmc4k8w87ff4wwxmc";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
deleted file mode 100644
index 53fe43b93fa..00000000000
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2015-10-16";
-
-  src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
-    rev = "63d868106efd4d8aef71d498ba84cb2271a95a07";
-    sha256 = "1sx0j50zp0is34x7rpddiizspg2qfscyfwc5yrw3y6hiklpzhz96";
-  };
-
-  patches = [ ./fix-pythonpath.patch ];
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46e10305482..ac6f71b1e23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1029,12 +1029,9 @@ let
   # The default should always be symlinked to the latest LTS
   # Dev should always point to the latest versioned release
   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 { });
 
   cfdg = builderDefsPackage (callPackage ../tools/graphics/cfdg) {};