diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/by-name/ce/ceph-csi/package.nix similarity index 51% rename from pkgs/tools/filesystems/ceph-csi/default.nix rename to pkgs/by-name/ce/ceph-csi/package.nix index 5d0a4c5a53a9..6c45b0aa2435 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -1,34 +1,50 @@ -{ stdenv, lib, go, ceph, fetchFromGitHub }: +{ + ceph, + fetchFromGitHub, + go, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "ceph-csi"; version = "3.11.0"; - nativeBuildInputs = [ go ]; - buildInputs = [ ceph ]; - src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A="; + hash = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A="; }; preConfigure = '' export GOCACHE=$(pwd)/.cache ''; + strictDeps = true; + + nativeBuildInputs = [ go ]; + + buildInputs = [ ceph ]; + installPhase = '' + runHook preInstall mkdir -p $out/bin cp ./_output/* $out/bin + runHook postInstall ''; - meta = with lib; { - homepage = "https://ceph.com/"; + meta = { description = "Container Storage Interface (CSI) driver for Ceph RBD and CephFS"; + downloadPage = "https://github.com/ceph/ceph-csi"; + changelog = "https://github.com/ceph/ceph-csi/releases/tag/v${version}"; + homepage = "https://ceph.com/"; + license = lib.licenses.asl20; mainProgram = "cephcsi"; - license = [ licenses.asl20 ]; - maintainers = with maintainers; [ johanot ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with lib.maintainers; [ johanot ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da040d58c4c6..5ea50d264ae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6423,8 +6423,6 @@ with pkgs; nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; - ceph-csi = callPackage ../tools/filesystems/ceph-csi { }; - libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; # Ceph currently requires >= 5.3