ceph: Don't use symlinks

No need to invent an ad-hoc symlink scheme when we can handle this
kind of indirection at the Nix expression level (e.g. by doing
"ceph-dev = ceph").

4 files changed, 15 insertions, 20 deletions

diff --git a/pkgs/tools/filesystems/ceph/9.nix b/pkgs/tools/filesystems/ceph/9.nix
deleted file mode 100644
index a82867e59a21..000000000000
--- a/pkgs/tools/filesystems/ceph/9.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 0f6f2dfda1d1..a82867e59a21 120000..100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1 +1,13 @@
-9.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
deleted file mode 120000
index 0f6f2dfda1d1..000000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1 +0,0 @@
-9.nix
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6f71b1e23e..fe750870f57e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1025,13 +1025,10 @@ let
 
   cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
 
-  # Only ever add ceph LTS releases
-  # The default should always be symlinked to the latest LTS
-  # Dev should always point to the latest versioned release
   libceph = ceph.lib;
-  ceph-9 = callPackage ../tools/filesystems/ceph/9.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
-  ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
+  ceph-dev = ceph;
+  #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
 
   cfdg = builderDefsPackage (callPackage ../tools/graphics/cfdg) {};