Merge pull request #196137 from maralorn/nixos-unstable

nix-output-monitor: 1.1.3.0 -> 2.0.0.0

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

@@ -226,4 +226,7 @@ self: super: {
   inline-c-cpp =
     (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
     super.inline-c-cpp;
+
+  relude = dontCheck self.relude_1_1_0_0;
+  hermes-json = doJailbreak super.hermes-json;
 }

pkgs/tools/nix/nix-output-monitor/default.nix

@@ -10,9 +10,8 @@
     testTarget = "unit-tests";
     buildTools = [installShellFiles];
     postInstall = ''
-      substitute "exe-sh/nom-build" "$out/bin/nom-build" \
-        --replace 'unbuffer' '${expect}/bin/unbuffer' \
-        --replace 'nom' "$out/bin/nom"
+      ln -s nom "$out/bin/nom-build"
+      ln -s nom "$out/bin/nom-shell"
       chmod a+x $out/bin/nom-build
       installShellCompletion --zsh --name _nom-build completions/completion.zsh
     '';

pkgs/tools/nix/nix-output-monitor/generated-package.nix

@@ -15,6 +15,7 @@
   fetchzip,
   filepath,
   generic-optics,
+  hermes-json,
   HUnit,
   lib,
   lock-file,
@@ -31,17 +32,16 @@
   terminal-size,
   text,
   time,
-  unix,
-  vector,
+  typed-process,
   wcwidth,
   word8,
 }:
 mkDerivation {
   pname = "nix-output-monitor";
-  version = "1.1.3.0";
+  version = "2.0.0.0";
   src = fetchzip {
-    url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.3.0.tar.gz";
-    sha256 = "085phr84m0b056mj3c09gzcwv7b1wax7nhsg2qscahfz0q8f4ym7";
+    url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.0.tar.gz";
+    sha256 = "033582nzyi0hfis062cnz8lgx918lk1bmzfimsd78a9zzxn20frg";
   };
   isLibrary = true;
   isExecutable = true;
@@ -58,12 +58,12 @@ mkDerivation {
     extra
     filepath
     generic-optics
+    hermes-json
     lock-file
     MemoTrie
     mtl
     nix-derivation
     optics
-    random
     relude
     safe
     stm
@@ -71,8 +71,6 @@ mkDerivation {
     terminal-size
     text
     time
-    unix
-    vector
     wcwidth
     word8
   ];
@@ -89,12 +87,12 @@ mkDerivation {
     extra
     filepath
     generic-optics
+    hermes-json
     lock-file
     MemoTrie
     mtl
     nix-derivation
     optics
-    random
     relude
     safe
     stm
@@ -102,8 +100,7 @@ mkDerivation {
     terminal-size
     text
     time
-    unix
-    vector
+    typed-process
     wcwidth
     word8
   ];
@@ -120,6 +117,7 @@ mkDerivation {
     extra
     filepath
     generic-optics
+    hermes-json
     HUnit
     lock-file
     MemoTrie
@@ -135,8 +133,6 @@ mkDerivation {
     terminal-size
     text
     time
-    unix
-    vector
     wcwidth
     word8
   ];

pkgs/top-level/all-packages.nix

@@ -4552,7 +4552,7 @@ with pkgs;
 
   nixel = callPackage ../tools/nix/nixel { };
 
-  nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { };
+  nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { haskellPackages = haskell.packages.ghc92; };
 
   nix-template = callPackage ../tools/package-management/nix-template {
     inherit (darwin.apple_sdk.frameworks) Security;