Commit 9d6582eb authored by Valentin Reis's avatar Valentin Reis
Browse files

util fixes

parent 9fed98dd
Pipeline #7162 passed with stages
in 3 minutes and 22 seconds
let let
f1 = { mkDerivation, stdenv f = { mkDerivation, stdenv
, cabal-install , cabal-install
, apply-refact , apply-refact
, hdevtools , hdevtools
...@@ -35,25 +35,6 @@ let ...@@ -35,25 +35,6 @@ let
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}; };
f2 = { mkDerivation, stdenv
, brittany
, panpipe
, panhandle
, haskell-tools-refactor
}:
mkDerivation {
pname = "dummy";
version = "";
src = "";
libraryHaskellDepends = [
brittany
panpipe
panhandle
haskell-tools-refactor
];
description = "";
license = stdenv.lib.licenses.mit;
};
in in
rec { rec {
filter = path: filter = path:
...@@ -73,14 +54,13 @@ rec { ...@@ -73,14 +54,13 @@ rec {
p.jq p.jq
]; ];
getHackEnv = pkgs1: pkgs2: super: package : super.shellFor { getHackEnv = pkgs: util-pkgs: super: package : super.shellFor {
packages = p: [ packages = p: [
package package
(pkgs1.haskellPackages.callPackage f1 {}) (pkgs.haskellPackages.callPackage f {})
(pkgs2.haskellPackages.callPackage f2 {})
]; ];
withHoogle = true; withHoogle = true;
buildInputs = devInputs pkgs1 ++ package.buildInputs; buildInputs = devInputs pkgs ++ package.buildInputs ++(with util-pkgs.haskellPackages; [brittany panpipe panhandle]);
}; };
cabalDevLoader = self: path: set: cabalDevLoader = self: path: set:
......
...@@ -147,6 +147,9 @@ let ...@@ -147,6 +147,9 @@ let
repoquality = (self.callCabal2nix "repoquality" repoquality-src ) {}; repoquality = (self.callCabal2nix "repoquality" repoquality-src ) {};
powerplots = (self.callCabal2nix "powerplots" powerplots-src ) {}; powerplots = (self.callCabal2nix "powerplots" powerplots-src ) {};
generic-aeson = doJailbreak super.generic-aeson;
nrm-schema = (self.callCabal2nix "nrm-schema" nrm-schema-src ) {};
}; };
}; };
...@@ -157,16 +160,23 @@ let ...@@ -157,16 +160,23 @@ let
panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit { panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit {
inherit (panhandle-src) url rev; })) {}; inherit (panhandle-src) url rev; })) {};
multistate = doJailbreak super.multistate; multistate = doJailbreak super.multistate;
jsonschema-gen = doJailbreak super.jsonschema-gen;
#hspec = doJailbreak super.hspec; #hspec = doJailbreak super.hspec;
dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {}; dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {};
nrm-schema = (self.callCabal2nix "nrm-schema" nrm-schema-src ) {};
}; };
}; };
# re-export from hpkgs and add non-haskell build rule specialization # re-export from hpkgs and add non-haskell build rule specialization
inherit (haskellPackages) repoquality; inherit (haskellPackages) repoquality;
inherit (bleedingHaskellPackages) dhall dhall-json nrm-schema; inherit (bleedingHaskellPackages) dhall dhall-json;
nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{
buildInputs = old.buildInputs ++ [
(pkgs.python.withPackages (ps: [
ps.warlock
ps.jsonschema
]))
];
});
dhrun = bleedingHaskellPackages.dhrun.overrideAttrs (old:{ dhrun = bleedingHaskellPackages.dhrun.overrideAttrs (old:{
installPhase = old.installPhase + '' installPhase = old.installPhase + ''
......
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