Unverified Commit ae2e299f authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #305222 from shivaraj-bh/update-nixci 

nixci: 0.2.0 -> 0.4.0
parents c4fe1b7e 5efa13b4

pkgs/tools/nix/nixci/default.nix

+14 −6
Original line number Diff line number Diff line
@@ -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";

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -39989,7 +39989,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;