diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index d5b828cb0e71..0e41ecd756a5 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.1.1"; - sha256 = "0fmmcmmdcvc5vj33bm9xzzb2jpnnb7r89ghdqwgg2c5gxjqbcfbd"; + version = "1.7.2.1"; + sha256 = "1s8xq39xnynsslzrzm7svv8qd301j66zcz9ckcs4f1zwzpq62z0p"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index f97981966933..c938b6eb52ad 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,10 +1,11 @@ -{ cabal, repa, vector }: +{ cabal, llvm, repa, vector }: cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "2.2.0.1"; - sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p"; + version = "3.1.0.1"; + sha256 = "17479hp6x02vdwbn201gvxrqsc6smp5q1ip61qbfsvirjih8f3pz"; buildDepends = [ repa vector ]; + extraLibraries = [ llvm ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix deleted file mode 100644 index 1d03f5c64586..000000000000 --- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, repa, vector }: - -cabal.mkDerivation (self: { - pname = "repa-bytestring"; - version = "2.2.0.1"; - sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg"; - buildDepends = [ repa vector ]; - meta = { - homepage = "http://repa.ouroborus.net"; - description = "Conversions between Repa Arrays and ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 18a8cb44bd6b..e807a01fe205 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "2.2.0.1"; - sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0"; + version = "3.1.0.1"; + sha256 = "1zyhq7qd7j0a0rx7j395j6330kybfi0g3whsf25clrg4znd1iwjc"; isLibrary = false; isExecutable = true; buildDepends = [ random repa repaAlgorithms repaIo vector ]; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 0d4772016fb3..01325019a709 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, bmp, repa, repaBytestring, vector }: +{ cabal, binary, bmp, repa, vector }: cabal.mkDerivation (self: { pname = "repa-io"; - version = "2.2.0.1"; - sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1"; - buildDepends = [ binary bmp repa repaBytestring vector ]; + version = "3.1.0.1"; + sha256 = "1il0zsba9qz0560c56f9hn6wks5kk1bvh8bpng46w70c12gxh81w"; + buildDepends = [ binary bmp repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 5bb059a457cb..cd98b9a9c1b7 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "2.2.0.1"; - sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy"; + version = "3.1.0.1"; + sha256 = "0dcx2n7bqw8rrr1aaxnrbmjv0c89lvxl6fgccrw0qci5rzwccnp2"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 6c070bc6d24b..f2b7e88de244 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8"; - sha256 = "12ly9f1lxzrxvwkcx25cjik7d1f1l2j1rkd0cabgpcg53hz4158c"; + version = "0.8.0.1"; + sha256 = "0z2pmfqk75qpjv720l06237cjdn8nmcchzyq7rp4wcvgdik8ahin"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d81d92c5cfae..11369a427853 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.30"; - sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b"; + version = "1.31"; + sha256 = "04qc74h6w3mvb3h3mv0hb3bbwk22ifl29hg3dcq1d5bg4y21j1vr"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7082a17e4c47..3b6529c7315b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1210,13 +1210,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; repa = callPackage ../development/libraries/haskell/repa {}; - repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {}; - - repaBytestring = callPackage ../development/libraries/haskell/repa-bytestring {}; - repaExamples = callPackage ../development/libraries/haskell/repa-examples {}; - repaIo = callPackage ../development/libraries/haskell/repa-io {}; RepLib = callPackage ../development/libraries/haskell/RepLib {};