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

ceph: Don't use symlinks

Browse Source 
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").
This commit is contained in:
Eelco Dolstra 2015-11-19 14:21:07 +01:00
parent adde71ea6e
commit aab90653af
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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