Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3457 from input-output-hk/devops-1013-enable-phas…
Browse files Browse the repository at this point in the history
…e-metrics

[DEVOPS-1013] bump nixpkgs and add enablePhaseMetrics=true
  • Loading branch information
disassembler authored Aug 25, 2018
2 parents cf4c65e + 72b237d commit d342a82
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ in
, enableProfiling ? false
, enableDebugging ? false
, enableBenchmarks ? true
, enablePhaseMetrics ? true
, allowCustomConfig ? true
, useStackBinaries ? false
}:
Expand Down Expand Up @@ -116,13 +117,20 @@ let
});
};

metricOverlay = self: super: {
mkDerivation = args: super.mkDerivation (args // {
enablePhaseMetrics = true;
});
};

cardanoPkgsBase = ((import ./pkgs { inherit pkgs; }).override {
ghc = overrideDerivation pkgs.haskell.compiler.ghc822 (drv: {
patches = drv.patches ++ [ ./ghc-8.0.2-darwin-rec-link.patch ];
});
});

activeOverlays = [ requiredOverlay ]
++ optional enablePhaseMetrics metricOverlay
++ optional enableBenchmarks benchmarkOverlay
++ optional enableDebugging debugOverlay
++ optional forceDontCheck dontCheckOverlay;
Expand Down
6 changes: 3 additions & 3 deletions nixpkgs-src.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"rev": "118431d4d68c68a6605932d94aae0a75a8309d95",
"sha256": "0w2a1ll8c5bysjqbm1ljzcgrmf0gkwm1c97xpfsb8k3ns56x4h52",
"sha256unpacked": "146z9syzfiq1phq3gs2kacq2zcvyzbpzxy52vhjgxhm1ygy449lm"
"rev": "4250ed05520fe19bb3a176f313a06a48e03fbe0e",
"sha256": "139hv9scw2hrdrrkmq0msnsvg8q4mg5d3m8inf8kq3m76pbp1h77",
"sha256unpacked": "1bihcn6mmhr7g2pyms8iircwfg53prx7jphnwdw3ifwk4q5fjxnq"
}

0 comments on commit d342a82

Please sign in to comment.