diff options
5 files changed, 109 insertions, 59 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 73fae1a6cec..ba98e7c0deb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; }); + Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index df9f96f73e7..49296fa04df 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -41,7 +41,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 53bcff9dc2f..a00b89e5b4e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,7 +38,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 235a165d2cd..0100aade358 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -41,7 +41,7 @@ self: super: { terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7ff4cbefc8b..46b51750658 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2079,7 +2079,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Cabal_1_22_2_0" = callPackage + "Cabal_1_22_3_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, extensible-exceptions, filepath, HUnit , old-time, pretty, process, QuickCheck, regex-posix @@ -2088,8 +2088,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.22.2.0"; - sha256 = "0q46wx1nvpi0cjbs9fw0kwmbyclkkvv5zp7dcssbdl3sqg216k6z"; + version = "1.22.3.0"; + sha256 = "15y78hym5yfrchg0lpix80hf41l3c75rda5w1ni8irm593y7il6l"; buildDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -27736,8 +27736,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.22.2.0"; - sha256 = "1nvamsklmxc77mivi02li5rijiliajl4x620pwchzgb0iyl2xg15"; + version = "1.22.3.0"; + sha256 = "0k4bz2haba1qk30swkshf3v8prbv5lkw47nxgvi4xxayhyv4wm98"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -27945,8 +27945,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.4"; - sha256 = "15h56aqzzxdxkk3rx6j03nkv1503f8ypzq6hbdflilqd0v63asa4"; + version = "0.9.5"; + sha256 = "0a2j9py1dafkscs9lz70zxl54vahba62zb8r6rv3rbhnv0d3llf3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30800,21 +30800,23 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-vhdl, containers - , directory, filepath, ghc, hashable, haskeline, lens, mtl, process - , text, transformers, unbound-generics, unix, unordered-containers + , directory, filepath, ghc, ghc-typelits-natnormalise, hashable + , haskeline, lens, mtl, process, text, transformers + , unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.5"; - sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj"; + version = "0.5.1"; + sha256 = "1z1m1dshrna6zyk2cmfsaks4ihnf9dww6zi81j3w1rh252v6nbqc"; isLibrary = false; isExecutable = true; buildDepends = [ array base bifunctors bytestring clash-lib clash-prelude clash-systemverilog clash-vhdl containers directory filepath ghc - hashable haskeline lens mtl process text transformers - unbound-generics unix unordered-containers + ghc-typelits-natnormalise hashable haskeline lens mtl process text + transformers unbound-generics unix unordered-containers ]; + jailbreak = true; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; @@ -30830,8 +30832,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5"; - sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng"; + version = "0.5.1"; + sha256 = "1arkx9510klyrhihkqhz3dqg3m3lp0zm0hycfwsl3qyc1jdndsby"; buildDepends = [ aeson attoparsec base bytestring concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl pretty @@ -30844,18 +30846,20 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, base, data-default, ghc-prim, integer-gmp - , singletons, template-haskell, th-lift + ({ mkDerivation, base, data-default, directory, doctest, filepath + , ghc-prim, ghc-typelits-natnormalise, integer-gmp, singletons + , template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.7.1"; - sha256 = "1hy1bx83faf0n3irp0g2136bmd9gvpd638ap8ifys6gdni25k3zv"; + version = "0.7.2"; + sha256 = "0ks4s4gg9s3s6fz860rfyjla029rcqvhh2h9bi0z0s46lla7p0nx"; buildDepends = [ - base data-default ghc-prim integer-gmp singletons template-haskell - th-lift + base data-default ghc-prim ghc-typelits-natnormalise integer-gmp + singletons template-haskell th-lift ]; - homepage = "http://christiaanb.github.io/clash2/"; + testDepends = [ base directory doctest filepath ]; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; @@ -30881,14 +30885,14 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.5"; - sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr"; + version = "0.5.1"; + sha256 = "0k24ic9fv72llpa507lxd1xyq7sbczh8ilis9x1axyl8yv132y67"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text ]; homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -30899,14 +30903,14 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5"; - sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5"; + version = "0.5.1"; + sha256 = "1l5iagc62f9da7x3yngklcmybl32c73zfgf7spx3wf8fdmdnrcvv"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text ]; homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34341,14 +34345,14 @@ self: { }: mkDerivation { pname = "convertible"; - version = "1.1.0.0"; - sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k"; + version = "1.1.1.0"; + sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring containers mtl old-locale old-time text time ]; - homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; + homepage = "http://hackage.haskell.org/package/convertible"; description = "Typeclasses and instances for converting between types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52647,6 +52651,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gll" = callPackage + ({ mkDerivation, array, base, containers }: + mkDerivation { + pname = "gll"; + version = "0.1.0.0"; + sha256 = "0z3v0bg8r1gmca5bgkrbc44j9ggxkrzlk6r1mqmpycjgv5zryw05"; + buildDepends = [ array base containers ]; + jailbreak = true; + description = "GLL parser with simple combinator interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "global" = callPackage ({ mkDerivation, base, haskell-src-exts, haskell-src-exts-qq , loch-th, SafeSemaphore, stm, syntax-trees-fork-bairyn, tagged @@ -55320,6 +55336,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) blas; lapack = null;}; + "hXmixer" = callPackage + ({ mkDerivation, base, directory, gtk3, process, split, text }: + mkDerivation { + pname = "hXmixer"; + version = "0.2.5.0"; + sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base directory gtk3 process split text ]; + homepage = "http://colinrmitchell.endoftheinternet.org/"; + description = "A Gtk mixer application for FreeBSD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haar" = callPackage ({ mkDerivation, base, QuickCheck, split, test-framework , test-framework-quickcheck2 @@ -62338,14 +62368,15 @@ self: { }) {}; "hexstring" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text + ({ mkDerivation, base, base16-bytestring, binary, bytestring, hspec + , text }: mkDerivation { pname = "hexstring"; - version = "0.9.0"; - sha256 = "1958vmg6xb9ibg8m2rjhczfc299zw5801byh95z8hpaszird0d11"; - buildDepends = [ base base16-bytestring bytestring text ]; - testDepends = [ base bytestring hspec text ]; + version = "0.10.0"; + sha256 = "1x543lqagjplycrd8if82y2m8xk399fkzynb3b3gc1ax6kymd1kl"; + buildDepends = [ base base16-bytestring binary bytestring text ]; + testDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; description = "Fast and safe representation of a hex string"; license = stdenv.lib.licenses.mit; @@ -63802,12 +63833,11 @@ self: { ({ mkDerivation, base, hledger-lib, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.2"; - sha256 = "1bdskrg6rxnhf3jzhg5n933ynkkn6n2fyphpwz3svv4qs9sqnwl1"; + version = "0.2.0.3"; + sha256 = "0m2wbjbihv0zlz2y3khy81xhh2c261fb4wr55csqy22rds73fwy8"; isLibrary = false; isExecutable = true; buildDepends = [ base hledger-lib time ]; - jailbreak = true; homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; @@ -76169,8 +76199,8 @@ self: { }: mkDerivation { pname = "kansas-lava-papilio"; - version = "0.2.0"; - sha256 = "1p1mlpcm5jaxa6ja5g9vcgkf1dqnh6b2xzy45m0qas9ak47qrhrd"; + version = "0.3.0"; + sha256 = "1dyvw2n25cd22zdpzyy8ipsxr3lbvhq10xbaz83l94rcf2k9yhqj"; buildDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava kansas-lava-cores netlist network sized-types @@ -87267,13 +87297,11 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "mtl-c"; - version = "0"; - revision = "1"; - sha256 = "0swr0db0hsj747p3zqzvac5fwflai1b7ixij8f19abbwpzc6bywr"; - editedCabalFile = "7f0a7eb30e5d8945ab66e8e90adb54ce278ec1e3197a8c13e845baf04f64463b"; + version = "0.1"; + sha256 = "0n91jh07v87j2rbilyrip3inixb9a95i2j61g5hz42kiq5wj71gb"; buildDepends = [ base mtl ]; homepage = "https://github.com/fumieval/mtl-c"; - description = "Monad transformers using continuation passing style"; + description = "Very strict CPS'd transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89581,8 +89609,8 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.1.1"; - sha256 = "18cx3dj6l7r12vl1alwgwy76cbfyckfh1bz81k4vg9r9zdi8zgqb"; + version = "1.1.2"; + sha256 = "0y3cqvakc676xdzc1hg9afv6aqzvj2pp4pci6cgs4bmm3kc3chfs"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons system-fileio @@ -92293,8 +92321,8 @@ self: { }: mkDerivation { pname = "orchestrate"; - version = "0.2.0.0"; - sha256 = "0d9p6b4ficxbsxmig7zjm130v2k60q8jskcm2gvjlg7z8xsqmhzl"; + version = "0.2.0.2"; + sha256 = "09h9jqni25ysalw747xbf532m0gvy8najjwbn3jj7d3z50s0vf8z"; buildDepends = [ aeson base bytestring case-insensitive data-default either errors http-client http-types lens mtl text transformers @@ -92304,7 +92332,6 @@ self: { aeson base bytestring errors hspec lens QuickCheck smallcheck text wreq ]; - jailbreak = true; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -94900,7 +94927,9 @@ self: { mkDerivation { pname = "persistent-template"; version = "2.1.1"; + revision = "1"; sha256 = "1bvmxpx8dqqsq87v079sw8wy795iykkz0fknrlpxhywja2j40dxc"; + editedCabalFile = "19fd43b237aa43be6327fda6415564650504e2887d3e7bd9ee3042082d1b283c"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -113359,12 +113388,33 @@ self: { version = "0.7.0.0"; sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj"; buildDepends = [ base stackage-cli stackage-update ]; - jailbreak = true; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; - broken = true; - }) { stackage-cli = null;}; + }) {}; + + "stackage-cli" = callPackage + ({ mkDerivation, base, bytestring, conduit, directory, either + , exceptions, filepath, hashable, http-client, http-types + , optparse-applicative, optparse-simple, parsec, process, split + , system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "stackage-cli"; + version = "0.0.0.1"; + sha256 = "05vz01lg06grfqvy1z7rvk951gmxxw2751hh1n9divh09rj25cjq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring conduit directory either exceptions filepath + hashable http-client http-types optparse-applicative + optparse-simple parsec process split system-fileio system-filepath + text transformers unordered-containers + ]; + description = "A CLI library for stackage commands"; + license = stdenv.lib.licenses.mit; + }) {}; "stackage-curator" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal |