diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9be62568373..c946cf6a22b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -782,6 +782,11 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ]; }); + nix-output-monitor = overrideCabal super.nix-output-monitor { + # Can't ran the golden-tests with nix, because they call nix + testTarget = "unit-tests"; + }; + haskell-language-server = overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 7cd4547d904..52a2737ebb7 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -25,6 +25,8 @@ self: super: { hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; + nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; + # cabal2nix --revision https://github.com/hasura/ci-info-hs.git ci-info = self.callPackage ../misc/haskell/hasura/ci-info {}; # cabal2nix --revision https://github.com/hasura/pg-client-hs.git diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix new file mode 100644 index 00000000000..3b4e9d34d2f --- /dev/null +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, ansi-terminal, async, attoparsec, base, containers +, directory, HUnit, mtl, nix-derivation, process, relude, stdenv +, stm, text, time, unix, fetchFromGitHub +}: +mkDerivation { + pname = "nix-output-monitor"; + version = "0.1.0.0"; + src = fetchFromGitHub { + owner = "maralorn"; + repo = "nix-output-monitor"; + sha256 = "1k9fni02y7xb97mkif1k7s0y1xv06hnqbkds35k4gg8mnf5z911i"; + rev = "a0e0b09"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async attoparsec base containers directory mtl + nix-derivation relude stm text time unix + ]; + executableHaskellDepends = [ + ansi-terminal async attoparsec base containers directory mtl + nix-derivation relude stm text time unix + ]; + testHaskellDepends = [ + ansi-terminal async attoparsec base containers directory HUnit mtl + nix-derivation process relude stm text time unix + ]; + homepage = "https://github.com/maralorn/nix-output-monitor"; + description = "Parses output of nix-build to show additional information"; + license = stdenv.lib.licenses.agpl3Plus; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e71ec4fc23..614af626d41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2286,6 +2286,8 @@ in nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); + nix-template = callPackage ../tools/package-management/nix-template { }; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;