diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 71 |
1 files changed, 61 insertions, 10 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cc0bab08414e..16405f53da67 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -526,6 +526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; + aes = callPackage ../development/libraries/haskell/aes {}; + aeson = callPackage ../development/libraries/haskell/aeson { blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; }; @@ -756,6 +758,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x checkers = callPackage ../development/libraries/haskell/checkers {}; + chell = callPackage ../development/libraries/haskell/chell {}; + + chellQuickcheck = callPackage ../development/libraries/haskell/chell-quickcheck {}; + chunkedData = callPackage ../development/libraries/haskell/chunked-data {}; citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; @@ -854,6 +860,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptohashConduit = callPackage ../development/libraries/haskell/cryptohash-conduit {}; + cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {}; cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; @@ -982,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dlist = callPackage ../development/libraries/haskell/dlist {}; + dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {}; + dns = callPackage ../development/libraries/haskell/dns {}; doctest = callPackage ../development/libraries/haskell/doctest {}; @@ -998,6 +1008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x DSH = callPackage ../development/libraries/haskell/DSH {}; + dsp = callPackage ../development/libraries/haskell/dsp {}; + dstring = callPackage ../development/libraries/haskell/dstring {}; dualTree = callPackage ../development/libraries/haskell/dual-tree {}; @@ -1258,6 +1270,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {}; + happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; + hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; hashable_1_2_1_0 = callPackage ../development/libraries/haskell/hashable/1.2.1.0.nix {}; hashable = self.hashable_1_2_1_0; @@ -1437,13 +1451,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; - hspec = callPackage ../development/libraries/haskell/hspec {}; + hspec = callPackage ../development/libraries/haskell/hspec { + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + }; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; - hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + }; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -1588,6 +1608,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lenses = callPackage ../development/libraries/haskell/lenses {}; + leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {}; + libffi = callPackage ../development/libraries/haskell/libffi { libffi = pkgs.libffi; }; @@ -1598,6 +1620,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { + systemd-journal = pkgs.systemd; + }; + libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; liftedAsync = callPackage ../development/libraries/haskell/lifted-async {}; @@ -1619,14 +1645,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; - llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix { + llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix { llvmConfig = pkgs.llvm; }; - llvmGeneral = self.llvmGeneral_3_4_1_0; + llvmGeneral = self.llvmGeneral_3_4_2_2; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; - llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_1_0; + llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4_2_2; lrucache = callPackage ../development/libraries/haskell/lrucache {}; @@ -1640,6 +1666,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lushtags = callPackage ../development/libraries/haskell/lushtags {}; + lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; @@ -1849,6 +1877,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x operational = callPackage ../development/libraries/haskell/operational {}; + options = callPackage ../development/libraries/haskell/options {}; + optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {}; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; @@ -1895,6 +1925,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pathtype = callPackage ../development/libraries/haskell/pathtype {}; + pbkdf = callPackage ../development/libraries/haskell/pbkdf {}; + pcap = callPackage ../development/libraries/haskell/pcap {}; pcapEnumerator = callPackage ../development/libraries/haskell/pcap-enumerator {}; @@ -2026,6 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; + QuickCheck_2_7_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; @@ -2145,6 +2178,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x scottyHastache = callPackage ../development/libraries/haskell/scotty-hastache {}; + scrypt = callPackage ../development/libraries/haskell/scrypt {}; + securemem = callPackage ../development/libraries/haskell/securemem {}; sendfile = callPackage ../development/libraries/haskell/sendfile {}; @@ -2189,6 +2224,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; + snowball = callPackage ../development/libraries/haskell/snowball {}; + socks = callPackage ../development/libraries/haskell/socks {}; sparse = callPackage ../development/libraries/haskell/sparse {}; @@ -2335,6 +2372,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tagged = callPackage ../development/libraries/haskell/tagged {}; + tagshare = callPackage ../development/libraries/haskell/tagshare {}; + tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; @@ -2349,7 +2388,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; - tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { + QuickCheck = self.QuickCheck_2_7_1; + }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; @@ -2365,6 +2406,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {}; + terminalSize = callPackage ../development/libraries/haskell/terminal-size {}; + terminfo_0_3_2_6 = callPackage ../development/libraries/haskell/terminfo/0.3.2.6.nix { inherit (pkgs) ncurses; }; terminfo_0_4_0_0 = callPackage ../development/libraries/haskell/terminfo/0.4.0.0.nix { inherit (pkgs) ncurses; }; terminfo = self.terminfo_0_4_0_0; @@ -2383,6 +2426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testingFeat = callPackage ../development/libraries/haskell/testing-feat {}; + texmath = callPackage ../development/libraries/haskell/texmath {}; text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; @@ -2401,6 +2446,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; @@ -2432,8 +2479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {}; - tls = self.tls_1_2_2; + tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {}; + tls = self.tls_1_2_3; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; @@ -2566,6 +2613,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x waiTest = callPackage ../development/libraries/haskell/wai-test {}; + waiWebsockets = callPackage ../development/libraries/haskell/wai-websockets {}; + warp = callPackage ../development/libraries/haskell/warp {}; warpTls = callPackage ../development/libraries/haskell/warp-tls {}; @@ -2861,7 +2910,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; cabalInstall = self.cabalInstall_1_18_0_3; - gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { + hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; }; + }; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; |