Merge pull request #231922 from maralorn/nom-2.0.0.6

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

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];
 }