From 72b237d7e01b1b1cb2777c97bb6bd134f602c710 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 22 Aug 2018 21:33:30 -0400 Subject: [PATCH] [DEVOPS-1013] bump nixpkgs and add enablePhaseMetrics=true --- default.nix | 8 ++++++++ nixpkgs-src.json | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 342ed6d577f..821a7c5436e 100644 --- a/default.nix +++ b/default.nix @@ -19,6 +19,7 @@ in , enableProfiling ? false , enableDebugging ? false , enableBenchmarks ? true +, enablePhaseMetrics ? true , allowCustomConfig ? true , useStackBinaries ? false }: @@ -116,6 +117,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 +130,7 @@ let }); activeOverlays = [ requiredOverlay ] + ++ optional enablePhaseMetrics metricOverlay ++ optional enableBenchmarks benchmarkOverlay ++ optional enableDebugging debugOverlay ++ optional forceDontCheck dontCheckOverlay; diff --git a/nixpkgs-src.json b/nixpkgs-src.json index 7bbdfec7d54..d58ce482ce4 100644 --- a/nixpkgs-src.json +++ b/nixpkgs-src.json @@ -1,5 +1,5 @@ { - "rev": "118431d4d68c68a6605932d94aae0a75a8309d95", - "sha256": "0w2a1ll8c5bysjqbm1ljzcgrmf0gkwm1c97xpfsb8k3ns56x4h52", - "sha256unpacked": "146z9syzfiq1phq3gs2kacq2zcvyzbpzxy52vhjgxhm1ygy449lm" + "rev": "4250ed05520fe19bb3a176f313a06a48e03fbe0e", + "sha256": "139hv9scw2hrdrrkmq0msnsvg8q4mg5d3m8inf8kq3m76pbp1h77", + "sha256unpacked": "1bihcn6mmhr7g2pyms8iircwfg53prx7jphnwdw3ifwk4q5fjxnq" }