diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 14d04c5007fc..3c9737242ae8 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz", - "sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj", - "msg": "Update from Hackage at 2021-09-29T20:58:23Z" + "commit": "b208fab03edb012b7005c6d4e30d0f4ddaf29434", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b208fab03edb012b7005c6d4e30d0f4ddaf29434.tar.gz", + "sha256": "08lg2b3hv0pcznzpvhp86qmgkasg9k9grrjzndpmr0qv60nk7lzn", + "msg": "Update from Hackage at 2021-10-02T21:03:40Z" } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82fc372f7b02..71476a742664 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1142,6 +1142,11 @@ self: super: { # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; + # 2021-10-04: too strict upper bound on Hakyll + hakyll-filestore = doJailbreak super.hakyll-filestore; + # https://github.com/LaurentRDC/hakyll-images/issues/10, fixed in 1.1.1 + hakyll-images = assert super.hakyll-images.version == "1.1.0"; + dontCheck super.hakyll-images; # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; @@ -1913,9 +1918,34 @@ EOT # https://github.com/Porges/email-validate-hs/issues/58 email-validate = doJailbreak super.email-validate; - # 2021-06-20: Outdated upper bounds - # https://github.com/Porges/email-validate-hs/issues/58 - ghcup = doJailbreak super.ghcup; + # 2021-10-02: Make optics 0.4 packages work together + optics-th_0_4 = super.optics-th_0_4.override { + optics-core = self.optics-core_0_4; + }; + optics-extra_0_4 = super.optics-extra_0_4.override { + optics-core = self.optics-core_0_4; + }; + optics_0_4 = super.optics_0_4.override { + optics-core = self.optics-core_0_4; + optics-extra = self.optics-extra_0_4; + optics-th = self.optics-th_0_4; + }; + + # https://github.com/plow-technologies/hspec-golden-aeson/issues/17 + hspec-golden-aeson_0_9_0_0 = dontCheck super.hspec-golden-aeson_0_9_0_0; + + # 2021-10-02: Doesn't compile with optics < 0.4 + ghcup = overrideCabal (super.ghcup.override { + hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0; + optics = self.optics_0_4; + }) (drv: { + # golden files are not shipped with the hackage tarball and hspec-golden-aeson + # needs some encouraging to create the missing files after version 0.8.0.0. + # See: https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/255 + preCheck = assert drv.version == "0.1.17.2"; '' + export CREATE_MISSING_GOLDEN=yes + '' + (drv.preCheck or ""); + }); # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; @@ -1992,19 +2022,13 @@ EOT hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; doJailbreak super.hw-xml; - # doctests fail due to deprecation warnings in 0.2 - candid = assert pkgs.lib.versionOlder super.candid.version "0.3"; - overrideCabal super.candid (drv: { - version = "0.3"; - sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x"; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - self.file-embed - ]; - }); - # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { network = self.network_3_1_2_2; }); + http3 = super.http3.overrideScope (self: super: { + network = self.network_3_1_2_2; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9e30c5114db5..22e081354599 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -708,14 +708,7 @@ self: super: builtins.intersectAttrs super { }; haskell-language-server = overrideCabal super.haskell-language-server (drv: { - postInstall = let - inherit (pkgs.lib) concatStringsSep take splitString; - ghc_version = self.ghc.version; - ghc_major_version = concatStringsSep "." (take 2 (splitString "." ghc_version)); - in '' - ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} - ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} - ''; + postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}"; testToolDepends = [ self.cabal-install pkgs.git ]; testTarget = "func-test"; # wrapper test accesses internet preCheck = '' @@ -980,4 +973,11 @@ self: super: builtins.intersectAttrs super { # Test suite is just the default example executable which doesn't work if not # executed by Setup.hs, but works if started on a proper TTY isocline = dontCheck super.isocline; + + # Some hash implementations are x86 only, but part of the test suite. + # So executing and building it on non-x86 platforms will always fail. + hashes = overrideCabal super.hashes { + doCheck = with pkgs.stdenv; hostPlatform == buildPlatform + && buildPlatform.isx86; + }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 91fb2f1a953a..9d6fd32fca97 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1304,6 +1304,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "BNFC_2_9_3" = callPackage + ({ mkDerivation, alex, array, base, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, filepath, happy, hspec + , hspec-discover, HUnit, mtl, pretty, process, QuickCheck + , string-qq, temporary, time + }: + mkDerivation { + pname = "BNFC"; + version = "2.9.3"; + sha256 = "1b2cgnr7c8ndk9jmfr0x905d72wgk0cc9ngbrw9f1q6fbm3mbcgp"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers deepseq directory filepath mtl pretty process + string-qq time + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base containers deepseq directory doctest filepath hspec + HUnit mtl pretty process QuickCheck string-qq temporary time + ]; + testToolDepends = [ alex happy hspec-discover ]; + description = "A compiler front-end generator"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "BNFC-meta" = callPackage ({ mkDerivation, alex-meta, array, base, fail, happy-meta , haskell-src-meta, syb, template-haskell @@ -10742,10 +10771,10 @@ self: { }: mkDerivation { pname = "HsHTSLib"; - version = "1.9.2"; - sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005"; + version = "1.9.2.2"; + sha256 = "11jy5xv58x379gmzgd4whgjba58syxlagggc6v77w4n3l86wrdxm"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit containers + base bytestring bytestring-lexing conduit containers vector ]; librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; @@ -20525,8 +20554,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.8"; - sha256 = "0w82pa6r2a6969w251fbrx0sr1ws8mkg2lwdyjl4qjhl5s28k43i"; + version = "0.4.7.9"; + sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -30487,8 +30516,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.1.0.0"; - sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; + version = "1.1.1.0"; + sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42839,8 +42868,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.1.0.0"; - sha256 = "0hri2bkydcffs2d9xjsr1gc16rl75g4vymjvgd8gr35p01zdc9mq"; + version = "0.1.1.0"; + sha256 = "0raryshzgahldn03dzpin6hi9vyq4w81dxgmgcq34z7h2salia5m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42850,14 +42879,14 @@ self: { ]; executableHaskellDepends = [ array base containers data-default deepseq directory extra factory - filepath hxt hxt-relaxng mtl process random time toolshed unix + filepath hxt hxt-relaxng mtl process random toolshed unix ]; testHaskellDepends = [ array base containers data-default deepseq extra filepath HUnit hxt mtl polyparse QuickCheck random toolshed ]; description = "Plays chess"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51174,8 +51203,8 @@ self: { "candid" = callPackage ({ mkDerivation, base, base32, bytestring, cereal, constraints - , containers, crc, directory, dlist, doctest, filepath, hex-text - , leb128-cereal, megaparsec, mtl, optparse-applicative + , containers, crc, directory, dlist, doctest, file-embed, filepath + , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative , parser-combinators, prettyprinter, row-types, scientific , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, tasty-smallcheck, template-haskell, text @@ -51183,13 +51212,13 @@ self: { }: mkDerivation { pname = "candid"; - version = "0.2"; - sha256 = "0cif618n6m9cvlcvr7hk3gnypv2vxaz1qaa63jrxakmkcr1lm028"; + version = "0.3"; + sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base32 bytestring cereal constraints containers crc dlist - hex-text leb128-cereal megaparsec mtl parser-combinators + file-embed hex-text leb128-cereal megaparsec mtl parser-combinators prettyprinter row-types scientific split template-haskell text transformers unordered-containers vector ]; @@ -68226,21 +68255,21 @@ self: { }) {}; "cuckoo" = callPackage - ({ mkDerivation, base, bytestring, criterion, cryptonite, doctest - , hashable, memory, primitive, QuickCheck, random, stopwatch - , vector + ({ mkDerivation, base, blake2, bytestring, criterion, doctest + , hashable, hashes, primitive, QuickCheck, random, stopwatch }: mkDerivation { pname = "cuckoo"; - version = "0.2.2"; - sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; - libraryHaskellDepends = [ base memory primitive random vector ]; + version = "0.3.0"; + sha256 = "11p7f1br9jyjdwaviy94xwq1jg3kgq5q1pqls20sakgm1f71axls"; + libraryHaskellDepends = [ + base bytestring hashes primitive random + ]; testHaskellDepends = [ - base bytestring cryptonite doctest hashable memory primitive - stopwatch + base blake2 bytestring doctest hashable stopwatch ]; benchmarkHaskellDepends = [ - base bytestring criterion memory QuickCheck stopwatch + base bytestring criterion QuickCheck stopwatch ]; doHaddock = false; description = "Haskell Implementation of Cuckoo Filters"; @@ -75752,8 +75781,8 @@ self: { }: mkDerivation { pname = "diagrams"; - version = "1.4"; - sha256 = "0fcik4vwm2zah5m3yf6p1dlf0vbs7h1jri77zfwl731bd3xgc246"; + version = "1.4.0.1"; + sha256 = "1y3yij2k2bpvmfxykr2s0hadbcprl1yi6z3pz4yjzqkib5s7y1mq"; libraryHaskellDepends = [ diagrams-contrib diagrams-core diagrams-lib diagrams-svg ]; @@ -75971,8 +76000,8 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; - revision = "3"; - editedCabalFile = "0k0i3nm5zpdmrqh8wmd8y5xhw7drd67hifdva5a7dih8w5sab4ra"; + revision = "4"; + editedCabalFile = "1w6xykrsfmhanzy7rdrnfzsc3ny9d28kqz9sla4dygm3gay5509q"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; @@ -78960,6 +78989,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dl-fedora_0_9_2" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , http-client, http-client-tls, http-directory, http-types + , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args + , text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.9.2"; + sha256 = "1x48nrgz34a3kyfkv126jscbjv5yra8h0csrb6sw8f9jw5x3spss"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -81963,6 +82015,8 @@ self: { pname = "dwarf-el"; version = "0.3"; sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7"; + revision = "1"; + editedCabalFile = "134jqfl7zrk1l6jcv3ws4511x1097yzhn2gi0vcn0bkz6qc8lr3s"; libraryHaskellDepends = [ base binary bytestring containers text text-show transformers ]; @@ -81978,6 +82032,8 @@ self: { pname = "dwarfadt"; version = "0.6"; sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0"; + revision = "1"; + editedCabalFile = "0rdydzqy6g24jgddc4sgg1244l9mdkhp1zyjnvjfg0jbrkgqcy73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84174,6 +84230,8 @@ self: { pname = "elf"; version = "0.30"; sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p"; + revision = "1"; + editedCabalFile = "08krv9xws8gr8s5k6796y7yzng22gf4m1a4mv5g57j3yjldwkds2"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base bytestring containers hspec ]; description = "An Elf parser"; @@ -87137,6 +87195,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.3.0"; + sha256 = "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89500,8 +89587,8 @@ self: { ({ mkDerivation, base, containers, fgl, mtl, transformers }: mkDerivation { pname = "exploring-interpreters"; - version = "0.3.2.0"; - sha256 = "0wf35nnqqlvmzn8l3dxrvnr1w9clrzvmpw2vls2zyxnh9dsvrhf7"; + version = "0.4.0.0"; + sha256 = "07q4cjk2sqp471w0rgygf1x2c91vyajh93s8xzi3j09wdb23v9l3"; libraryHaskellDepends = [ base containers fgl mtl transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; @@ -98838,24 +98925,25 @@ self: { broken = true; }) {}; - "functor-combinators_0_4_0_0" = callPackage + "functor-combinators_0_4_1_0" = callPackage ({ mkDerivation, assoc, base, bifunctors, comonad, constraints , containers, contravariant, dependent-sum, deriving-compat, free - , hedgehog, invariant, kan-extensions, mmorph, mtl + , hashable, hedgehog, invariant, kan-extensions, mmorph, mtl , natural-transformation, nonempty-containers, pointed, profunctors - , semigroupoids, sop-core, tagged, tasty, tasty-hedgehog, these - , transformers, trivial-constraint, vinyl + , semigroupoids, sop-core, StateVar, tagged, tasty, tasty-hedgehog + , these, transformers, trivial-constraint, unordered-containers + , vinyl }: mkDerivation { pname = "functor-combinators"; - version = "0.4.0.0"; - sha256 = "1kikldm7ih7r5ydyq26fkp01025dnwrafipsw9qv897k887b8gvg"; + version = "0.4.1.0"; + sha256 = "1b7324ia810i1rjn2z4q3h7rcbbvmfh3nl8vxswgnkglhrkcmg49"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant - deriving-compat free invariant kan-extensions mmorph mtl + deriving-compat free hashable invariant kan-extensions mmorph mtl natural-transformation nonempty-containers pointed profunctors - semigroupoids sop-core tagged these transformers trivial-constraint - vinyl + semigroupoids sop-core StateVar tagged these transformers + trivial-constraint unordered-containers vinyl ]; testHaskellDepends = [ base bifunctors dependent-sum free hedgehog nonempty-containers @@ -99404,8 +99492,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.1.0.0"; - sha256 = "0mv3q4a6l3xp0qjlhh9f8bvgbmrmr4hypnkapb2wsn0fvb0iw2kb"; + version = "1.1.1.0"; + sha256 = "1iqrpvh79y6a3b56ybafyxc98mlilnx928aqclx6h78hs10qlysy"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -101018,6 +101106,30 @@ self: { license = lib.licenses.mit; }) {}; + "generic-data_0_9_2_1" = callPackage + ({ mkDerivation, ap-normalize, base, base-orphans, contravariant + , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing + , one-liner, show-combinators, tasty, tasty-hunit, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "generic-data"; + version = "0.9.2.1"; + sha256 = "0hs5ahl1nx61kw5j0pnwgjrph7jgqq0djma956ksz6aivzldjf7q"; + libraryHaskellDepends = [ + ap-normalize base base-orphans contravariant ghc-boot-th + show-combinators + ]; + testHaskellDepends = [ + base generic-lens inspection-testing one-liner show-combinators + tasty tasty-hunit template-haskell unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Deriving instances with GHC.Generics and related utilities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-data-surgery" = callPackage ({ mkDerivation, base, first-class-families, generic-data , show-combinators, tasty, tasty-hunit @@ -104924,53 +105036,47 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base - , base16-bytestring, binary, bytestring, bz2, case-insensitive - , casing, concurrent-output, containers, cryptohash-sha256 - , generic-arbitrary, generics-sop, haskus-utils-types - , haskus-utils-variant, hpath, hpath-directory, hpath-filepath - , hpath-io, hpath-posix, hspec, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, monad-logger, mtl, optics, optics-vl - , optparse-applicative, os-release, parsec, pretty, pretty-terminal - , QuickCheck, quickcheck-arbitrary-adt, regex-posix, resourcet - , safe, safe-exceptions, split, streamly, streamly-bytestring - , streamly-posix, strict-base, string-interpolate, template-haskell - , text, time, transformers, unix, unix-bytestring - , unordered-containers, uri-bytestring, utf8-string, vector - , versions, vty, word8, yaml, zlib + , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan + , case-insensitive, casing, containers, cryptohash-sha256, deepseq + , directory, disk-free-space, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, HsYAML-aeson, libarchive, lzma-static + , megaparsec, mtl, optics, optparse-applicative, os-release, pretty + , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt + , regex-posix, resourcet, safe, safe-exceptions, split, strict-base + , template-haskell, temporary, text, time, transformers, unix + , unix-bytestring, unliftio-core, unordered-containers + , uri-bytestring, utf8-string, vector, versions, word8, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.14.2"; - sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; - revision = "1"; - editedCabalFile = "1vy71ly44jibq8bil0ns80m2zn9gcpnz8f9w2mn4j404gajpqagk"; + version = "0.1.17.2"; + sha256 = "0ggajcaxbr71npn6ihmlw954aj8lmdlwq3k22n9cnf23gg8s0yfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base16-bytestring binary bytestring bz2 - case-insensitive casing concurrent-output containers - cryptohash-sha256 generics-sop haskus-utils-types - haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io - hpath-posix libarchive lzma-static megaparsec monad-logger mtl - optics optics-vl os-release parsec pretty pretty-terminal - regex-posix resourcet safe safe-exceptions split streamly - streamly-bytestring streamly-posix strict-base string-interpolate - template-haskell text time transformers unix unix-bytestring - unordered-containers uri-bytestring utf8-string vector versions vty - word8 yaml zlib + aeson async base base16-bytestring binary bytestring bz2 Cabal + case-insensitive casing containers cryptohash-sha256 deepseq + directory disk-free-space filepath haskus-utils-types + haskus-utils-variant HsYAML-aeson libarchive lzma-static megaparsec + mtl optics os-release pretty pretty-terminal regex-posix resourcet + safe safe-exceptions split strict-base template-haskell temporary + text time transformers unix unix-bytestring unliftio-core + unordered-containers uri-bytestring vector versions word8 zlib ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers haskus-utils-variant - hpath hpath-filepath hpath-io libarchive megaparsec monad-logger - mtl optics optparse-applicative pretty pretty-terminal regex-posix - resourcet safe safe-exceptions string-interpolate template-haskell - text transformers uri-bytestring utf8-string versions yaml + aeson aeson-pretty async base bytestring cabal-plan containers + deepseq filepath haskus-utils-variant HsYAML-aeson libarchive + megaparsec mtl optics optparse-applicative pretty pretty-terminal + regex-posix resourcet safe safe-exceptions template-haskell text + transformers uri-bytestring utf8-string versions ]; testHaskellDepends = [ - base bytestring containers generic-arbitrary hpath hspec + base bytestring containers generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text uri-bytestring versions ]; + testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ maralorn ]; @@ -117207,9 +117313,9 @@ self: { }) {}; "hakyll" = callPackage - ({ mkDerivation, aeson, array, base, binary, blaze-html - , blaze-markup, bytestring, containers, data-default, deepseq - , directory, file-embed, filepath, fsnotify, hashable, http-conduit + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit , http-types, lifted-async, lrucache, mtl, network-uri , optparse-applicative, pandoc, parsec, process, QuickCheck, random , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden @@ -117219,15 +117325,15 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.14.1.0"; - sha256 = "1s0y7fc48zw0dkk4m9gv53mmklk1zfk4rkf7r6xawnkg5cj6sjpc"; + version = "4.15.0.1"; + sha256 = "09arikf44i4llffhi948fy2zdj76zym7z9swjx5p5axc7qvc4sqh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base binary blaze-html blaze-markup bytestring - containers data-default deepseq directory file-embed filepath - fsnotify hashable http-conduit http-types lifted-async lrucache mtl + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lifted-async lrucache mtl network-uri optparse-applicative pandoc parsec process random regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static @@ -119921,17 +120027,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_3_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit - , integer-gmp, QuickCheck, random, test-framework + "hashable_1_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.3.0"; - sha256 = "1p45rck6avm0ng963mmhphhwjljv9wcb7r2171cnka5nizjpi9cr"; + version = "1.3.4.0"; + sha256 = "0f796cs8mmk370c26qwc6g9wgx3r74m4p6m8909j1kdl5hj1sr86"; libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp text + base bytestring containers deepseq ghc-prim integer-gmp text ]; testHaskellDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -120076,6 +120182,21 @@ self: { broken = true; }) {}; + "hashes" = callPackage + ({ mkDerivation, base, bytestring, criterion, memory, QuickCheck }: + mkDerivation { + pname = "hashes"; + version = "0.1.0.1"; + sha256 = "0r686g8ksgl680s11m433z0d5b9hq8dz7k2as31qm2r2b6rvg7yd"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion memory QuickCheck + ]; + description = "Hash functions"; + license = lib.licenses.mit; + }) {}; + "hashflare" = callPackage ({ mkDerivation, base, containers, simple-money }: mkDerivation { @@ -141084,8 +141205,8 @@ self: { ({ mkDerivation, base, hspec, tmp-proc }: mkDerivation { pname = "hspec-tmp-proc"; - version = "0.5.0.0"; - sha256 = "00w5rly9a4pkr3qmj3924md4nlkn55jwl8a4dnnmpzbinhz4mav1"; + version = "0.5.0.1"; + sha256 = "0zn0q3cvszpnb0lqlnizfh8v0z2kasjl414ny4pzni6yf13m2jfh"; libraryHaskellDepends = [ base hspec tmp-proc ]; description = "Simplify use of tmp-proc from hspec tests"; license = lib.licenses.bsd3; @@ -158373,19 +158494,19 @@ self: { , cryptohash-md5, derive-storable, derive-storable-plugin , distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec , neat-interpolation, optparse-applicative, optparse-simple - , resourcet, rio, rio-app, StateVar, tagged, template-haskell, text - , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils - , VulkanMemoryAllocator, zstd + , resourcet, rio, rio-app, serialise, StateVar, tagged + , template-haskell, text, transformers, unagi-chan, unliftio + , vector, vulkan, vulkan-utils, VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-core"; - version = "0.1.2.0"; - sha256 = "07l493nn691bn6b2c4z684cjfj589vkip6068szc8j2j9pwqgr23"; + version = "0.1.3.0"; + sha256 = "0nvrspga2s0w8yydk3m3vn1c9dv40zk66bbsfmskxck950n5qw6k"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive file-embed foldl geomancy GLFW-b ktx-codec neat-interpolation optparse-applicative - optparse-simple resourcet rio rio-app StateVar tagged + optparse-simple resourcet rio rio-app serialise StateVar tagged template-haskell text transformers unagi-chan unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd ]; @@ -158418,8 +158539,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.2.1"; - sha256 = "0dij5rnzzcbggc1mvsg123aynx1s337vv1a4px965aj0ny3lfn0k"; + version = "0.1.3.0"; + sha256 = "15cp34k0kmis9wf5r8x2pfihl263fjwmwfkpi9fn7p5snn36pc28"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring derive-storable @@ -190421,18 +190542,19 @@ self: { ({ mkDerivation, aeson, array, base, base64, binary, bytestring , case-insensitive, containers, ede, enclosed-exceptions , http-client, http-types, network, ngx-export, ngx-export-tools - , prettyprinter, safe, snap-core, snap-server, template-haskell - , text, time, trifecta, unordered-containers + , pcre-heavy, pcre-light, prettyprinter, safe, snap-core + , snap-server, template-haskell, text, time, trifecta + , unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.7.0.0"; - sha256 = "0d7p227s33sg5g1ck5s9pmcwnwvvpanbzyq2qc54bzpawpvn5kwi"; + version = "0.8.0.0"; + sha256 = "03s47hzw82w2wgyffdqvgcf4i0nz1vmaim7f3j8pniaa2b3xj3gv"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types network - ngx-export ngx-export-tools prettyprinter safe snap-core - snap-server template-haskell text time trifecta + ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter + safe snap-core snap-server template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; @@ -196195,6 +196317,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "operational_0_2_4_0" = callPackage + ({ mkDerivation, base, mtl, random }: + mkDerivation { + pname = "operational"; + version = "0.2.4.0"; + sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ base mtl random ]; + description = "Implementation of difficult monads made easy with operational semantics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "operational-alacarte" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -199992,21 +200129,24 @@ self: { "parameterized-utils" = callPackage ({ mkDerivation, base, base-orphans, constraints, containers - , deepseq, ghc-prim, hashable, hashtables, hedgehog, lens, mtl + , deepseq, ghc-prim, hashable, hashtables, hedgehog + , hedgehog-classes, indexed-traversable, lens, mtl, profunctors , tasty, tasty-ant-xml, tasty-hedgehog, tasty-hunit , template-haskell, text, th-abstraction, vector }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.3.0"; - sha256 = "1222lsdf4jbxwinv88g0sdnmbfyyxjmhfiinmasi5qbgkay4907l"; + version = "2.1.4.0"; + sha256 = "16hdmlpyjg9gbal195wpglb11i9qbaw8khp3c1433kgdlqz56hj7"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable - hashtables lens mtl template-haskell text th-abstraction vector + hashtables indexed-traversable lens mtl profunctors + template-haskell text th-abstraction vector ]; testHaskellDepends = [ - base ghc-prim hashable hashtables hedgehog lens mtl tasty - tasty-ant-xml tasty-hedgehog tasty-hunit + base ghc-prim hashable hashtables hedgehog hedgehog-classes + indexed-traversable lens mtl tasty tasty-ant-xml tasty-hedgehog + tasty-hunit ]; description = "Classes and data structures for working with data-kind indexed types"; license = lib.licenses.bsd3; @@ -202230,15 +202370,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_1" = callPackage + "pcre2_2_0_2" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.1"; - sha256 = "0f93z99qhlhyvq7xsfn0nap9cxpxg2hs7790jqc5hi5kmqxlwvmy"; + version = "2.0.2"; + sha256 = "0v96cxkx1c9x9n5z2fh1xawgrnaz00pf7ip76my8r92rzayzy0kw"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -204938,8 +205078,8 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-permutations-array"; - version = "0.1.0.0"; - sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4"; + version = "0.2.0.0"; + sha256 = "0czrkhiplkblgsf6gq17m4hrwas4j4gj1hlq9zab8dcak39qkmc8"; libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; @@ -248716,8 +248856,8 @@ self: { }: mkDerivation { pname = "souffle-haskell"; - version = "3.0.0"; - sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q"; + version = "3.1.0"; + sha256 = "1sjdfrhvncsz5lg3bv29x4j2dk0dn7c5mcaj61al8ksh9r51y05l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl process template-haskell temporary text text-short @@ -251321,8 +251461,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.3.1"; - sha256 = "034y2a8zhfjrf2wjqhsvkxycwypyykyq9abq2ir33nadgxlshfk4"; + version = "0.4"; + sha256 = "180jpmdvc0lkzb4fcr88y370j150vr74ih4hsypjydn0x3khx3f1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -255563,8 +255703,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.2.0"; - sha256 = "1i6y41kyhbarwsppm55rlb1ddqihnpcc89yfgsd8mjgmbrmpsr3l"; + version = "0.5.3.0"; + sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -269438,19 +269578,22 @@ self: { "tmp-proc" = callPackage ({ mkDerivation, async, base, bytestring, connection, data-default - , doctest, hspec, http-client, http-client-tls, http-types, mtl - , network, process, req, text, unliftio, wai, warp, warp-tls + , hspec, http-client, http-client-tls, http-types, mtl, network + , process, req, text, unliftio, wai, warp, warp-tls }: mkDerivation { pname = "tmp-proc"; - version = "0.5.0.0"; - sha256 = "0vqmi5dpq7b8yn1djlpg662nwwjqzhqblz85f83qvlhiyikqkhdp"; + version = "0.5.0.1"; + sha256 = "11mh34jirabrdx9jbai42r0pgbx2q2v6028zigjznvhrsc7lkk4l"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring mtl network process text unliftio wai warp warp-tls ]; testHaskellDepends = [ - base bytestring connection data-default doctest hspec http-client + base bytestring connection data-default hspec http-client http-client-tls http-types req text wai warp warp-tls ]; description = "Run 'tmp' processes in integration tests"; @@ -284452,8 +284595,9 @@ self: { }: mkDerivation { pname = "wai-middleware-delegate"; - version = "0.1.2.2"; - sha256 = "0g2zbvzi3d3pd3b4a2lrhp3vxk93agcg236yif0wghw3d0rqv1mr"; + version = "0.1.2.4"; + sha256 = "17r2qay83xnsg6f61bxpy7kvjw73827hdl8srxiwqirw6zzc1pha"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra data-default http-client http-conduit http-types @@ -290195,8 +290339,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.10.0"; - sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr"; + version = "0.11.0"; + sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -293340,8 +293484,8 @@ self: { }: mkDerivation { pname = "yapb"; - version = "0.1.3"; - sha256 = "11p3ygnfpsh9dqlnpppi02baa5bk86pw6w6f1gawdd848qh7q9if"; + version = "0.1.3.1"; + sha256 = "1jscmf1rm6fknsd4088ij0nsldgrz14v4xwfkbc5500hg81ikpqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 64e26698aed1..7e8839b2e726 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -10,8 +10,6 @@ let inherit (lib) concatStringsSep concatMapStringsSep take splitString; getPackages = version: haskell.packages."ghc${version}"; - getMajorVersion = packages: - concatStringsSep "." (take 2 (splitString "." packages.ghc.version)); tunedHls = hsPkgs: haskell.lib.justStaticExecutables (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { @@ -27,7 +25,6 @@ let let packages = getPackages version; in [ "haskell-language-server-${packages.ghc.version}" - "haskell-language-server-${getMajorVersion packages}" ]; makeSymlinks = version: concatMapStringsSep "\n" (x: