From 0599045c7c0eee3a8fe047d1c9cb03e419e8c5e5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:52:55 -0300 Subject: [PATCH 1/3] ceph-csi: migrate to pkgs/by-name --- .../ceph-csi/default.nix => by-name/ce/ceph-csi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/filesystems/ceph-csi/default.nix => by-name/ce/ceph-csi/package.nix} (100%) diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/by-name/ce/ceph-csi/package.nix similarity index 100% rename from pkgs/tools/filesystems/ceph-csi/default.nix rename to pkgs/by-name/ce/ceph-csi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8e717d4047..d61afe8625c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6451,8 +6451,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 From 06f1086c5b78e438dc4772c35abaeaf7840ad8ef Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:02:42 -0300 Subject: [PATCH 2/3] ceph-csi: refactor - migrate sha256 to hash - add install runHook - order derivation by phases order, attrs by alphabetical order - enable strictDeps - meta: add changelog, downloadPage, remove nested with --- pkgs/by-name/ce/ceph-csi/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 5d0a4c5a53a9..3539e6f043a4 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -1,34 +1,41 @@ -{ 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 ]; + maintainers = with lib.maintainers; [ johanot ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From 861d2d667fd725e2b673732cd4df6aa76dda4e52 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:03:09 -0300 Subject: [PATCH 3/3] ceph-csi: nixfmt format --- pkgs/by-name/ce/ceph-csi/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 3539e6f043a4..6c45b0aa2435 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -1,4 +1,10 @@ -{ ceph, fetchFromGitHub, go, lib, stdenv }: +{ + ceph, + fetchFromGitHub, + go, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "ceph-csi"; @@ -36,6 +42,9 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "cephcsi"; maintainers = with lib.maintainers; [ johanot ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; }