Commit df274e06 authored by Valentin Reis's avatar Valentin Reis
Browse files

haskell lib fix.

parent 60cdefa8
Pipeline #7141 passed with stages
in 19 minutes and 6 seconds
......@@ -27,7 +27,6 @@ let
protolude
shake
Glob
#panpipe
ghcid
typed-process
unix
......@@ -38,6 +37,8 @@ let
f2 = { mkDerivation, stdenv
, brittany
, panpipe
, panhandle
, haskell-tools-refactor
}:
mkDerivation {
......@@ -46,6 +47,8 @@ let
src = "";
libraryHaskellDepends = [
brittany
panpipe
panhandle
haskell-tools-refactor
];
description = "";
......
......@@ -42,6 +42,7 @@
genericTestName ? "run"
}:
let
panhandle-src = fetched panhandle/pin.json;
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
addBI = drv: bi: drv.overrideAttrs
......@@ -131,9 +132,10 @@ let
haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib;
rec {
panpipe = (pkgs.haskell.lib.doJailbreak super.panpipe);
spdx = (pkgs.haskell.lib.doJailbreak super.spdx);
monad-mock = (pkgs.haskell.lib.doJailbreak super.monad-mock);
panpipe = doJailbreak super.panpipe;
#panhandle = doJailbreak super.panhandle;
spdx = doJailbreak super.spdx;
monad-mock = doJailbreak super.monad-mock;
generic-pretty = doJailbreak super.generic-pretty;
#minor cabal and version fix
......@@ -150,11 +152,9 @@ let
bleedingHaskellPackages = bleeding.haskellPackages.override {
overrides = self: super: with bleeding.haskell.lib;
rec {
#panpipe = (bleeding.haskell.lib.doJailbreak super.panpipe);
#spdx = (bleeding.haskell.lib.doJailbreak super.spdx);
#monad-mock = (bleeding.haskell.lib.doJailbreak super.monad-mock);
#generic-pretty = doJailbreak super.generic-pretty;
panpipe = doJailbreak super.panpipe;
panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit {
inherit (panhandle-src) url rev; })) {};
multistate = doJailbreak super.multistate;
#hspec = doJailbreak super.hspec;
dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment