From 01ba9d0dec962ac5a7651150a1a6c43762f59b31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 May 2015 20:40:07 +0200 Subject: [PATCH] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/69ffcf7c20bf9aa1d0aaa12925d810d9a6ae382c with hackage2nix revision 936f7d1dd81cf86df3d79e4e38d17dc68e2a561e --- .../haskell-modules/hackage-packages.nix | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7b787e0d389..d88534cdaf4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1008,22 +1008,21 @@ self: { }) {}; "BCMtools" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-lexing - , colour, conduit, conduit-extra, data-binary-ieee754 - , data-default-class, matrices, optparse-applicative, resourcet - , split, transformers, unordered-containers, vector, zlib + ({ mkDerivation, base, bytestring, bytestring-lexing, cereal + , colour, conduit, conduit-extra, data-default-class, matrices + , optparse-applicative, resourcet, split, transformers + , unordered-containers, vector, zlib }: mkDerivation { pname = "BCMtools"; - version = "0.1.0"; - sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg"; + version = "0.1.1"; + sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4"; isLibrary = true; isExecutable = true; buildDepends = [ - base binary bytestring bytestring-lexing colour conduit - conduit-extra data-binary-ieee754 data-default-class matrices - optparse-applicative resourcet split transformers - unordered-containers vector zlib + base bytestring bytestring-lexing cereal colour conduit + conduit-extra data-default-class matrices optparse-applicative + resourcet split transformers unordered-containers vector zlib ]; description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; @@ -15795,12 +15794,13 @@ self: { }) {}; "Yampa" = callPackage - ({ mkDerivation, base, random }: + ({ mkDerivation, base, hlint, random }: mkDerivation { pname = "Yampa"; - version = "0.9.6.1"; - sha256 = "14nssljqgpirdjl6rxb1x4xxl6rpq2rhldhcvsvc0qx31mb01df1"; + version = "0.10.1"; + sha256 = "10ggyb0lbjcz77dmfrnrxhfi5pph4396zp5vzmcvmiwls2s1g3am"; buildDepends = [ base random ]; + testDepends = [ base hlint ]; homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; @@ -28977,6 +28977,7 @@ self: { homepage = "https://github.com/nh2/call-haskell-from-anything"; description = "Python-to-Haskell function calls"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "camh" = callPackage @@ -47676,7 +47677,7 @@ self: { }) {}; "fft" = callPackage - ({ mkDerivation, array, base, carray, fftw3, fftw3f, ix-shapable + ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb }: mkDerivation { @@ -47687,26 +47688,26 @@ self: { array base carray ix-shapable storable-complex syb ]; testDepends = [ base carray QuickCheck storable-complex ]; - pkgconfigDepends = [ fftw3 fftw3f ]; + pkgconfigDepends = [ fftw fftwFloat ]; jailbreak = true; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fftw3 = null; fftw3f = null;}; + }) { inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage - ({ mkDerivation, base, fftw3 }: + ({ mkDerivation, base, fftw }: mkDerivation { pname = "fftwRaw"; version = "0.1.0.0"; sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4"; buildDepends = [ base ]; - extraLibraries = [ fftw3 ]; + extraLibraries = [ fftw ]; homepage = "https://github.com/adamwalker/haskell-fftw-simple"; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fftw3 = null;}; + }) { inherit (pkgs) fftw;}; "fgl" = callPackage ({ mkDerivation, array, base, containers, mtl }: @@ -77890,9 +77891,10 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "lambdaBase"; - version = "0.0.1.0"; - sha256 = "0mmdkyadpnkm8d3jv6vb7ln762vkf744hcq6qiyhznxhvih0k28x"; + version = "0.0.2.0"; + sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd"; buildDepends = [ base parsec ]; + testDepends = [ base parsec ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -100452,17 +100454,17 @@ self: { }) {}; "pulse-simple" = callPackage - ({ mkDerivation, base, bytestring, pulse-simple }: + ({ mkDerivation, base, bytestring, pulseaudio }: mkDerivation { pname = "pulse-simple"; version = "0.1.14"; sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4"; buildDepends = [ base bytestring ]; - extraLibraries = [ pulse-simple ]; + extraLibraries = [ pulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { pulse-simple = null;}; + }) { inherit (pkgs) pulseaudio;}; "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text @@ -106150,19 +106152,19 @@ self: { }) {}; "rtlsdr" = callPackage - ({ mkDerivation, base, c2hs, rtlsdr }: + ({ mkDerivation, base, c2hs, rtl-sdr }: mkDerivation { pname = "rtlsdr"; version = "0.1.0.4"; sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz"; buildDepends = [ base ]; buildTools = [ c2hs ]; - extraLibraries = [ rtlsdr ]; + extraLibraries = [ rtl-sdr ]; homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { rtlsdr = null;}; + }) { inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual @@ -111464,6 +111466,7 @@ self: { homepage = "http://rel4tion.org/projects/smaoin-hs/"; description = "Utilities for the Smaoin semantic information model"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smartGroup" = callPackage @@ -127367,20 +127370,19 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw3, primitive, storable-complex, vector - }: + ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; version = "0.1.3.2"; sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0"; buildDepends = [ base primitive storable-complex vector ]; - extraLibraries = [ fftw3 ]; + extraLibraries = [ fftw ]; jailbreak = true; homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fftw3 = null;}; + }) { inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox @@ -134501,8 +134503,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.1.1.0"; - sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f"; + version = "0.1.3.0"; + sha256 = "0yj1mn5xbvq4j6qqndfby04vdy6x2k7ik9xg6vb4ffhg9z9r8q3y"; buildDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers yesod yesod-core