Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f82528a92b73
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 79bf9ef3b5bb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 22, 2020

  1. ceph: Bring back ceph-volume

    @srhb
    srhb committed Jan 22, 2020
    Copy the full SHA
    585ac58 View commit details

  2. Merge pull request #78243 from srhb/ceph-revert-lost-ceph-volume 

    ceph: Bring back ceph-volume
    @flokli
    flokli authored Jan 22, 2020
    Copy the full SHA
    79bf9ef View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/tools/filesystems/ceph/default.nix
12 changes: 9 additions & 3 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ let
ps.six
ps.pyyaml
]);
sitePackages = ceph-python-env.python.sitePackages;

version = "14.2.6";
in rec {
@@ -135,7 +136,8 @@ in rec {
# for pybind/rgw to find internal dep
export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
# install target needs to be in PYTHONPATH for "*.pth support" check to succeed
# set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others
export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages}
patchShebangs src/script src/spdk src/test src/tools
'';
@@ -159,6 +161,10 @@ in rec {
postFixup = ''
wrapPythonPrograms
wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
# Test that ceph-volume exists since the build system has a tendency to
# silently drop it with misconfigurations.
test -f $out/bin/ceph-volume
'';

enableParallelBuilding = true;
@@ -187,11 +193,11 @@ in rec {
platforms = [ "x86_64-linux" ];
};
} ''
mkdir -p $out/{bin,etc,lib/python3.7/site-packages}
mkdir -p $out/{bin,etc,${sitePackages}}
cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
cp -r ${ceph}/bin/rbd-replay* $out/bin
cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/
cp -r ${ceph}/${sitePackages} $out/${sitePackages}
cp -r ${ceph}/etc/bash_completion.d $out/etc
# wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
substituteInPlace $out/bin/ceph --replace ${ceph} $out