From c722252251aa029d598330b030f5c2301ce7d5e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Dec 2017 13:54:15 +0100 Subject: [PATCH] idris: update overrides for new 1.1.1 default version --- pkgs/development/haskell-modules/configuration-common.nix | 7 +------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 54ac33260a3..09e3ef6e7a1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -730,14 +730,9 @@ self: super: { ''; }); - # test suite cannot find its own "idris" binary + # The standard libraries are compiled separately idris = doJailbreak (dontCheck super.idris); - idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: { - # The standard libraries are compiled separately - configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ]; - }); - # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87b01063d9c..31df81851dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5951,7 +5951,6 @@ with pkgs; overrides = self: super: { binary = lib.dontCheck self.binary_0_8_5_1; cheapskate = self.cheapskate_0_1_1; - idris = self.idris_1_1_1; parsers = lib.dontCheck super.parsers; semigroupoids = lib.dontCheck super.semigroupoids; trifecta = lib.dontCheck super.trifecta;