Unverified Commit 56d71be1 authored by benaryorg's avatar benaryorg
Browse files

pkgs/ceph: client as output 



Moving the ceph client to a separate output allows moving the entire package to the by-name structure more easily.

Signed-off-by: default avatarbenaryorg <binary@benary.org>
parent f04ab690

pkgs/tools/filesystems/ceph/default.nix

+243 −251
Original line number Diff line number Diff line
@@ -373,8 +373,7 @@ let 
    hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";

  };

in

rec {

  ceph = stdenv.mkDerivation {

stdenv.mkDerivation rec {

  pname = "ceph";

  inherit src version;
@@ -580,11 +579,25 @@ rec { 
    # Test that ceph-volume exists since the build system has a tendency to

    # silently drop it with misconfigurations.

    test -f $out/bin/ceph-volume



    mkdir -p $client/{bin,etc,${sitePackages},share/bash-completion/completions}

    cp -r $out/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $client/bin

    cp -r $out/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $client/bin

    cp -r $out/bin/rbd-replay* $client/bin

    cp -r $out/sbin/mount.ceph $client/bin

    cp -r $out/sbin/mount.fuse.ceph $client/bin

    ln -s bin $client/sbin

    cp -r $out/${sitePackages}/* $client/${sitePackages}

    cp -r $out/etc/bash_completion.d $client/share/bash-completion/completions

    # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths

    substituteInPlace $client/bin/ceph          --replace $out $client

    substituteInPlace $client/bin/.ceph-wrapped --replace $out $client

  '';



  outputs = [

    "out"

    "lib"

    "client"

    "dev"

    "doc"

    "man"
@@ -610,25 +623,4 @@ rec { 
        ;

    };

  };

  };



  ceph-client =

    runCommand "ceph-client-${version}"

      {

        meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs";

      }

      ''

        mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}

        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}/sbin/mount.ceph $out/bin

        cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin

        ln -s bin $out/sbin

        cp -r ${ceph}/${sitePackages}/* $out/${sitePackages}

        cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions

        # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths

        substituteInPlace $out/bin/ceph          --replace ${ceph} $out

        substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out

      '';

}

pkgs/top-level/all-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -2345,11 +2345,9 @@ with pkgs; 


  cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };



  ceph = callPackage ../tools/filesystems/ceph { };

  libceph = ceph.lib;

  inherit (callPackages ../tools/filesystems/ceph { })

    ceph

    ceph-client

    ;

  ceph-client = ceph.client;

  ceph-dev = ceph;



  clementine = libsForQt5.callPackage ../applications/audio/clementine {