From 991fbf2f1061b0f1dc1ee3ac7661a704bae4985a Mon Sep 17 00:00:00 2001 From: Rohit Singh Date: Thu, 25 Jul 2024 01:05:30 +0530 Subject: [PATCH 1/2] nixci: 0.5.0 -> 1.0.0 --- pkgs/tools/nix/nixci/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index e84e21f4c83f..e8e1c5f89c7e 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -8,21 +8,23 @@ , Security , SystemConfiguration , IOKit +, installShellFiles +, nix }: rustPlatform.buildRustPackage rec { pname = "nixci"; - version = "0.5.0"; + version = "1.0.0"; src = fetchCrate { inherit version; pname = "nixci"; - hash = "sha256-XbPXS29zqg+pOs/JRRB2bRPdMTDy/oKLM41UomSZTN0="; + hash = "sha256-49I09hXYoVo6vzv1b6mkeiFwzfj6g1SkXTL/tCEdOYc="; }; - cargoHash = "sha256-+ed/XsEAwp7bsZOb+bOailpgSFnKvwoHR0QptnGeulk="; + cargoHash = "sha256-trmWeYJNev7jYJtGp9XR/emmQiiI94NM0cPFrAuD7m0="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles nix ]; buildInputs = lib.optionals stdenv.isLinux [ openssl @@ -32,6 +34,13 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; + postInstall = '' + installShellCompletion --cmd nixci \ + --bash <($out/bin/nixci completion bash) \ + --fish <($out/bin/nixci completion fish) \ + --zsh <($out/bin/nixci completion zsh) + ''; + # The rust program expects an environment (at build time) that points to the # devour-flake flake. env.DEVOUR_FLAKE = fetchFromGitHub { From 103bd1c7921f37a920c56351ea27f4eafaf506f9 Mon Sep 17 00:00:00 2001 From: Rohit Singh Date: Thu, 25 Jul 2024 13:05:04 +0530 Subject: [PATCH 2/2] nixci: add rsrohitsingh682 as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/nix/nixci/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4dc8e5cdea8d..66dae16c0910 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17629,6 +17629,12 @@ githubId = 19433256; name = "Radoslaw Sniezek"; }; + rsrohitsingh682 = { + email = "rsrohitsingh682@gmail.com"; + github = "rsrohitsingh682"; + githubId = 45477585; + name = "Rohit Singh"; + }; rster2002 = { name = "Bjørn"; github = "rster2002"; diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index e8e1c5f89c7e..304c5ff8ce6a 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { description = "Define and build CI for Nix projects anywhere"; homepage = "https://github.com/srid/nixci"; license = licenses.agpl3Only; - maintainers = with maintainers; [ srid shivaraj-bh ]; + maintainers = with maintainers; [ srid shivaraj-bh rsrohitsingh682 ]; mainProgram = "nixci"; }; }