From e9697da7b95dcfc1d398dd6c26bf92cb41bcc8fc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 29 Oct 2025 11:03:15 +0100 Subject: pkgs: add blessings as regular haskell package --- krebs/5pkgs/default.nix | 22 +--------------------- krebs/5pkgs/haskell/blessings/default.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 krebs/5pkgs/haskell/blessings/default.nix diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 8046d9b71..866796a4e 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -20,27 +20,7 @@ fix (foldl' (flip extends) (self: super) ( [ (self: super: { brockman = self.haskellPackages.brockman; - reaktor2 = self.haskellPackages.reaktor2.override { - blessings = - self.haskellPackages.callPackage ( - { mkDerivation, base, bytestring, extra, fetchgit, hspec, lib - , QuickCheck, text, wcwidth - }: - mkDerivation { - pname = "blessings"; - version = "2.5.0"; - src = fetchgit { - url = "https://cgit.krebsco.de/blessings"; - sha256 = "1spwm4xjz72c76wkkxxxbvxpgkxam344iwq37js5lhfbb2hbjqbx"; - rev = "8f9b20f3aa93f7fbba9d24de7732f4cca0119154"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ base bytestring extra text wcwidth ]; - testHaskellDepends = [ base hspec QuickCheck ]; - license = lib.licenses.mit; - } - ) {}; - }; + reaktor2 = self.haskellPackages.reaktor2; }) ] )) diff --git a/krebs/5pkgs/haskell/blessings/default.nix b/krebs/5pkgs/haskell/blessings/default.nix new file mode 100644 index 000000000..643f320be --- /dev/null +++ b/krebs/5pkgs/haskell/blessings/default.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, bytestring, extra, fetchgit, hspec, lib +, QuickCheck, text, wcwidth +}: +mkDerivation { + pname = "blessings"; + version = "2.5.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/blessings"; + sha256 = "1spwm4xjz72c76wkkxxxbvxpgkxam344iwq37js5lhfbb2hbjqbx"; + rev = "8f9b20f3aa93f7fbba9d24de7732f4cca0119154"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ base bytestring extra text wcwidth ]; + testHaskellDepends = [ base hspec QuickCheck ]; + license = lib.licenses.mit; +} -- cgit v1.2.3