From 2cf08210fd98a99dbe0ac59eb58ecbda3d5d7795 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 16 Jun 2022 15:27:37 -0700 Subject: [PATCH 01/20] ghc8107-ghc923: patch haddock to generate correct source links Previously links to external modules were jacked because haddock was doing them wrong. I fixed this upstream in early May 2022 but it's not out yet. --- pkgs/development/compilers/ghc/8.10.7.nix | 8 ++++++++ pkgs/development/compilers/ghc/9.0.2.nix | 8 ++++++++ pkgs/development/compilers/ghc/9.2.3.nix | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 981dfee88b86..eb9f08ef8208 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -191,6 +191,14 @@ stdenv.mkDerivation (rec { # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + # cabal passes incorrect --host= when cross-compiling # https://github.com/haskell/cabal/issues/5887 (fetchpatch { diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 7b3f213ed333..96688f104e6a 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -184,6 +184,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 (fetchpatch { diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.3.nix index 016b7df90ce1..43db5beb694f 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.3.nix @@ -185,6 +185,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. From caea0835e4448ba2af01c22b4726c40df346578c Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Jun 2022 01:49:12 +0900 Subject: [PATCH 02/20] haskellPackages: stackage LTS 19.12 -> LTS 19.13 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a7f461652b7e..f9c9d161a692 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.12 +# Stackage LTS 19.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -192,7 +192,7 @@ default-package-overrides: - bits ==0.6 - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.3 - - bitvec ==1.1.2.0 + - bitvec ==1.1.3.0 - bitwise-enum ==1.0.1.0 - blake2 ==0.3.0 - blanks ==0.5.0 @@ -429,9 +429,9 @@ default-package-overrides: - convertible ==1.1.1.1 - cookie ==0.4.5 - copr-api ==0.1.0 - - core-data ==0.3.3.1 + - core-data ==0.3.4.0 - core-program ==0.4.6.4 - - core-text ==0.3.7.2 + - core-text ==0.3.8.0 - countable ==1.0 - covariance ==0.1.0.6 - cpphs ==1.20.9.1 @@ -543,7 +543,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.1 + - deferred-folds ==0.9.18.2 - dejafu ==2.4.0.3 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -626,7 +626,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.0 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.8.2 + - dunai ==0.8.3 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -1004,13 +1004,13 @@ default-package-overrides: - haskintex ==0.8.0.0 - haskoin-core ==0.21.2 - hasktags ==0.72.0 - - hasql ==1.5.0.3 + - hasql ==1.5.0.4 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.1 - hasql-optparse-applicative ==0.3.0.9 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.14 + - hasql-th ==0.4.0.15 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1238,7 +1238,7 @@ default-package-overrides: - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.2 + - hybrid-vectors ==0.2.3 - hyper ==0.2.1.1 - hyperloglog ==0.4.6 - hyphenation ==0.8.2 @@ -1417,7 +1417,7 @@ default-package-overrides: - lift-generics ==0.2.1 - lift-type ==0.1.0.1 - line ==4.0.1 - - linear ==1.21.9 + - linear ==1.21.10 - linear-base ==0.1.0 - linear-circuit ==0.1.0.4 - linebreak ==1.1.0.1 @@ -1873,7 +1873,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4.3 + - postgresql-binary ==0.12.4.4 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.3 @@ -1886,7 +1886,7 @@ default-package-overrides: - postgresql-typed ==0.6.2.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - - pqueue ==1.4.1.4 + - pqueue ==1.4.2.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.3 @@ -1910,7 +1910,7 @@ default-package-overrides: - primitive ==0.7.3.0 - primitive-addr ==0.1.0.2 - PrimitiveArray ==0.10.1.1 - - primitive-extras ==0.10.1.4 + - primitive-extras ==0.10.1.5 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.1 - primitive-unlifted ==0.1.3.1 @@ -2036,7 +2036,7 @@ default-package-overrides: - reform-happstack ==0.2.5.5 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 - - regex ==1.1.0.1 + - regex ==1.1.0.2 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 - regex-base ==0.94.0.2 @@ -2046,7 +2046,7 @@ default-package-overrides: - regex-posix ==0.96.0.1 - regex-posix-clib ==2.7 - regex-tdfa ==1.3.1.2 - - regex-with-pcre ==1.1.0.1 + - regex-with-pcre ==1.1.0.2 - reinterpret-cast ==0.1.0 - rel8 ==1.3.1.0 - reliable-io ==0.0.2 @@ -2075,8 +2075,6 @@ default-package-overrides: - rfc5051 ==0.2 - rg ==1.4.0.0 - rhbzquery ==0.4.4 - - rhine ==0.7.1 - - rhine-gloss ==0.7.1 - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 @@ -2228,7 +2226,7 @@ default-package-overrides: - silently ==1.2.5.2 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - - simple-cmd ==0.2.6 + - simple-cmd ==0.2.7 - simple-cmd-args ==0.1.7 - simple-log ==0.9.12 - simple-media-timestamp ==0.2.0.0 @@ -2288,7 +2286,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 - - splint ==1.0.1.5 + - splint ==1.0.2.0 - split ==0.2.3.4 - splitmix ==0.1.0.4 - splitmix-distributions ==0.9.0.0 @@ -2687,7 +2685,7 @@ default-package-overrides: - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.3 + - vector-builder ==0.3.8.4 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.4 - vector-instances ==3.4 From b5ea807275040d364a22c6e96383e53b8e485914 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Jun 2022 01:49:32 +0900 Subject: [PATCH 03/20] all-cabal-hashes: 2022-06-23T03:01:47Z -> 2022-06-26T16:08:53Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d3d11e13385b..2ff486bfeaaa 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9.tar.gz", - "sha256": "0m1ahg2knm136g2gr66asicsqcy9n80lmszs70nkz550ll51vq8v", - "msg": "Update from Hackage at 2022-06-23T03:01:47Z" + "commit": "bdaaf418b8ae6d7933c074769223755338d91ac8", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/bdaaf418b8ae6d7933c074769223755338d91ac8.tar.gz", + "sha256": "0ngv8mscd9c05306v98z1jrzwbyi2wfnh4sc4dlvdsxxjnvq1dqs", + "msg": "Update from Hackage at 2022-06-26T16:08:53Z" } From 7cc8942e14a3fc4f7be49277d04803bb66fecf35 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Jun 2022 01:53:52 +0900 Subject: [PATCH 04/20] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 772 ++++++++---------- 1 file changed, 343 insertions(+), 429 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 706c6a36ee21..dc7bcaa78246 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37228,19 +37228,18 @@ self: { }) {}; "autodocodec" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , hashable, mtl, scientific, text, time, unordered-containers - , validity, validity-scientific, vector + ({ mkDerivation, aeson, base, bytestring, containers, hashable, mtl + , scientific, text, time, unordered-containers, validity + , validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.1.0.1"; - sha256 = "1m1zcscbx5553kh4hi12awqqqddxw4sr5vsg3lwcskl9qjzi1crx"; + version = "0.1.0.2"; + sha256 = "05sx66bdk6l2p26cvh24ynak4gp2dr8xdiw78jxbvgknsvrjkgf6"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector ]; - testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; license = lib.licenses.mit; }) {}; @@ -45152,31 +45151,6 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , primitive, quickcheck-classes, quickcheck-classes-base, random - , tasty, tasty-bench, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "bitvec"; - version = "1.1.2.0"; - sha256 = "0h7c5kpx43bm6qqnkpbzma9n201987cnq1231zg33p3xp7qc1hm2"; - revision = "1"; - editedCabalFile = "0kf70z3adgdhmwc91ymr2y3jlg9irnz4hzck3l9im1d3zxs1lyvs"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-bignum primitive vector - ]; - testHaskellDepends = [ - base ghc-bignum primitive quickcheck-classes - quickcheck-classes-base tasty tasty-hunit tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base containers ghc-bignum random tasty-bench vector - ]; - description = "Space-efficient bit vectors"; - license = lib.licenses.bsd3; - }) {}; - - "bitvec_1_1_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum , primitive, quickcheck-classes, quickcheck-classes-base, random , tasty, tasty-bench, tasty-quickcheck, vector @@ -45197,7 +45171,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -67678,23 +67651,6 @@ self: { }) {}; "core-data" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, hourglass, prettyprinter, scientific, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.3.3.1"; - sha256 = "149hf4mi6rklzcnqai44hkilp8kwis5irkn25bxjpkrwyl41m25q"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable hourglass - prettyprinter scientific text time unordered-containers vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = lib.licenses.mit; - }) {}; - - "core-data_0_3_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, hourglass, prettyprinter, scientific, text, time , unordered-containers, uuid, vector @@ -67711,7 +67667,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -67799,23 +67754,6 @@ self: { }) {}; "core-text" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq - , fingertree, hashable, prettyprinter, template-haskell, text - , text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.3.7.2"; - sha256 = "0ybac107psr558fqyfmc1x8ssfd8mk1cf3v220svi6k6i8qaxi7x"; - libraryHaskellDepends = [ - ansi-terminal base bytestring colour deepseq fingertree hashable - prettyprinter template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = lib.licenses.mit; - }) {}; - - "core-text_0_3_8_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text , text-short @@ -67830,7 +67768,6 @@ self: { ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-warn" = callPackage @@ -76402,28 +76339,6 @@ self: { }) {}; "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.18.1"; - sha256 = "1hf14xa9fdfyk9ijxnll402x96m59giqrpj9s5rjqkd5pyi1yj6w"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_18_2" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -76443,7 +76358,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -78997,19 +78911,19 @@ self: { "diagnose" = callPackage ({ mkDerivation, base, data-default, hashable, prettyprinter - , prettyprinter-ansi-terminal, unordered-containers, wcwidth + , prettyprinter-ansi-terminal, text, unordered-containers, wcwidth }: mkDerivation { pname = "diagnose"; - version = "2.0.0"; - sha256 = "1rb2fm0bx1rmb63xc56v19adi9f0iy72j0h8rvrvw0lvcwp398xk"; + version = "2.1.1"; + sha256 = "1ydga65py1bbxhgm76mmzsy3khklb4ay72nn8idc6bp1z1qdk0pa"; libraryHaskellDepends = [ base data-default hashable prettyprinter - prettyprinter-ansi-terminal unordered-containers wcwidth + prettyprinter-ansi-terminal text unordered-containers wcwidth ]; testHaskellDepends = [ base data-default hashable prettyprinter - prettyprinter-ansi-terminal unordered-containers wcwidth + prettyprinter-ansi-terminal text unordered-containers wcwidth ]; description = "Beautiful error reporting done easily"; license = lib.licenses.bsd3; @@ -81038,21 +80952,21 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, data-default, emoji, http-client, iso8601-time - , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, scientific + , containers, data-default, emoji, http-api-data, http-client + , iso8601-time, MonadRandom, mtl, req, safe-exceptions, scientific , text, time, unliftio, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.13.0"; - sha256 = "1bj75kj9pzm0f6dyh8g60s9nvkbsfc80sqrsd7q6czwhi765nqy0"; + version = "1.14.0"; + sha256 = "0dxzv2kl4njnq5m48d017ph1r8fir418ndzjahcing3b2hp2g1lp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers - data-default emoji http-client iso8601-time JuicyPixels MonadRandom - mtl req safe-exceptions scientific text time unliftio websockets - wuss + data-default emoji http-api-data http-client iso8601-time + MonadRandom mtl req safe-exceptions scientific text time unliftio + websockets wuss ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; @@ -85394,23 +85308,6 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty - , tasty-hunit, transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; - version = "0.8.2"; - sha256 = "1hcjzd6zki10lkh6f11naxqrnkdmiqm4hwyj5acj4naqkakc6mmp"; - libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base - ]; - testHaskellDepends = [ base tasty tasty-hunit transformers ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "dunai_0_8_3" = callPackage ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty , tasty-hunit, transformers, transformers-base }: @@ -85424,7 +85321,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -94288,6 +94184,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "fakedata_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, directory, exceptions, fakedata-parser, filepath, gauge + , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa + , string-random, template-haskell, text, time, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "1.0.3"; + sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable random string-random + template-haskell text time transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable hspec QuickCheck random + regex-tdfa string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq directory + exceptions fakedata-parser filepath gauge hashable random + string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + description = "Library for producing fake data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fakedata-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -101219,6 +101151,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "free_5_1_9" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.9"; + sha256 = "1vlzis9sqxh7xrmh3habbgiw3skkhkn710bhqb6fnl45804i6x9f"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -103488,6 +103439,8 @@ self: { pname = "futhark"; version = "0.21.12"; sha256 = "1pjrq70x4qxgjjx5yy8zk9v6k3d01kk42bq5jrrb5f27id4dyn6v"; + revision = "1"; + editedCabalFile = "12kwyz9zbnf80zr3y5ix8anparv8mcpf5wlxxm6if9qa35mccfls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110993,8 +110946,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220525"; - sha256 = "1nrwa4qm3xkr11x0b0c1mx052zhd7lz9w97xf0ycdkhsyc6vbiy6"; + version = "10.20220624"; + sha256 = "0a17ph8w620fmbwhm4yhdz2pwp0z8g5d4qsw2bg8k1par2n8rnmz"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -124675,8 +124628,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.3"; - sha256 = "0ca6vpin2vavff94lw8an5sisni5ncz9cvidy48dvw5y5hlj2yv8"; + version = "0.5.0.3.1"; + sha256 = "0d3zx4lbbc49lzc5pyrrh18c6ca9wnfsrxdakfpvqx8y4r1nlrdp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129490,8 +129443,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.4"; - sha256 = "0jl6ncf16lc4h9w6w8n59b3z58h5g4ddcmjm5ml2pd1qgp5ncilh"; + version = "0.0.0.5"; + sha256 = "1y1zgsr2ba8m8rjwias1xqx61p1g081pxxwaas14blq5ijcp9ivz"; libraryHaskellDepends = [ aeson base containers exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -129531,32 +129484,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, text - , text-builder, transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "1.5.0.3"; - sha256 = "1ai1vq1l58r4k6ri78gl0zlbc4sgkp3mcyi2dsm37f7ah9r38hsz"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-strict-builder contravariant - dlist hashable hashtables mtl postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - contravariant-extras QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ gauge rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - }) {}; - - "hasql_1_5_0_4" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, postgresql-binary @@ -129580,7 +129507,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -130109,8 +130035,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.14"; - sha256 = "0zskfsvxzilz6j3cd09hl6ixn3j9daksqjcb73pfm1f9hhrasa2a"; + version = "0.4.0.15"; + sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -130120,15 +130046,15 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-th_0_4_0_15" = callPackage + "hasql-th_0_4_0_16" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant, foldl , hasql, postgresql-syntax, template-haskell , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.15"; - sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; + version = "0.4.0.16"; + sha256 = "029zmhwmr8wp432hf33ffvns5nkfqzk1cnh663cln5f2ryllxxx3"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -137497,14 +137423,14 @@ self: { mainProgram = "hkgr"; }) {}; - "hkgr_0_4" = callPackage + "hkgr_0_4_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , simple-cabal, simple-cmd-args, typed-process, xdg-basedir }: mkDerivation { pname = "hkgr"; - version = "0.4"; - sha256 = "1h4dxnsj729cy8x687f77y0p8gh7sz9z7dl8vgqwmcd4p65vjwlk"; + version = "0.4.2"; + sha256 = "0ssh8wylalmgicpcixilvx3p46jf8miqx2q0gz9yjhxa54c721ab"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -138028,6 +137954,8 @@ self: { pname = "hledger-stockquotes"; version = "0.1.2.1"; sha256 = "09h021dcpya8492kgyqkd2irxa10kwc9dgzk5xn7r121hl55jp50"; + revision = "1"; + editedCabalFile = "1b10qfxps3iz69l05gagshphifhxw5nvsx79yfyc4iq1rb8hnxc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146327,7 +146255,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-aeson_2_2_0_1" = callPackage + "hslua-aeson_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hslua-core, hslua-marshalling, mtl, QuickCheck , quickcheck-instances, scientific, tasty, tasty-quickcheck, text @@ -146335,8 +146263,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "2.2.0.1"; - sha256 = "0s6viv1gvwvla8i64ifqwmpcfpjcskpg1q6p11bszdakz1d9ay5f"; + version = "2.2.1"; + sha256 = "0igmkay5bf3wg1n6rqm20kjv1xq36x552lgdvr1vlpwikgsiq8mb"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector @@ -149872,8 +149800,8 @@ self: { ({ mkDerivation, base, bytestring, http-client }: mkDerivation { pname = "http-client-brread-timeout"; - version = "0.1.0.1"; - sha256 = "04p98qkii1g6mk3cjra6ij73ks6qv0r2p7naq9j1rwvr9m7n1d4p"; + version = "0.1.0.2"; + sha256 = "0vyilqqdxav4aa6yv7mvvz6rzrjfb1y1rfz00mr3ar2rwbvgk3jw"; libraryHaskellDepends = [ base bytestring http-client ]; description = "Http client with time-limited brRead"; license = lib.licenses.mit; @@ -150034,6 +149962,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "http-client-rustls" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-types, network, port-utils, process, resourcet, rustls + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "http-client-rustls"; + version = "0.0.0.0"; + sha256 = "1rwiclqc1hpxgaqz6y8pxl96g68bg8d8m1clapg60fgmyj0zjnha"; + libraryHaskellDepends = [ + base bytestring http-client network resourcet rustls text + ]; + testHaskellDepends = [ + base bytestring directory filepath http-client http-types network + port-utils process rustls tasty tasty-hunit temporary + ]; + description = "http-client TLS backend using Rustls"; + license = lib.licenses.cc0; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -153741,21 +153689,6 @@ self: { }) {}; "hybrid-vectors" = callPackage - ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: - mkDerivation { - pname = "hybrid-vectors"; - version = "0.2.2"; - sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; - revision = "1"; - editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88"; - libraryHaskellDepends = [ - base deepseq primitive semigroups vector - ]; - description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; - license = lib.licenses.bsd3; - }) {}; - - "hybrid-vectors_0_2_3" = callPackage ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: mkDerivation { pname = "hybrid-vectors"; @@ -153766,7 +153699,6 @@ self: { ]; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hydra-hs" = callPackage @@ -160567,8 +160499,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.1"; - sha256 = "1iynpy0mz1y569p8im3x9a48z73r7mz191dy0cm9x878r79hbplz"; + version = "0.1.0.2"; + sha256 = "07xyvpca365avqlkzpns1f73slr17dxy6mdarnh0y0wzyr0ihai4"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -174730,33 +174662,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, cereal, containers, deepseq, distributive, ghc-prim - , hashable, HUnit, indexed-traversable, lens, random, reflection - , semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.21.9"; - sha256 = "1lc2kgszbqgxxypprk68x305cqpr7y88if955mqd7c07vx7ci9ba"; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable indexed-traversable lens - random reflection semigroupoids semigroups tagged template-haskell - transformers transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq HUnit reflection simple-reflect - test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_10" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, distributive, ghc-prim , hashable, HUnit, indexed-traversable, lens, random, reflection @@ -174781,7 +174686,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -175088,6 +174992,8 @@ self: { pname = "linearscan"; version = "1.0.0"; sha256 = "12p1li2g69jf9rhr7xx4phrhsmw5nzn7q82n8n19bzidxflkdabm"; + revision = "1"; + editedCabalFile = "1n65l60wjwmdlcw7jbfmr0mknb8c812ibqnnlaayy3z1wnzpb4g3"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -179322,6 +179228,8 @@ self: { pname = "lsp-types"; version = "1.4.0.1"; sha256 = "0dxf5nnaxs2564hgjldkclhm5gvszjxxvz6gk00jmx0gf8k6dm8z"; + revision = "1"; + editedCabalFile = "0p5yywd6lam533arwfw9b4xvmibg9glmfd69j0h5268l62fqdh10"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq Diff directory dlist filepath hashable hslogger lens mod mtl network-uri @@ -183458,8 +183366,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.16.0"; - sha256 = "1hjb408dznls8r6k89jv0zvliv259xj2gzl03f4ypwacihmr3qiw"; + version = "50200.17.0"; + sha256 = "10n0vgphdkbdhyadiwn2a35zdazmxz2k0ibq7f1v9iyr8ylshz46"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183495,8 +183403,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.12.0"; - sha256 = "12mmpyw1lcmyxh73rgzckww7dd6lxc6m81h2xa9rpd8mxwx0n17n"; + version = "50200.13.0"; + sha256 = "128x1ygfb8g8ig4wy3cgmjh3ijkrg7vg27ylxvb1rnn4hc4lfn7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183520,8 +183428,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.12.0"; - sha256 = "00fgr80xanrni835n7wgazq6900f040cwnhbsz99936azx125nx4"; + version = "50200.13.0"; + sha256 = "0qy0jzv808hry99clfkc61sfmid8qwv3qcf2gsmana30bdxy8v57"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -187636,29 +187544,20 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, containers, directory, free - , ki, process, record-dot-preprocessor, record-hasfield, temporary - , text, text-ansi, unix + ({ mkDerivation, base, base64, containers, directory, ki + , optparse-applicative, parsec, process, text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "7"; - sha256 = "1asr82fnqpb936kfj8fnilas76l5r5ndylvzf1van2z57sxjx9ba"; + version = "8"; + sha256 = "0rknwwfysmic2x8apwah99d0lmjlgyn6wnxrvviv22903bnjlcn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock containers directory ki process - record-dot-preprocessor record-hasfield text text-ansi unix - ]; - executableHaskellDepends = [ - base base64 clock containers directory ki process - record-dot-preprocessor record-hasfield text text-ansi unix - ]; - testHaskellDepends = [ - base base64 clock containers directory free ki process - record-dot-preprocessor record-hasfield temporary text text-ansi - unix + base base64 containers directory ki optparse-applicative parsec + process text text-ansi unix ]; + executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -189876,12 +189775,19 @@ self: { }) {}; "monad-schedule" = callPackage - ({ mkDerivation, base, free, stm, time-domain, transformers }: + ({ mkDerivation, base, free, HUnit, QuickCheck, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time-domain + , transformers + }: mkDerivation { pname = "monad-schedule"; - version = "0.1.0.0"; - sha256 = "1jc70f71yr886wd150vg97kvbyp489nma0c98xa6drhw720rbwwz"; + version = "0.1.2.0"; + sha256 = "1crzah9arrr0c3zmld66r20w3jvd5gcblq9d3my784z9sh8cqwz3"; libraryHaskellDepends = [ base free stm time-domain transformers ]; + testHaskellDepends = [ + base free HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; description = "A new, simple, composable concurrency abstraction"; license = lib.licenses.mit; }) {}; @@ -200813,6 +200719,59 @@ self: { license = lib.licenses.bsd3; }) {}; + "nonempty-wrapper" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "nonempty-wrapper"; + version = "0.1.0.0"; + sha256 = "057c0ry3p4z1x2br6v5gm4c044i0z868kk5jihyf8s0r821zfzxj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core hspec-discover ]; + testToolDepends = [ hspec-discover ]; + description = "Create NonEmpty version of any container"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-aeson" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, hspec-core + , hspec-discover, nonempty-wrapper + }: + mkDerivation { + pname = "nonempty-wrapper-aeson"; + version = "0.1.0.0"; + sha256 = "0qg0xl93vl4nkm2aqsfqnwgk7vsaxvbib302n4ap6m5vks84b8fg"; + libraryHaskellDepends = [ aeson base nonempty-wrapper ]; + testHaskellDepends = [ + aeson base containers hspec hspec-core hspec-discover + nonempty-wrapper + ]; + testToolDepends = [ hspec-discover ]; + description = "aeson instances for 'NonEmpty'"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-quickcheck" = callPackage + ({ mkDerivation, base, nonempty-wrapper, QuickCheck }: + mkDerivation { + pname = "nonempty-wrapper-quickcheck"; + version = "0.1.0.0"; + sha256 = "1k0bb0ir5k9cmgv261s1l86yd0sfrl0m9h0dfc2qhq9qzz9k2lvz"; + libraryHaskellDepends = [ base nonempty-wrapper QuickCheck ]; + description = "QuickCheck instance for 'NonEmpty'"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-text" = callPackage + ({ mkDerivation, base, bytestring, nonempty-wrapper, text }: + mkDerivation { + pname = "nonempty-wrapper-text"; + version = "0.1.0.0"; + sha256 = "1v2my0dcy7frmnnhf46rqsiqi5mfsk7d1fi28agcg9qva73qiw4q"; + libraryHaskellDepends = [ base bytestring nonempty-wrapper text ]; + description = "'NonEmpty' wrappers for text"; + license = lib.licenses.isc; + }) {}; + "nonempty-zipper" = callPackage ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: mkDerivation { @@ -210899,20 +210858,21 @@ self: { }) {}; "patch" = callPackage - ({ mkDerivation, base, constraints-extras, containers - , dependent-map, dependent-sum, directory, filemanip, filepath - , hedgehog, hlint, HUnit, indexed-traversable, lens + ({ mkDerivation, base, commutative-semigroups, constraints-extras + , containers, dependent-map, dependent-sum, directory, filemanip + , filepath, hedgehog, hlint, HUnit, indexed-traversable, lens , monoidal-containers, semialign, semigroupoids, these , transformers, witherable }: mkDerivation { pname = "patch"; - version = "0.0.6.0"; - sha256 = "0wgxmk9vfrgnq5vg93jwzkszxmyrk91b36fnnlm8qr6mlg7j8m0z"; + version = "0.0.7.0"; + sha256 = "0hpx1sh90rhvvd9j8nmpibdhj9jd4mmwbsr1c220ywaz7g6f3bxv"; libraryHaskellDepends = [ - base constraints-extras containers dependent-map dependent-sum - indexed-traversable lens monoidal-containers semialign - semigroupoids these transformers witherable + base commutative-semigroups constraints-extras containers + dependent-map dependent-sum indexed-traversable lens + monoidal-containers semialign semigroupoids these transformers + witherable ]; testHaskellDepends = [ base containers directory filemanip filepath hedgehog hlint HUnit @@ -221024,33 +220984,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances - , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.4.3"; - sha256 = "0g3qj41gdiphngil9rz4wi9sg78m13q9mvh6369i46612w0jc9dv"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_4_4" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -221075,7 +221008,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -222361,18 +222293,6 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "pqueue"; - version = "1.4.1.4"; - sha256 = "06hjgy7q6dmz6g0m2w466cn5yfdhsv4qqyhmd4wwggvpcn89yr5d"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - description = "Reliable, persistent, fast priority queues"; - license = lib.licenses.bsd3; - }) {}; - - "pqueue_1_4_2_0" = callPackage ({ mkDerivation, base, deepseq, random, tasty, tasty-bench , tasty-quickcheck }: @@ -222385,7 +222305,6 @@ self: { benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; description = "Reliable, persistent, fast priority queues"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pqueue-mtl" = callPackage @@ -222602,8 +222521,8 @@ self: { ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.7.0.3"; - sha256 = "0ipbl4wq95z61h7jd0x5jv5m01vw69v6qqif4nwx9wp7mjfdp7z0"; + version = "0.8.0.0"; + sha256 = "1fjh0zi3fwy1xkxrr4ang4fa6g0ckdd6sjz11ix0ih6ymsdai39f"; libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; @@ -223938,28 +223857,6 @@ self: { }) {}; "primitive-extras" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "primitive-extras"; - version = "0.10.1.4"; - sha256 = "00x8jwmkijc110idviz6i4q25dfxnjv4gcdkhsyrldrg8g1bn90f"; - libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus foldl list-t primitive - primitive-unlifted profunctors vector - ]; - testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - description = "Extras for the \"primitive\" library"; - license = lib.licenses.mit; - }) {}; - - "primitive-extras_0_10_1_5" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit @@ -223979,7 +223876,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-foreign" = callPackage @@ -227516,12 +227412,12 @@ self: { , regex-base, regex-tdfa, safe, scientific, semialign, semigroups , serialise, sourcemap, split, stm, stringsearch, syb, text, these , time, transformers, transformers-base, transformers-compat - , unordered-containers, utf8-string, vector + , typed-process, unordered-containers, utf8-string, vector }: mkDerivation { pname = "purescript"; - version = "0.15.2"; - sha256 = "11ym7ix8nwx96mxq53kgfwqr2cwx5b537di14zr2bk4dp5kr7nd4"; + version = "0.15.3"; + sha256 = "1avs6nwfkvpj73px4v2r9hjcsl5byrpzq3knirddxv7b4axkfk90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227534,7 +227430,7 @@ self: { pattern-arrows process protolude regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ @@ -227548,7 +227444,7 @@ self: { parsec pattern-arrows process protolude regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; executableToolDepends = [ happy ]; testHaskellDepends = [ @@ -227562,7 +227458,7 @@ self: { process protolude QuickCheck regex-base regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; testToolDepends = [ happy hspec-discover ]; doCheck = false; @@ -235373,25 +235269,6 @@ self: { }) {}; "regex" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , hashable, regex-base, regex-pcre-builtin, regex-tdfa - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "regex"; - version = "1.1.0.1"; - sha256 = "0gjascxc2x4mxq570wv1q5fn6qfkk9lc4x0xdkhqrd84aw4pc3qm"; - libraryHaskellDepends = [ - array base base-compat bytestring containers hashable regex-base - regex-pcre-builtin regex-tdfa template-haskell text time - time-locale-compat transformers unordered-containers utf8-string - ]; - description = "Toolkit for regex-base"; - license = lib.licenses.bsd3; - }) {}; - - "regex_1_1_0_2" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers , hashable, regex-base, regex-pcre-builtin, regex-tdfa , template-haskell, text, time, time-locale-compat, transformers @@ -235408,7 +235285,6 @@ self: { ]; description = "Toolkit for regex-base"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -235931,24 +235807,6 @@ self: { }) {}; "regex-with-pcre" = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, regex - , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "regex-with-pcre"; - version = "1.1.0.1"; - sha256 = "1dypklwhjcsq1y7nfpn6z6gj9c4j1wg3x55yvfczlnk97jl6dk1m"; - libraryHaskellDepends = [ - base base-compat bytestring containers regex regex-base - regex-pcre-builtin regex-tdfa template-haskell text transformers - unordered-containers - ]; - description = "Toolkit for regex-base"; - license = lib.licenses.bsd3; - }) {}; - - "regex-with-pcre_1_1_0_2" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, regex , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell , text, transformers, unordered-containers @@ -235964,7 +235822,6 @@ self: { ]; description = "Toolkit for regex-base"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-wrapper" = callPackage @@ -242346,6 +242203,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "rustls" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , derive-storable, derive-storable-plugin, directory, filepath + , hedgehog, network, process, resourcet, rustls, stm, tasty + , tasty-hedgehog, tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "rustls"; + version = "0.0.0.0"; + sha256 = "1j7qxmapz9znmbd02359qxbsh1pkprzcg2jjpsz80kfyb6bjj766"; + libraryHaskellDepends = [ + base bytestring derive-storable derive-storable-plugin network + resourcet text transformers + ]; + librarySystemDepends = [ rustls ]; + testHaskellDepends = [ + async base bytestring containers directory filepath hedgehog + process resourcet stm tasty tasty-hedgehog tasty-hunit temporary + text transformers + ]; + description = "TLS bindings for Rustls"; + license = lib.licenses.cc0; + }) {rustls = null;}; + "rv" = callPackage ({ mkDerivation, base, base-unicode-symbols, criterion, Fin, peano , smallcheck, tasty, tasty-smallcheck, util, word @@ -253233,10 +253114,10 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.2.2"; - sha256 = "0d99ix0gffch5vnbnkd48zlah6lgbn4pj1z58k07g90rickrv4sl"; + version = "0.1.3.0"; + sha256 = "0n5miyicjirpkh5p9vgcxb75jh4n6g8lxhrzxpm8fggmv8z0gm1s"; libraryHaskellDepends = [ base megaparsec text ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec megaparsec ]; description = "Parse strings into words, like a shell would"; license = lib.licenses.mit; }) {}; @@ -254431,22 +254312,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, extra, filepath, hspec, process - , time, unix - }: - mkDerivation { - pname = "simple-cmd"; - version = "0.2.6"; - sha256 = "0x5r4i1ckswrs0060blr6zx1n8zbdqc977nq9n5gmwcfznsrhc67"; - libraryHaskellDepends = [ - base directory extra filepath process time unix - ]; - testHaskellDepends = [ base hspec ]; - description = "Simple String-based process commands"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_7" = callPackage ({ mkDerivation, base, directory, extra, filepath, hspec, process , time, unix }: @@ -254460,7 +254325,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Simple String-based process commands"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -261627,17 +261491,6 @@ self: { }) {}; "splint" = callPackage - ({ mkDerivation, base, containers, ghc, hlint, stm }: - mkDerivation { - pname = "splint"; - version = "1.0.1.5"; - sha256 = "1mvkd5jcrivc57g6dw6iwss6682q7wyi6zb2k3nd3vywm1a0c8ql"; - libraryHaskellDepends = [ base containers ghc hlint stm ]; - description = "HLint as a GHC source plugin"; - license = lib.licenses.isc; - }) {}; - - "splint_1_0_2_0" = callPackage ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; @@ -261646,7 +261499,6 @@ self: { libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "split" = callPackage @@ -267834,8 +267686,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "2.0.1.0"; - sha256 = "16jiqhkl6ww1rk0n3bp26p30x536akyaaww75bwz0rwzxkr8rjsh"; + version = "3.0.0.0"; + sha256 = "0nv2xypch45lm8v6lx4g9isgdxxpj60s9a5ki8iwnc333vy62q1v"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -269038,6 +268890,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "superbuffer_0_3_1_2" = callPackage + ({ mkDerivation, async, base, buffer-builder, bytestring, criterion + , HTF, QuickCheck + }: + mkDerivation { + pname = "superbuffer"; + version = "0.3.1.2"; + sha256 = "024mcjmayirwxqqyr9w1zfsxihi680clzngkpmgccv10phb8qpsp"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring HTF QuickCheck ]; + benchmarkHaskellDepends = [ + async base buffer-builder bytestring criterion + ]; + description = "Efficiently build a bytestring from smaller chunks"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -283748,14 +283618,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "transformers-compat_0_7_1" = callPackage + "transformers-compat_0_7_2" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.7.1"; - sha256 = "102hydcqn7yjskzp586fvsw39dp3fi34fkskc7ykqkf16haqc2xc"; - revision = "1"; - editedCabalFile = "03xi4gxwvim33xkv289g6wz9dpz43zd91s5j2ini7bhcg40gagl7"; + version = "0.7.2"; + sha256 = "0slxrkxi8xa1bmi9saq9x8bz52clrf2slf877m3ckjzkr4276b5n"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = lib.licenses.bsd3; @@ -289275,10 +289143,10 @@ self: { ({ mkDerivation, base, containers, uni-util }: mkDerivation { pname = "uni-events"; - version = "2.2.2.0"; - sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz"; + version = "2.2.2.1"; + sha256 = "0l6m6gzpk8v4f5lhmxf8irpfncjfj017s564mbvgc8dn6zc0301r"; libraryHaskellDepends = [ base containers uni-util ]; - description = "Event handling for the uniform workbench"; + description = "uni events"; license = "LGPL"; hydraPlatforms = lib.platforms.none; }) {}; @@ -289289,8 +289157,8 @@ self: { }: mkDerivation { pname = "uni-graphs"; - version = "2.2.1.1"; - sha256 = "1l9spz147nppdzannk98x9zb7r2pdxz31xs7vqzj1g5alndn2ffy"; + version = "2.2.1.2"; + sha256 = "0l05mcn0swciq6sb9xsym0qksazyrlzlcp3k7ngpva0h092g7gfm"; libraryHaskellDepends = [ base containers mtl uni-events uni-htk uni-reactor uni-util ]; @@ -289366,15 +289234,15 @@ self: { "uni-util" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , ghc-prim, mtl, network, old-time, parsec + , ghc-prim, mtl, network, network-bsd, old-time, parsec }: mkDerivation { pname = "uni-util"; - version = "2.3.0.2"; - sha256 = "0qxpfaxsmkhvqbpwymlz20hx63z9bkxra2pynr0imxchaxahxws6"; + version = "2.3.0.3"; + sha256 = "0y0xivvy9wgd0q0npahii5jmq0z2913pmbf8smn6w0xpxi1a7482"; libraryHaskellDepends = [ array base bytestring containers directory ghc-prim mtl network - old-time parsec + network-bsd old-time parsec ]; description = "Utilities for the uniform workbench"; license = "LGPL"; @@ -294227,25 +294095,6 @@ self: { }) {}; "vector-builder" = callPackage - ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-builder"; - version = "0.3.8.3"; - sha256 = "0rajpk54n9anlqixxr2qn7qximhhy7qa4gg4czwmj5zl5ysj2br4"; - revision = "1"; - editedCabalFile = "026yz76lqi7pllcnix8jwsqa7dp775nd0ssf6pkjbqnmlgf5iblf"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Vector builder"; - license = lib.licenses.mit; - }) {}; - - "vector-builder_0_3_8_4" = callPackage ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector }: @@ -294260,7 +294109,6 @@ self: { ]; description = "Vector builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-bytes-instances" = callPackage @@ -299671,8 +299519,10 @@ self: { }: mkDerivation { pname = "webby"; - version = "1.0.1"; - sha256 = "00sdw1ly5848f4yq64j4an8w1c83gwry6n8bp7z7csh1y0lz4mm3"; + version = "1.0.2"; + sha256 = "17mx6xwrb49rqx55ccg1wx3ysjpfbvii8kwrmd4nd9wisslldiv6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring formatting http-api-data http-types relude resourcet text unliftio unliftio-core unordered-containers @@ -300010,6 +299860,26 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-core_1_0_3" = callPackage + ({ mkDerivation, arrows, base, bytestring, case-insensitive + , filepath, http-api-data, http-media, http-types, jose, mime-types + , network, safe-exceptions, tagged, template-haskell, text + , unordered-containers, wai + }: + mkDerivation { + pname = "webgear-core"; + version = "1.0.3"; + sha256 = "1617gc4hlhgx5xyd5b5l1syhpqdq801ifpdgsbrk3z3madhn8vag"; + libraryHaskellDepends = [ + arrows base bytestring case-insensitive filepath http-api-data + http-media http-types jose mime-types network safe-exceptions + tagged template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP APIs"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types , insert-ordered-containers, lens, openapi3, text, webgear-core @@ -300026,6 +299896,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-openapi_1_0_3" = callPackage + ({ mkDerivation, arrows, base, http-media, http-types + , insert-ordered-containers, lens, openapi3, text, webgear-core + }: + mkDerivation { + pname = "webgear-openapi"; + version = "1.0.3"; + sha256 = "0j0xdqg43qsphsnk0lhy5di3hk77a0n5bbw0qp8n371lk90464hd"; + libraryHaskellDepends = [ + arrows base http-media http-types insert-ordered-containers lens + openapi3 text webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-server" = callPackage ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring , bytestring-conversion, http-api-data, http-media, http-types @@ -300051,6 +299938,32 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-server_1_0_3" = callPackage + ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring + , bytestring-conversion, http-api-data, http-media, http-types + , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai + , webgear-core + }: + mkDerivation { + pname = "webgear-server"; + version = "1.0.3"; + sha256 = "1qj297wgrhzkg7sb9lrmp5jfi77k09fnfmz4mn74vbwwpr90ahaw"; + libraryHaskellDepends = [ + aeson arrows base base64-bytestring bytestring + bytestring-conversion http-api-data http-media http-types jose + monad-time mtl text unordered-containers wai webgear-core + ]; + testHaskellDepends = [ + base base64-bytestring bytestring http-types QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai + webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -301907,9 +301820,10 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "word-compat"; - version = "0.0.2"; - sha256 = "164zpk3cqw9i9mblz0cdshgk1382pcnbakr7pxamz4r0gyhs3r9n"; + version = "0.0.3"; + sha256 = "1zr5jcvnhmr7g74ysyd5n8ykakl0n0shpfh7li42a9j7q5bq6ryb"; libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ]; description = "Compatibility shim for the Int/Word internal change in GHC 9.2"; license = lib.licenses.bsd3; }) {}; From 8d49c0ba6d5ddae5eba45d39a7e66b9b6200adb6 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 28 Jun 2022 13:40:58 +0900 Subject: [PATCH 05/20] all-cabal-hashes: 2022-06-26T16:08:53Z -> 2022-06-28T01:15:54Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 2ff486bfeaaa..848ba37737a0 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "bdaaf418b8ae6d7933c074769223755338d91ac8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/bdaaf418b8ae6d7933c074769223755338d91ac8.tar.gz", - "sha256": "0ngv8mscd9c05306v98z1jrzwbyi2wfnh4sc4dlvdsxxjnvq1dqs", - "msg": "Update from Hackage at 2022-06-26T16:08:53Z" + "commit": "3ec21f9b18788dae329e5f782e03803123295029", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ec21f9b18788dae329e5f782e03803123295029.tar.gz", + "sha256": "10shljvigc4zmy40hba4frcpx6c4h6387w35b67gr7rr00qwc0d2", + "msg": "Update from Hackage at 2022-06-28T01:15:54Z" } From 352c7eaf9d4582462e06ca0c4bc2b27eed7234db Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 28 Jun 2022 13:43:49 +0900 Subject: [PATCH 06/20] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 229 +++++++++++++----- 1 file changed, 174 insertions(+), 55 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dc7bcaa78246..88da58fcccc9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32979,6 +32979,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "applicable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "applicable"; + version = "0.4.0.0"; + sha256 = "0gyj204svcscigrar6n349hr76gna5x8zbh6f0f6n2la4q8r88ak"; + libraryHaskellDepends = [ base ]; + description = "A class for things that can be applied"; + license = lib.licenses.mit; + }) {}; + "applicative-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -52471,8 +52482,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.7.0"; - sha256 = "10yyzk26hmx4xqv4zc83a5m69bj88fd6v2fs76nfbqc2kcpiis6k"; + version = "0.7.1"; + sha256 = "1n3gb40bj426fzdcqx7yypbss17z3snrz75d1aff60az4942n3jd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59020,8 +59031,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.17"; - sha256 = "1yaga5g4r9rngc4f8hz4mndrjd6xnksw2vs916ccx2b5dn6i871c"; + version = "0.6.17.2"; + sha256 = "1kcm89mx6is7lvikipa1is9g9l8nivlcncw475zh2lylhv774qgd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -76338,6 +76349,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "defaultable-map" = callPackage + ({ mkDerivation, base, containers, deepseq, semigroupoids }: + mkDerivation { + pname = "defaultable-map"; + version = "1.0.2"; + sha256 = "0s70fwnh6r41hlr7hzv5rwiw8m0rrlj8v1bar09fq3gzqmhrpbqw"; + libraryHaskellDepends = [ base containers deepseq semigroupoids ]; + description = "Applicative maps"; + license = lib.licenses.bsd3; + }) {}; + "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty @@ -85587,8 +85609,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.4"; - sha256 = "01gdh96p5nwca9g5sa0nrv65vaial3jqprngk67n9wxbj74pwr8f"; + version = "0.2.0.5"; + sha256 = "0g88xm00j0b5k20rw7fdzmswn1migqs6sw3sm0yy9na4b5l1mf4p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -94585,10 +94607,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "2.0.1"; - sha256 = "1v60jrcpbd86np5265grd61x6rla1fy85jphcnknffy4zf0sswrf"; - revision = "1"; - editedCabalFile = "120prvsdwkil1wq5y72ym4h5gzafdpm3cy4kchgfjcdlyf8jf619"; + version = "2.0.2"; + sha256 = "06sw868inr6sngyxcfvzbldlzllqhk9sfsb8193x9jbxvxbrlfws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103439,8 +103459,8 @@ self: { pname = "futhark"; version = "0.21.12"; sha256 = "1pjrq70x4qxgjjx5yy8zk9v6k3d01kk42bq5jrrb5f27id4dyn6v"; - revision = "1"; - editedCabalFile = "12kwyz9zbnf80zr3y5ix8anparv8mcpf5wlxxm6if9qa35mccfls"; + revision = "2"; + editedCabalFile = "1m6rn5amxikflgli0izq9lsdc2s4qcwmmhiila54mnk1c6l2q7zv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103493,8 +103513,8 @@ self: { }: mkDerivation { pname = "futhark-manifest"; - version = "1.0.0.1"; - sha256 = "0zm6c907a9ywl9isslmqrl7k42076azzrrx16z0dj8w1pns69nw5"; + version = "1.1.0.0"; + sha256 = "1y1f3b6rz6m778izvi6n7ylinr6m41fy19h4by0bb6hdmcazaxpn"; libraryHaskellDepends = [ aeson base bytestring containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -140069,15 +140089,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hoauth2_2_4_0" = callPackage + "hoauth2_2_5_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, exceptions, http-conduit, http-types, microlens , text, transformers, uri-bytestring, uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "2.4.0"; - sha256 = "0lz4ah5dxzzbkw01sarx5dg15vr2d7bms7nksbl66kblpdwyskbx"; + version = "2.5.0"; + sha256 = "0pi9g8rn9cs3hf2api1im9bvm9hk811wbkx8ncaakrkvjyx53gf4"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default exceptions http-conduit http-types microlens text transformers uri-bytestring @@ -164885,6 +164905,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_5" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.5"; + sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -177371,6 +177410,22 @@ self: { license = lib.licenses.asl20; }) {}; + "loc_0_1_4_0" = callPackage + ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog + }: + mkDerivation { + pname = "loc"; + version = "0.1.4.0"; + sha256 = "1sv3nka1dxvxrvcl9jz8qa06194wvk2vcs894rzb4g052ikxgmnb"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers hedgehog hspec hspec-hedgehog + ]; + description = "Types representing line and column positions and ranges in text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { @@ -190736,8 +190791,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.1"; - sha256 = "13vncdylaazcyfsdylxxnfkywyzw7ydmacisjhx6qhq12c87375q"; + version = "1.1.2"; + sha256 = "1ac59pk7yv0g55c7yxykmsy06d4dlxnas5739041ydc5f9vdd1wz"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -200806,6 +200861,18 @@ self: { license = lib.licenses.mit; }) {}; + "nonlinear" = callPackage + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: + mkDerivation { + pname = "nonlinear"; + version = "0.1.0"; + sha256 = "1qka0yrsi64z7brppsnp387xbsax0nqahgs6190kiwk63fp0p12n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; + description = "Low-dimensional vectors"; + license = lib.licenses.bsd3; + }) {}; + "nonlinear-optimization" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -212682,6 +212749,37 @@ self: { license = lib.licenses.asl20; }) {}; + "perfect-hash-generator_1_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , data-ordlist, directory, filepath, hashable, HUnit + , optparse-applicative, random, sorted-list, test-framework + , test-framework-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "perfect-hash-generator"; + version = "1.0.0"; + sha256 = "1gxrba5lpwzifjg5glld6nj54xhvajm4b6cg88cs64iqnwhh2chi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-default data-ordlist + directory filepath hashable sorted-list text unordered-containers + vector + ]; + executableHaskellDepends = [ + base binary bytestring containers hashable optparse-applicative + random text unordered-containers vector + ]; + testHaskellDepends = [ + base binary bytestring containers data-default hashable HUnit + optparse-applicative random test-framework test-framework-hunit + text unordered-containers vector + ]; + description = "Perfect minimal hashing implementation in native Haskell"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "perfect-vector-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, primitive, QuickCheck , quickcheck-instances, random, tasty, tasty-quickcheck, vector @@ -226070,15 +226168,15 @@ self: { }) {}; "proto3-wire" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck - , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector, word-compat + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, doctest, ghc-prim, hashable, parameterized, primitive + , QuickCheck, random, safe, tasty, tasty-hunit, tasty-quickcheck + , text, transformers, unordered-containers, vector, word-compat }: mkDerivation { pname = "proto3-wire"; - version = "1.3.0"; - sha256 = "1m9yv7cvswkzz32cxm57ay68gh4rdklcz15m3v8rzywp5fqsly26"; + version = "1.4.0"; + sha256 = "1byjv249w3vm1298dqqjpmrwpzcdmz8dh7bykn981zxyn9qhf55y"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ghc-prim hashable parameterized primitive QuickCheck safe text transformers @@ -226088,6 +226186,7 @@ self: { base bytestring cereal doctest QuickCheck tasty tasty-hunit tasty-quickcheck text transformers vector ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -236103,8 +236202,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.7.0.2"; - sha256 = "1vjvpszac038lyjix9mbfixfid224incb3y97s2dhqjirb8dzzbf"; + version = "0.7.0.3"; + sha256 = "1scas90v8qsikacahk6z5xkg4k6vy0fq4kpgdzgmzibfgjb5d4an"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -239284,16 +239383,16 @@ self: { "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free - , MonadRandom, random, simple-affine-space, time, transformers - , vector-sized + , MonadRandom, random, simple-affine-space, time, time-domain + , transformers, vector-sized }: mkDerivation { pname = "rhine"; - version = "0.7.1"; - sha256 = "1pgmbb1l3qf4gm7hb5vic5r85qrq2spzb0r1jniw12sq0jb113dp"; + version = "0.8.0.0"; + sha256 = "0axhfv3vwd12k5c21fd34hw4dvn0bydyzr50b62z8wl0009vq01x"; libraryHaskellDepends = [ base containers deepseq dunai free MonadRandom random - simple-affine-space time transformers vector-sized + simple-affine-space time time-domain transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; @@ -239304,8 +239403,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine, transformers }: mkDerivation { pname = "rhine-gloss"; - version = "0.7.1"; - sha256 = "0xy135nqjrzqxyvcma7mqp05plfw8xhl9qn827wswrqy8wcg85pm"; + version = "0.8.0.0"; + sha256 = "00mc1kbxvh4ilxkgpmxzfac50hziq6x6j7f1h7rfdlxhjhfyzh6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine transformers ]; @@ -245723,8 +245822,8 @@ self: { }: mkDerivation { pname = "script-monad"; - version = "0.0.3"; - sha256 = "18gwf2d8hzpgmkyjzr7p6f33qjcgr9lbj267s4bjf8476kk40ifg"; + version = "0.0.4"; + sha256 = "1wyw3kqr0fnps8nj59wc1g5jj72fx7zjfvizka61smxlfqvvil87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245734,8 +245833,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck - tasty-quickcheck-laws transformers + base bytestring http-client http-types QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-quickcheck-laws text transformers ]; description = "Stack of error, reader, writer, state, and prompt monad transformers"; license = lib.licenses.bsd3; @@ -247430,15 +247529,16 @@ self: { }) {}; "sendgrid-v3" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, lens - , semigroups, tasty, tasty-hunit, text, wreq + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , lens, semigroups, tasty, tasty-hunit, text, wreq }: mkDerivation { pname = "sendgrid-v3"; - version = "0.3.0.0"; - sha256 = "0b1m2r0zq3f3ggy9nds42rf0w25p08mkcs9crvckmvqjhmwik1cm"; + version = "1.0.0.0"; + sha256 = "0rl1zz01ca61bmm795b769k7h399s0yhkivp2br85flhrqw3asmm"; libraryHaskellDepends = [ - aeson base bytestring http-client lens semigroups text wreq + aeson base bytestring containers http-client lens semigroups text + wreq ]; testHaskellDepends = [ base lens semigroups tasty tasty-hunit text wreq @@ -272744,16 +272844,16 @@ self: { "takedouble" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath - , hedgehog, temporary, unix + , filepattern, hedgehog, temporary, unix }: mkDerivation { pname = "takedouble"; - version = "0.0.1.1"; - sha256 = "0b0m96grcjjk1hw9i13d9nfs8k7i68zl4jv5raqw8lxqvav5yd3j"; + version = "0.0.2.0"; + sha256 = "09n187ng4gk0ck40jx8xzpbyw6dj800qc479hzib9bq248pbw4lg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory extra filepath unix + base bytestring directory extra filepath filepattern unix ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -289311,6 +289411,24 @@ self: { license = lib.licenses.asl20; }) {}; + "unicode-data-names" = callPackage + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench, unicode-data + }: + mkDerivation { + pname = "unicode-data-names"; + version = "0.1.0"; + sha256 = "08f071i6p13q6n9aqlibdn0zsl4b6079lml341bfydd5qj9kjmgv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec unicode-data ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; + description = "Unicode characters names and aliases"; + license = lib.licenses.asl20; + }) {}; + "unicode-general-category" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , file-embed, hspec, QuickCheck, text @@ -297793,20 +297911,21 @@ self: { }) {}; "wai-rate-limit-postgres" = callPackage - ({ mkDerivation, base, http-client, http-types, postgresql-simple - , postgresql-simple-url, relude, resource-pool, tasty, tasty-hunit - , text, wai, wai-rate-limit, warp + ({ mkDerivation, base, bytestring, http-client, http-types + , postgresql-simple, postgresql-simple-url, resource-pool, tasty + , tasty-hunit, text, time-units, wai, wai-rate-limit, warp }: mkDerivation { pname = "wai-rate-limit-postgres"; - version = "0.5.0.0"; - sha256 = "1qf6s5qx16vjhcxyl24xdh3q10f1rg0aq7hnwm4zmy9b2jfsj77n"; + version = "0.6.0.0"; + sha256 = "1pfdy2gsk5kbxlkjy9f31y45s6jd06ji8mr5qhqh6sxf4gynkmn7"; libraryHaskellDepends = [ - base postgresql-simple relude resource-pool text wai-rate-limit + base bytestring postgresql-simple resource-pool text wai-rate-limit ]; testHaskellDepends = [ - base http-client http-types postgresql-simple postgresql-simple-url - relude resource-pool tasty tasty-hunit text wai wai-rate-limit warp + base bytestring http-client http-types postgresql-simple + postgresql-simple-url resource-pool tasty tasty-hunit text + time-units wai wai-rate-limit warp ]; description = "See README for more info"; license = lib.licenses.asl20; From 956dd00dc73e2e3fe12d0f803a7c1151004adfd0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 20 Jun 2022 11:00:04 -0400 Subject: [PATCH 07/20] cachix: pin to nix_2_9 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ba5d70682a8c..2727a67916d5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -845,7 +845,7 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; }; hercules-ci-cnix-expr = From c15e73a012d48fb4f1eee463b161a333add587b7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 20 Jun 2022 11:00:31 -0400 Subject: [PATCH 08/20] hercules-ci-{agent,cnix-expr,cnix-store}: pin to nix_2_9 --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2727a67916d5..14c6dd666719 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -847,12 +847,12 @@ self: super: builtins.intersectAttrs super { cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; } + super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; } ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; }; + hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. From 98365428b067485a32f23fcf70552c9882203f18 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 3 Jul 2022 01:29:56 +0900 Subject: [PATCH 09/20] all-cabal-hashes: 2022-07-02T15:59:48Z -> 2022-07-02T15:59:48Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 848ba37737a0..d78722b89491 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3ec21f9b18788dae329e5f782e03803123295029", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ec21f9b18788dae329e5f782e03803123295029.tar.gz", - "sha256": "10shljvigc4zmy40hba4frcpx6c4h6387w35b67gr7rr00qwc0d2", - "msg": "Update from Hackage at 2022-06-28T01:15:54Z" + "commit": "e304e8df4de976f80d5d58e47cf560be91055799", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e304e8df4de976f80d5d58e47cf560be91055799.tar.gz", + "sha256": "10xws4lazlx8bx26xc8h6c7ab7gkzc01an7nwip3bghc1h92zr4m", + "msg": "Update from Hackage at 2022-07-02T15:59:48Z" } From 3865a901725e316fe0a98d1df025527ef7348f8f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 3 Jul 2022 01:31:41 +0900 Subject: [PATCH 10/20] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 531 ++++++++++++++---- 1 file changed, 414 insertions(+), 117 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88da58fcccc9..d9dd16f24921 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24480,6 +24480,8 @@ self: { pname = "acquire"; version = "0.3.1"; sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw"; + revision = "1"; + editedCabalFile = "0p78cr2qg5ciy0d98mf98ay0cbkl072j79is73j7vcmq1mwcli3c"; libraryHaskellDepends = [ base transformers ]; description = "Abstraction over management of resources"; license = lib.licenses.mit; @@ -31318,6 +31320,17 @@ self: { broken = true; }) {}; + "ann" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ann"; + version = "1.0.0"; + sha256 = "11313ml12h7k4l71bpv170ryjy5g6bwrpmpw7b2yf1j5lkwjwrxf"; + libraryHaskellDepends = [ base ]; + description = "Informative annotations which don't change equality"; + license = lib.licenses.bsd3; + }) {}; + "annah" = callPackage ({ mkDerivation, alex, array, base, Earley, lens-family-core, morte , optparse-applicative, pipes, system-fileio, system-filepath, text @@ -37312,8 +37325,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.1.0.1"; - sha256 = "1js3w0r7nrvl70vkkwblx8zqax22idblpdzs1ljr4x0jiwwji8bs"; + version = "0.2.0.0"; + sha256 = "0wqc0gxyakz5vqa99kj684mnxfdgr3qz2prwabynr1lqs08krw1i"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -53041,6 +53054,29 @@ self: { broken = true; }) {}; + "call-alloy_0_3_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , file-embed, filepath, hashable, hspec, mtl, process, split + , trifecta, unix + }: + mkDerivation { + pname = "call-alloy"; + version = "0.3.0.2"; + sha256 = "1bigpy4338zkvcxccnri3xfav7wdz3zblkzzwm0nrnyz7an4mgy6"; + libraryHaskellDepends = [ + base bytestring containers directory extra file-embed filepath + hashable mtl process split trifecta unix + ]; + testHaskellDepends = [ + base bytestring containers directory extra file-embed filepath + hashable hspec mtl process split trifecta unix + ]; + description = "A simple library to call Alloy given a specification"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "call-haskell-from-anything" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, mtl , storable-endian, template-haskell @@ -89660,6 +89696,18 @@ self: { license = lib.licenses.mit; }) {}; + "env-guard" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "env-guard"; + version = "0.2"; + sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Conditionally running IO actions based on environment variables"; + license = lib.licenses.mit; + }) {}; + "env-locale" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -103530,8 +103578,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.0.0"; - sha256 = "0ahpn2f35jmm4n1dqw58ca4v9ny4hs1fhxih9fdmp5cya9fli0nf"; + version = "1.2.1.0"; + sha256 = "0i5jc7lddc8s938qh4jq61i33l13yfknppxi6q9n7yqig0rl3lbv"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -103683,6 +103731,21 @@ self: { license = lib.licenses.mit; }) {}; + "fuzzy-time_0_2_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, megaparsec, text, time + , validity, validity-time + }: + mkDerivation { + pname = "fuzzy-time"; + version = "0.2.0.1"; + sha256 = "1wlcq37q71q3565dc73jcr42p970lml0gmpjqwn3k5xf8d63ridj"; + libraryHaskellDepends = [ + base containers deepseq megaparsec text time validity validity-time + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "fuzzy-time-gen" = callPackage ({ mkDerivation, base, containers, criterion, fuzzy-time , genvalidity, genvalidity-criterion, genvalidity-hspec @@ -104197,8 +104260,8 @@ self: { }: mkDerivation { pname = "gargoyle"; - version = "0.1.1.0"; - sha256 = "1rjkz0v8jmzxxh41fs777fyhdp7lizwngg33886awmg08hdk24rq"; + version = "0.1.1.1"; + sha256 = "1c1pcv7vs7h9v7v1drjxilz7dw3b0fzpg9yl72h5ahjdfdc6xcqp"; libraryHaskellDepends = [ base directory filelock filepath network process unix ]; @@ -104214,8 +104277,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql"; - version = "0.2.0.1"; - sha256 = "1k12cfrz58hmdrjnrxyb3dixj8yfz41xpq0dqgvxzwlrd3d4nb9g"; + version = "0.2.0.2"; + sha256 = "1l1p51wp8s52bpy6ac1zw1d1x0sk97bi9g77p43610386cq3dlpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104237,10 +104300,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.0"; - sha256 = "00gfs33hcmjla7h32hiazjpsdcszvig7fajhsx48yr8jq9srkm3d"; - revision = "2"; - editedCabalFile = "052glxfxsd9wvdyqxdj49vp1b1vvqr77zrdv85r3iqm7mvf16gmk"; + version = "0.1.0.1"; + sha256 = "0ipx0zh8j1k6w71h6zkhdf1xkjhid90q4yiy5mwypyywwwwbwjdv"; libraryHaskellDepends = [ base bytestring directory gargoyle gargoyle-postgresql gargoyle-postgresql-nix postgresql-simple resource-pool @@ -104256,8 +104317,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-nix"; - version = "0.3.0.0"; - sha256 = "1cjh9hqk4ba1bz29b4vj0h249vpfpdgn8zsznqcr7b58czd8cf4y"; + version = "0.3.0.1"; + sha256 = "0fspvwgvs2mcg7hlivmjsw92phmxpjzjls23psvnl600nk7pnij8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129529,6 +129590,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_5_0_5" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.5.0.5"; + sha256 = "029bsr8966q6r1ig7x2ykj5jmrg64990c00zqpjq48acc39ap0qw"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -149820,8 +149908,8 @@ self: { ({ mkDerivation, base, bytestring, http-client }: mkDerivation { pname = "http-client-brread-timeout"; - version = "0.1.0.2"; - sha256 = "0vyilqqdxav4aa6yv7mvvz6rzrjfb1y1rfz00mr3ar2rwbvgk3jw"; + version = "0.1.1.0"; + sha256 = "0prghn5hif47r9viy9g7slpw03zs91z9k9z135ar5b6xa5xdz058"; libraryHaskellDepends = [ base bytestring http-client ]; description = "Http client with time-limited brRead"; license = lib.licenses.mit; @@ -158734,15 +158822,19 @@ self: { }) {}; "interprocess" = callPackage - ({ mkDerivation, base, typed-process }: + ({ mkDerivation, async, base, bytestring, containers, stm + , temporary, typed-process + }: mkDerivation { pname = "interprocess"; - version = "0.2.0.1"; - sha256 = "1s8q8nvd7x55vzvgbj0clfcjl1wh5xy04hxrqj1qz6gg0irm2iq8"; + version = "0.2.1.0"; + sha256 = "1g57ing0kkwqlq06dw0y6fmdwfx7922q27nb32fgrd92cc1b46bx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base typed-process ]; + testHaskellDepends = [ + async base bytestring containers stm temporary typed-process + ]; description = "Shared memory and control structures for IPC"; license = lib.licenses.bsd3; }) {}; @@ -160519,8 +160611,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.2"; - sha256 = "07xyvpca365avqlkzpns1f73slr17dxy6mdarnh0y0wzyr0ihai4"; + version = "0.1.0.5"; + sha256 = "03sarmva392szf5c04nqq795jsbkbklad409y8ym49kvb28mh1sg"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -162620,8 +162712,8 @@ self: { }: mkDerivation { pname = "joy-rewrite"; - version = "0.1.0.0"; - sha256 = "1bfzi4axs0bz0c0aqshixmy73s1whr28iql7i955crm2blwf3zjq"; + version = "0.2.0"; + sha256 = "00p1gnkydlcfkbcbv2dycpafni2v2dg5xp87yvcf304jiyw4xh4r"; libraryHaskellDepends = [ base containers hspec monad-loops parsec text ]; @@ -166673,6 +166765,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki_1_0_0" = callPackage + ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "ki"; + version = "1.0.0"; + sha256 = "1nag3rc3yiwc3x9q0mn70vrb6vjh7f2vxawaxq296za2q6n1gylh"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "A lightweight structured concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ki-unlifted" = callPackage + ({ mkDerivation, base, ki, unliftio-core }: + mkDerivation { + pname = "ki-unlifted"; + version = "1.0.0"; + sha256 = "0751sy948gng9a0bqp127xsdgl4gf5acnj6vrvsmr7lw9x67ap04"; + libraryHaskellDepends = [ base ki unliftio-core ]; + description = "A lightweight structured-concurrency library"; + license = lib.licenses.bsd3; + }) {}; + "kibro" = callPackage ({ mkDerivation }: mkDerivation { @@ -167577,6 +167693,22 @@ self: { broken = true; }) {}; + "kudzu" = callPackage + ({ mkDerivation, base, hedgehog, hpc, leancheck, QuickCheck }: + mkDerivation { + pname = "kudzu"; + version = "0.1.0.0"; + sha256 = "19324i7scjpi5xq8978hn18n2vyyiczqzv5109yn2wisprnklv8f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hedgehog hpc leancheck QuickCheck ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "coverage driven random testing framework"; + license = lib.licenses.bsd3; + mainProgram = "kudzu"; + }) {}; + "kuifje" = callPackage ({ mkDerivation, base, boxes, containers, lens }: mkDerivation { @@ -170747,31 +170879,29 @@ self: { "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-conversion, clock, containers, cryptohash - , exceptions, extra, generic-lens, hashtables, hedis, http-client - , http-client-tls, http-types, HUnit, iso8601-time, lens, lrucache - , monad-logger, mtl, pcre-light, random, retry, scientific, semver - , text, time, unordered-containers, uuid, vector + , bytestring, clock, containers, cryptohash, exceptions, extra + , generic-lens, hashtables, hedis, http-client, http-client-tls + , http-types, HUnit, iso8601-time, lens, lrucache, monad-logger + , mtl, pcre-light, random, retry, scientific, semver, text, time + , unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.2.0"; - sha256 = "0hi6w7rb1qf3dzla5cjmhz25a4ynkc29mpnixgdx5i8p771zyg3z"; + version = "3.0.1"; + sha256 = "08smhjp2vjnjz2dvgpswgsrv7vjwrawgm3vbylgysc816w56bxg7"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - bytestring-conversion clock containers cryptohash exceptions extra - generic-lens hashtables hedis http-client http-client-tls - http-types iso8601-time lens lrucache monad-logger mtl pcre-light - random retry scientific semver text time unordered-containers uuid - vector + aeson attoparsec base base16-bytestring bytestring clock containers + cryptohash exceptions extra generic-lens hashtables hedis + http-client http-client-tls http-types iso8601-time lens lrucache + monad-logger mtl pcre-light random retry scientific semver text + time unordered-containers uuid vector yaml ]; testHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - bytestring-conversion clock containers cryptohash exceptions extra - generic-lens hashtables hedis http-client http-client-tls - http-types HUnit iso8601-time lens lrucache monad-logger mtl - pcre-light random retry scientific semver text time - unordered-containers uuid vector + aeson attoparsec base base16-bytestring bytestring clock containers + cryptohash exceptions extra generic-lens hashtables hedis + http-client http-client-tls http-types HUnit iso8601-time lens + lrucache monad-logger mtl pcre-light random retry scientific semver + text time unordered-containers uuid vector yaml ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; @@ -173715,6 +173845,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "libsecp256k1" = callPackage + ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, monad-par, mtl + , QuickCheck, secp256k1, secp256k1-haskell, string-conversions + , unliftio-core + }: + mkDerivation { + pname = "libsecp256k1"; + version = "0.0.1"; + sha256 = "1bjrnh3y37iij5y8g3fpl0nl2102n1h6q09xsgkdrxgcbsdbkl0j"; + libraryHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable QuickCheck + string-conversions unliftio-core + ]; + libraryPkgconfigDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable hspec HUnit + monad-par mtl QuickCheck secp256k1-haskell string-conversions + unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1"; + license = lib.licenses.mit; + }) {inherit (pkgs) secp256k1;}; + "libsodium" = callPackage ({ mkDerivation, base, c2hs, hedgehog, libsodium, tasty , tasty-hedgehog, tasty-hunit @@ -187280,6 +187435,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mintty_0_1_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1.4"; + sha256 = "0zla9cg6fcjgpjjsgq7mi0xl753j5zmvhy5kwsagb5pp2gc48l3b"; + libraryHaskellDepends = [ base ]; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec , primitive, vector @@ -187328,25 +187495,27 @@ self: { "misfortune" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath - , knob, monad-loops, random-fu, regex-base, regex-pcre, semigroups + , knob, monad-loops, random, random-fu, regex-base, regex-pcre , text, utf8-string, vector }: mkDerivation { pname = "misfortune"; - version = "0.1.1.2"; - sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf"; - revision = "1"; - editedCabalFile = "1i3ivm06g690ksxnkmkg56rxzns7acwilnl6iy610n9b1k7plnqc"; + version = "0.1.2"; + sha256 = "0jnws1sc5dxbg03iy2l3glimm3qk2z0pcvyk4518y7a4n0wnxf89"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cereal directory filepath knob random-fu semigroups + base bytestring cereal directory filepath knob random random-fu text utf8-string vector ]; - executableHaskellDepends = [ monad-loops regex-base regex-pcre ]; + executableHaskellDepends = [ + base bytestring cereal directory filepath knob monad-loops random + random-fu regex-base regex-pcre text utf8-string vector + ]; description = "fortune-mod clone"; - license = lib.licenses.publicDomain; + license = lib.licenses.mit; + mainProgram = "misfortune"; }) {}; "mismi-core" = callPackage @@ -199431,20 +199600,21 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, array, base, base64, binary, bytestring , case-insensitive, containers, ede, enclosed-exceptions - , http-client, http-types, network, ngx-export, ngx-export-tools - , pcre-heavy, pcre-light, prettyprinter, safe, snap-core - , snap-server, template-haskell, text, time, trifecta - , unordered-containers + , http-client, http-client-brread-timeout, http-types, network + , ngx-export, ngx-export-tools, pcre-heavy, pcre-light + , prettyprinter, safe, snap-core, snap-server, template-haskell + , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.0"; - sha256 = "1p77wanci0bs5bvhxd8fjfqpm5aasvwxgxhpazkcvhb0s8lr67am"; + version = "1.1.0"; + sha256 = "191v30zxqwpyb546sbgbn7nwbxmv7l476msavgrqnahphcgg5zqy"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive - containers ede enclosed-exceptions http-client http-types network - ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter - safe snap-core snap-server template-haskell text time trifecta + containers ede enclosed-exceptions http-client + http-client-brread-timeout http-types network 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"; @@ -210393,6 +210563,8 @@ self: { pname = "parsley"; version = "2.0.0.0"; sha256 = "0h6msk2a11bq4bzl5gs3aq0sqd1z13smp2n8bxsr49vm51hmd1qh"; + revision = "1"; + editedCabalFile = "112643pvn60a0146d6804pafv5n1na2fn6awdivpdkxxngvy7xji"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; @@ -210419,8 +210591,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "2.1.0.0"; - sha256 = "0vr4qlgkwsh92a8fv4fj48l9625xd80mkkmihwf20zln6svcsbfs"; + version = "2.1.0.1"; + sha256 = "0nagpms1d8cxng4pswrcncn8dacyhc91v3gbg93xn9mw2h2gapfx"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -218960,10 +219132,8 @@ self: { ({ mkDerivation, base, requirements }: mkDerivation { pname = "poly-rec"; - version = "0.7.0.0"; - sha256 = "0ayaz87l2rgpm4ddc7bidss042xhfcwa3sk7685ypssqvp02k5r0"; - revision = "2"; - editedCabalFile = "12cgm587k27mmjkix58qs4ihdcx1axlkp17bq7f3fhw80j64imk7"; + version = "0.7.0.2"; + sha256 = "1kysfam03sbwx9kqbnnncrp0sp764zj57sfj6raar8im9wpwpyh9"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; @@ -224983,8 +225153,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.6.0"; - sha256 = "0jkrx34hymx70aqxjcnw2a7pdiw1hy4nc6m2larjrgxjczshpfqx"; + version = "0.4.6.1"; + sha256 = "1a8li2wkr2af1d5ddpprxzjs7m2j7ii30k7j93a22isfqmywhhbb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -227515,8 +227685,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.3"; - sha256 = "1avs6nwfkvpj73px4v2r9hjcsl5byrpzq3knirddxv7b4axkfk90"; + version = "0.15.4"; + sha256 = "13w604knmazp8bhbdcb7smfpyy4nwsbng10km0gmp367lxwr09yz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232027,21 +232197,18 @@ self: { }) {}; "raven-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl + ({ mkDerivation, aeson, base, bytestring, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers , uuid-types }: mkDerivation { pname = "raven-haskell"; - version = "0.1.4.0"; - sha256 = "136vszzvfmhpxzavl7smnbyn45w026j005cdknapxhb6v495b7qz"; + version = "0.1.4.1"; + sha256 = "0977rwafdwljz3444asvjsikpwc89diahmmzl9f5xc8dzfqcnzay"; libraryHaskellDepends = [ aeson base bytestring http-conduit mtl network random resourcet text time unordered-containers uuid-types ]; - testHaskellDepends = [ - aeson base bytestring hspec time unordered-containers - ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -234260,6 +234427,24 @@ self: { license = lib.licenses.mit; }) {}; + "refined_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , hashable, mtl, QuickCheck, template-haskell, text, these-skinny + }: + mkDerivation { + pname = "refined"; + version = "0.7"; + sha256 = "0l0hn905vjymabp9m3mvs9lg73kwp7c7133zkbyc911mb9h0lq54"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions hashable mtl QuickCheck + template-haskell text these-skinny + ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Refinement types with static and runtime checking"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "refined-http-api-data" = callPackage ({ mkDerivation, base, http-api-data, refined, text }: mkDerivation { @@ -234348,36 +234533,37 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, bifunctors, comonad, constraints - , constraints-extras, containers, criterion, data-default, deepseq - , dependent-map, dependent-sum, directory, exception-transformers - , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint - , hspec, lens, loch-th, MemoTrie, mmorph, monad-control - , monoidal-containers, mtl, patch, prim-uniq, primitive, process - , proctest, profunctors, random, ref-tf, reflection, semialign - , semigroupoids, split, stm, syb, template-haskell, text, these - , these-lens, time, transformers, unbounded-delays, witherable + ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad + , constraints, constraints-extras, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, hspec, lens, loch-th, MemoTrie, mmorph + , monad-control, monoidal-containers, mtl, patch, prim-uniq + , primitive, process, proctest, profunctors, random, ref-tf + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, text, these, these-lens, time, transformers + , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.8.2.0"; - sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d"; - revision = "2"; - editedCabalFile = "1msjk8bk59dv1pm90l2hxkrl185aj4xblzgc7nkwn7x31ykcnhyw"; + version = "0.8.2.1"; + sha256 = "1w8smiwn86cxb3fsfgyzxpk11hryhxi6g94m52grmnx6vhc7sm6v"; libraryHaskellDepends = [ - base bifunctors comonad constraints constraints-extras containers - data-default dependent-map dependent-sum exception-transformers - haskell-src-exts haskell-src-meta lens MemoTrie mmorph - monad-control monoidal-containers mtl patch prim-uniq primitive - profunctors random ref-tf reflection semialign semigroupoids stm - syb template-haskell these time transformers unbounded-delays + base bifunctors commutative-semigroups comonad constraints + constraints-extras containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays witherable ]; testHaskellDepends = [ - base bifunctors constraints constraints-extras containers deepseq - dependent-map dependent-sum directory filemanip filepath hlint - hspec lens monoidal-containers mtl patch proctest ref-tf semialign - split text these these-lens transformers witherable + base bifunctors commutative-semigroups constraints + constraints-extras containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint hspec lens monoidal-containers + mtl patch proctest ref-tf semialign split text these these-lens + transformers witherable ]; benchmarkHaskellDepends = [ base containers criterion deepseq dependent-map dependent-sum @@ -236151,8 +236337,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.8"; - sha256 = "1mz8ahbivaj8a9hsi5m8shwmdz5hqq2fw1m0z7m2kpinnj1p3pbf"; + version = "0.3.0.9"; + sha256 = "1w4qs28q5gb5v896hb7rpkbjix7jwgni5ky0wddas04l7ap3an0d"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -237949,8 +238135,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "requirements"; - version = "0.7.0.1"; - sha256 = "0nikl4ga2jap95yf29z87wnazfhz7k272phjwajn1yk22shv308z"; + version = "0.7.0.2"; + sha256 = "0291av4vixsns5w55yff4vjd8mr2wr8fpm26ckx903sll0y982ix"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; @@ -238338,6 +238524,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "resourcet_1_2_6" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.6"; + sha256 = "0d7xnpysrick56gxzkkj0mpblywbxaaldhziyl77am3822r3afzq"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resourcet-pool" = callPackage ({ mkDerivation, base, resource-pool, resourcet }: mkDerivation { @@ -238710,6 +238913,24 @@ self: { broken = true; }) {}; + "ret" = callPackage + ({ mkDerivation, base, case-insensitive, containers, directory + , filepath, unix + }: + mkDerivation { + pname = "ret"; + version = "0.1.4.2"; + sha256 = "1p0d854hw5qs94fiqsbgbs4picyjj2g51x0j4nasw4acbfwhmzgz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base case-insensitive containers directory filepath unix + ]; + description = "A tool that returns to a landmark parent directory"; + license = lib.licenses.mit; + mainProgram = "ret"; + }) {}; + "rethinkdb" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, binary , bytestring, containers, criterion, data-default, doctest, mtl @@ -242546,6 +242767,22 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, text, validity + , validity-bytestring, validity-text + }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.2.0.1"; + sha256 = "0n8pkdy7v1c3c14fpbwkrib5vmmviqv9ysl7bcm6g3p23qi4lq5i"; + libraryHaskellDepends = [ + base bytestring text validity validity-bytestring validity-text + ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-gen" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-bytestring , genvalidity-sydtest, genvalidity-text, safe-coloured-text @@ -242553,8 +242790,8 @@ self: { }: mkDerivation { pname = "safe-coloured-text-gen"; - version = "0.0.0.0"; - sha256 = "1z5livjv0n1i05i3fi58hi7vqwvycapnr5rp1m8rpgj8lhsbi9qx"; + version = "0.0.0.1"; + sha256 = "1h2n6qvggrzrqfbi9633kjzmlpgqf4anbqzip6l3ygj5p1lk69zb"; libraryHaskellDepends = [ base genvalidity genvalidity-bytestring genvalidity-text safe-coloured-text @@ -242614,6 +242851,18 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text-terminfo_0_1_0_0" = callPackage + ({ mkDerivation, base, safe-coloured-text, terminfo }: + mkDerivation { + pname = "safe-coloured-text-terminfo"; + version = "0.1.0.0"; + sha256 = "1qfs1y35sxabnlihfzbs5nhmhz5xb7fwiib4j2nhwwq70glyldcn"; + libraryHaskellDepends = [ base safe-coloured-text terminfo ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coupling" = callPackage ({ mkDerivation, HUnit, liquid-base, liquid-containers , liquid-prelude, liquidhaskell, probability, rest-rewrite, sort @@ -244143,7 +244392,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_4_0" = callPackage + "sbp_4_5_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -244152,8 +244401,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.4.0"; - sha256 = "1alwz2ch0yb5x2djk2pfba1iiywgkq7qzsk31l4mc8ixy4bcx6sf"; + version = "4.5.0"; + sha256 = "1yw6ak55j5zwc7wa3fspwdcmgxn6hy0lha42r6slr82gam9pcih3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262910,6 +263159,8 @@ self: { pname = "stache"; version = "2.3.2"; sha256 = "1ya9hnxvwqh1qhlci7aqpbj9abmsi2n13251b8nffmpvlpls6lk8"; + revision = "1"; + editedCabalFile = "1dirydqnbnvyasdpsncf1c9vlcfb9h8c8ff3fancsbrdwfbdjlbj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -262933,6 +263184,40 @@ self: { mainProgram = "stache"; }) {}; + "stache_2_3_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, gitrev, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl + , optparse-applicative, template-haskell, text, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.3.3"; + sha256 = "1naqj54qm59f04x310lvj4fsrp3xar1v643i79gp7h48kyn1c2vy"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text vector + ]; + executableHaskellDepends = [ + aeson base filepath gitrev optparse-applicative text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "stache"; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -270023,8 +270308,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.10.1.0"; - sha256 = "149nn1shdwixg3is7fgjav0ff4vaqkm39ha0gswds7z57pr18qhm"; + version = "0.11.0.0"; + sha256 = "0alrpz8py6afanr1g1in9yd9jvjps9iww9gjb6kg0mdvnrwimj7b"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path @@ -274145,8 +274430,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "1.2.0.0"; - sha256 = "0hw0aanmhxq59r577d1ypd10m08kprhqpdb5w6x4na9pll5sc0gb"; + version = "1.3.0.1"; + sha256 = "065m1x9zjyfjw167crr67ja0hsqpckl0zai6dbpr93jnvifg17ar"; libraryHaskellDepends = [ base directory filemanip filepath kvitable logict microlens mtl optparse-applicative prettyprinter tasty text @@ -285669,6 +285954,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "tuple-append" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, template-haskell }: + mkDerivation { + pname = "tuple-append"; + version = "0.1.0.0"; + sha256 = "1lmpwf5fdgs6xzfbgp5mr9090m7323gmrn8fbclmr1kr2xfribnw"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ base ghc-prim hspec ]; + description = "A package to append items and tuples into new tuples"; + license = lib.licenses.bsd3; + }) {}; + "tuple-gen" = callPackage ({ mkDerivation, base, combinat }: mkDerivation { @@ -299828,8 +300125,8 @@ self: { }: mkDerivation { pname = "webdriver-w3c"; - version = "0.0.2"; - sha256 = "04ca4j880dpivlascckp386r0jj8cwsw9mfq4jala0b59pkz8z6y"; + version = "0.0.3"; + sha256 = "0q653ais8ayvpgmh7hg25wjlq0h7023khv6xqwz7fb7pp3vadg0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -299840,7 +300137,7 @@ self: { unordered-containers uri-encode vector wreq ]; executableHaskellDepends = [ - base tasty tasty-expected-failure transformers + base tasty tasty-expected-failure text transformers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring containers directory @@ -300883,8 +301180,8 @@ self: { ({ mkDerivation, base, shelly, template-haskell, text }: mkDerivation { pname = "which"; - version = "0.2"; - sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa"; + version = "0.2.0.1"; + sha256 = "0wa11a7x003fx3fx0l7bn8f339pbz9fhv1dnr6jv7xx2066mdnya"; libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = lib.licenses.bsd3; From c996ce44157e11713b4b6fd588f09becc2252ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 2 Jul 2022 18:42:26 +0200 Subject: [PATCH 11/20] haskellPackages.misfortune: remove patch Applied in 0.1.2: https://github.com/ncfavier/misfortune/commit/59fe811f30b3544b71d19276076021bba82d2498 --- .../haskell-modules/configuration-common.nix | 6 -- .../patches/misfortune-ghc9.patch | 70 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/misfortune-ghc9.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f3396bd24a19..3a8592e02923 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2348,12 +2348,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # compatibility with random-fu 0.3 https://github.com/mokus0/misfortune/pull/5 - misfortune = appendPatch ./patches/misfortune-ghc9.patch (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.misfortune); - # GHC 9 support https://github.com/lambdabot/dice/pull/2 dice = appendPatch (fetchpatch { name = "dice-ghc9.patch"; diff --git a/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch b/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch deleted file mode 100644 index 39f983b15d78..000000000000 --- a/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/misfortune.cabal b/misfortune.cabal -index f5d0dd3..faa5794 100644 ---- a/misfortune.cabal -+++ b/misfortune.cabal -@@ -113,7 +113,8 @@ Library - directory, - filepath, - knob, -- random-fu >= 0.2.2, -+ random, -+ random-fu >= 0.3, - semigroups, - text, - utf8-string, -diff --git a/src/Data/Fortune.hs b/src/Data/Fortune.hs -index 16d221e..ffbc970 100644 ---- a/src/Data/Fortune.hs -+++ b/src/Data/Fortune.hs -@@ -64,6 +64,7 @@ import Paths_misfortune - import System.Directory - import System.Environment - import System.FilePath -+import System.Random.Stateful (newIOGenM, newStdGen) - - -- |The number of fortune strings in the index - numFortunes :: S.FortuneStats -> Int -@@ -233,9 +234,10 @@ randomFortune paths = withFortuneFiles '%' False paths $ \fs -> do - -- random fortune from that file (unformly). - randomFortuneFromRandomFile :: RVar FortuneFile -> IO String - randomFortuneFromRandomFile file = do -- f <- sample file -+ gen <- newStdGen >>= newIOGenM -+ f <- sampleFrom gen file - n <- getNumFortunes f -- i <- sample (uniform 0 (n-1)) -+ i <- sampleFrom gen (uniform 0 (n-1)) - T.unpack <$> getFortune f i - - -- |Given a list of 'FortuneFile's, compute a distrubution over them weighted by the number -diff --git a/src/Fortune.hs b/src/Fortune.hs -index 5a27578..d6ffb74 100644 ---- a/src/Fortune.hs -+++ b/src/Fortune.hs -@@ -21,6 +21,7 @@ import System.Environment - import System.Exit - import System.FilePath - import System.IO -+import System.Random.Stateful (newIOGenM, newStdGen) - import Text.Printf - import Text.Regex.Base - import Text.Regex.PCRE -@@ -200,6 +201,7 @@ main = do - fortunes <- filterM (filterFile args) (fortuneFiles args) - - dist <- getDist args fortunes -+ gen <- newStdGen >>= newIOGenM - - when (numEvents dist == 0) $ do - hPutStrLn stderr "No fortunes matched the filter criteria" -@@ -225,8 +227,8 @@ main = do - , let pctStr = printf "(%.2f%%)" (100 * weight / totalWeight dist) :: String - ] - else do -- (file, fortuneDist) <- sample dist -- fortune <- sample fortuneDist -+ (file, fortuneDist) <- sampleFrom gen dist -+ fortune <- sampleFrom gen fortuneDist - putStrLn . T.unpack =<< getFortune file fortune - - getDist :: Args -> [FortuneFile] -> IO (Categorical Float (FortuneFile, Categorical Float Int)) From 3f4d5f2cf8794f09892b73b786447ee8bb0b6173 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 2 Jul 2022 17:35:08 +0100 Subject: [PATCH 12/20] haskellPackages.rio: skip a broken test on aarch64-darwin --- .../haskell-modules/configuration-darwin.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index d40643114e47..fd632ee81f82 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -281,7 +281,16 @@ self: super: ({ # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; - + # This is the same issue as above; the rio tests call functions in unliftio + # that have issues as tracked in the GitHub issue above. Once the unliftio + # tests are fixed, we can remove this as well. + # + # We skip just the problematic tests by replacing 'it' with 'xit'. + rio = overrideCabal (drv: { + preConfigure = '' + sed -i 's/\bit /xit /g' test/RIO/FileSpec.hs + ''; + }) super.rio; # https://github.com/haskell-crypto/cryptonite/issues/360 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite; From c29d8a06e1338fbec4fdb665bbf62e7ab36999ed Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Tue, 5 Jul 2022 11:58:21 +0200 Subject: [PATCH 13/20] haskellPackages.powerdns: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 1 + .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a8592e02923..27f354122b61 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -379,6 +379,7 @@ self: super: { posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12 postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; + powerdns = dontCheck super.powerdns; # Tests require networking and external services process-streaming = dontCheck super.process-streaming; punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6c882587c579..ba853f6a9d35 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4014,7 +4014,6 @@ broken-packages: - postmaster - potato-tool - potoki-core - - powerdns - powermate - powerpc - powerqueue-levelmem From e233468d9fa78b1f34e4da3447c5bb7d5d67e2ab Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 6 Jul 2022 21:41:24 +0200 Subject: [PATCH 14/20] haskellPackages.purescript: adjust for 0.15.4 0.15.4 supports GHC 9.0 and aeson 2.0, as well as the latest bower-json version, but the purescript-{a,c}st packages don't sadly. --- .../haskell-modules/configuration-common.nix | 28 +++++++++++-------- pkgs/top-level/release-haskell.nix | 3 -- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 27f354122b61..7d6e8c3d4231 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2556,9 +2556,6 @@ self: super: { # dependencies to avoid version mismatches in their dependency closure. # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? purescriptOverlay = self: super: { - # Purescript targets Stackage LTS 18, so we need to downgrade a few things - aeson = self.aeson_1_5_6_0; - bower-json = self.bower-json_1_0_0_1; # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, # but it has a problem with parsing the `async` keyword. It doesn't allow # `async` to be used as an object key: @@ -2566,11 +2563,20 @@ self: super: { language-javascript = self.language-javascript_0_7_0_0; }; - # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) - purescriptBrokenFlag = drv: + # Don't support GHC >= 9.0 yet and need aeson 1.5.* + purescriptStOverride = drv: + let + overlayed = drv.overrideScope ( + lib.composeExtensions + purescriptOverlay + (self: super: { + aeson = self.aeson_1_5_6_0; + }) + ); + in if lib.versionAtLeast self.ghc.version "9.0" - then dontDistribute (markBroken drv) - else drv; + then dontDistribute (markBroken overlayed) + else overlayed; in { purescript = lib.pipe @@ -2586,13 +2592,11 @@ in { doJailbreak # Generate shell completions (generateOptparseApplicativeCompletion "purs") - - purescriptBrokenFlag ]; - purescript-cst = purescriptBrokenFlag (super.purescript-cst.overrideScope purescriptOverlay); + purescript-cst = purescriptStOverride super.purescript-cst; - purescript-ast = purescriptBrokenFlag (super.purescript-ast.overrideScope purescriptOverlay); + purescript-ast = purescriptStOverride super.purescript-ast; - purenix = super.purenix.overrideScope purescriptOverlay; + purenix = purescriptStOverride super.purenix; }) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0777b448d5b4..0d4100c25c13 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -381,9 +381,6 @@ let compilerNames.ghc902 compilerNames.ghc923 ]; - purescript = [ - compilerNames.ghc8107 - ]; purescript-cst = [ compilerNames.ghc8107 ]; From a49a073fc0bcc1382382d15dfed0bbd36daa5cab Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 7 Jul 2022 00:49:22 +0200 Subject: [PATCH 15/20] haskellPackages.patch: back-pin patch to fix build --- .../configuration-hackage2nix/main.yaml | 4 ++ .../haskell-modules/hackage-packages.nix | 67 ++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61854cf5bcc..8d0765353421 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -87,6 +87,10 @@ default-package-overrides: - dhall-nix < 1.1.24 # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version - distribution-nixpkgs < 1.7.0 + # patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet + - patch < 0.0.7 + - reflex < 0.8.2.1 + - reflex-dom-core < 0.7.0.2 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d9dd16f24921..2c290807f336 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -211097,6 +211097,29 @@ self: { }) {}; "patch" = callPackage + ({ mkDerivation, base, constraints-extras, containers + , dependent-map, dependent-sum, directory, filemanip, filepath + , hedgehog, hlint, HUnit, indexed-traversable, lens + , monoidal-containers, semialign, semigroupoids, these + , transformers, witherable + }: + mkDerivation { + pname = "patch"; + version = "0.0.6.0"; + sha256 = "0wgxmk9vfrgnq5vg93jwzkszxmyrk91b36fnnlm8qr6mlg7j8m0z"; + libraryHaskellDepends = [ + base constraints-extras containers dependent-map dependent-sum + indexed-traversable lens monoidal-containers semialign + semigroupoids these transformers witherable + ]; + testHaskellDepends = [ + base containers directory filemanip filepath hedgehog hlint HUnit + ]; + description = "Data structures for describing changes to other data structures"; + license = lib.licenses.bsd3; + }) {}; + + "patch_0_0_7_0" = callPackage ({ mkDerivation, base, commutative-semigroups, constraints-extras , containers, dependent-map, dependent-sum, directory, filemanip , filepath, hedgehog, hlint, HUnit, indexed-traversable, lens @@ -211118,6 +211141,7 @@ self: { ]; description = "Data structures for describing changes to other data structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -222394,8 +222418,6 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "powermate" = callPackage @@ -234533,6 +234555,46 @@ self: { }) {}; "reflex" = callPackage + ({ mkDerivation, base, bifunctors, comonad, constraints + , constraints-extras, containers, criterion, data-default, deepseq + , dependent-map, dependent-sum, directory, exception-transformers + , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint + , hspec, lens, loch-th, MemoTrie, mmorph, monad-control + , monoidal-containers, mtl, patch, prim-uniq, primitive, process + , proctest, profunctors, random, ref-tf, reflection, semialign + , semigroupoids, split, stm, syb, template-haskell, text, these + , these-lens, time, transformers, unbounded-delays, witherable + }: + mkDerivation { + pname = "reflex"; + version = "0.8.2.0"; + sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d"; + revision = "2"; + editedCabalFile = "1msjk8bk59dv1pm90l2hxkrl185aj4xblzgc7nkwn7x31ykcnhyw"; + libraryHaskellDepends = [ + base bifunctors comonad constraints constraints-extras containers + data-default dependent-map dependent-sum exception-transformers + haskell-src-exts haskell-src-meta lens MemoTrie mmorph + monad-control monoidal-containers mtl patch prim-uniq primitive + profunctors random ref-tf reflection semialign semigroupoids stm + syb template-haskell these time transformers unbounded-delays + witherable + ]; + testHaskellDepends = [ + base bifunctors constraints constraints-extras containers deepseq + dependent-map dependent-sum directory filemanip filepath hlint + hspec lens monoidal-containers mtl patch proctest ref-tf semialign + split text these these-lens transformers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers + ]; + description = "Higher-order Functional Reactive Programming"; + license = lib.licenses.bsd3; + }) {}; + + "reflex_0_8_2_1" = callPackage ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad , constraints, constraints-extras, containers, criterion , data-default, deepseq, dependent-map, dependent-sum, directory @@ -234571,6 +234633,7 @@ self: { ]; description = "Higher-order Functional Reactive Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "reflex-animation" = callPackage From c16deed1a6aead1c531a21b0f95a7a29e5a46e4c Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 7 Jul 2022 12:08:49 +0900 Subject: [PATCH 16/20] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 9 ++++ .../transitive-broken.yaml | 27 +++++++++-- .../haskell-modules/hackage-packages.nix | 45 +++++++++++++++++-- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ba853f6a9d35..5de2e98465c4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -262,6 +262,7 @@ broken-packages: - authenticate-ldap - authinfo-hs - auto + - autodocodec-yaml - autom - autonix-deps - autopack @@ -1134,6 +1135,7 @@ broken-packages: - direct-plugins - direm - dirtree + - discord-haskell - discordian-calendar - discord-types - discrete @@ -1314,6 +1316,7 @@ broken-packages: - enum-text - enum-utf8 - envelope + - env-extra - env-parser - envstatus - epanet-haskell @@ -1417,6 +1420,7 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush + - fast-tags - FastxPipe - fathead-util - fb @@ -1600,6 +1604,7 @@ broken-packages: - fused-effects-resumable - fused-effects-squeal - fusion + - futhark - futhask - futun - future @@ -1659,6 +1664,7 @@ broken-packages: - gentlemark - geocode-google - GeocoderOpenCage + - geodetics - geodetic-types - GeoIp - geojson-types @@ -2843,6 +2849,7 @@ broken-packages: - khph - kickass-torrents-dump-parser - kickchan + - ki-unlifted - kleene-list - kmonad - kmp-dfa @@ -3174,6 +3181,7 @@ broken-packages: - matrix-market - matrix-sized - matroid + - matterhorn - maude - maxent-learner-hw - maybench @@ -4417,6 +4425,7 @@ broken-packages: - ruin - runhs - runmany + - rustls - rws - RxHaskell - rz-pipe diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fe20afdc4e71..a68cf2b513a3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1026,6 +1026,7 @@ dont-distribute-packages: - commsec-keyexchange - comonad-random - compact-mutable + - compactable - compdata-automata - compdata-dags - compdata-param @@ -1431,6 +1432,7 @@ dont-distribute-packages: - feed-translator - feed2lj - feed2twitter + - feedback - fei-base - fei-dataiter - fei-datasets @@ -1558,6 +1560,11 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-mergeful + - genvalidity-sydtest + - genvalidity-sydtest-aeson + - genvalidity-sydtest-hashable + - genvalidity-sydtest-lens + - genvalidity-sydtest-persistent - geodetic - geolite-csv - getemx @@ -1937,6 +1944,7 @@ dont-distribute-packages: - hascat-setup - hascat-system - hashable-accelerate + - hashes - hashflare - hask-home - haskades @@ -2248,6 +2256,7 @@ dont-distribute-packages: - hts - htsn-import - http-client-auth + - http-client-rustls - http-enumerator - http-pony - http2-client-exe @@ -3174,7 +3183,6 @@ dont-distribute-packages: - proto3-wire - protobuf-native - protocol-buffers-descriptor-fork - - psc-ide - psql - ptera - ptera-core @@ -3187,7 +3195,6 @@ dont-distribute-packages: - pure-cdb - pure-priority-queue-tests - purescript-iso - - purescript-tsd-gen - pursuit-client - push-notify - push-notify-apn @@ -3426,6 +3433,9 @@ dont-distribute-packages: - runtime-arbitrary - rv - s-expression + - safe-coloured-text-gen + - safe-coloured-text-layout + - safe-coloured-text-layout-gen - safe-coupling - safe-plugins - safer-file-handles @@ -3549,6 +3559,7 @@ dont-distribute-packages: - shady-graphics - shake-ats - shake-bindist + - shake-futhark - shake-minify-css - shake-plus-extended - shakebook @@ -3745,7 +3756,17 @@ dont-distribute-packages: - sweet-egison - switch - syb-with-class-instances-text + - sydtest + - sydtest-aeson - sydtest-amqp + - sydtest-hedgehog + - sydtest-hspec + - sydtest-persistent + - sydtest-persistent-sqlite + - sydtest-process + - sydtest-servant + - sydtest-typed-process + - sydtest-wai - sydtest-webdriver - sydtest-webdriver-screenshot - sydtest-webdriver-yesod @@ -3851,6 +3872,7 @@ dont-distribute-packages: - to-string-instances - toboggan - todos + - token-limiter-concurrent - toktok - tomlcheck - tonatona @@ -4202,7 +4224,6 @@ dont-distribute-packages: - yuuko - z85 - zasni-gerna - - zephyr - zephyr-copilot - zeromq3-conduit - zeromq3-haskell diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2c290807f336..c0be9cfc8380 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37334,6 +37334,8 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "autoexporter" = callPackage @@ -62990,6 +62992,7 @@ self: { ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "compactmap" = callPackage @@ -81029,7 +81032,9 @@ self: { executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "ping-pong"; + broken = true; }) {}; "discord-haskell-voice" = callPackage @@ -89694,6 +89699,8 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "env-guard" = callPackage @@ -94672,7 +94679,9 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fast-tags"; + broken = true; }) {}; "fast-tagsoup" = callPackage @@ -95840,6 +95849,7 @@ self: { executableHaskellDepends = [ base ]; description = "Declarative feedback loop manager"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "fei-base" = callPackage @@ -103530,7 +103540,9 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; + broken = true; }) {}; "futhark-data" = callPackage @@ -106459,6 +106471,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard properties for functions on `Validity` types for the sydtest framework"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-aeson" = callPackage @@ -106481,6 +106494,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for aeson-related instances in sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-hashable" = callPackage @@ -106502,6 +106516,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for Hashable instances for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-lens" = callPackage @@ -106521,6 +106536,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for lens for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-persistent" = callPackage @@ -106543,6 +106559,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for persistent-related instances for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -106788,6 +106805,8 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "geohash" = callPackage @@ -125074,6 +125093,7 @@ self: { benchmarkSystemDepends = [ openssl ]; description = "Hash functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "hashflare" = callPackage @@ -150088,6 +150108,7 @@ self: { ]; description = "http-client TLS backend using Rustls"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; }) {}; "http-client-session" = callPackage @@ -166787,6 +166808,8 @@ self: { libraryHaskellDepends = [ base ki unliftio-core ]; description = "A lightweight structured-concurrency library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kibro" = callPackage @@ -183599,8 +183622,10 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "matterhorn"; maintainers = [ lib.maintainers.kiwi ]; + broken = true; }) {}; "mattermost-api" = callPackage @@ -226806,7 +226831,6 @@ self: { ]; description = "Language support for the PureScript programming language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -227882,7 +227906,6 @@ self: { ]; description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "purs-tsd-gen"; }) {}; @@ -242608,6 +242631,8 @@ self: { ]; description = "TLS bindings for Rustls"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {rustls = null;}; "rv" = callPackage @@ -242864,6 +242889,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-layout" = callPackage @@ -242881,6 +242907,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-layout-gen" = callPackage @@ -242901,6 +242928,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-terminfo" = callPackage @@ -252715,6 +252743,7 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -270386,6 +270415,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-aeson" = callPackage @@ -270404,6 +270434,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An aeson companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-amqp" = callPackage @@ -270460,6 +270491,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A Hedgehog companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-hedis" = callPackage @@ -270498,6 +270530,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An Hspec companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-mongo" = callPackage @@ -270534,6 +270567,7 @@ self: { ]; description = "A persistent companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-persistent-postgresql" = callPackage @@ -270575,6 +270609,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-process" = callPackage @@ -270590,6 +270625,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-rabbitmq" = callPackage @@ -270630,6 +270666,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-typed-process" = callPackage @@ -270645,6 +270682,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-wai" = callPackage @@ -270666,6 +270704,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-webdriver" = callPackage @@ -282559,6 +282598,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "token-search" = callPackage @@ -311188,7 +311228,6 @@ self: { testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "zephyr"; }) {}; From 39401993df0dd92ab1b9f5a1971cec253232d5ab Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 7 Jul 2022 17:29:53 +0900 Subject: [PATCH 17/20] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5de2e98465c4..4424378cfba7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4117,6 +4117,7 @@ broken-packages: - provenience - proxy-kindness - proxy-mapping + - psc-ide - pseudo-trie - PSQueue - PTQ @@ -4134,6 +4135,7 @@ broken-packages: - pure-io - purenix - pure-priority-queue + - purescript-tsd-gen - pure-zlib - pushbullet - pushbullet-types @@ -5846,6 +5848,7 @@ broken-packages: - zendesk-api - zeno - zeolite-lang + - zephyr - zeromq4-clone-pattern - zeromq4-conduit - zeromq4-patterns diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c0be9cfc8380..84d1288e8fc6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -226831,6 +226831,8 @@ self: { ]; description = "Language support for the PureScript programming language"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pseudo-boolean" = callPackage @@ -227906,7 +227908,9 @@ self: { ]; description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "purs-tsd-gen"; + broken = true; }) {}; "pursuit-client" = callPackage @@ -311228,7 +311232,9 @@ self: { testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "zephyr"; + broken = true; }) {}; "zephyr-copilot" = callPackage From 632f30598552878d00041eab62452c24d2802c80 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Jul 2022 11:07:18 +0200 Subject: [PATCH 18/20] matterhorn: provide brick 0.70.* --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7d6e8c3d4231..ec0fbbd65e36 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -353,7 +353,10 @@ self: super: { matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage - matterhorn = doJailbreak super.matterhorn; + # Needs brick ^>= 0.70 + matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { + brick = self.brick_0_70_1; + })); memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4424378cfba7..506783ad32bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3181,7 +3181,6 @@ broken-packages: - matrix-market - matrix-sized - matroid - - matterhorn - maude - maxent-learner-hw - maybench diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 84d1288e8fc6..51fa6a6c283a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -183622,10 +183622,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "matterhorn"; maintainers = [ lib.maintainers.kiwi ]; - broken = true; }) {}; "mattermost-api" = callPackage From 2be2a78f422f4eda8edef93832416828ddb71c63 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Jul 2022 11:07:35 +0200 Subject: [PATCH 19/20] git-annex: update sha256 for 10.20220624 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec0fbbd65e36..67f713782423 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -99,7 +99,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0a0jnahljd46vzjgcwlzjhrrjgn40s0zfjklh63aa9w9x0zkvbin"; + sha256 = "0pr2fnaq3fa6lcly39xssl89v65h0wa26ikv5g30fm8y6z5rkqqd"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From 0a0baa8935a79ad07c1b14b6283d5b4ffd2b042e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Jul 2022 11:25:39 +0200 Subject: [PATCH 20/20] haskellPackages.futhark: 0.21.12 -> 0.21.13 By upgrading we make it match the futhark-manifest version we ship at the moment, fixing the build. Most of the code, except the lsp 1.5.0.0 override can be removed on the next hackage bump. --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 67f713782423..40b7efc96bd0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2554,6 +2554,26 @@ self: super: { # has been resolved. lucid-htmx = doJailbreak super.lucid-htmx; + lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override { + lsp-types = self.lsp-types_1_5_0_0; + }); + + # A delay between futhark package uploads caused us to end up with conflicting + # versions of futhark and futhark-manifest + futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: { + editedCabalFile = null; + revision = null; + version = "0.21.13"; + sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.fgl + self.fgl-visualize + self.co-log-core + ]; + }) (super.futhark.override { + lsp = self.lsp_1_5_0_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 506783ad32bb..67c5b5255fa8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1604,7 +1604,6 @@ broken-packages: - fused-effects-resumable - fused-effects-squeal - fusion - - futhark - futhask - futun - future diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51fa6a6c283a..2e945a16b459 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103540,9 +103540,7 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; - broken = true; }) {}; "futhark-data" = callPackage