From 77c3aab5b860a952e9d83db56aefe23ee04ccebc Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 12 Oct 2021 19:36:09 +0200 Subject: pkgs: use relative stockholm.lib --- krebs/5pkgs/haskell/blessings.nix | 5 +++-- krebs/5pkgs/haskell/default.nix | 5 +++-- krebs/5pkgs/haskell/email-header.nix | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'krebs/5pkgs/haskell') diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix index b0e81fdc..00299ca6 100644 --- a/krebs/5pkgs/haskell/blessings.nix +++ b/krebs/5pkgs/haskell/blessings.nix @@ -1,6 +1,7 @@ -with import ; -{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }: let +{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, stockholm, text }: +with stockholm.lib; +let cfg = { "18.03" = { version = "1.1.0"; diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix index e824699f..98cbcb3b 100644 --- a/krebs/5pkgs/haskell/default.nix +++ b/krebs/5pkgs/haskell/default.nix @@ -1,8 +1,9 @@ -with import ; +self: super: +with self.stockholm.lib; + let overrides = self: super: mapNixDir (path: self.callPackage path {}) ./.; in -self: super: { haskell = super.haskell // { packages = mapAttrs (name: value: diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index 94b33e28..ccc32c09 100644 --- a/krebs/5pkgs/haskell/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix @@ -1,8 +1,10 @@ -with import ; { mkDerivation, attoparsec, base, base64-bytestring, bytestring , case-insensitive, containers, exceptions, fetchgit, QuickCheck -, stdenv, tasty, tasty-quickcheck, text, text-icu, time -}: let +, stdenv, stockholm, tasty, tasty-quickcheck, text, text-icu, time +}: +with stockholm.lib; + +let cfg = { "18.03" = { -- cgit v1.2.3