From fe3253355d6343cfc5be8f999ba328336cfd12a4 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 21 Nov 2013 08:44:41 +0000 Subject: [PATCH 1/2] haskellPackages.socketActivation: New expression --- .../haskell/socket-activation/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/socket-activation/default.nix diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix new file mode 100644 index 00000000000..4309e2d3456 --- /dev/null +++ b/pkgs/development/libraries/haskell/socket-activation/default.nix @@ -0,0 +1,15 @@ +{ cabal, network, transformers }: + +cabal.mkDerivation (self: { + pname = "socket-activation"; + version = "0.1.0.0"; + sha256 = "1w10i9a10lq5gscwm1vf1w7pqkfyx3n108jw8dx4zdqhrh82lmwv"; + buildDepends = [ network transformers ]; + meta = { + homepage = "https://github.com/sakana/haskell-socket-activation"; + description = "systemd socket activation library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7ff91204b94..85a038f8280 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1994,6 +1994,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; + socketActivation = callPackage ../development/libraries/haskell/socket-activation {}; + split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; From d93d7c645c34c2a0b7064a237c7ae44ba2c345a9 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 21 Nov 2013 08:42:54 +0000 Subject: [PATCH 2/2] haskellPackages.quickcheckInstances: New expression --- .../haskell/quickcheck-instances/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/quickcheck-instances/default.nix diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix new file mode 100644 index 00000000000..647e08718a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -0,0 +1,15 @@ +{ cabal, QuickCheck, text, time }: + +cabal.mkDerivation (self: { + pname = "quickcheck-instances"; + version = "0.3.3"; + sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72"; + buildDepends = [ QuickCheck text time ]; + meta = { + homepage = "https://github.com/aslatter/qc-instances"; + description = "Common quickcheck instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85a038f8280..8c289ad9bb1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1769,6 +1769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; + quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; + quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; qrencode = callPackage ../development/libraries/haskell/qrencode {