diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-15 11:08:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 11:08:35 +0200 |
| commit | e26cca5555178d421ea512ee80f2d509ac310534 (patch) | |
| tree | e907a23ee0e34fc6872c286cdfe9de99f8a14089 | |
| parent | a461d366c2a05378c25e10abc3b77aff5700a915 (diff) | |
| parent | 4414a2d94878818f7645b080fdf8f11ea9a1b92a (diff) | |
| download | nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar.gz nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar.bz2 nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar.lz nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar.xz nixlib-e26cca5555178d421ea512ee80f2d509ac310534.tar.zst nixlib-e26cca5555178d421ea512ee80f2d509ac310534.zip | |
Merge pull request #231922 from maralorn/nom-2.0.0.6
| -rw-r--r-- | pkgs/tools/nix/nix-output-monitor/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/nix/nix-output-monitor/generated-package.nix | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 49cc4d2bedcc..2eb15ebcfb7a 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,14 +1,18 @@ { haskell, - expect, haskellPackages, installShellFiles, - lib + lib, }: let inherit (haskell.lib.compose) justStaticExecutables overrideCabal; + overrides = { passthru.updateScript = ./update.sh; + + # nom has unit-tests and golden-tests + # golden-tests call nix and thus can’t be run in a nix build. testTarget = "unit-tests"; + buildTools = [installShellFiles]; postInstall = '' ln -s nom "$out/bin/nom-build" @@ -16,15 +20,11 @@ chmod a+x $out/bin/nom-build installShellCompletion --zsh --name _nom-build completions/completion.zsh ''; - mainProgram = "nom"; }; - nom-pkg = haskellPackages.callPackage ./generated-package.nix { }; - nom-pkg-with-scope = nom-pkg.overrideScope (hfinal: hprev: { - hermes-json = hfinal.hermes-json_0_2_0_1; - }); + raw-pkg = haskellPackages.callPackage ./generated-package.nix {}; in -lib.pipe - nom-pkg-with-scope + lib.pipe + raw-pkg [ (overrideCabal overrides) justStaticExecutables diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index b2490a211b88..8d9ae67ff9c4 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -26,7 +26,7 @@ relude, safe, stm, - streamly, + streamly-core, strict, strict-types, terminal-size, @@ -38,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.0.0.5"; + version = "2.0.0.6"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.5.tar.gz"; - sha256 = "02xrbf2nr64yfny3idkjb1xbd97wl8m5viifrwjf4hi6ivs5bl18"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.6.tar.gz"; + sha256 = "1adxg2bws7fqbmzfna5hr28fh8j10gvf57j6b0xbkhh4hgj4h9xd"; }; isLibrary = true; isExecutable = true; @@ -66,7 +66,7 @@ mkDerivation { relude safe stm - streamly + streamly-core strict strict-types terminal-size @@ -96,7 +96,7 @@ mkDerivation { relude safe stm - streamly + streamly-core strict strict-types terminal-size @@ -129,7 +129,7 @@ mkDerivation { relude safe stm - streamly + streamly-core strict strict-types terminal-size @@ -142,5 +142,6 @@ mkDerivation { homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [maralorn]; + mainProgram = "nom"; + maintainers = [lib.maintainers.maralorn]; } |