diff options
-rw-r--r-- | pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix (renamed from pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix) | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/HDBC/HDBC.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/convertible/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/testpack/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/time/1.1.3.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 24 |
9 files changed, 81 insertions, 30 deletions
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix deleted file mode 100644 index 429407d25d2a0..0000000000000 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix +++ /dev/null @@ -1,10 +0,0 @@ -{cabal}: - -cabal.mkDerivation (self : { - pname = "HDBC"; - version = "1.1.4"; - sha256 = "de03020874b532f7aa734f093caf0709e7d33d0d64c59ce0a003b2269fc85597"; - meta = { - description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix deleted file mode 100644 index d9a1985839c53..0000000000000 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, HDBC, postgresql}: - -cabal.mkDerivation (self : { - pname = "HDBC-postgresql"; - version = "1.1.4.0"; - sha256 = "039eae03693330fee0e4083e22d502f94865969b243744a939786f598aec34ad"; - meta = { - description = "This package provides a PostgreSQL driver for HDBC"; - }; - propagatedBuildInputs = [HDBC postgresql]; -}) - diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix new file mode 100644 index 0000000000000..4877a9fe8cb0a --- /dev/null +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -0,0 +1,12 @@ +{cabal, HDBC, postgresql, parsec}: + +cabal.mkDerivation (self : { + pname = "HDBC-postgresql"; + version = "2.1.0.0"; + sha256 = "424b491766410df73f2df87a5cd4b5f4549850cc53a2f1c937b546ff1ef1562b"; + propagatedBuildInputs = [HDBC parsec postgresql]; + meta = { + description = "This package provides a PostgreSQL driver for HDBC"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index b0c7eb27e6a36..e6aefbb825aab 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self : { pname = "HDBC-sqlite3"; - version = "1.1.4.0"; - sha256 = "328fed8d4cdba4311efd50d9d60591a81481317ddba10c58fbaa2ec7f418f788"; + version = "2.1.0.0"; + sha256 = "a95f28fadd67ba1593cf75774308b7cfdde4a78ee5cba0a6aeb6c18723d8d67b"; + propagatedBuildInputs = [HDBC sqlite]; meta = { description = "This is the Sqlite v3 driver for HDBC, the generic database access system for Haskell"; }; - propagatedBuildInputs = [HDBC sqlite]; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix new file mode 100644 index 0000000000000..abfa0aea85bf8 --- /dev/null +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -0,0 +1,12 @@ +{cabal, HUnit, QuickCheck, mtl, time, utf8String, convertible, testpack}: + +cabal.mkDerivation (self : { + pname = "HDBC"; + version = "2.1.1"; + sha256 = "9a3ab307c006fb9c22089a15d190339c45de0a32e700f2d9eda70423e719197c"; + propagatedBuildInputs = + [HUnit QuickCheck mtl time utf8String convertible testpack]; + meta = { + description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases"; + }; +}) diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix new file mode 100644 index 0000000000000..24ed30810de66 --- /dev/null +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -0,0 +1,12 @@ +{cabal, mtl, time}: + +cabal.mkDerivation (self : { + pname = "convertible"; + version = "1.0.5"; + sha256 = "caf75727a35cf249690f3da60fce770642c8a1fad6080f3ba57e924fbe3c9465"; + propagatedBuildInputs = [mtl time]; + meta = { + description = "Typeclasses and instances for converting between types"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix new file mode 100644 index 0000000000000..fc77c15446d8d --- /dev/null +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -0,0 +1,12 @@ +{cabal, HUnit, QuickCheck, mtl}: + +cabal.mkDerivation (self : { + pname = "testpack"; + version = "1.0.2"; + sha256 = "ff3d24a755aeeb765d5e93aa0189d0d67ac96b2d84e27a29609eb4738a6cdabc"; + propagatedBuildInputs = [HUnit QuickCheck mtl]; + meta = { + description = "Test Utility Pack for HUnit and QuickCheck"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix new file mode 100644 index 0000000000000..025a5faa380e7 --- /dev/null +++ b/pkgs/development/libraries/haskell/time/1.1.3.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "time"; + version = "1.1.3"; + sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b"; + meta = { + description = "A time library"; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fcb082d3350f6..0a2d33e8d93dc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -42,6 +42,11 @@ rec { inherit cabal mtl network parsec xhtml; }; + convertible = import ../development/libraries/haskell/convertible { + inherit cabal mtl; + time = time113; + }; + Crypto = import ../development/libraries/haskell/Crypto { inherit cabal; }; @@ -127,16 +132,16 @@ rec { inherit cabal; }; - HDBC = import ../development/libraries/haskell/HDBC/HDBC-1.1.4.nix { - inherit cabal; + HDBC = import ../development/libraries/haskell/HDBC/HDBC.nix { + inherit cabal HUnit QuickCheck mtl time utf8String convertible testpack; }; - HDBCPostgresql = import ../development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix { - inherit cabal HDBC; + HDBCPostgresql = import ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { + inherit cabal HDBC parsec; inherit (pkgs) postgresql; }; - HDBCSqlite = import ../development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix { + HDBCSqlite = import ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix { inherit cabal HDBC; inherit (pkgs) sqlite; }; @@ -299,10 +304,19 @@ rec { inherit (pkgs) ncurses; }; + testpack = import ../development/libraries/haskell/testpack { + inherit cabal HUnit QuickCheck mtl; + }; + + /* time is Haskell Platform default, time113 is more recent but incompatible */ time = import ../development/libraries/haskell/time { inherit cabal; }; + time113 = import ../development/libraries/haskell/time/1.1.3.nix { + inherit cabal; + }; + uniplate = import ../development/libraries/haskell/uniplate { inherit cabal mtl; }; |