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 ...@@ -27,7 +27,6 @@ let
protolude protolude
shake shake
Glob Glob
#panpipe
ghcid ghcid
typed-process typed-process
unix unix
...@@ -38,6 +37,8 @@ let ...@@ -38,6 +37,8 @@ let
f2 = { mkDerivation, stdenv f2 = { mkDerivation, stdenv
, brittany , brittany
, panpipe
, panhandle
, haskell-tools-refactor , haskell-tools-refactor
}: }:
mkDerivation { mkDerivation {
...@@ -46,6 +47,8 @@ let ...@@ -46,6 +47,8 @@ let
src = ""; src = "";
libraryHaskellDepends = [ libraryHaskellDepends = [
brittany brittany
panpipe
panhandle
haskell-tools-refactor haskell-tools-refactor
]; ];
description = ""; description = "";
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
genericTestName ? "run" genericTestName ? "run"
}: }:
let let
panhandle-src = fetched panhandle/pin.json;
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs); callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
addBI = drv: bi: drv.overrideAttrs addBI = drv: bi: drv.overrideAttrs
...@@ -131,9 +132,10 @@ let ...@@ -131,9 +132,10 @@ let
haskellPackages = pkgs.haskellPackages.override { haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib; overrides = self: super: with pkgs.haskell.lib;
rec { rec {
panpipe = (pkgs.haskell.lib.doJailbreak super.panpipe); panpipe = doJailbreak super.panpipe;
spdx = (pkgs.haskell.lib.doJailbreak super.spdx); #panhandle = doJailbreak super.panhandle;
monad-mock = (pkgs.haskell.lib.doJailbreak super.monad-mock); spdx = doJailbreak super.spdx;
monad-mock = doJailbreak super.monad-mock;
generic-pretty = doJailbreak super.generic-pretty; generic-pretty = doJailbreak super.generic-pretty;
#minor cabal and version fix #minor cabal and version fix
...@@ -150,11 +152,9 @@ let ...@@ -150,11 +152,9 @@ let
bleedingHaskellPackages = bleeding.haskellPackages.override { bleedingHaskellPackages = bleeding.haskellPackages.override {
overrides = self: super: with bleeding.haskell.lib; overrides = self: super: with bleeding.haskell.lib;
rec { rec {
#panpipe = (bleeding.haskell.lib.doJailbreak super.panpipe); panpipe = doJailbreak super.panpipe;
#spdx = (bleeding.haskell.lib.doJailbreak super.spdx); panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit {
#monad-mock = (bleeding.haskell.lib.doJailbreak super.monad-mock); inherit (panhandle-src) url rev; })) {};
#generic-pretty = doJailbreak super.generic-pretty;
multistate = doJailbreak super.multistate; multistate = doJailbreak super.multistate;
#hspec = doJailbreak super.hspec; #hspec = doJailbreak super.hspec;
dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {}; 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