diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix index 5060d0aeda01..1acafb10eabc 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,9 +1,25 @@ -{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: +{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv, emptyDirectory }: let - inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; + overrides = old: { + hercules-ci-agent = + overrideCabal + (o: { + isLibrary = true; + isExecutable = false; + postInstall = ""; # ignore completions + enableSharedExecutables = false; + buildTarget = "lib:hercules-ci-agent hercules-ci-agent-unit-tests"; + configureFlags = o.configureFlags or [ ] ++ [ + "--bindir=${emptyDirectory}/hercules-ci-built-without-binaries/no-bin" + ]; + }) + old.hercules-ci-agent; + }; + pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal @@ -15,7 +31,7 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); + (addBuildTools [ makeWrapper ] (justStaticExecutables (haskellPackages.hercules-ci-cli.override overrides))); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; |