diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix new file mode 100644 index 00000000000..832b7db0369 --- /dev/null +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cpu"; + version = "0.1.0"; + sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-cpu"; + description = "Cpu information and properties helpers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 904c33b7431..1b2dc44fbdd 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,15 +1,15 @@ -{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged -, vector +{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive +, tagged, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.0"; - sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix"; + version = "0.3.1"; + sha256 = "14icn1p0mjg4y45q6pbh8qamw5hm1z2z7d424gmiknbf24nq8nmi"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 6475d245ed6..5f62315a972 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.1.1"; - sha256 = "170lsalbak7l52fzdppdvq88ky8y06zzlxy6h18zpd1g18caa0q7"; + version = "1.1.3"; + sha256 = "1f8aav4gcpixmnnwcml0aqsqswb8fc0rp986nbyap22gmcw4hflx"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 90fbd70fdc5..5a13b3e888e 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.0.1.1"; - sha256 = "16a7aym0cpcq9lsiwfh5bvgh1bkyz4j06bhyvnxawsdgzmmsbch4"; + version = "1.0.1.2"; + sha256 = "1lb1q2nkih7z63gh1rdwl4656ybmpdqic1d09q5jqgm6bjqrgw53"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 4e8d4cb50ed..7799ae0c311 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.5"; - sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v"; + version = "0.5.0.6"; + sha256 = "068ksmi8kdjm00279lnnhih4sqs9yh8mnvvn71brwak5r361m056"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index d2ffc52d28d..7207c662d53 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.1.0.4"; - sha256 = "0xd41nminlrj78l2ggcba6z764c5v6x9w08d6mb0qk3ssj7ldv89"; + version = "0.1.1"; + sha256 = "148631zwax809nzm01fqymmgvkscyv1kii36a12phkmg7sx014vm"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 17f351ed9fd..69c55ba049b 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.1.2"; - sha256 = "0nrvz5zc5w7j2payg7ji7dpvkbk4ssg75pwi3pqjq6jrfyf4aw9m"; + version = "0.3.1.3"; + sha256 = "0sx0jr8hccqh519sgn428y4xfk6m5jpwfm9201vn8zj1cxlppjv9"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 7d0f08a6d2e..c3a94e03673 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.5.0.1"; - sha256 = "04mr1pb0q1ks29q3mzy3apk5ki1sbzlslavbldfnrrq3g2s90366"; + version = "0.5.0.2"; + sha256 = "10391b6vwgp5harzmiji66qs4zc5qipagak1mm2j8njhbqi8z0rb"; buildDepends = [ fclabels hashable QuickCheck transformers unorderedContainers vault ]; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index 50a79401290..d71e2a034d0 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck"; - version = "0.2.8"; - sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl"; + version = "0.2.8.1"; + sha256 = "042vdq18mqw4rhsj3x51mz1iv9zbxvlz7jg6r9cni2xpw5m7v6dk"; buildDepends = [ deepseq extensibleExceptions QuickCheck random testFramework ]; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 34d5b6ae51f..1f1a45d4245 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.2.12.1"; - sha256 = "03m6kf6lhi9nzymfyfqqimfgs6139bpa0pzbxzvz2nvizdnbmmcw"; + version = "0.2.12.2"; + sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4134447eaaa..7ae1a202c70 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -591,6 +591,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; }; + cpu = callPackage ../development/libraries/haskell/cpu {}; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};