Skip to content

nix-output-monitor: 1.1.3.0 -> 2.0.0.0 #196137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdepillabout merged 1 commit into from
Oct 15, 2022
Merged

nix-output-monitor: 1.1.3.0 -> 2.0.0.0 #196137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 2 additions & 3 deletions pkgs/tools/nix/nix-output-monitor/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';
Expand Down
22 changes: 9 additions & 13 deletions pkgs/tools/nix/nix-output-monitor/generated-package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
fetchzip,
filepath,
generic-optics,
hermes-json,
HUnit,
lib,
lock-file,
Expand All @@ -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;
Expand All @@ -58,21 +58,19 @@ mkDerivation {
extra
filepath
generic-optics
hermes-json
lock-file
MemoTrie
mtl
nix-derivation
optics
random
relude
safe
stm
streamly
terminal-size
text
time
unix
vector
wcwidth
word8
];
Expand All @@ -89,21 +87,20 @@ mkDerivation {
extra
filepath
generic-optics
hermes-json
lock-file
MemoTrie
mtl
nix-derivation
optics
random
relude
safe
stm
streamly
terminal-size
text
time
unix
vector
typed-process
wcwidth
word8
];
Expand All @@ -120,6 +117,7 @@ mkDerivation {
extra
filepath
generic-optics
hermes-json
HUnit
lock-file
MemoTrie
Expand All @@ -135,8 +133,6 @@ mkDerivation {
terminal-size
text
time
unix
vector
wcwidth
word8
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4541,7 +4541,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;
Expand Down