diff --git a/default.nix b/default.nix index 342ed6d577f..795cc612ecc 100644 --- a/default.nix +++ b/default.nix @@ -116,6 +116,12 @@ 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 ]; @@ -123,6 +129,7 @@ let }); activeOverlays = [ requiredOverlay ] + ++ [ metricOverlay ] ++ optional enableBenchmarks benchmarkOverlay ++ optional enableDebugging debugOverlay ++ optional forceDontCheck dontCheckOverlay; diff --git a/nixpkgs-src.json b/nixpkgs-src.json index 7bbdfec7d54..a15c503435c 100644 --- a/nixpkgs-src.json +++ b/nixpkgs-src.json @@ -1,5 +1,5 @@ { - "rev": "118431d4d68c68a6605932d94aae0a75a8309d95", - "sha256": "0w2a1ll8c5bysjqbm1ljzcgrmf0gkwm1c97xpfsb8k3ns56x4h52", - "sha256unpacked": "146z9syzfiq1phq3gs2kacq2zcvyzbpzxy52vhjgxhm1ygy449lm" + "rev": "3518baa230549044151557c2c37eb8b06897f86d", + "sha256": "1c71lslxiz570xcl13sgp46h9pzjmb2sq0pyj6z42j6mzdfc9rz3", + "sha256unpacked": "1bihcn6mmhr7g2pyms8iircwfg53prx7jphnwdw3ifwk4q5fjxnq" }