From 7dc88be121b0d3da927f3f7787688e66f250f41d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Jan 2015 23:19:05 +0100 Subject: [PATCH] structured-haskell-mode: use older version of haskell-src-exts and descriptive to fix the build Fixes https://github.com/NixOS/nixpkgs/issues/5894. --- .../haskell-modules/configuration-common.nix | 6 ++++ .../haskell-modules/hackage-packages.nix | 36 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad0454b8bb2a..2dd3dd32f43d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -369,6 +369,12 @@ self: super: { # https://github.com/begriffs/postgrest/issues/127 postgrest = dontDistribute super.postgrest; + # Needs older versions of its dependencies. + structured-haskell-mode = (dontJailbreak super.structured-haskell-mode).override { + haskell-src-exts = self.haskell-src-exts_1_15_0_1; # https://github.com/chrisdone/structured-haskell-mode/issues/90 + descriptive = self.descriptive_0_0_2; # https://github.com/chrisdone/structured-haskell-mode/issues/94 + }; + } // { # Not on Hackage yet. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 799a0329a8e6..4bde9e84ff7e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37112,6 +37112,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "descriptive_0_0_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, mtl, text + , transformers + }: + mkDerivation { + pname = "descriptive"; + version = "0.0.2"; + sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p"; + buildDepends = [ + aeson base bifunctors containers mtl text transformers + ]; + homepage = "https://github.com/chrisdone/descriptive"; + description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "descriptive" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, hspec, HUnit , mtl, text, transformers @@ -55152,6 +55168,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts_1_15_0_1" = callPackage + ({ mkDerivation, array, base, containers, cpphs, directory + , filemanip, filepath, ghc-prim, happy, mtl, pretty, smallcheck + , syb, tasty, tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.15.0.1"; + sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45"; + buildDepends = [ array base cpphs ghc-prim pretty ]; + testDepends = [ + base containers directory filemanip filepath mtl smallcheck syb + tasty tasty-golden tasty-smallcheck + ]; + buildTools = [ happy ]; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-src-exts" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, smallcheck, syb, tasty