diff options
author | shivaraj-bh <sbh69840@gmail.com> | 2024-04-19 09:11:57 +0530 |
---|---|---|
committer | shivaraj-bh <sbh69840@gmail.com> | 2024-04-20 17:59:37 +0530 |
commit | 5efa13b4a40d236a3b39d82b60c250b82112c062 (patch) | |
tree | 6465c444f6b76a8a276761266b37a92e6eaabe8f /pkgs | |
parent | 9d50a5b0d8f0efe29b961c626a1aa0e7a94eb601 (diff) |
nixci: 0.2.0 -> 0.4.0; fix Darwin build
https://github.com/srid/nixci/releases/tag/0.4.0 Add SystemConfiguration and IOKit from apple_sdk to fix the darwin build failure
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/nix/nixci/default.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index bc78b3aab59a5..dbbc7ae1cc4f4 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -6,23 +6,31 @@ , openssl , pkg-config , Security +, SystemConfiguration +, IOKit }: rustPlatform.buildRustPackage rec { pname = "nixci"; - version = "0.2.0"; + version = "0.4.0"; src = fetchCrate { inherit version; pname = "nixci"; - hash = "sha256-Q3V/JL64xkIj0X0NSMRTjRAP3PJC9ouj3CmEscVWdns="; + hash = "sha256-JC1LUny8UKflANlcx6Hcgx39CRry+ossnp/RQK36oaI="; }; - cargoHash = "sha256-tjk91AaPsMLfXYB2o1HTTxb6Qr3l8BABPStrKEGvbtM="; + cargoHash = "sha256-pYPzM7QlQ2EXwrvuXMa1qs0m7cmumh1iPesgJZ0H2kg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libiconv openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + IOKit + Security + SystemConfiguration + ]; # The rust program expects an environment (at build time) that points to the # devour-flake flake. @@ -37,7 +45,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 ]; + maintainers = with maintainers; [ srid shivaraj-bh ]; mainProgram = "nixci"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db8d02340712c..a0456fb9ce0a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40055,7 +40055,7 @@ with pkgs; alejandra = callPackage ../tools/nix/alejandra { }; nixci = callPackage ../tools/nix/nixci { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit; }; nixfmt-classic = haskellPackages.nixfmt.bin; |