From c091486f096426c2bb4e0abfa9d7d13f4b38c921 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 10:49:31 +0900 Subject: [PATCH 01/62] haskellPackages: stackage-lts 18.20 -> 18.21 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 72dfff26fd0b..25aec118a506 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 18.20 +# Stackage LTS 18.21 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -154,7 +154,7 @@ default-package-overrides: - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.9.3.0 - - apportionment ==0.0.0.3 + - apportionment ==0.0.0.4 - approximate ==0.3.5 - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 @@ -207,7 +207,7 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.3.0 - - base16 ==0.3.0.2 + - base16 ==0.3.1.0 - base16-bytestring ==1.0.2.0 - base16-lens ==0.1.3.2 - base32 ==0.2.1.0 @@ -338,7 +338,7 @@ default-package-overrides: - cabal-plan ==0.7.2.0 - cabal-rpm ==2.0.10 - cache ==0.1.3.0 - - cached-json-file ==0.1.0 + - cached-json-file ==0.1.1 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.3.0 @@ -513,7 +513,7 @@ default-package-overrides: - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 - - c-struct ==0.1.1.0 + - c-struct ==0.1.1.1 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.6 @@ -601,7 +601,7 @@ default-package-overrides: - dialogflow-fulfillment ==0.1.1.4 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - - Diff ==0.4.0 + - Diff ==0.4.1 - digest ==0.0.1.3 - digits ==0.3.1 - dimensional ==1.4 @@ -848,7 +848,7 @@ default-package-overrides: - GenericPretty ==1.2.2 - generic-random ==1.4.0.0 - generics-eot ==0.4.0.1 - - generics-sop ==0.5.1.1 + - generics-sop ==0.5.1.2 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.8 - genvalidity ==0.11.0.2 @@ -880,7 +880,7 @@ default-package-overrides: - genvalidity-unordered-containers ==0.3.0.1 - genvalidity-uuid ==0.1.0.4 - genvalidity-vector ==0.3.0.1 - - geojson ==4.0.2 + - geojson ==4.0.4 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.6 @@ -1059,7 +1059,7 @@ default-package-overrides: - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hlint ==3.2.7 + - hlint ==3.2.8 - hmatrix ==0.20.2 - hmatrix-backprop ==0.1.3.0 - hmatrix-gsl ==0.19.0.1 @@ -1069,7 +1069,7 @@ default-package-overrides: - hmm-lapack ==0.4 - hmpfr ==0.4.4 - hnock ==0.4.0 - - hoauth2 ==1.16.0 + - hoauth2 ==1.16.1 - hoogle ==5.0.18.3 - hOpenPGP ==2.9.7 - hopenpgp-tools ==0.23.6 @@ -1483,7 +1483,7 @@ default-package-overrides: - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - metrics ==0.4.1.1 - - mfsolve ==0.3.2.0 + - mfsolve ==0.3.2.1 - microlens ==0.4.12.0 - microlens-aeson ==2.3.1 - microlens-contra ==0.1.0.2 @@ -1875,7 +1875,7 @@ default-package-overrides: - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.3 - - ptr-poker ==0.1.2.3 + - ptr-poker ==0.1.2.4 - publicsuffix ==0.20200526 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 @@ -1923,7 +1923,7 @@ default-package-overrides: - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.4.3 + - rank2classes ==1.4.4 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.17 @@ -2058,7 +2058,7 @@ default-package-overrides: - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.2 - - search-algorithms ==0.3.1 + - search-algorithms ==0.3.2 - secp256k1-haskell ==0.5.0 - securemem ==0.1.10 - selda ==0.5.1.0 @@ -2188,7 +2188,7 @@ default-package-overrides: - socket ==0.8.3.0 - socks ==0.6.1 - some ==1.0.2 - - sop-core ==0.5.0.1 + - sop-core ==0.5.0.2 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.7 @@ -2283,7 +2283,7 @@ default-package-overrides: - swagger ==0.3.0 - swagger2 ==2.6 - sweet-egison ==0.1.1.3 - - swish ==0.10.0.9 + - swish ==0.10.1.0 - syb ==0.7.2.1 - sydtest ==0.2.0.0 - sydtest-discover ==0.0.0.1 @@ -2368,7 +2368,7 @@ default-package-overrides: - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 - text-manipulate ==0.3.0.0 - - text-metrics ==0.3.1 + - text-metrics ==0.3.2 - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.2 - text-regex-replace ==0.1.1.4 @@ -2411,7 +2411,7 @@ default-package-overrides: - th-test-utils ==1.1.1 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.9 + - tidal ==1.7.10 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2447,7 +2447,7 @@ default-package-overrides: - transformers-compat ==0.6.6 - transformers-fix ==1.0 - traverse-with-class ==1.0.1.1 - - tree-diff ==0.2.1 + - tree-diff ==0.2.1.1 - tree-fun ==0.8.1.0 - tree-view ==0.5.1 - trifecta ==2.1.2 @@ -2559,7 +2559,7 @@ default-package-overrides: - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - vault ==0.3.1.5 - - vcs-ignore ==0.0.1.0 + - vcs-ignore ==0.0.2.0 - vec ==0.4 - vector ==0.12.3.1 - vector-algorithms ==0.8.0.4 From 7269b849576a9073991660fa61ca621732467fd6 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 10:49:47 +0900 Subject: [PATCH 02/62] all-cabal-hashes: 2021-12-28T00:33:48Z -> 2022-01-05T00:50:25Z 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 ba4ce5feee3e..22308a5cf063 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "f1cca49c3c22107b73ce7156ebc7735d7d8d250e", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f1cca49c3c22107b73ce7156ebc7735d7d8d250e.tar.gz", - "sha256": "0bcfynix3y0w5fhrij241l6sbndfr5h20pnxwqb9sf4h2ag0zlsa", - "msg": "Update from Hackage at 2021-12-28T00:33:48Z" + "commit": "52e5aa39956d0d5a8158320897630fed86ec2ed3", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz", + "sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz", + "msg": "Update from Hackage at 2022-01-05T00:50:25Z" } From 9a558b9b8ac1332004091cfc9aacedece205817d Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 10:50:31 +0900 Subject: [PATCH 03/62] 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 | 1531 +++++++++++------ 1 file changed, 1052 insertions(+), 479 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3288fb06e70e..52b3d1370652 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,8 +811,8 @@ self: { pname = "Agda"; version = "2.6.2.1"; sha256 = "03dw7jfqr3ffik6avigm525djqh2gn5c3qwnb2h6298zkr9lch9w"; - revision = "1"; - editedCabalFile = "1n43j03gmm4bhkvn2g752si6sj65hm2x4vq65frhqrjz3byag7ar"; + revision = "2"; + editedCabalFile = "1n037ql18gayqmdiaf592c4iw9cmwyjz12vvj6wbxrbcwylhc6ji"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -4623,8 +4623,8 @@ self: { }: mkDerivation { pname = "Diff"; - version = "0.4.0"; - sha256 = "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j"; + version = "0.4.1"; + sha256 = "0w166w5jksiqad7xf2ldjl2ykap0xf08byrl92qwp6r1qym4lppx"; libraryHaskellDepends = [ array base pretty ]; testHaskellDepends = [ array base directory pretty process QuickCheck test-framework @@ -11849,8 +11849,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "7"; - editedCabalFile = "12ylqc5xi7jhgdsq8dbxm4v6llbi1km78zam962052b5s81d00qw"; + revision = "8"; + editedCabalFile = "08ym2s8ypmqs2viz4jr9zm54cia8b54li2zqi8dq93vjnzz0kkbf"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -19013,6 +19013,17 @@ self: { broken = true; }) {}; + "SmithNormalForm" = callPackage + ({ mkDerivation, base, matrix, vector }: + mkDerivation { + pname = "SmithNormalForm"; + version = "0.1.0.0"; + sha256 = "1lwf047v5b757fwdz4dz94rky08lg9fib38iv6g5f4wsyacx0jzj"; + libraryHaskellDepends = [ base matrix vector ]; + description = "A lightweight Haskell implementation of Smith normal form over the integers"; + license = lib.licenses.mit; + }) {}; + "Smooth" = callPackage ({ mkDerivation, base, containers, DifferenceLogic , FirstOrderTheory, HUnit, Proper @@ -23563,8 +23574,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "acme-functors"; - version = "0.1.0.0"; - sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq"; + version = "0.1.0.1"; + sha256 = "0blzbrlg033vfy8v225sw0nhaacc1pb0zq9vsh1wafadfwmpi6ig"; libraryHaskellDepends = [ base ]; description = "The best applicative functors"; license = lib.licenses.bsd3; @@ -24632,7 +24643,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_0_2_0" = callPackage + "aeson_2_0_3_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist @@ -24645,25 +24656,23 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.0.2.0"; - sha256 = "0dw041ha28r55ss5hjv6gc3rc5ins4a4vw36w6hd6mdbgzfmbjnm"; - revision = "1"; - editedCabalFile = "0xhchqq056fmdz01w73zdq1hhwc1inl0zklp211mbxyncabz6hdv"; + version = "2.0.3.0"; + sha256 = "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable indexed-traversable - OneTuple primitive scientific semialign strict tagged + OneTuple primitive QuickCheck scientific semialign strict tagged template-haskell text text-short th-abstraction these time time-compat unordered-containers uuid-types vector witherable ]; testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring bytestring containers data-fix Diff directory dlist filepath - generic-deriving ghc-prim hashable integer-logarithms OneTuple - QuickCheck quickcheck-instances scientific strict tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - text-short these time time-compat unordered-containers uuid-types - vector + generic-deriving ghc-prim hashable indexed-traversable + integer-logarithms OneTuple primitive QuickCheck + quickcheck-instances scientific strict tagged tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text text-short these + time time-compat unordered-containers uuid-types vector ]; description = "Fast JSON parsing and encoding"; license = lib.licenses.bsd3; @@ -24822,8 +24831,8 @@ self: { pname = "aeson-compat"; version = "0.3.10"; sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; - revision = "1"; - editedCabalFile = "1k4bnmq76ihk0vlx9nhxsyyawhnbca9dxj1ivxs3k4aip40bjjq8"; + revision = "2"; + editedCabalFile = "0x0i17094nkmhzfh5rl758y21kpgv1fw2qicll5rx51fj6a77rr2"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24949,6 +24958,8 @@ self: { pname = "aeson-extra"; version = "0.5.1"; sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; + revision = "1"; + editedCabalFile = "0minlchivdbpwlfqv7n7ss9cvd7fbpflnmbvs0bcmw1fi83k3b32"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -25039,17 +25050,17 @@ self: { "aeson-gadt-th" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map , dependent-sum, dependent-sum-template, hspec, HUnit - , template-haskell, th-abstraction, th-extras, transformers + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.5.0"; - sha256 = "17csf7w0r6v8abmj9wx3fa830fmxif0mr3pgwxd63xhlrpv1hq72"; + version = "0.2.5.1"; + sha256 = "15d706h09igm9ic0sgjamwngghvcqhs2pir5pqb2crlkvmhr25cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers dependent-sum template-haskell th-abstraction - th-extras transformers + transformers ]; executableHaskellDepends = [ aeson base dependent-map dependent-sum dependent-sum-template @@ -25220,6 +25231,8 @@ self: { pname = "aeson-optics"; version = "1.1.1"; sha256 = "1na5nsbp4sds8q289knzj4rgiwabbinxm0ihh66jfz0sjiia4wp7"; + revision = "1"; + editedCabalFile = "0wyn0l2qhlrlrf5xy1grk9mshlxsfy566ayabg9f92w7m89n0kff"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring optics-core optics-extra scientific text unordered-containers vector @@ -31557,6 +31570,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "api-maker_0_1_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, easy-logger + , http-api-data, http-client, http-client-tls, http-types, lens + , monad-control, mtl, req, text, transformers, transformers-base + }: + mkDerivation { + pname = "api-maker"; + version = "0.1.0.6"; + sha256 = "1b3mh2z1paizbjzh4i03qvs5r8v6rgqmbga81dnsc6kxi4s8bw2a"; + libraryHaskellDepends = [ + aeson base bytestring containers easy-logger http-api-data + http-client http-client-tls http-types lens monad-control mtl req + text transformers transformers-base + ]; + testHaskellDepends = [ + aeson base bytestring containers easy-logger http-api-data + http-client http-client-tls http-types lens monad-control mtl req + text transformers transformers-base + ]; + description = "Package to make APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "api-monobank" = callPackage ({ mkDerivation, aeson, base, bytestring, hs-coindesk-api , http-client, http-client-tls, http-conduit, servant @@ -32246,6 +32283,8 @@ self: { pname = "apply-refact"; version = "0.9.3.0"; sha256 = "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w"; + revision = "1"; + editedCabalFile = "0hgdjm6ydfc29d922h1cpwrch61r5qchzrw21dz80kdry53qxl5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32298,12 +32337,17 @@ self: { }) {}; "apportionment" = callPackage - ({ mkDerivation, base, containers, utility-ht }: + ({ mkDerivation, base, containers, doctest-exitcode-stdio + , doctest-lib, QuickCheck, utility-ht + }: mkDerivation { pname = "apportionment"; - version = "0.0.0.3"; - sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg"; + version = "0.0.0.4"; + sha256 = "12b4jlh3k3da1w5lw8z83qgvn0ys85xwvdqylm5kwfi2i1i72256"; libraryHaskellDepends = [ base containers utility-ht ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck + ]; description = "Round a set of numbers while maintaining its sum"; license = lib.licenses.bsd3; }) {}; @@ -35725,6 +35769,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-iso8601_1_0_2_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat-batteries, text + , time, time-compat + }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.0.2.1"; + sha256 = "1zmj6v63xjj20ja50ffbi222yg513cnnqyxl76ybb4x98z9jld0k"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries text time time-compat + ]; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -36806,7 +36866,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "avro_0_5_2_1" = callPackage + "avro_0_6_0_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -36818,10 +36878,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.5.2.1"; - sha256 = "0g10nbcxz5ff7rckbzwb4sxh1qqg6ay5zwakmlxrsfj9srg8dq2d"; - revision = "1"; - editedCabalFile = "14kq896191zvqnsl3hgfxlwi7ajvagrbsiv5l8hxckp5glh5825j"; + version = "0.6.0.0"; + sha256 = "056nd6cgl9lqv0ij8a2s0rca1f0qcxr2mfr0i8pkh84h9y84nzv9"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -38024,8 +38082,8 @@ self: { pname = "b-tree"; version = "0.1.4"; sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg"; - revision = "2"; - editedCabalFile = "0dvmbs7dd2crv5qiziry2dlrpvsvcgj9hbpq04rbd25pzpk28hqi"; + revision = "3"; + editedCabalFile = "1xri692y7l1q5aa5a9ijwhxjy3gf181paqrqf2lqgmbfzci2ii58"; libraryHaskellDepends = [ base binary bytestring containers directory errors exceptions filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -38931,32 +38989,6 @@ self: { }) {}; "base16" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , deepseq, primitive, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base16"; - version = "0.3.0.2"; - sha256 = "16jkb0cmi7gi6plm4ycrk6a1ahjzzlgjf937cv8hld83pg713yvz"; - revision = "1"; - editedCabalFile = "1w7msrq6340iadhsmbdk1lz4il2lylkv0m9szicbx0ln980xx1fd"; - libraryHaskellDepends = [ - base bytestring deepseq primitive text text-short - ]; - testHaskellDepends = [ - base base16-bytestring bytestring QuickCheck random-bytestring - tasty tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base base16-bytestring bytestring criterion deepseq - random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base16 encoding"; - license = lib.licenses.bsd3; - }) {}; - - "base16_0_3_1_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, primitive, QuickCheck, random-bytestring, tasty , tasty-hunit, tasty-quickcheck, text, text-short @@ -38978,7 +39010,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base16 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base16-bytestring_0_1_1_7" = callPackage @@ -39878,6 +39909,26 @@ self: { license = lib.licenses.mit; }) {}; + "bcp47_0_2_0_5" = callPackage + ({ mkDerivation, aeson, base, containers, country, doctest + , generic-arbitrary, hspec, iso639, megaparsec, QuickCheck, text + }: + mkDerivation { + pname = "bcp47"; + version = "0.2.0.5"; + sha256 = "1drfv04v5137c726c9bpz8lh1c0blb4mfnca4dgzai91pjk026sd"; + libraryHaskellDepends = [ + aeson base containers country generic-arbitrary iso639 megaparsec + QuickCheck text + ]; + testHaskellDepends = [ + aeson base containers country doctest hspec iso639 QuickCheck text + ]; + description = "Language tags as specified by BCP 47"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bcp47-orphans" = callPackage ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable , hspec, http-api-data, path-pieces, persistent, QuickCheck, text @@ -41273,6 +41324,22 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "bin_0_1_2" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, fin, hashable + , QuickCheck, some + }: + mkDerivation { + pname = "bin"; + version = "0.1.2"; + sha256 = "0idm2ix4wv1ppr3fjvd8xdlbkhk6lq4rvfs9dv615lmds4gbzm72"; + libraryHaskellDepends = [ + base boring dec deepseq fin hashable QuickCheck some + ]; + description = "Bin: binary natural numbers"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary_0_8_9_0" = callPackage ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring , Cabal, cereal, containers, criterion, deepseq, directory @@ -41486,8 +41553,8 @@ self: { pname = "binary-instances"; version = "1.0.2"; sha256 = "10z29k35clq74ma2f0yrkbyf14wdax1zzgb6mn26ja4vp9f5wc14"; - revision = "1"; - editedCabalFile = "1k0dygivh0qrc9w9hck1qf4bmwwsni0kv16rjpidvp3nv3s45549"; + revision = "2"; + editedCabalFile = "1f9db18466pbnn8hxhbwqb7pf5qmbmc7szpcdhy77n825pvhjyi8"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -42366,8 +42433,8 @@ self: { ({ mkDerivation, base, bindings-DSL }: mkDerivation { pname = "bindings-libpci"; - version = "0.4.0.1"; - sha256 = "01wsk8qr1wky0x5pmpw3nljrjbxyf3hd2kgd5vsmcn71gj436hl9"; + version = "0.4.0.2"; + sha256 = "13fyg463zpbgwl8jpx6x7g63alrlb2qlmcqqvl3vhaycgxnnxw1s"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to libpci"; license = lib.licenses.bsd3; @@ -46335,22 +46402,20 @@ self: { }) {}; "bound-extras" = callPackage - ({ mkDerivation, base, bound, containers, deepseq, filepath - , hashable, pretty, tasty, tasty-golden, text-short, transformers - , utf8-string + ({ mkDerivation, adjunctions, base, bound, containers, deepseq + , filepath, hashable, pretty, tasty, tasty-golden, text-short + , transformers, utf8-string }: mkDerivation { pname = "bound-extras"; - version = "0.0.1"; - sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq"; - revision = "3"; - editedCabalFile = "10vv6dsfia3fdclvnhp8q76s3zgmxwzi4bvvii6g6ic8wid6asvg"; + version = "0.0.2"; + sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; testHaskellDepends = [ - base bound containers filepath pretty tasty tasty-golden text-short - transformers utf8-string + adjunctions base bound containers filepath pretty tasty + tasty-golden text-short transformers utf8-string ]; description = "ScopeH and ScopeT extras for bound"; license = lib.licenses.bsd3; @@ -47773,6 +47838,33 @@ self: { broken = true; }) {}; + "bugsnag-haskell_0_0_4_3" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, containers, doctest, Glob, hspec, http-client + , http-client-tls, http-conduit, http-types, iproute, network + , parsec, template-haskell, text, th-lift-instances, time + , ua-parser, unliftio, wai, yaml + }: + mkDerivation { + pname = "bugsnag-haskell"; + version = "0.0.4.3"; + sha256 = "098bmbv7wgpjqp8yys0bpsf6q5m4940g2g9n50mjam7lwnxwk1gg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers Glob http-client + http-client-tls http-conduit http-types iproute network parsec + template-haskell text th-lift-instances time ua-parser wai + ]; + testHaskellDepends = [ + aeson aeson-qq base doctest hspec text time unliftio yaml + ]; + description = "Bugsnag error reporter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bugsnag-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client , text, time, unordered-containers @@ -49392,18 +49484,6 @@ self: { }) {}; "c-struct" = callPackage - ({ mkDerivation, array, base, primitive, template-haskell }: - mkDerivation { - pname = "c-struct"; - version = "0.1.1.0"; - sha256 = "15q0y2v1nvgdrlzha196xdavr2j539vib4f83pmymc263ll0hr02"; - libraryHaskellDepends = [ array base primitive template-haskell ]; - testHaskellDepends = [ array base primitive template-haskell ]; - description = "To make a wrapper for struct of C language"; - license = lib.licenses.bsd3; - }) {}; - - "c-struct_0_1_1_1" = callPackage ({ mkDerivation, array, base, primitive, template-haskell }: mkDerivation { pname = "c-struct"; @@ -49413,7 +49493,6 @@ self: { testHaskellDepends = [ array base primitive template-haskell ]; description = "To make a wrapper for struct of C language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "c0check" = callPackage @@ -50297,10 +50376,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.4.3"; - sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; - revision = "1"; - editedCabalFile = "18ngagasjind29r0840rnsjzzki92q01yi1p0fw4i5p129mczc8n"; + version = "0.4.4"; + sha256 = "0yr2yqnbzsx191sp0s1p4i4a4hjgnscm2f0pl9zfdszlyhbvdnyl"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -51079,22 +51156,6 @@ self: { }) {}; "cached-json-file" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , http-query, time, xdg-basedir - }: - mkDerivation { - pname = "cached-json-file"; - version = "0.1.0"; - sha256 = "1w1zxzcbyf4c0p5hg4j2b531r6vg95745ah3qqwiafwb4z11l7ih"; - libraryHaskellDepends = [ - aeson base bytestring directory filepath http-query time - xdg-basedir - ]; - description = "Locally cache a json file obtained by http"; - license = lib.licenses.bsd3; - }) {}; - - "cached-json-file_0_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-query, time, xdg-basedir }: @@ -51108,7 +51169,6 @@ self: { ]; description = "Locally cache a json file obtained by http"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cached-traversable" = callPackage @@ -52455,6 +52515,8 @@ self: { pname = "carray"; version = "0.1.6.8"; sha256 = "04qny61gcjblqjrz761wp4bdkxk6zbm31xn6h426iybw9kanf6cg"; + revision = "1"; + editedCabalFile = "04c4xizl2hjrk5fqwxpv1f0rdrrdl4z5vw6kl7cgc22pywkc2hgj"; libraryHaskellDepends = [ array base binary bytestring ix-shapable QuickCheck syb ]; @@ -52888,8 +52950,8 @@ self: { }: mkDerivation { pname = "casr-logbook"; - version = "0.5.4"; - sha256 = "06r160c9cjqmiqldpdd9h4dx5g9gj6cmrajprwbcabcar6ckdsci"; + version = "0.6.6"; + sha256 = "0nq6jkaxw68dn4m9pqa717w0k1kbvqz00ji4sjal3r2imykpwrfa"; libraryHaskellDepends = [ base containers digit lens lucid text time ]; @@ -56076,22 +56138,24 @@ self: { "cimple" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, base - , bytestring, containers, filepath, groom, happy, hspec - , hspec-discover, mtl, text + , bytestring, containers, data-fix, filepath, groom, happy, hspec + , hspec-discover, mtl, recursion-schemes, text, transformers-compat }: mkDerivation { pname = "cimple"; - version = "0.0.5"; - sha256 = "1yzf78x1vz9mpkkakk5v4h1lq4y14d8vgq6lyf5chwfa0pdlw1n8"; + version = "0.0.8"; + sha256 = "08mm6v0a52l7wq4kaj4zs9wyvnf7g0qmhxvbdbbrcqgxm8a9mc9v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base bytestring containers filepath - groom mtl text + aeson ansi-wl-pprint array base bytestring containers data-fix + filepath groom mtl recursion-schemes text transformers-compat ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring groom text ]; - testHaskellDepends = [ ansi-wl-pprint base hspec text ]; + testHaskellDepends = [ + ansi-wl-pprint base data-fix hspec text transformers-compat + ]; testToolDepends = [ hspec-discover ]; description = "Simple C-like programming language"; license = lib.licenses.gpl3Only; @@ -57677,8 +57741,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "cli-arguments"; - version = "0.1.0.1"; - sha256 = "0brks5bvl9h045ghx69s9ls4pssah652s8hc1ilysfi4kcgq8l98"; + version = "0.3.1.0"; + sha256 = "14zgzsps25xr47a2l888xrzg3d09zfdz62g6d3liawhmf1kiwbkp"; libraryHaskellDepends = [ base ]; description = "A library to process command line arguments in some more convenient way"; license = lib.licenses.mit; @@ -65699,6 +65763,22 @@ self: { broken = true; }) {}; + "copr-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, http-query + , text, unordered-containers + }: + mkDerivation { + pname = "copr-api"; + version = "0.1.0"; + sha256 = "0v28y0xnjk9hl66hsi17g5h6mrsg1a6b9p6r05r41cnd8a093vb0"; + libraryHaskellDepends = [ + aeson base bytestring directory http-query text + unordered-containers + ]; + description = "Copr API client libary"; + license = lib.licenses.gpl3Only; + }) {}; + "coquina" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, exceptions, filepath, hspec, lens, markdown-unlit @@ -66504,8 +66584,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.8"; - sha256 = "1v3fm2gd47q0qd59zzd11mpmvmyxh9asb1aymg3337296irvnk66"; + version = "3.6.9"; + sha256 = "1d6308vy4zgwpqjqlslxj50x2pbgkq698p9l05xvm3wr5ml6dyv9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -69455,8 +69535,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.2"; - sha256 = "0vr4b2k688imxfgkh85i9k96djklp1pp75qzi9f8fl5c46flknrg"; + version = "0.2.1"; + sha256 = "1ii7q63pr3zazkb76j1912yjzamj62h3ilqpszypq5s27vfs2yb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74881,8 +74961,8 @@ self: { pname = "dependent-sum"; version = "0.7.1.0"; sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; - revision = "1"; - editedCabalFile = "0h9rr26ksrqfnfjibnrzbf6hyp1mmffgzbvjjxjs6vdqylvr4h8f"; + revision = "2"; + editedCabalFile = "0d7wb1ag60mcm56axcrx9pd6hgrsxmqynyplbcfl01ms2i60fhr9"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; @@ -75975,6 +76055,8 @@ self: { pname = "dhall"; version = "1.40.2"; sha256 = "14wh497fipvz01zc9s31gv144spg1iqfwp6x5mlk1hjk0v9qs5by"; + revision = "1"; + editedCabalFile = "1dfnyin9rcq7ily0dlm94s7xnrsjg8ix24zsp52hl7wg4fkfc46c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76040,6 +76122,8 @@ self: { pname = "dhall-bash"; version = "1.0.39"; sha256 = "0by0w5dqsi0yrs9qnkpls7n5m0qwslxkcycb4s97vk8xl6nj5kk8"; + revision = "1"; + editedCabalFile = "1c01623qx7wxas9g8b4hliybvff0g994jbwrcx14hhb77xr6j14v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76085,6 +76169,8 @@ self: { pname = "dhall-csv"; version = "1.0.1"; sha256 = "00a08lcxf9r1ln87bzy4j83z08yl1m7xmzv1irg0xa03vskby3lx"; + revision = "1"; + editedCabalFile = "1bwsapkmfqcw0hgvpnw3mpsx5q36x1f5dq4dai5wypj0bly3x8k0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76117,6 +76203,8 @@ self: { pname = "dhall-docs"; version = "1.0.8"; sha256 = "1rkwvk6vd8l52nxv186fw3qdmsjvi8098yccnnbysmf41rz80fi7"; + revision = "1"; + editedCabalFile = "0z2xrvbfprgq5zzd862s2g8w4zr4k5wrl3vmb9vzds72yk65h3sk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76213,6 +76301,8 @@ self: { pname = "dhall-json"; version = "1.7.9"; sha256 = "11rl46vn6lzcm9kznpfc43c3a2cbq2si2zba3k2x4j360kvg9fgn"; + revision = "1"; + editedCabalFile = "07izgs7x8ssmalv0m6r9clhx5gbs48f1bxxr3qsyxs26liqvppzq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76314,6 +76404,8 @@ self: { pname = "dhall-nix"; version = "1.1.23"; sha256 = "17ajfkhxg4kjn6w7v3ymr6nsbqplvywkcwmfzybxqvmphh4zmfjb"; + revision = "1"; + editedCabalFile = "1grr0r30nbhi1d52vhmhp0rx2pas0wbg7m5npsqczfgd1d9p43dz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76339,8 +76431,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.7"; sha256 = "1s7md4b2jzgmf557clln9fc5lmdrd9xjs55dd97dv8q6krm8nabg"; - revision = "1"; - editedCabalFile = "0ld4z4d3gw9mxyhm5g2hgw4w68izjnwrcqd6j7yhwhrblhdmqrr4"; + revision = "2"; + editedCabalFile = "06cz8iszdgxyy9v95ppcr5zjkrxw4mx01kvc68h88jdf8g5fgp6g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76363,6 +76455,8 @@ self: { pname = "dhall-openapi"; version = "1.0.3"; sha256 = "0k7yq7g77ws7wjfzd35ydsjwaq2kc1y0rhwjwb6yvkyvljmr0ykz"; + revision = "1"; + editedCabalFile = "0jmbgjrinlsgdw4ksqmn0lr15m6r0kxw33c5g7slnqgbnimbjrgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76457,6 +76551,8 @@ self: { pname = "dhall-toml"; version = "1.0.1"; sha256 = "024cillwk8rq7jlv6vh85ifypy1ddfvszf3fzmgl1r0ca9iclmbb"; + revision = "1"; + editedCabalFile = "1gha7d2mv02l85z78grikillywh295ankc94vg3gbzlcc0bk0czz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76513,6 +76609,8 @@ self: { pname = "dhall-yaml"; version = "1.2.9"; sha256 = "0gn9jrqihimjs8i9ksgmlkh8c64km52rmsgz2y6k3ab0igkv8dw6"; + revision = "1"; + editedCabalFile = "1mq7si8d9mkwnh6kw4041dhfppam507blr2ji3m6xw8f1pg70rcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76783,8 +76881,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.5"; sha256 = "0dz617kfkvjf3f2zbphkdx1scglcjj162qsfk9xj7slbapnj918m"; - revision = "2"; - editedCabalFile = "1jys7j2s8shwh5yr7w597qd46ip5xqvszaqgpjvnx9fxazqp6r0v"; + revision = "4"; + editedCabalFile = "0ni9kbzcazr0wcgzp6r19n0hd36sd29nrwj5af1sf4a1mbs4jwqf"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -76858,8 +76956,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "3"; - editedCabalFile = "03drxpqhyv62kzsxiabhfjiayk79fpv8wrq4qapsjbv7ph2jhx2v"; + revision = "4"; + editedCabalFile = "1hsi63kig21mb71qa4kf27h4g99xxqwlfqzl9jpca451sadlk7mp"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -76940,6 +77038,8 @@ self: { pname = "diagrams-haddock"; version = "0.4.1.1"; sha256 = "1azc42pr0hb5qamgf8i0kpkvpzxqlgc9npmi21sxnsw66bnzxw7i"; + revision = "1"; + editedCabalFile = "0ha61hb4g1izyz7v5gynbrm9q3260kjv6x7zmqb0hqmsaqhxsqnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77080,10 +77180,8 @@ self: { }: mkDerivation { pname = "diagrams-pgf"; - version = "1.4.1.1"; - sha256 = "10glg5pqy8zw6l77wnskcawl8da0c10sqfg9dx2jydksd3xpns2f"; - revision = "1"; - editedCabalFile = "00hs5jk49g734majid3sx2wrl9r2flcjn70gqhaiibj6q0hyw206"; + version = "1.4.2"; + sha256 = "1x7qz8683rsfi0gpmfmhicswmmxppil779d4mhfwkp537b6l2zmh"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -77101,10 +77199,10 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.5"; - sha256 = "00j58mc84srjvrf21v6zjxxlbw6b8ahhn1jmbq697w8kw3cvygpa"; - revision = "3"; - editedCabalFile = "1aq214837jk85b2l79adm5rcrv8y929aspvix7yjq1skyrqgk7pa"; + version = "1.5.1"; + sha256 = "11h2s33y6p1xd1d0kp281nz8iq5rpm0wj63wrzdha874qf79wz9g"; + revision = "1"; + editedCabalFile = "0wdg7wmm0j9kimw2dw7b80iv2s7yz0jclw0ybzjdgaq545l05ggi"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -77138,10 +77236,8 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.4.2.1"; - sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z"; - revision = "2"; - editedCabalFile = "1vd8njhanjaa86h0g8hb6khz11bv9zvg8l4pfx0dj4ypknz4hwak"; + version = "1.4.2.2"; + sha256 = "1q0b3yh7wbi3yq0y8qswhvfmcz52f6njl4dawq9gl71jyfb2g8nq"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -77211,10 +77307,10 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.4.3"; - sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; - revision = "4"; - editedCabalFile = "0irjf0g1barr06fy409r0ld2hypihrhh6n80ig3487xxny6gfzs0"; + version = "1.4.3.1"; + sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237"; + revision = "1"; + editedCabalFile = "0534kgm9r70s5yhfjy4pkqy1f2aflg0acfp2g23xjfzr9kwq9v7m"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -80857,22 +80953,23 @@ self: { ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob , hspec, hspec-core, hspec-discover, HUnit, mockery, pretty - , process, QuickCheck, setenv, silently, stringbuilder, syb + , process, QuickCheck, random, setenv, silently, stringbuilder, syb , template-haskell, transformers, unordered-containers }: mkDerivation { pname = "doctest-parallel"; - version = "0.2"; - sha256 = "1p8mz36c9v0cql7hrw8f9m08x9ks31vwqv283dpr1h0s9m8pib6c"; + version = "0.2.1"; + sha256 = "1ybk4dl4qmb83izpqizzlzgys1ylrxwv4rzv48kk1cnll5k1hz45"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory - exceptions filepath ghc ghc-paths Glob pretty process syb + exceptions filepath ghc ghc-paths Glob pretty process random syb template-haskell transformers unordered-containers ]; testHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths hspec hspec-core hspec-discover HUnit mockery process - QuickCheck setenv silently stringbuilder syb transformers + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit + mockery process QuickCheck setenv silently stringbuilder syb + transformers ]; testToolDepends = [ hspec-discover ]; doHaddock = false; @@ -83697,8 +83794,8 @@ self: { }: mkDerivation { pname = "easy-logger"; - version = "0.1.0.4"; - sha256 = "040q410p9i9vwydnsa5n7ycy1bq0gr1p3jvmv1y52hh96bcsbdg1"; + version = "0.1.0.7"; + sha256 = "1s4fj1xbza3j868p46glh950qa6njsjlbpvvx837xjmx73x7qk29"; libraryHaskellDepends = [ array auto-update base bytestring containers template-haskell text unix-compat unix-time @@ -92078,10 +92175,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "2.0.0"; - sha256 = "0q2ijh1pdxzm57557vln195mmxs15wra9159vpsjvjda4gnd7bs6"; - revision = "1"; - editedCabalFile = "18q3hzl178a3hzxmvb79y1g9r29b6dxfq9nczwk2g3pqmi9qnbmr"; + version = "2.0.1"; + sha256 = "1v60jrcpbd86np5265grd61x6rla1fy85jphcnknffy4zf0sswrf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93941,8 +94036,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "7"; - editedCabalFile = "1jm3jr70vvfv9an3nb7n5rx5ldk6i4c1dcwi3pgbf6lkx7lkp754"; + revision = "8"; + editedCabalFile = "19jh6iavjb9asm6j91d3d6fandm0fm16ariayx12xp6ach1alpxr"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -94439,6 +94534,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fin_0_2_1" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, hashable + , inspection-testing, QuickCheck, some, tagged, universe-base + }: + mkDerivation { + pname = "fin"; + version = "0.2.1"; + sha256 = "14zknp1f65i57nsx8v0np08d7y0szzblybmq7fa5ydazhqwnxlrv"; + libraryHaskellDepends = [ + base boring dec deepseq hashable QuickCheck some universe-base + ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fin-int" = callPackage ({ mkDerivation, attenuation, base, data-default-class, deepseq , portray, portray-diff, QuickCheck, sint @@ -96892,6 +97004,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "focuslist_0_1_1_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , genvalidity, genvalidity-containers, genvalidity-hspec, hedgehog + , hspec, lens, mono-traversable, QuickCheck, tasty, tasty-hedgehog + , tasty-hspec, template-haskell, validity + }: + mkDerivation { + pname = "focuslist"; + version = "0.1.1.0"; + sha256 = "0bna0akhjf8ldx6g8n5w0ni5mhx5j69n0dzpj25vbdc3y8y9crqh"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers lens mono-traversable QuickCheck + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-containers genvalidity-hspec + hedgehog hspec lens QuickCheck tasty tasty-hedgehog tasty-hspec + template-haskell validity + ]; + description = "Lists with a focused element"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fold-debounce" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time @@ -97333,8 +97471,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "7"; - editedCabalFile = "07508rqcarhrw4i22sszr4mplxk8m61g0c3rm273ga89bajf9nja"; + revision = "8"; + editedCabalFile = "0ifp1bcvgkyma6sp889f1fr866vw884d0wgrnzqx9isfjk52csi4"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -97811,8 +97949,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.7.0"; - sha256 = "1ngh156qyaha44ghisb3h8c2lxik0i6g0a46nq2fhif70r5piqw6"; + version = "0.8.0"; + sha256 = "1pmy9rr6xgqmcx84wk879cvnpyhchz12w8mjymxafn6fljcx96hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98377,8 +98515,8 @@ self: { }: mkDerivation { pname = "franz"; - version = "0.5.1"; - sha256 = "0y65ywk8k6by8k8wf71pfk8dsaq47sqjnw0ina09jgq66by4vgwq"; + version = "0.5.2"; + sha256 = "0mah7ghfzgg41iazvwpxzr6gc0afw30hsp6v3vg1vadnsp96nfnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98779,10 +98917,8 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.5.0"; - sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; - revision = "4"; - editedCabalFile = "07xkdzajkrswa69gazl0gpzayklafs883xz4xf8cawk58m5pr645"; + version = "0.1.5.1"; + sha256 = "14mch3p12sd44y272gg3qr6v0fp689y48fjbvhjbp62lipvxc9i4"; libraryHaskellDepends = [ base lens linear MemoTrie pragmatic-show vector vector-space ]; @@ -102684,8 +102820,8 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "2"; - editedCabalFile = "0516sqr5xplh57kdzcxx1fpsxwhmxc1bl9hxlcdif9hrjjb61rwg"; + revision = "3"; + editedCabalFile = "0srsqwncr5fkjcqk7ldfmd8q4y80ksbv9mvnzrw9lk2hywdagl8c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -102797,8 +102933,8 @@ self: { pname = "generic-optics-lite"; version = "0.1"; sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "2"; - editedCabalFile = "1ib6klb9ff27qw8y6icywldnq1p5z8fbkwkibsjyimbvvdk4lqki"; + revision = "3"; + editedCabalFile = "0f2dnsdl25s6cfdp7f97r2d9md82vn53dm5gry2pds791k1w4q53"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -103028,8 +103164,8 @@ self: { }: mkDerivation { pname = "generics-sop"; - version = "0.5.1.1"; - sha256 = "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1"; + version = "0.5.1.2"; + sha256 = "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell th-abstraction ]; @@ -103047,8 +103183,8 @@ self: { pname = "generics-sop-lens"; version = "0.2.0.1"; sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; - revision = "1"; - editedCabalFile = "1y9v2imcrm8wyagv2d91x7zvdf358iz7460gqakhg9bgifjaylh1"; + revision = "2"; + editedCabalFile = "14rw0xyfhgyywyb7yghjaqnkpkx9dh0yz8y7l8phxzqgim5r8d1v"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = lib.licenses.bsd3; @@ -104672,29 +104808,6 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hlint, lens, scientific, semigroups, tasty, tasty-hspec - , tasty-quickcheck, text, transformers, validation, vector - }: - mkDerivation { - pname = "geojson"; - version = "4.0.2"; - sha256 = "0csbg4pdh686bxk689968bi94njx78iv1sm5g6lp915pg6cfnd66"; - revision = "1"; - editedCabalFile = "1ry2z0hwacbdwpxjbz1zfwc24094776xqshqdkq23r2gfgyy3m3k"; - libraryHaskellDepends = [ - aeson base containers deepseq lens scientific semigroups text - transformers validation vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hlint tasty tasty-hspec - tasty-quickcheck text validation - ]; - description = "A thin GeoJSON Layer above the aeson library"; - license = lib.licenses.bsd3; - }) {}; - - "geojson_4_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hlint, lens, scientific, semigroups, tasty, tasty-hspec , tasty-quickcheck, text, transformers, validation, vector @@ -104713,7 +104826,6 @@ self: { ]; description = "A thin GeoJSON Layer above the aeson library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "geojson-types" = callPackage @@ -105501,12 +105613,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-exactprint_1_3_0" = callPackage + "ghc-exactprint_1_4_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.3.0"; - sha256 = "012ka8qxc340sijbn6sgwdpzdkk07kpbs6i8b71kwnpk5k5ahqdl"; + version = "1.4.1"; + sha256 = "0q9z43753arxbcs6mz26kz4dsz0c2i5hkxa125gl36vsipxfrq92"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -106374,8 +106486,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.6.1.0"; - sha256 = "1ic243jdvmm8sqzksx6hady2p7ca07as04hxvsxa3vh6b9nwwkk2"; + version = "0.7.0.0"; + sha256 = "0lnvfahphrkvg4r0r5imxqjj0a5bb5cpcx85svw4g4y9p13i94jh"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -106595,8 +106707,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.16.0"; - sha256 = "1ywlk4bf7m868vvd07vmzpv7d7xmw9haa16p13rx3kdf5rqc7wcv"; + version = "0.0.17.0"; + sha256 = "0w251vy5pw3c6503bfvvpr3r0s7xhs1dmp57wl52w94h6gnxf0wv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109581,8 +109693,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20211123"; - sha256 = "0i9dhh601axv0b1i56yzn6jnfp160z530fp9pd557kpq4nbvg5kl"; + version = "8.20211231"; + sha256 = "0cpa3rl8vcm0arima8x9m5q0a9r05z0851ibr1vcria2z0mmwmi7"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -115634,6 +115746,59 @@ self: { broken = true; }) {}; + "graph-trace" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot + , ghc-prim, random, syb, template-haskell, transformers + }: + mkDerivation { + pname = "graph-trace"; + version = "0.1.0.0"; + sha256 = "1nxmj3gd77ffy0441ikvassy5figb5cgav3qbwmgir10jnrqhhbl"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot ghc-prim random syb + template-haskell transformers + ]; + description = "Trace the call graph of a program"; + license = lib.licenses.mit; + }) {}; + + "graph-trace-dot" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory + }: + mkDerivation { + pname = "graph-trace-dot"; + version = "0.1.0.0"; + sha256 = "08wmaqn6b6qzid1vr6jhiqknak44msqm4030pcgjgaw99aa54m60"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory + ]; + executableHaskellDepends = [ + attoparsec base bytestring containers directory + ]; + description = "Converts a graph-trace log into a DOT file for use with Graphviz"; + license = lib.licenses.mit; + }) {}; + + "graph-trace-viz" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed + , graph-trace-dot, process + }: + mkDerivation { + pname = "graph-trace-viz"; + version = "0.1.0.0"; + sha256 = "080i1krd6491cr0q74g6kp6q6z67gbz617kv4k3bmadwqlgl3cl8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory file-embed graph-trace-dot process + ]; + description = "Converts a graph-trace log into an HTML document"; + license = lib.licenses.mit; + }) {}; + "graph-utils" = callPackage ({ mkDerivation, base, containers, fgl, mtl, parsec, syb , template-haskell @@ -116369,6 +116534,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_2_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hspec, hspec-discover + , semigroups, should-not-typecheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "2.0.0.0"; + sha256 = "0havwzskc9abganrgj991r7szcagzw4vkm8qh6b7xqykdf4479xv"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hspec + should-not-typecheck text unordered-containers + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck @@ -116391,6 +116580,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "1.0.0.0"; + sha256 = "0b86rwghrbqzqk5vb9n6qsc4a12pbnwvvy20wdiv1g51dpyi440a"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, hspec-discover, safe-exceptions @@ -116414,6 +116626,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-websocket_1_0_0_0" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, hspec-discover, safe-exceptions + , stm, text, unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "1.0.0.0"; + sha256 = "1nw8jz843080w6jq4j8bmqv9pz66va1yp36a0d1vkybhdhlxs5vy"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -116650,8 +116886,8 @@ self: { }: mkDerivation { pname = "groundhog"; - version = "0.11.0"; - sha256 = "1kx5jdzi7qrb399z23s5khvvllks5qyjl9y5spwssf6d6n9r6w82"; + version = "0.12.0"; + sha256 = "027yf5azppdnj1r0q3l6jzr3c06jh5sz06xhc4wsw0dckg16ai9g"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers monad-control mtl resourcet safe-exceptions scientific text time @@ -116711,8 +116947,8 @@ self: { }: mkDerivation { pname = "groundhog-mysql"; - version = "0.11"; - sha256 = "0xir9181c0h5f5hrg1drzd2g7cgr77zghg1i7fcwl6h9prpp6ira"; + version = "0.12"; + sha256 = "13s4wb5ppyymxxvb415p76rnhvqmw7s2ixbx1kr8adn1bpdlriqv"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers @@ -116730,8 +116966,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.11"; - sha256 = "0c8xqdsv1mi9pp1cnnbj8anf8mb3y6hjg965giw9jsmxf2b4d80x"; + version = "0.12"; + sha256 = "03l54srq5hlx70xvcfzp212zf2bdpil61q3kq6fhwqcrqklvwpy1"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool resourcet text @@ -116748,8 +116984,8 @@ self: { }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.11.0"; - sha256 = "03vnnja0rbk2v8qws0m37hs6imh001pj5hy00gx5xr7kwayvc13g"; + version = "0.12.0"; + sha256 = "07hnm4pja70algvcd3gzn6zwh2c3is4p6m2kcicpfhjiclhv8fqn"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers @@ -116764,8 +117000,10 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.11"; - sha256 = "1rqzqwcvk9shgprgfvl54s67n3img2wnvq98mvbnmr6pfxgcy2az"; + version = "0.12"; + sha256 = "07s1i4s6nm91cp13dp163x32xvsylspra96nivj9f3svsbqfysxr"; + revision = "1"; + editedCabalFile = "1sa068wdcghyapwy6f6q2zi1i4dljv6205is34y1nvvr3xrgi75l"; libraryHaskellDepends = [ aeson base bytestring containers groundhog libyaml template-haskell text time unordered-containers yaml @@ -126550,8 +126788,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.64.8"; - sha256 = "1dryr93698a0v6bdl7dx0abl1zaayx0p9yvx449d3cw98hw841c0"; + version = "0.64.10"; + sha256 = "16dslrdkl4dw7ywjf181mr8vnrjwz9yrc03jr80c704vc0034ymj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126598,8 +126836,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.64.8"; - sha256 = "0caih6piinnfshvryvlv6jwrmvrz7570vki3lc9d5jvvbk7sqlx5"; + version = "0.64.10"; + sha256 = "01nlxy8s37nizvliq6167aaiqy4nl7an3qnhka0pnzawlvn6hdhk"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -127461,6 +127699,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_5_0_1" = 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.1"; + sha256 = "0y8q3jh6lf9nc3xj4l1rql2g1r0id5j7gjmicqq6rqz6k0njs8h9"; + 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 @@ -127680,6 +127945,22 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-optparse-applicative_0_3_0_7" = callPackage + ({ mkDerivation, base-prelude, hasql, hasql-pool + , optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.3.0.7"; + sha256 = "1ncv3xs9kxgzibmxddrxii1ik9z6iw2p1q0lbli8n56d4y1rs570"; + libraryHaskellDepends = [ + base-prelude hasql hasql-pool optparse-applicative + ]; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-pipes" = callPackage ({ mkDerivation, base, bytestring-tree-builder, hasql, pipes , pipes-safe, protolude @@ -127707,6 +127988,19 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-pool_0_5_2_2" = callPackage + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.5.2.2"; + sha256 = "0sr8ifvkyd5g7ajaqd7bbqgfpnpkazv7fbq5ix07h94kdf1idqq5"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; + description = "A pool of connections for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -127817,8 +128111,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.9"; - sha256 = "0z3falhkyyqpzqh116xwzvjj0xb391bwahh64sasnw4vf2i0drb9"; + version = "0.4.0.10"; + sha256 = "1s339xkqdz1hcd8i183lzf565radl95zqq0y7h2r2ayz3rh36485"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -127847,6 +128141,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction_1_0_1_1" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rerebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1.0.1.1"; + sha256 = "0ajk7g9sk83sig2bkfajxpwasqrswxr0f82mxzwfy9j08z3ks235"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + description = "Composable abstraction over retryable transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-url" = callPackage ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty , tasty-quickcheck @@ -135012,8 +135325,8 @@ self: { pname = "hkd"; version = "0.1"; sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa"; - revision = "2"; - editedCabalFile = "19z00b29z095fp9jxp0n7k1dgm980j9i94aysqd0mm1yjvxvn1k5"; + revision = "3"; + editedCabalFile = "0801yrh576b5yvglv0ywzhqfqda376bc10frgdkc0phi5c7qmnj4"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -135849,10 +136162,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2.7"; - sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; - revision = "2"; - editedCabalFile = "0p2d3pi268jkb3hz750apjn917kr40hhamc2apgiv08chqyk82bj"; + version = "3.2.8"; + sha256 = "14nvq71kn1lhqx02r69f949p33rhxi466fwmxj9g0wd5191jawrs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135868,7 +136179,7 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hlint_3_3_5" = callPackage + "hlint_3_3_6" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex @@ -135877,8 +136188,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.3.5"; - sha256 = "1pry95jik5bl49v1mj5g7lbax0937ra6g5wcpblypkpfwgh1h8l1"; + version = "3.3.6"; + sha256 = "0g4fnx0xlwny41dw01vxmfq9ibfwvpgf1cailj870k2wrbs2c9df"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137466,8 +137777,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.16.0"; - sha256 = "0s69fs131djsrdqsmb4ics90g9by1k7yy8q9qq2m3gdbdp7xln86"; + version = "1.16.1"; + sha256 = "17845a9p2k2390xwnh1k2v9a1sdwjn5r5riww54nknxv2vqdkf42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143454,7 +143765,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-aeson_2_0_0" = callPackage + "hslua-aeson_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hslua-core, hslua-marshalling, ieee754, mtl, QuickCheck , quickcheck-instances, scientific, tasty, tasty-hunit @@ -143462,8 +143773,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "2.0.0"; - sha256 = "0djxr6f93n8dmaq4s8dfx0msx8vsg4mdszn407p48vlykxlgzpvd"; + version = "2.0.1"; + sha256 = "17j5gz8pjysq1dgvfqdzbcg3x7nrianzv707rrhj578661hg8h5h"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector @@ -146735,8 +147046,8 @@ self: { pname = "http-api-data"; version = "0.4.3"; sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; - revision = "5"; - editedCabalFile = "18gh7q1j2jiz4c6sn352j5rl4009gi238nni8ff9kqgi3c4mlrs0"; + revision = "6"; + editedCabalFile = "0q4rhz81r5v0z1mn7x9q0ldbfv1a2cp3dpw8s2j96halsq34l4zl"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -151567,8 +151878,8 @@ self: { }: mkDerivation { pname = "ice40-prim"; - version = "0.3.1.1"; - sha256 = "1g0hfkkzgfkqsyyyhpxz7w4g2v5ay5k7d2xs2dp7m6lpzrgs5dl0"; + version = "0.3.1.2"; + sha256 = "1jsqisqpwvnj9fibnrs88255hqarmssq62nkm080g7h0n8a14ggr"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate @@ -154601,6 +154912,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5.1"; sha256 = "1mnc0gby7xz8065rvkqsaqk1vqs0gv1y9qgvwsvxx3gsg9yj3a7r"; + revision = "1"; + editedCabalFile = "1vqsm280r2b573bfznkd9pqmm8ld9ix3z5i1nqmj42q5mv3zlzfm"; libraryHaskellDepends = [ aeson base deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids text transformers unordered-containers @@ -156210,8 +156523,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.7.3"; - sha256 = "0xcn9la0c2illw53xn8m2w2jpfi9yivzl2w54l62cj2fn7l9l5cf"; + version = "1.7.4"; + sha256 = "1hvqgah86z2saizhjpq2352x2ncxjsshvzj66bmij3yk6y107yfs"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -160138,17 +160451,21 @@ self: { }) {}; "json-sop" = callPackage - ({ mkDerivation, aeson, base, generics-sop, lens-sop, tagged, text - , time, transformers, unordered-containers, vector + ({ mkDerivation, aeson, base, generics-sop, lens-sop, tagged, tasty + , tasty-quickcheck, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "json-sop"; - version = "0.2.0.5"; - sha256 = "1sdc2ywdra75nqlc5829f0clfi91fdqyrcmik1nrxrdnxr4yzhvh"; + version = "0.2.1"; + sha256 = "0kzl21669wh9vdxspliflciwrkn5wamwwyg96aqrm4ybdqscpcn4"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; + testHaskellDepends = [ + aeson base generics-sop tasty tasty-quickcheck + ]; description = "Generics JSON (de)serialization using generics-sop"; license = lib.licenses.bsd3; }) {}; @@ -161861,6 +162178,27 @@ self: { broken = true; }) {}; + "katip-wai" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , hspec, hspec-discover, http-client, http-types, katip, network + , stm, text, uuid, wai, warp + }: + mkDerivation { + pname = "katip-wai"; + version = "0.1.0.0"; + sha256 = "1y7f7a0pa9gdp9cvbdqd4xfrd5gazp2wy92hjmrf1fvp35xv1b2f"; + libraryHaskellDepends = [ + aeson base bytestring clock http-types katip network text uuid wai + ]; + testHaskellDepends = [ + aeson async base bytestring containers hspec http-client http-types + katip stm text uuid wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "WAI middleware for logging request and response info through katip"; + license = lib.licenses.bsd3; + }) {}; + "katt" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers , directory, errors, filepath, lens, mtl, parsec, text, url, wreq @@ -163070,6 +163408,8 @@ self: { pname = "ki"; version = "0.2.0.1"; sha256 = "1nxmgv4kxh2whdsmj659iypf8gfjrqzyxzyzghapg1fmpffjpcyr"; + revision = "1"; + editedCabalFile = "0prk6bq1rw52dc7ydapqklcapl1z6yqz0vnx0fl4cm600pd9salm"; libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base stm ]; description = "A lightweight, structured-concurrency library"; @@ -163247,8 +163587,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "4"; - editedCabalFile = "1n7bf4l3wmm3qcwswjkw1d8n39a4b7pxqizpnpkjwq6lj8qxkmd2"; + revision = "5"; + editedCabalFile = "0fqzr4bwiif9ifmdjxkcnky9hn5ygn8pj3gd004dc27nx6dhxzmc"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -163529,8 +163869,8 @@ self: { }: mkDerivation { pname = "koji-install"; - version = "0.4"; - sha256 = "1qsrg57ak7zxmx6c6q83da0dzfhvdcj4ycnz4026xp25ijhl5frd"; + version = "0.5"; + sha256 = "0a0qykn4xp5chaqgid97ryyxb68ryn0pwf8cdn6q336l0k6d68xm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -175233,8 +175573,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "11"; - editedCabalFile = "0qvpsrsr9fw0lyybaq53zskfgawka0lwpkvxaihbyp0k4alj7yjx"; + revision = "12"; + editedCabalFile = "0jc46492lq09yrmp0887q9smk0z6nn35nlgcarm9rndsr2a1x0ya"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -175344,27 +175684,25 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_1_2_0_1" = callPackage + "lsp_1_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, exceptions, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , containers, data-default, exceptions, filepath, hashable + , hslogger, hspec, hspec-discover, lens, lsp-types, mtl , network-uri, QuickCheck, quickcheck-instances, random , rope-utf16-splay, scientific, sorted-list, stm, text, time , transformers, unliftio-core, unordered-containers, uuid }: mkDerivation { pname = "lsp"; - version = "1.2.0.1"; - sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; - revision = "1"; - editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2"; + version = "1.4.0.0"; + sha256 = "18hnb4k3zwjxp3r5jrgrbakvqr2d16azp6jwmfv5lq5n8xn6mwgv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring containers data-default - dependent-map exceptions hashable hslogger lens lsp-types mtl - network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid + exceptions hashable hslogger lens lsp-types mtl network-uri random + scientific sorted-list stm text time transformers unliftio-core + unordered-containers uuid ]; testHaskellDepends = [ aeson base containers filepath hspec lens network-uri QuickCheck @@ -175404,7 +175742,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_14_0_1" = callPackage + "lsp-test_0_14_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, extra, filepath, Glob, hspec, lens, lsp @@ -175413,8 +175751,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.14.0.1"; - sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy"; + version = "0.14.0.2"; + sha256 = "1capjilca74cqiwmrhbl1an6ih3227n3g417dfvql0lffa3j6qsf"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob @@ -175422,7 +175760,7 @@ self: { transformers unix unordered-containers ]; testHaskellDepends = [ - aeson async base data-default directory filepath hspec lens lsp mtl + aeson base data-default directory filepath hspec lens lsp mtl parser-combinators process text unliftio unordered-containers ]; testToolDepends = [ lsp ]; @@ -175455,24 +175793,22 @@ self: { license = lib.licenses.mit; }) {}; - "lsp-types_1_3_0_1" = callPackage + "lsp-types_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl - , network-uri, rope-utf16-splay, scientific, some, template-haskell - , temporary, text, unordered-containers + , data-default, deepseq, Diff, directory, dlist, filepath, hashable + , hslogger, lens, mod, mtl, network-uri, rope-utf16-splay + , scientific, some, template-haskell, temporary, text + , unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.3.0.1"; - sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z"; - revision = "1"; - editedCabalFile = "031b69fxi8m4fcwwgqb7cf4k806ikkmjqnn3wv6bn3sny1hn5gg7"; + version = "1.4.0.0"; + sha256 = "0rzvjfn26qrgb7h21m20rvdc7x730z93lgmrz4m4l7g9s2xa7s3s"; libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template Diff directory dlist filepath - hashable hslogger lens mtl network-uri rope-utf16-splay scientific - some template-haskell temporary text unordered-containers + aeson base binary bytestring containers data-default deepseq Diff + directory dlist filepath hashable hslogger lens mod mtl network-uri + rope-utf16-splay scientific some template-haskell temporary text + unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -175998,8 +176334,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; - revision = "1"; - editedCabalFile = "0mmq1q82mrbayiij0p8wdnkf0j8drmq1iibg8kn4cak3nrn9pd1d"; + revision = "2"; + editedCabalFile = "1h4pdybiqpwljjm4p9bhn3nr2kgqxxggnl5czk5d6ch6li1w1160"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -180574,6 +180910,8 @@ self: { pname = "megaparsec"; version = "9.2.0"; sha256 = "1whjn3n14h2q3ja1v7zllzmj28ai7lqwfbif22c08rl00wpwmwhd"; + revision = "1"; + editedCabalFile = "1jv3j59fvykvplj3c653c9rk5wiwg6x0jnljhi2vknzxxmxkjj02"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -181852,8 +182190,8 @@ self: { }: mkDerivation { pname = "mfsolve"; - version = "0.3.2.0"; - sha256 = "1wa2m8q49lv0a335ahgx2svkff8vaba65cqlfmmk43ww5x26f893"; + version = "0.3.2.1"; + sha256 = "190dszcnvy5j5bs3n0kya8a9nq0vdhrpgpndjpsxw7x70y3hc9d2"; libraryHaskellDepends = [ base hashable mtl mtl-compat unordered-containers ]; @@ -182307,8 +182645,8 @@ self: { pname = "microstache"; version = "1.0.2"; sha256 = "0pirywb9304j2ylasskwq20k6d2srk616sh41l4s37yajsjggx5i"; - revision = "2"; - editedCabalFile = "1hvvqn3l8y3mxvzpnh0p801zp2j0m8immbabbzn8nc6wp88rwvd4"; + revision = "3"; + editedCabalFile = "1bs7h4ffd1ckjjanqsshvw1z472d0lnq3bz7qmbnfmg73jji23pv"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -183678,8 +184016,8 @@ self: { }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "4"; - sha256 = "14sfzb7ii0ldwkfx05r4jk4rc0nqxzi7nw81v8kgsyi0saa1ig0i"; + version = "6"; + sha256 = "1bwnpf7jvbc8z7aipw0fvkgjq1mmwn1xmm6vaaipf3ami10gpfn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185621,6 +185959,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "monad-memo_0_5_4" = callPackage + ({ mkDerivation, array, base, containers, criterion, primitive + , QuickCheck, random, test-framework, test-framework-quickcheck2 + , transformers, vector + }: + mkDerivation { + pname = "monad-memo"; + version = "0.5.4"; + sha256 = "0lw5pdkk39zxckwha4wjfjg5hxlvxa5gjmw385zmanjx34wkzg2c"; + libraryHaskellDepends = [ + array base containers primitive transformers vector + ]; + testHaskellDepends = [ + array base containers primitive QuickCheck random test-framework + test-framework-quickcheck2 transformers vector + ]; + benchmarkHaskellDepends = [ + array base containers criterion primitive transformers vector + ]; + description = "Memoization monad transformer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-mersenne-random" = callPackage ({ mkDerivation, base, mersenne-random-pure64 }: mkDerivation { @@ -188400,34 +188762,53 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mptcp" = callPackage + ({ mkDerivation, base, bytestring-conversion, c2hs, containers + , enumset, Frames, hspec, ip, lens, text, unordered-containers + }: + mkDerivation { + pname = "mptcp"; + version = "0.0.1"; + sha256 = "0740han3qvmzvq6n6dznfkmh7n0mvk9gw4yj3sn9953gag762cc9"; + libraryHaskellDepends = [ + base bytestring-conversion containers enumset Frames ip lens text + unordered-containers + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base hspec ip text ]; + description = "Datastructures to describe TCP and MPTCP connections"; + license = lib.licenses.gpl3Only; + }) {}; + "mptcp-pm" = callPackage ({ mkDerivation, aeson, aeson-extra, aeson-pretty, base, bytestring , bytestring-conversion, c2hs, cereal, containers, enumset - , filepath, formatting, HUnit, ip, mtl, netlink + , filepath, formatting, HUnit, ip, lens, mptcp, mtl, netlink , optparse-applicative, polysemy, polysemy-log, polysemy-log-co - , polysemy-plugin, process, readable, temporary, text, transformers - , unordered-containers + , polysemy-plugin, pretty-simple, process, readable, temporary + , text, transformers, unordered-containers }: mkDerivation { pname = "mptcp-pm"; - version = "0.0.4"; - sha256 = "1i84pkifb8mqyhv4cg0gc6adss673yp25ffmlyif3zcrc3dshjyc"; + version = "0.0.5"; + sha256 = "12c9n7gda23lnpnsnv373rh14phidv27w5vjncrpxf8xfdiyharb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-extra aeson-pretty base bytestring - bytestring-conversion cereal containers enumset formatting ip mtl - netlink polysemy polysemy-log polysemy-log-co polysemy-plugin - process readable text transformers unordered-containers + bytestring-conversion cereal containers enumset formatting ip lens + mptcp mtl netlink polysemy polysemy-log polysemy-log-co + polysemy-plugin process readable text transformers + unordered-containers ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ aeson aeson-extra aeson-pretty base bytestring cereal containers - filepath formatting ip mtl netlink optparse-applicative polysemy - polysemy-log polysemy-log-co polysemy-plugin process readable - temporary text transformers + filepath formatting ip lens mptcp mtl netlink optparse-applicative + polysemy polysemy-log polysemy-log-co polysemy-plugin pretty-simple + process readable temporary text transformers ]; - testHaskellDepends = [ base HUnit ip text ]; + testHaskellDepends = [ base HUnit ip mptcp text ]; description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; platforms = [ @@ -192533,6 +192914,25 @@ self: { license = lib.licenses.mit; }) {}; + "neat-interpolation_0_5_1_3" = callPackage + ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.5.1.3"; + sha256 = "01v5ccv16gw13mjxdxcxnbs6ggzmqh4vwzybzkzqzm40la163aqz"; + libraryHaskellDepends = [ base megaparsec template-haskell text ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "needle" = callPackage ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec , parsec-extra, template-haskell, text, vector @@ -193028,14 +193428,14 @@ self: { "net-spider" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-interval , doctest, doctest-discover, extended-reals, greskell - , greskell-websocket, hashable, hspec, monad-logger + , greskell-websocket, hashable, hspec, hspec-discover, monad-logger , regex-applicative, safe-exceptions, scientific, text, time , unordered-containers, vector }: mkDerivation { pname = "net-spider"; - version = "0.4.3.6"; - sha256 = "1whi7v16zqa26c8a4a36g5p8gddk69acnxar3pgybyc58y9af0i1"; + version = "0.4.3.7"; + sha256 = "0azbrvwg8qy3ch96pxpdna9ycigqw6jayi3n7isgyrdwsfsa2vl7"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -193045,6 +193445,7 @@ self: { aeson base bytestring doctest doctest-discover greskell hashable hspec text time vector ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "A graph database middleware to maintain a time-varying graph"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -193053,13 +193454,13 @@ self: { "net-spider-cli" = callPackage ({ mkDerivation, aeson, base, doctest, doctest-discover - , greskell-core, hashable, hspec, net-spider, optparse-applicative - , text + , greskell-core, hashable, hspec, hspec-discover, net-spider + , optparse-applicative, text }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.6"; - sha256 = "0byd87p7h6vrdmg7j7ypjq2mcks8a7axi9j9qnjv283y4n56nxw1"; + version = "0.2.0.7"; + sha256 = "0saylldz7d0qcjh85i7gc8wisb10hmbap66ldqkkl557wv4w6kaa"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -193067,6 +193468,7 @@ self: { testHaskellDepends = [ base doctest doctest-discover hspec net-spider optparse-applicative ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "CLI option parsers for NetSpider objects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -193093,13 +193495,14 @@ self: { "net-spider-rpl" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-parse - , fast-logger, greskell, hashable, hspec, ip, monad-logger, mtl - , net-spider, regex-applicative, safe-exceptions, text, time + , fast-logger, greskell, hashable, hspec, hspec-discover, ip + , monad-logger, mtl, net-spider, regex-applicative, safe-exceptions + , text, time }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.4"; - sha256 = "0pmmxvfg8y8xymkkxka2c7jk83as5b6d5wmi0x9cml8hsnvlcifx"; + version = "0.4.1.5"; + sha256 = "0v3jxw2nhj0apbsms2f5z2lvbr7wkj1r8zmrb46j2a6k4l14w3ij"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -193108,6 +193511,7 @@ self: { aeson base bytestring fast-logger hspec ip monad-logger net-spider text ]; + testToolDepends = [ hspec-discover ]; description = "NetSpider data model and utility for RPL networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -193115,14 +193519,14 @@ self: { "net-spider-rpl-cli" = callPackage ({ mkDerivation, base, bytestring, fast-logger, fgl, greskell - , hashable, hspec, ip, monad-logger, net-spider, net-spider-cli - , net-spider-rpl, optparse-applicative, text, time, transformers - , unordered-containers + , hashable, hspec, hspec-discover, ip, monad-logger, net-spider + , net-spider-cli, net-spider-rpl, optparse-applicative, text, time + , transformers, unordered-containers }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.3"; - sha256 = "1cxp61nkl0vbks9ny7gpyjjiqg3cvzbz934iia66g2iwkbnfx250"; + version = "0.1.3.4"; + sha256 = "118i7sjj3rs3lgan9g6da67r4f5swnmzn311pady5za6329lcpvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193135,6 +193539,7 @@ self: { base bytestring fast-logger hashable hspec ip monad-logger net-spider net-spider-cli net-spider-rpl optparse-applicative text ]; + testToolDepends = [ hspec-discover ]; description = "CLI executable of NetSpider.RPL."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -195280,8 +195685,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.3.1.0"; - sha256 = "16yggqk02cs5s9iljllz4xh6grq829wxzpzidfi0276bmwmkdi1b"; + version = "0.3.2.0"; + sha256 = "18lpy0zqj8s4q4ar49y4gsfcr1vkhzzrlg2fip9gs807arkjfmps"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Build custom libraries for Nginx haskell module"; license = lib.licenses.bsd3; @@ -195621,6 +196026,8 @@ self: { pname = "nix-derivation"; version = "1.1.2"; sha256 = "0248xbxq4889hc3qp9z0yr21f97j3lxrjjx2isxdf8ah4hpidzy7"; + revision = "1"; + editedCabalFile = "06fj7rqj8g3xhwm0x0cyxp7f8k8gasm4y2ccnm8zq9bhli1hw4b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195821,24 +196228,25 @@ self: { "nix-tree" = callPackage ({ mkDerivation, aeson, async, base, brick, bytestring, clock , containers, deepseq, directory, filepath, hashable, hedgehog - , hrfsize, relude, terminal-progress-bar, text, transformers - , typed-process, unordered-containers, vty + , hrfsize, optparse-applicative, relude, terminal-progress-bar + , text, transformers, typed-process, unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.1.9"; - sha256 = "1xgb7f735afq0x7y3lsdciv9mk7cf9szbazn9fksb7fxf437w27m"; + version = "0.2.0"; + sha256 = "1m8ahqdm9ivgc1l1mk3s9q8gviklpq6kckn7jhdzx2mbzx7gf2vj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base brick bytestring clock containers deepseq - directory filepath hashable hrfsize relude terminal-progress-bar - text transformers typed-process unordered-containers vty + directory filepath hashable hrfsize optparse-applicative relude + terminal-progress-bar text transformers typed-process + unordered-containers vty ]; testHaskellDepends = [ aeson base brick bytestring clock containers deepseq directory - filepath hashable hedgehog hrfsize relude text transformers - typed-process unordered-containers vty + filepath hashable hedgehog hrfsize optparse-applicative relude text + transformers typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; license = lib.licenses.bsd3; @@ -201437,8 +201845,8 @@ self: { pname = "optics-extra"; version = "0.4"; sha256 = "1ynhyw22rwvvh5yglybmb6skhpgqk4gh9w2w4dh8kb7myzcwfj1s"; - revision = "1"; - editedCabalFile = "0imfv8ax513jnlcjqhxvwsn6izi6rndf42qkpjaycbw23a163fj4"; + revision = "2"; + editedCabalFile = "16a139wxgmg4hq6wd8fygbd6qqavf4xgyqdq4c5q37ai43a38wir"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors indexed-traversable-instances mtl optics-core text transformers @@ -203463,8 +203871,8 @@ self: { pname = "palette"; version = "0.3.0.2"; sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; - revision = "2"; - editedCabalFile = "134w4bm1p6piyx594dx4hncf3adycqld4935bs2wbrq634w7ngxg"; + revision = "3"; + editedCabalFile = "1m9nd65pmnwmy74yqq283w53p483mnfvzkv1iyd6y97f0scgxs84"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -204109,6 +204517,8 @@ self: { pname = "pandoc-plot"; version = "1.3.0"; sha256 = "0d33cbw0ygsdwh718q7q5gw2s6565dbrjwi3rz0qdf78q14wiayi"; + revision = "1"; + editedCabalFile = "1l4rxi23i8ngfrv6vk94l0j0cfczwxchp2bwh1l894b4dfhkq1ks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206554,19 +206964,21 @@ self: { "patch" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-map, dependent-sum, directory, filemanip, filepath - , hlint, lens, monoidal-containers, semialign, semigroupoids, these - , transformers, witherable + , hedgehog, hlint, HUnit, lens, monoidal-containers, semialign + , semigroupoids, these, transformers, witherable }: mkDerivation { pname = "patch"; - version = "0.0.4.0"; - sha256 = "02hdhgk7wwcnq7aahbaqx5zzlha6mq6lj0mw57phj3ykmca0zggc"; + version = "0.0.5.1"; + sha256 = "073q0kxjkjyv7cvxmxksln91s0dqki07by9fbg4ls1lh5mwyn3vk"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers witherable ]; - testHaskellDepends = [ base directory filemanip filepath hlint ]; + testHaskellDepends = [ + base containers directory filemanip filepath hedgehog hlint HUnit + ]; description = "Data structures for describing changes to other data structures"; license = lib.licenses.bsd3; }) {}; @@ -215040,19 +215452,15 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.3.1.7"; - sha256 = "0cra8zz7xmgw1103j3a1a4sk8jvk073wnyyk51x2fxiwjpqmax1y"; + version = "0.3.1.8"; + sha256 = "11f8yj77kws6aybaw1jdgjj1kn4n4ip0b97cg3bsjybnjwg4hppy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy relude string-interpolate tasty tasty-hedgehog template-haskell text transformers ]; - testHaskellDepends = [ - base containers either hedgehog path path-io polysemy relude - string-interpolate tasty tasty-hedgehog template-haskell text - transformers - ]; + testHaskellDepends = [ base hedgehog path polysemy tasty text ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; }) {}; @@ -216770,8 +217178,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "5"; - editedCabalFile = "0vnawd7f2lwqgh1hi6s5y5wny85a12i27haz93bmjvpmdljjmsjk"; + revision = "6"; + editedCabalFile = "1s7f6l17qakhgmfn1l09s4g5pmawn9qa8ylbzybkm91h9y7mwlzn"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -216959,8 +217367,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "4"; - editedCabalFile = "092gkvwzdf0nmm6q6lgjb81j8vpn5d3pybavs39ya2v92mbhrpmm"; + revision = "5"; + editedCabalFile = "17l5iq6c4yjw3gswgav398cbih5105m05ak68kdibv6jjazkqw7p"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -221949,8 +222357,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.2.3"; - sha256 = "0930yrqvp9m28ypc3l4fgxbclp3a9b8r8drylws2s7jflss778bn"; + version = "0.1.2.4"; + sha256 = "1kqh7n92bipk5wzywb5zlrb0l4qh5lq2pqll4wsbklqg47i1y9ai"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; @@ -223800,15 +224208,15 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, binary, containers, ghc-prim - , hashable, path-pieces, text, unordered-containers, vector + ({ mkDerivation, aeson, base, binary, containers, hashable + , path-pieces, text, unordered-containers, vector }: mkDerivation { pname = "quantification"; - version = "0.5.2"; - sha256 = "0ngy44xlbxhq8gzvp9fs71pchzqgy2bpqqfm3wna666c1034srxf"; + version = "0.6.0"; + sha256 = "1512z20qqkj50nwhmf30f6fy5pqhibn3mdb6whckxy62i9vw6s6s"; libraryHaskellDepends = [ - aeson base binary containers ghc-prim hashable path-pieces text + aeson base binary containers hashable path-pieces text unordered-containers vector ]; description = "Rage against the quantification"; @@ -224353,6 +224761,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.27"; sha256 = "10vb3rl1ma9x4qdych9vn8gj9kngkqs2b97f4s6s1a908ddxv4m5"; + revision = "1"; + editedCabalFile = "1b17ghhhrw9h625q08145pdpw72xmava73d3xb933slza5jms6nz"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple QuickCheck scientific splitmix @@ -225805,12 +226215,33 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "ral_0_2_1" = callPackage + ({ mkDerivation, adjunctions, base, bin, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable, QuickCheck + , semigroupoids, vector + }: + mkDerivation { + pname = "ral"; + version = "0.2.1"; + sha256 = "1f6sks81g8zxkgnp7lc5n0aimnvbbvkazassc17z0prs56hs63si"; + libraryHaskellDepends = [ + adjunctions base bin boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Random access lists"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ral-lens" = callPackage ({ mkDerivation, base, bin, fin, lens, ral }: mkDerivation { pname = "ral-lens"; version = "0.2"; sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; + revision = "1"; + editedCabalFile = "0fmwfl0ci25g4lzprj9xm4jv1is4m7j8v8j0n09j4qxvlzz6y4p1"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -225822,6 +226253,8 @@ self: { pname = "ral-optics"; version = "0.2"; sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; + revision = "1"; + editedCabalFile = "1dbd9v0s0g06sr0cx5dma4bn6ga47ha501nm06rfs2y6dbv1jn23"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -226459,10 +226892,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.4.3"; - sha256 = "03sla9gsg23ma8xxm3mndc9wrh715lsgksxc34rxkmjbp9vxlccj"; - revision = "1"; - editedCabalFile = "1607wkp0d9a9igyngc5hip6mcsx8lm6v70facnggz0lnv7vqm5l8"; + version = "1.4.4"; + sha256 = "0c220gxk7dzn2gb0g34bvjjwjw5ir5i8qa089mcpyqqaba8jzxaw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base distributive template-haskell transformers @@ -229343,6 +229774,8 @@ self: { pname = "reflex-dom"; version = "0.6.1.1"; sha256 = "0ykkzmzxiznd09sgmjwzmbrpnm8gr2bd57hzdl8avrr728bwj8ga"; + revision = "1"; + editedCabalFile = "0g9ch18sibdz6mqkfkh1dh86hf7vp3bjr8hyq2dqk33vn1lkrlrp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229423,8 +229856,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.3.0"; - sha256 = "0w3vn5in594rslv3lfw5sgbs2phh7f9f3q9sxpqbjqvcscll5rpg"; + version = "0.7.0.0"; + sha256 = "0g96z0qd658g5zhcb01f7gzpk3kb016w6w67wcyrigvg4zxk2vyn"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -230222,8 +230655,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "5"; - editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi"; + revision = "6"; + editedCabalFile = "16a2d8d84gzbjbvs7pc7sz5bi7rz2s5c57gkwi0vf5lmscgjy25h"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = lib.licenses.bsd3; @@ -230532,6 +230965,21 @@ self: { broken = true; }) {}; + "regex-rure" = callPackage + ({ mkDerivation, base, bytestring, c2hs, rure, tasty, tasty-hunit + }: + mkDerivation { + pname = "regex-rure"; + version = "0.1.0.0"; + sha256 = "0fji4j0nhq47s956ahxq7rh1a50q6y65b5m9rdcn3mjahqmirkal"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ rure ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "Bindings to Rust's regex library"; + license = lib.licenses.gpl3Only; + }) {rure = null;}; + "regex-tdfa" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, mtl, parsec, regex-base, text, utf8-string @@ -231876,10 +232324,8 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.4.1.4"; - sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "9"; - editedCabalFile = "0n287hg4lmn139dwji5xbry369a4ci0qh1birxkzzrsvyv0aq0nz"; + version = "3.4.1.5"; + sha256 = "0saa2r94l0x52dlj9402csah96akp5wlc0xaah9p2pb8fv3yvs11"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -231891,10 +232337,8 @@ self: { ({ mkDerivation, base, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.4.1.3"; - sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y"; - revision = "1"; - editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm"; + version = "3.4.1.4"; + sha256 = "0k5xmr46vnai095bsa0nsi7imzwnsmll2y4hqbsajlizcr6ilwmq"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; license = lib.licenses.bsd3; @@ -232662,6 +233106,8 @@ self: { pname = "rere"; version = "0.2"; sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr"; + revision = "1"; + editedCabalFile = "1mpabhclfkn4a1b7r4vwf6n98xwrzivw8nd0g5jbplbsw5lwxv1j"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -233211,6 +233657,8 @@ self: { pname = "rest-rewrite"; version = "0.1.1"; sha256 = "0absln2c3ia5bj473wr6lahms9x9xj6szk9lgpb9382px038wxrn"; + revision = "1"; + editedCabalFile = "0nzzqg9m7b01g574mm37yiqaqkff4p7hskgj98nb4v7cdp46nypb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233538,7 +233986,7 @@ self: { license = lib.licenses.mit; }) {}; - "retrie_1_2_0_0" = callPackage + "retrie_1_2_0_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , data-default, deepseq, directory, exceptions, filepath, ghc , ghc-exactprint, ghc-paths, haskell-src-exts, HUnit, list-t, mtl @@ -233547,8 +233995,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "1.2.0.0"; - sha256 = "0l4n1yhq388x774w2qyzsi4q1xsj121ccd60q21b5fz0hdzrxy26"; + version = "1.2.0.1"; + sha256 = "1n3g9wr45xz1q2mhlj1r2709rqakczrvd7x6vxh7iapz43f69c6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237383,6 +237831,8 @@ self: { pname = "safe-json"; version = "1.1.2.0"; sha256 = "1908s40l6chnxlxnqmn95p8hvr5jbjm8hm5dnjbq7czxpw22x7s2"; + revision = "1"; + editedCabalFile = "0276r8ic9yl805nx681ws0x5m1kdl162dc0rshqa24z33i4a09mx"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -239733,8 +240183,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "1"; - editedCabalFile = "0wydsjgrl28wx3rv9iq6vcva50r9s8ss8g2hkp6bkrr0nggv9vfp"; + revision = "2"; + editedCabalFile = "01vmr4pz1j0xjcln61m7gng6bzhgri56h05x7sl6xbxjps15likn"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive template-haskell text @@ -241143,13 +241593,14 @@ self: { }) {}; "search-algorithms" = callPackage - ({ mkDerivation, base, containers, doctest, hspec }: + ({ mkDerivation, base, containers, criterion, doctest, hspec }: mkDerivation { pname = "search-algorithms"; - version = "0.3.1"; - sha256 = "1803pmk78l29nlgh68y7hndhlmlsabddf78hsva1bq87yhzz1rlv"; + version = "0.3.2"; + sha256 = "0lkpsr4vwf77slgwxc38xmhkwwxbh360gjqhblysrph7rl9w7sh7"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hspec ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Common graph search algorithms"; license = lib.licenses.bsd3; }) {}; @@ -241914,6 +242365,8 @@ self: { pname = "semialign-optics"; version = "1.2"; sha256 = "04vh689mmnb5q77v6ifhg7xf7m2qh5x4i4804rm4biw78130xqr1"; + revision = "1"; + editedCabalFile = "1cvl6lprra947pdiy7x54qczsfq0383ncsxp4hvlkk9kif7w0pvm"; libraryHaskellDepends = [ base optics-core semialign ]; doHaddock = false; description = "SemialignWithIndex, i.e. izipWith and ialignWith"; @@ -246379,8 +246832,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.2.0.0"; - sha256 = "1q1b1kzc4578drz92r666gl2l02pn4zdbbbnjcwwkklccslb3zcd"; + version = "1.2.1.0"; + sha256 = "18di6krrrclilp74fazwlsfcq3jym9mmya8q0x2vm2cdgbpjm8mi"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -247829,6 +248282,27 @@ self: { license = lib.licenses.mit; }) {}; + "shikensu_0_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow + , Glob, tasty, tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "shikensu"; + version = "0.4.0"; + sha256 = "0ln51nw01k776lv8bxg1pp8cpnchhr4aj12llxvh4zzi4asxj2x6"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath flow Glob text + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath flow Glob tasty + tasty-hunit text unordered-containers + ]; + description = "Run a sequence of functions on in-memory representations of files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "shimmer" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, haskeline , text @@ -249895,14 +250369,14 @@ self: { "simpoole" = callPackage ({ mkDerivation, base, concurrency, containers, exceptions, hspec - , time + , mtl, time }: mkDerivation { pname = "simpoole"; - version = "0.2.0"; - sha256 = "17hisyc7c4vff3nn69sk7xkkq2nj8l0zwq27zx1nfarwqf04g2ix"; + version = "0.3.0"; + sha256 = "188c6r5vzi7bdyk8qgi5z2zxw7cjacf7fa986y7r1v89q0advr8v"; libraryHaskellDepends = [ - base concurrency containers exceptions time + base concurrency containers exceptions mtl time ]; testHaskellDepends = [ base concurrency hspec ]; description = "Simple pool"; @@ -254507,10 +254981,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "sop-core"; - version = "0.5.0.1"; - sha256 = "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys"; - revision = "1"; - editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd"; + version = "0.5.0.2"; + sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -254968,6 +255440,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "spade" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring + , constraints, containers, Decimal, exceptions, file-embed + , hedgehog, hex-text, hspec, hspec-discover, hspec-hedgehog + , monad-loops, mtl, neat-interpolation, ordered-containers, process + , random, scientific, sdl2, sdl2-mixer, stm, strip-ansi-escape + , template-haskell, text, time, unordered-containers, vector, vty + , WAVE + }: + mkDerivation { + pname = "spade"; + version = "0.1.0.2"; + sha256 = "0iyml3hnx9qkax2fwynk9mcfwsi8rnhqn1xbb5kdp0j930xp4d4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring constraints containers Decimal + exceptions file-embed hedgehog hex-text hspec hspec-hedgehog + monad-loops mtl ordered-containers process random scientific sdl2 + sdl2-mixer stm template-haskell text time unordered-containers + vector vty WAVE + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring constraints containers Decimal + exceptions file-embed hedgehog hex-text hspec hspec-hedgehog + monad-loops mtl ordered-containers process random scientific sdl2 + sdl2-mixer stm template-haskell text time unordered-containers + vector vty WAVE + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring constraints containers Decimal + exceptions file-embed hedgehog hex-text hspec hspec-discover + hspec-hedgehog monad-loops mtl neat-interpolation + ordered-containers process random scientific sdl2 sdl2-mixer stm + strip-ansi-escape template-haskell text time unordered-containers + vector vty WAVE + ]; + testToolDepends = [ hspec-discover ]; + description = "A simple programming and debugging environment"; + license = lib.licenses.gpl3Only; + }) {}; + "spake2" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, memory , optparse-applicative, process, protolude, QuickCheck, tasty @@ -257388,8 +257902,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.4.3"; - sha256 = "1978fc1v7i6g41fa755sb2lpwbkahr76w5f5bm0iqv5hid536a60"; + version = "0.4.4"; + sha256 = "1z2lvvpzlaxwxxbb30xyr62sm483bqiknxwmzdnfb0ri7qf31kfr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -258490,8 +259004,8 @@ self: { pname = "statestack"; version = "0.3"; sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns"; - revision = "1"; - editedCabalFile = "03kk2zab7mcr5m89mxxl0zivag2hb024ijfdi0mp794hswncwhxy"; + revision = "2"; + editedCabalFile = "00qpdrgxibfcdablasi5bdvdflxfgdk3hyg6461nsymwagr42ya3"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -261207,8 +261721,8 @@ self: { pname = "strict"; version = "0.4.0.1"; sha256 = "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz"; - revision = "3"; - editedCabalFile = "13yn5xvywyy3zwhyhl6dq3qrk6im6sm94q98647vgh6xs8xvlvya"; + revision = "4"; + editedCabalFile = "0pdzqhy7z70m8gxcr54jf04qhncl1jbvwybigb8lrnxqirs5l86n"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -262176,10 +262690,8 @@ self: { }: mkDerivation { pname = "strong-path"; - version = "1.1.1.0"; - sha256 = "1jqz927n21q44i8021x8r1swppn6n6dy0z4zv0509jc7s6vf34vi"; - revision = "1"; - editedCabalFile = "01j3fgkhqln8nj4wh4za1l8b6fpms7fxifzi2fwlfaxnwis029vv"; + version = "1.1.2.0"; + sha256 = "1rz3rxdq3apah0ixj9dzd1wlicjj0l5lspv9bz79kfjvlxn15yib"; libraryHaskellDepends = [ base exceptions filepath path template-haskell ]; @@ -262302,8 +262814,8 @@ self: { pname = "structured"; version = "0.1.1"; sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; - revision = "1"; - editedCabalFile = "0ijyzfr55xyp692aj9jch81lwqx3pavg4ci8hzbc230zjs5idc50"; + revision = "2"; + editedCabalFile = "1vsb5707b2mza2sd1xrrih4y85iaiwp05fajr359xlg1n1dfc1qf"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -263638,8 +264150,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "3"; - editedCabalFile = "1zc7shja5i63rn7kd9mnq2m052qhp7nh44qy8qp93dm64v9m9pi2"; + revision = "4"; + editedCabalFile = "1731ryf1bymy0s4hg109f2g7wn6mm9b52y2r4gw2d59170lxzv8f"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -264064,8 +264576,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.0.9"; - sha256 = "1l9mz4gxrdjy2z5rz7vbmp80jq9x2hwhccd5360yh6ljm8glf4y6"; + version = "0.10.1.0"; + sha256 = "0xy12fmmiydaqm0cng24qd7c1py1sbb4ww66w0n5w26kwgh622cc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -267540,15 +268052,15 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "taskwarrior_0_6_0_1" = callPackage + "taskwarrior_0_6_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-discover, process, QuickCheck, quickcheck-instances, random , text, time, uuid }: mkDerivation { pname = "taskwarrior"; - version = "0.6.0.1"; - sha256 = "0g7g03hnlij7ggrq0rlxy4gay6b8f9j1yxm71y4yb80wnrj9lgwf"; + version = "0.6.0.2"; + sha256 = "16m4578ybwawiza4fg8gc6ndfc8hpvdkh5bv3ghamwpqyw0aq766"; libraryHaskellDepends = [ aeson base bytestring containers process random text time uuid ]; @@ -268728,8 +269240,8 @@ self: { pname = "tdigest"; version = "0.2.1.1"; sha256 = "1dvkf7cs8dcr13wza5iyq2qgvz75r33mzgfmhdihw62xzxsqb6d3"; - revision = "1"; - editedCabalFile = "1paw32ixw4jgq0pl9f4ag43n8gqg5gmdjib6w4wx8x6ynmk19cq0"; + revision = "2"; + editedCabalFile = "0hcsjdd8km8dhydg4npc6mw6yy6bhv4f21zvm8is8h0ci4057asy"; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers vector vector-algorithms @@ -271147,8 +271659,8 @@ self: { pname = "texrunner"; version = "0.0.1.2"; sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; - revision = "3"; - editedCabalFile = "1l3cpi7yx8jm3653rf3v7midf19i7khc6in75m7zz66124c6i350"; + revision = "4"; + editedCabalFile = "13vd48qr6hi6lnb9j41lw6g8yd5k8gpf1z5ig4qw58xg8vws6rzx"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -271230,8 +271742,8 @@ self: { pname = "text-ansi"; version = "0.1.1"; sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6"; - revision = "2"; - editedCabalFile = "03r5318sxzxykms6jjmry6mkm4zy83ajamk727jym9r9kp16dkmc"; + revision = "3"; + editedCabalFile = "0xv9j3fyygaixmv14i3yds63nmvfqwfnz7883by61lvhq5dl3iyv"; libraryHaskellDepends = [ base text ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -271615,6 +272127,8 @@ self: { pname = "text-manipulate"; version = "0.3.0.0"; sha256 = "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a"; + revision = "1"; + editedCabalFile = "1px2b8knr4z44hp9wb9dwac1pycaic7ji4fhpma3sr6jgjjszyw4"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -271647,8 +272161,8 @@ self: { }: mkDerivation { pname = "text-metrics"; - version = "0.3.1"; - sha256 = "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2"; + version = "0.3.2"; + sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -271862,24 +272376,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-short_0_1_4" = callPackage + "text-short_0_1_5" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim - , hashable, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text + , hashable, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text }: mkDerivation { pname = "text-short"; - version = "0.1.4"; - sha256 = "1p56cjm6f883ajb54y8hmrl01sqda6a36xvbmgjv3mb9gxv953v4"; - revision = "2"; - editedCabalFile = "08rgniynvmfla0v6xsq5347i7r0jig9bzjppnwjddzahhqa8jirc"; + version = "0.1.5"; + sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text ]; testHaskellDepends = [ - base binary bytestring quickcheck-instances tasty tasty-hunit - tasty-quickcheck template-haskell text + base binary bytestring tasty tasty-hunit tasty-quickcheck + template-haskell text ]; description = "Memory-efficient representation of Unicode text strings"; license = lib.licenses.bsd3; @@ -271916,7 +272428,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_9_4" = callPackage + "text-show_3_9_5" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -271926,8 +272438,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.9.4"; - sha256 = "0wskjfyb3nn6dkd6h0zakiy71qkhgmin636qrmryqbv3q7172yfq"; + version = "3.9.5"; + sha256 = "03gp01wim236xdznxi5naq42lz9whdb2ms8xj01g39l54i83n22q"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -272613,6 +273125,8 @@ self: { pname = "th-extras"; version = "0.0.0.5"; sha256 = "03pfwadxxnabkpy1i6jmmgk6p8w3r9cn3xz7d7jvzqsig70mnpim"; + revision = "2"; + editedCabalFile = "1ml4mhc362j89kjrlw0qcfv361mak9pqdhsczs26bbjsfajwcabq"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -273586,8 +274100,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; - revision = "3"; - editedCabalFile = "0pk2vy2lqifjdm3cw9lhl5nx7aw4ff4g8p6l8p7yc9x7h9m6va16"; + revision = "4"; + editedCabalFile = "020yz8zgbk76cwi0z3bf2ikfpd7mm55jp1hjqdbjjxj7k2mwpl1h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -273982,28 +274496,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, network, parsec - , primitive, random, text, transformers, weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.7.9"; - sha256 = "1117qcmgjrhvijjqkkdrb003k3jymgr11dhcr67i1xw23v59a689"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - network parsec primitive random text transformers - ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - }) {}; - - "tidal_1_7_10" = callPackage ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, exceptions, hint, hosc, microspec , mtl, network, parsec, primitive, random, text, transformers @@ -274028,7 +274520,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -274481,8 +274972,8 @@ self: { pname = "time-parsers"; version = "0.1.2.1"; sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; - revision = "3"; - editedCabalFile = "1cv9fpn8bixicwcacyv0hx81q1xw06pig07zrpnf354bqzrsf3jw"; + revision = "4"; + editedCabalFile = "04hc42rkk0n9xapiy5zwac4x55m5cc5a8bgnkf6lkd7sy79k1j9k"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -276751,6 +277242,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "topaz" = callPackage + ({ mkDerivation, aeson, base, binary, hashable, quantification + , vector + }: + mkDerivation { + pname = "topaz"; + version = "0.6.0"; + sha256 = "0vi3k4bx3jf71qq3az6m8qnc5pqiscpsimqpxz32qplc3ixm9a8r"; + libraryHaskellDepends = [ + aeson base binary hashable quantification vector + ]; + description = "Extensible records library"; + license = lib.licenses.bsd3; + }) {}; + "tophat" = callPackage ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { @@ -276793,8 +277299,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; - revision = "2"; - editedCabalFile = "1iyjrvpv7lgfpfirb2vw0lv4fs3fhpkfkicl2p49wi8zc4dv7xz1"; + revision = "3"; + editedCabalFile = "144pbbmir77ql5qzf031mh2qs946c05h22iz3fm8xkzg1cgils0z"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -278250,8 +278756,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.2.1"; - sha256 = "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap"; + version = "0.2.1.1"; + sha256 = "0p1pvbqgrwkxmv4b8xmw9mx6a1xpyl6j8ivg1qs65q5nd7xaxqvp"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -279789,8 +280295,8 @@ self: { pname = "turtle"; version = "1.5.23"; sha256 = "02g0a6az01lfikrinx2027zqrp8wyivldwi36s2yqk9a5qm3ap5c"; - revision = "1"; - editedCabalFile = "1qzkxl8zhqqcic7dv6l777152zm7vfd33zrqls89s7236c19ki53"; + revision = "2"; + editedCabalFile = "0i8fnwzqc6j599d19rzcggk29ky45izy5wc9y9ii54lc95d8c7xg"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -283163,14 +283669,19 @@ self: { }) {}; "unicode-data" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench + }: mkDerivation { pname = "unicode-data"; - version = "0.2.0"; - sha256 = "1vn1kzy49k314gprpi8ls91vs5xrjwwxklzgnxx0krcpjq8zy100"; + version = "0.3.0"; + sha256 = "0pwjjsk0gjkn73ghj10s603p84xr7h2kfg351c9grzngrcv9giq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; description = "Access Unicode character database"; license = lib.licenses.asl20; }) {}; @@ -286433,6 +286944,8 @@ self: { pname = "uuid"; version = "1.3.15"; sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; + revision = "1"; + editedCabalFile = "1wjcic98hvvz5xynlrk60dyfhw0nypv56sza24g2z3q62013rfrg"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -286550,8 +287063,8 @@ self: { pname = "uuid-types"; version = "1.0.5"; sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; - revision = "1"; - editedCabalFile = "16n39hl1i1amvca70bkkl6hxs9q90n6kp14aqb380q2l2f5pdr3w"; + revision = "2"; + editedCabalFile = "0x3limqb67l4i0lfdaqgqbjak7mi7ydk5dhkv80791r3hyhbhiw4"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random template-haskell text @@ -287639,8 +288152,8 @@ self: { }: mkDerivation { pname = "vcs-ignore"; - version = "0.0.1.0"; - sha256 = "0zz4vwvzxgdqpi30ncp82irdwjyam23z0bdz834xxghfg70q2b5m"; + version = "0.0.2.0"; + sha256 = "0cyab0mj225j79fpk4386iz4llpzisxpipb0v2i773psz4saw8ar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287751,12 +288264,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "vec_0_4_1" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, boring, criterion + , deepseq, distributive, fin, hashable, indexed-traversable + , inspection-testing, QuickCheck, semigroupoids, tagged + , transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.4.1"; + sha256 = "01v5zd4lak76ymlhi3zjpsy3g01vcchwx1b7cavc4rdzpdjqw58b"; + libraryHaskellDepends = [ + adjunctions base boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids transformers + ]; + testHaskellDepends = [ + base base-compat fin inspection-testing tagged + ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vec-lens" = callPackage ({ mkDerivation, base, fin, lens, vec }: mkDerivation { pname = "vec-lens"; version = "0.4"; sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; + revision = "1"; + editedCabalFile = "1708aj1b38cd17fmv6giidq8hdpq96imka8hfr7z1y5nq9bf8am3"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -287768,6 +288306,8 @@ self: { pname = "vec-optics"; version = "0.4"; sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; + revision = "1"; + editedCabalFile = "0bwian3k668nbp7vnawdzzr9sv8vxhfsd3qjyfk9k112w3y2kjfs"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -287912,6 +288452,8 @@ self: { pname = "vector-builder"; version = "0.3.8.3"; sha256 = "0rajpk54n9anlqixxr2qn7qximhhy7qa4gg4czwmj5zl5ysj2br4"; + revision = "1"; + editedCabalFile = "026yz76lqi7pllcnix8jwsqa7dp775nd0ssf6pkjbqnmlgf5iblf"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances rerebase tasty @@ -288638,8 +289180,8 @@ self: { }: mkDerivation { pname = "verset"; - version = "0.0.1.5"; - sha256 = "1bqbwjw5lpn6lxm5pqxk0v3ywnmrl8fmn4y0whby76xn2xspsl8b"; + version = "0.0.1.6"; + sha256 = "1fk53vd2mh6ngrj4v2322fzdx0k0cj0zc2w1xpwkvyy3584l8af8"; libraryHaskellDepends = [ base bytestring containers extra mtl safe text time uuid ]; @@ -290345,6 +290887,37 @@ self: { license = lib.licenses.mit; }) {}; + "wai-extra_3_1_8" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, directory, fast-logger, hspec, http-types + , http2, HUnit, iproute, network, resourcet, streaming-commons + , text, time, transformers, unix, vault, wai, wai-logger, word8 + , zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.8"; + sha256 = "0ddgdr0304b3kg50vfjsg3bxlhfp3vmsb4c8i80k8adqzh54hz5l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class directory + fast-logger http-types http2 HUnit iproute network resourcet + streaming-commons text time transformers unix vault wai wai-logger + word8 + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit iproute resourcet text time transformers wai + zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp @@ -298303,8 +298876,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.40"; - sha256 = "1mrdiblm8vilkm1w23pz6xbi16zh1b1lvql26czjzw5k79vd67sf"; + version = "0.41"; + sha256 = "0z9dm6drsqpd9axras11f5k3mlj8rwdj4hh8f8g9hv0c3jmyd9d7"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -304346,8 +304919,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "2"; - editedCabalFile = "17q1as97cazj2nkwdi31kkgaa3wrxpc8phdj6f9wr4jibbm3jyp6"; + revision = "3"; + editedCabalFile = "04xvwbwxg18hgfy67nlcvwa5j7wknf616f83jwdxrj8q51ii3gq5"; libraryHaskellDepends = [ base containers parsec text transformers ]; From d0e6c53a9678ec169a2a112a3b40239892d66d6a Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 11:14:20 +0900 Subject: [PATCH 04/62] haskellPackages.lsp: bump override for most recent version --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02ec8c38f4cb..d8fb6b66d660 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2048,11 +2048,11 @@ self: super: { # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.) - lsp = doDistribute self.lsp_1_2_0_1; - lsp-types = doDistribute self.lsp-types_1_3_0_1; + lsp = doDistribute self.lsp_1_4_0_0; + lsp-types = doDistribute self.lsp-types_1_4_0_0; # Not running the "example" test because it requires a binary from lsps test # suite which is not part of the output of lsp. - lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1); + lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2); # 2021-09-14: Tests are flaky. hls-splice-plugin = dontCheck super.hls-splice-plugin; From 882ecaa53044af65cf6aab5d62802454cbf0e87d Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 11:29:05 +0900 Subject: [PATCH 05/62] haskellPackages.hlint: bump latest version --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 25c0873729d7..d20cbb9db25c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -117,7 +117,7 @@ self: super: { retry = dontCheck super.retry; # Hlint needs >= 3.3.4 for ghc 9 support. - hlint = doDistribute super.hlint_3_3_5; + hlint = doDistribute super.hlint_3_3_6; # 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 3b73361d2399..7b083ce3584a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -233,7 +233,7 @@ self: super: { rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46"; sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc"; }; - } (super.hlint_3_3_5.overrideScope (self: super: { + } (super.hlint_3_3_6.overrideScope (self: super: { ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; })) From 11b0130ebd95bdef797e02a8c5b20ebbe2daa71c Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Jan 2022 11:30:56 +0900 Subject: [PATCH 06/62] haskellPackages.text-short: bump latest version to fix eval errors --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index d20cbb9db25c..558e43469dca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -147,7 +147,7 @@ self: super: { # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; # Fixes a bug triggered on GHC 9.0.1 - text-short = self.text-short_0_1_4; + text-short = self.text-short_0_1_5; # 2021-09-18: The following plugins don‘t work yet on ghc9. haskell-language-server = appendConfigureFlags [ diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 7b083ce3584a..1082f792e83d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -221,7 +221,7 @@ self: super: { semigroupoids = overrideCabal (drv: { postPatch = "sed -i -e 's,hashable >= 1.2.7.0 && < 1.4,hashable >= 1.2.7.0 \\&\\& < 1.5,' semigroupoids.cabal";}) super.semigroupoids; # Tests have a circular dependency on quickcheck-instances - text-short = dontCheck super.text-short_0_1_4; + text-short = dontCheck super.text-short_0_1_5; # Use hlint from git for GHC 9.2.1 support hlint = doDistribute ( From 1071b77c21f2e3bbccd20ace7272f3d843fea0b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jan 2022 15:28:59 +0100 Subject: [PATCH 07/62] knot-resolver: 5.4.3 -> 5.4.4 This is basically just no-op. Only version number changes. https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.4.4 --- pkgs/servers/dns/knot-resolver/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 94fa36c5b03d..4d12a6d7172a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -17,23 +17,15 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.3"; + version = "5.4.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506"; + sha256 = "588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea"; }; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1237 - name = "console.aws.amazon.com-fix.patch"; - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4dabfbec9273703.diff"; - sha256 = "3J+FDwNQ6CqIGo9pSzhrQZlHX99vXFDpPOBpwpCnOxs="; - }) - ]; - # Path fixups for the NixOS service. postPatch = '' patch meson.build < Date: Wed, 5 Jan 2022 15:58:27 +0100 Subject: [PATCH 08/62] nixos/kresd: fix IPv6 scope syntax The systemd syntax is suprising to me, but I suppose it's worth being compatible as people might be sharing it with other modules. Our regexp is lenient on IPv6 address part, so this is actually backwards compatible (i.e. you can put the scope at either place). --- nixos/modules/services/networking/kresd.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 3a36ac7e6670..16011573f8bb 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -7,15 +7,16 @@ let # Convert systemd-style address specification to kresd config line(s). # On Nix level we don't attempt to precisely validate the address specifications. + # The optional IPv6 scope spec comes *after* port, perhaps surprisingly. mkListen = kind: addr: let - al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr; - al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr; + al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr; + al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr; al_portOnly = builtins.match "([0-9]+)" addr; al = findFirst (a: a != null) (throw "services.kresd.*: incorrect address specification '${addr}'") [ al_v4 al_v6 al_portOnly ]; - port = last al; - addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '0.0.0.0'}"; + port = elemAt al 1; + addrSpec = if al_portOnly == null then "'${head al}${elemAt al 2}'" else "{'::', '0.0.0.0'}"; in # freebind is set for compatibility with earlier kresd services; # it could be configurable, for example. '' From f662c8be61bb678797b18ae1874ad992e6102511 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Nov 2021 15:47:50 +0100 Subject: [PATCH 09/62] ghcWithPackages: remove check for GHC >= 6.12 It's been quite a while since any version below that has been in use in nixpkgs, so this check is almost certainly safe to remove. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index e5fe60a0ae5c..046f83e6db6c 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -9,9 +9,6 @@ assert ghcLibdir != null -> (ghc.isGhcjs or false); -# This wrapper works only with GHC 6.12 or later. -assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM; - # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of # that package in Nix that honors these environment variables From baaf9459d6105c243239289e1e82e3cdd5ac4809 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Nov 2021 16:31:02 +0100 Subject: [PATCH 10/62] haskellPackages.callPackage: support returning functions Overrideable functions are possible by wrapping them as functors in an attribute set first and appending the overrideScope and override attributes later. --- pkgs/development/haskell-modules/make-package-set.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 62bcf7dc84c3..982041982503 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -87,8 +87,11 @@ let drv = if lib.isFunction fn then fn else import fn; auto = builtins.intersectAttrs (lib.functionArgs drv) scope; + # Converts a returned function to a functor attribute set if necessary + ensureAttrs = v: if builtins.isFunction v then { __functor = _: v; } else v; + # this wraps the `drv` function to add a `overrideScope` function to the result. - drvScope = allArgs: drv allArgs // { + drvScope = allArgs: ensureAttrs (drv allArgs) // { overrideScope = f: let newScope = mkScope (fix' (extends f scope.__unfix__)); # note that we have to be careful here: `allArgs` includes the auto-arguments that From fb075fab731adbacfec384ad910bf48920c099c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Nov 2021 17:43:12 +0100 Subject: [PATCH 11/62] haskellPackages.{ghcWithPackages, ghcWithHoogle}: make overrideable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is achieved by passing the entire package set to the respective wrappers and passing the select function as a second attribute. Together with the new support for callPackage-ing functions this allows for things like `ghcWithPackages.override { useLLVM = true; } (p: [ … ])`. To make this possible for `ghcWithHoogle` as well, we need to make the wrapper a bit more bespoke and inline the hoogle feature as well. The hoogle wrapper, however, can remain separate and is exposed as `hoogleWithPackages` additionally, as it can also serve standalone use. `hoogleLocal` is kept for backwards compatibility (including the old, suboptimal API), but will inform users about the better alternative via a warning. --- .../haskell-modules/configuration-common.nix | 5 -- pkgs/development/haskell-modules/hoogle.nix | 38 +++++--------- .../haskell-modules/make-package-set.nix | 52 ++++++++++++++----- .../haskell-modules/with-packages-wrapper.nix | 19 ++++++- 4 files changed, 69 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8fb6b66d660..612dddb8ae6b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,11 +41,6 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # enable using a local hoogle with extra packagages in the database - # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" - # $ hoogle server - hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; - # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index d55f37f980d8..0b3f71995c99 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -1,34 +1,22 @@ # Install not only the Hoogle library and executable, but also a local Hoogle # database which provides "Source" links to all specified 'packages' -- or the # current Haskell Platform if no custom package set is provided. -# -# It is intended to be used in config.nix similarly to: -# -# { packageOverrides = pkgs: rec { -# -# haskellPackages = -# let callPackage = pkgs.lib.callPackageWith haskellPackages; -# in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override { -# extension = self: super: { -# hoogleLocal = pkgs.haskellPackages.hoogleLocal.override { -# packages = with pkgs.haskellPackages; [ -# mmorph -# monadControl -# ]; -# }; -# }; -# }); -# }} -# -# This will build mmorph and monadControl, and have the hoogle installation -# refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, buildPackages -, hoogle, writeText, ghc -, packages +{ lib, stdenv, buildPackages, haskellPackages +, writeText }: +# This argument is a function which selects a list of Haskell packages from any +# passed Haskell package set. +# +# Example: +# (hpkgs: [ hpkgs.mtl hpkgs.lens ]) +selectPackages: + let + inherit (haskellPackages) ghc hoogle; + packages = selectPackages haskellPackages; + wrapper = ./hoogle-local-wrapper.sh; isGhcjs = ghc.isGhcjs or false; opts = lib.optionalString; @@ -55,7 +43,7 @@ let in buildPackages.stdenv.mkDerivation { - name = "hoogle-local-0.1"; + name = "hoogle-with-packages"; buildInputs = [ghc hoogle]; inherit docPackages; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 982041982503..e9ce4f127051 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -120,11 +120,6 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; - withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { - inherit (self) ghc llvmPackages; - inherit packages; - }; - # Use cabal2nix to create a default.nix for the package sources found at 'src'. haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let @@ -269,22 +264,53 @@ in package-set { inherit pkgs lib callPackage; } self // { then (modifier drv).envFunc {inherit withHoogle;} else modifier drv; - ghcWithPackages = selectFrom: withPackages (selectFrom self); + # This can be used to easily create a derivation containing GHC and the specified set of Haskell packages. + # + # Example: + # $ nix-shell -p 'haskellPackages.ghcWithPackages (hpkgs: [ hpkgs.mtl hpkgs.lens ])' + # $ ghci # in the nix-shell + # Prelude > import Control.Lens + # + # GHC is setup with a package database with all the specified Haskell packages. + # + # ghcWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation + ghcWithPackages = self.callPackage ./with-packages-wrapper.nix { + haskellPackages = self; + }; + # Put 'hoogle' into the derivation's PATH with a database containing all # the package's dependencies; run 'hoogle server --local' in a shell to # host a search engine for the dependencies. # + # Example usage: + # $ nix-shell -p 'haskellPackages.hoogleWithPackages (p: [ p.mtl p.lens ])' + # [nix-shell] $ hoogle server + # + # hoogleWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation + # # To reload the Hoogle server automatically on .cabal file changes try # this: # echo *.cabal | entr -r -- nix-shell --run 'hoogle server --local' - ghcWithHoogle = selectFrom: - let - packages = selectFrom self; - hoogle = callPackage ./hoogle.nix { - inherit packages; - }; - in withPackages (packages ++ [ hoogle ]); + hoogleWithPackages = self.callPackage ./hoogle.nix { + haskellPackages = self; + }; + hoogleLocal = + { packages ? [] }: + lib.warn "hoogleLocal is deprecated, use hoogleWithPackages instead" ( + self.hoogleWithPackages (_: packages) + ); + # This is like a combination of ghcWithPackages and hoogleWithPackages. + # It provides a derivation containing both GHC and Hoogle with an index of + # the given Haskell package database. + # + # Example: + # $ nix-shell -p 'haskellPackages.ghcWithHoogle (hpkgs: [ hpkgs.conduit hpkgs.lens ])' + # + # ghcWithHoogle :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation + ghcWithHoogle = self.ghcWithPackages.override { + withHoogle = true; + }; # Returns a derivation whose environment contains a GHC with only # the dependencies of packages listed in `packages`, not the diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 046f83e6db6c..3c645999a1a3 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,13 +1,20 @@ -{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +{ lib, stdenv, haskellPackages, symlinkJoin, makeWrapper # GHC will have LLVM available if necessary for the respective target, # so useLLVM only needs to be changed if -fllvm is to be used for a # platform that has NCG support , useLLVM ? false +, withHoogle ? false +, hoogleWithPackages , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: -assert ghcLibdir != null -> (ghc.isGhcjs or false); +# This argument is a function which selects a list of Haskell packages from any +# passed Haskell package set. +# +# Example: +# (hpkgs: [ hpkgs.mtl hpkgs.lens ]) +selectPackages: # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -31,6 +38,11 @@ assert ghcLibdir != null -> (ghc.isGhcjs or false); # fi let + inherit (haskellPackages) llvmPackages ghc; + + packages = selectPackages haskellPackages + ++ lib.optional withHoogle (hoogleWithPackages selectPackages); + isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; @@ -50,6 +62,9 @@ let ([ llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang); in + +assert ghcLibdir != null -> (ghc.isGhcjs or false); + if paths == [] && !useLLVM then ghc else symlinkJoin { # this makes computing paths from the name attribute impossible; From b7f010ed965dace4a954fbb8bd34a63cc4042197 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Fri, 7 Jan 2022 11:19:58 +0000 Subject: [PATCH 12/62] vivaldi-ffmpeg-codecs: 94.0.4606.50 -> 97.0.4692.56 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 0e4236f421a1..28543c31edc4 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchurl -, dpkg -}: +{ dpkg, fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "94.0.4606.50"; + version = "97.0.4692.56"; src = fetchurl { - url = "https://launchpadlibrarian.net/558847674/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-H7Tzd8tkaoLClXtNiwEO5nD4+PPt7Jgs+gtLiag/KN4="; + url = "https://launchpadlibrarian.net/574348729/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-v5DHJxQjHjBeIS/psaM+LyUaHKlwzrKncLarErbUGVU="; }; buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x $src . - find . ''; installPhase = '' @@ -26,7 +23,7 @@ stdenv.mkDerivation rec { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ betaboon lluchs ]; + maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; platforms = [ "x86_64-linux" ]; }; } From f371562bb440bf76d20d350ff336064ced981c94 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Jan 2022 21:39:22 +0100 Subject: [PATCH 13/62] haskellPackages.git-annex: adjust src hash for 8.20211231 --- 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 612dddb8ae6b..3efd8ac3cbe4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -77,7 +77,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 = "1x2d0gfqxxfygzigm34n0spaxh8bwipxs9317f6c5lkpj916p957"; + sha256 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5"; # 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 dc0704c08ffd886046ed6ec736599743f901cc2a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Jan 2022 21:39:39 +0100 Subject: [PATCH 14/62] haskellPackages.mfsolve: disable broken test suite --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3efd8ac3cbe4..570732c1a090 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2236,6 +2236,10 @@ self: super: { sdp4unordered = disableLibraryProfiling super.sdp4unordered; sdp4vector = disableLibraryProfiling super.sdp4vector; + # Test suite fails to compile + # https://github.com/kuribas/mfsolve/issues/8 + mfsolve = dontCheck super.mfsolve; + hie-bios = appendPatches [ # Accounts for a breaking change in GHC 9.0.2 via CPP (pkgs.fetchpatch { From 85fb55626b580642d6b738939695d4139b937891 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 8 Jan 2022 23:43:59 +0100 Subject: [PATCH 15/62] haskellPackages.haskell-language-server: Fix build by pinning dependencies --- .../haskell-modules/configuration-common.nix | 6 +- .../configuration-hackage2nix/main.yaml | 4 + .../haskell-modules/hackage-packages.nix | 85 +++++++++++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 570732c1a090..14f48823f755 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2043,11 +2043,11 @@ self: super: { # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.) - lsp = doDistribute self.lsp_1_4_0_0; - lsp-types = doDistribute self.lsp-types_1_4_0_0; + lsp = doDistribute self.lsp_1_2_0_1; + lsp-types = doDistribute self.lsp-types_1_3_0_1; # Not running the "example" test because it requires a binary from lsps test # suite which is not part of the output of lsp. - lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2); + lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1); # 2021-09-14: Tests are flaky. hls-splice-plugin = dontCheck super.hls-splice-plugin; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2374b713198a..af9910d066cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -165,6 +165,10 @@ extra-packages: - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2 + # 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage + - lsp < 1.3 + - lsp-types < 1.4 + - lsp-test < 0.14.0.2 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 52b3d1370652..b5a407031db4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -175684,6 +175684,39 @@ self: { license = lib.licenses.mit; }) {}; + "lsp_1_2_0_1" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, exceptions, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.2.0.1"; + sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; + revision = "1"; + editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map exceptions hashable hslogger lens lsp-types mtl + network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base containers filepath hspec lens network-uri QuickCheck + quickcheck-instances rope-utf16-splay sorted-list text + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp_1_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, exceptions, filepath, hashable @@ -175742,6 +175775,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, extra, filepath, Glob, hspec, lens, lsp + , lsp-types, mtl, parser-combinators, process, some, text, time + , transformers, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.14.0.1"; + sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson async base data-default directory filepath hspec lens lsp mtl + parser-combinators process text unliftio unordered-containers + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test_0_14_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -175793,6 +175854,30 @@ self: { license = lib.licenses.mit; }) {}; + "lsp-types_1_3_0_1" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl + , network-uri, rope-utf16-splay, scientific, some, template-haskell + , temporary, text, unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.3.0.1"; + sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z"; + revision = "1"; + editedCabalFile = "031b69fxi8m4fcwwgqb7cf4k806ikkmjqnn3wv6bn3sny1hn5gg7"; + libraryHaskellDepends = [ + aeson base binary bytestring containers data-default deepseq + dependent-sum dependent-sum-template Diff directory dlist filepath + hashable hslogger lens mtl network-uri rope-utf16-splay scientific + some template-haskell temporary text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable From 967c9bccb4acecffa1348f849fdbbc68b553d22f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 00:07:53 +0100 Subject: [PATCH 16/62] python310Packages.mdformat: 0.7.12 -> 0.7.13 --- pkgs/development/python-modules/mdformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 76fc16d291d7..1ab425ade551 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.12"; + version = "0.7.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-h85UzzE84TksZipcbbBaOC/sPv8HQMwiEGCgTdi/8J0="; + sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8="; }; nativeBuildInputs = [ From e49d3a2ebc2bc16da1bb71417a70afe91b98dc8a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 10 Jan 2022 00:53:06 +0100 Subject: [PATCH 17/62] haskellPackages.ghcup: Fix build --- 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 14f48823f755..f5dcc06cc17c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2005,7 +2005,7 @@ self: super: { ghcup = doJailbreak (super.ghcup.overrideScope (self: super: { hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0; optics = self.optics_0_4; - streamly = self.streamly_0_8_1_1; + streamly = doJailbreak self.streamly_0_8_1_1; Cabal = self.Cabal_3_6_2_0; libyaml-streamly = markUnbroken super.libyaml-streamly; })); From 0e87f1f5aaeea491f0c504064e5af1602aa0f886 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 10 Jan 2022 01:30:31 +0100 Subject: [PATCH 18/62] haskellPackages.reflex-dom-core: Fix build by pinning patch --- .../configuration-hackage2nix/main.yaml | 3 +++ .../haskell-modules/hackage-packages.nix | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index af9910d066cb..cdb939f1e2b4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -130,6 +130,9 @@ default-package-overrides: - polysemy-resume < 0.1.0.2 - polysemy-conc < 0.5 - polysemy-mocks < 0.2 + # Pinning patch because it is mainly used by the reflex-frp ecosystem which is not yet compatible with it. + # https://github.com/reflex-frp/reflex-dom/issues/431 + - patch < 0.0.5.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b5a407031db4..a8a8dcbd1bd7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -207047,6 +207047,26 @@ self: { }) {}; "patch" = callPackage + ({ mkDerivation, base, constraints-extras, containers + , dependent-map, dependent-sum, directory, filemanip, filepath + , hlint, lens, monoidal-containers, semialign, semigroupoids, these + , transformers, witherable + }: + mkDerivation { + pname = "patch"; + version = "0.0.4.0"; + sha256 = "02hdhgk7wwcnq7aahbaqx5zzlha6mq6lj0mw57phj3ykmca0zggc"; + libraryHaskellDepends = [ + base constraints-extras containers dependent-map dependent-sum lens + monoidal-containers semialign semigroupoids these transformers + witherable + ]; + testHaskellDepends = [ base directory filemanip filepath hlint ]; + description = "Data structures for describing changes to other data structures"; + license = lib.licenses.bsd3; + }) {}; + + "patch_0_0_5_1" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-map, dependent-sum, directory, filemanip, filepath , hedgehog, hlint, HUnit, lens, monoidal-containers, semialign @@ -207066,6 +207086,7 @@ self: { ]; description = "Data structures for describing changes to other data structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "patch-combinators" = callPackage From 9d64a1a98f7541fb80450533b8a28c818ec22b21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 09:56:37 +0100 Subject: [PATCH 19/62] python3Packages.qcs-api-client: enable tests --- .../python-modules/qcs-api-client/default.nix | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 8fd24d957ca7..49c1c993e32e 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -1,9 +1,11 @@ { lib , attrs , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , httpx , iso8601 +, poetry-core , pydantic , pyjwt , pytest-asyncio @@ -19,15 +21,21 @@ buildPythonPackage rec { pname = "qcs-api-client"; version = "0.20.9"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574"; + src = fetchFromGitHub { + owner = "rigetti"; + repo = "qcs-api-client-python"; + rev = "v${version}"; + hash = "sha256-bQ+5TZzjxGnNRsENEW/sN7sF6SOcgWl4MFtLekD0D+8="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ attrs httpx @@ -46,15 +54,28 @@ buildPythonPackage rec { respx ]; + patches = [ + # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; + sha256 = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; + }) + ]; + postPatch = '' - substituteInPlace setup.py \ - --replace "attrs>=20.1.0,<21.0.0" "attrs" \ - --replace "httpx>=0.15.0,<0.16.0" "httpx" \ - --replace "pyjwt>=1.7.1,<2.0.0" "pyjwt" + substituteInPlace pyproject.toml \ + --replace 'attrs = "^20.1.0"' 'attrs = "*"' \ + --replace 'httpx = "^0.15.0"' 'httpx = "*"' \ + --replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \ + --replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \ + --replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"' ''; - # Project has no tests - doCheck = false; + disabledTestPaths = [ + # Test is outdated + "tests/test_client/test_client.py" + ]; pythonImportsCheck = [ "qcs_api_client" From 2d7b3699b3ba04ed99b8c865058ee372d91785d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 10:35:03 +0100 Subject: [PATCH 20/62] python3Packages.cirq-rigetti: relax dependency constrains --- pkgs/development/python-modules/cirq-rigetti/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 662eaef5579b..70333fb47a9a 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -40,7 +40,9 @@ buildPythonPackage rec { --replace "httpx~=0.15.5" "httpx" \ --replace "idna~=2.10" "idna" \ --replace "pyjwt~=1.7.1" "pyjwt" \ - --replace "qcs-api-client~=0.8.0" "qcs-api-client" + --replace "qcs-api-client~=0.8.0" "qcs-api-client" \ + --replace "iso8601~=0.1.14" "iso8601" \ + --replace "pydantic~=1.8.2" "pydantic" # Remove outdated test rm cirq_rigetti/service_test.py ''; From adf8815c8ea78ad0bcada51fe41f1015a67ee5ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 12:19:11 +0100 Subject: [PATCH 21/62] python3Packages.s3transfer: enable tests --- .../python-modules/s3transfer/default.nix | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 9ed50fb9e49e..d1d428bcba47 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -1,52 +1,57 @@ { lib -, fetchPypi -, pythonOlder +, botocore , buildPythonPackage , docutils +, fetchFromGitHub , mock -, nose -, coverage +, pytestCheckHook +, pythonOlder , wheel -, unittest2 -, botocore -, futures ? null }: buildPythonPackage rec { pname = "s3transfer"; version = "0.5.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-UO2CPh3FhorUDI3JIHL3V6oOZToZKEXJSjtnb0pi2kw="; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "boto"; + repo = pname; + rev = version; + hash = "sha256-0Dl7oKB2xxq/a8do3HgBUIGay88yOGBUdOGo+QCtnUE="; }; - propagatedBuildInputs = - [ - botocore - ] ++ lib.optional (pythonOlder "3") futures; + propagatedBuildInputs = [ + botocore + ]; buildInputs = [ docutils mock - nose - coverage + pytestCheckHook wheel - unittest2 ]; - checkPhase = '' - pushd s3transfer/tests - nosetests -v unit/ functional/ - popd - ''; + disabledTestPaths = [ + # Requires network access + "tests/integration/test_copy.py" + "tests/integration/test_delete.py" + "tests/integration/test_download.py" + "tests/integration/test_processpool.py" + "tests/integration/test_s3transfer.py" + "tests/integration/test_upload.py" + ]; - # version on pypi has no tests/ dir - doCheck = false; + pythonImportsCheck = [ + "s3transfer" + ]; meta = with lib; { + description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; license = licenses.asl20; - description = "A library for managing Amazon S3 transfers"; + maintainers = with maintainers; [ ]; }; } From a3d54a465d1c27caee33233aa7c927cb44b8eccd Mon Sep 17 00:00:00 2001 From: Max Hausch Date: Mon, 10 Jan 2022 15:07:21 +0100 Subject: [PATCH 22/62] inkscape: Remove networkmanager as an inkscape dependency --- pkgs/applications/graphics/inkscape/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 338731661190..b93a0fcaff84 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -9,7 +9,6 @@ , gettext , ghostscript , glib -, glib-networking , glibmm , gsl , gspell @@ -118,7 +117,6 @@ stdenv.mkDerivation rec { boost gettext glib - glib-networking glibmm gsl gtkmm3 From 315b52cb98c48f08c55aa3401491f5261d32e873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 15:55:54 +0100 Subject: [PATCH 23/62] awscli2: 2.3.4 -> 2.4.9 --- pkgs/tools/admin/awscli2/default.nix | 53 +++++++++++++++------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 6726fde94f49..2a2d55dc1955 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -1,4 +1,9 @@ -{ lib, python3, groff, less, fetchFromGitHub }: +{ lib +, python3 +, groff +, less +, fetchFromGitHub +}: let py = python3.override { packageOverrides = self: super: { @@ -10,7 +15,9 @@ let sha256 = "sha256:1cmfkcv2zzirxsb989vx1hvna9nv24pghcvypl0zaxsjphv97mka"; }; }); + botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { + # Releases: https://github.com/boto/botocore/commits/v2 version = "2.0.0dev155"; src = fetchFromGitHub { owner = "boto"; @@ -20,6 +27,7 @@ let }; propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "2.0.10"; src = oldAttrs.src.override { @@ -27,41 +35,21 @@ let sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; }; }); - s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { - version = "0.4.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; - }; - }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.3.4"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-C/NrU+1AixuN4T1N5Zs8xduUQiwuQWvXkitQRnPJdNw="; + sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "colorama>=0.2.5,<0.4.4" "colorama" \ - --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ - --replace "docutils>=0.10,<0.16" "docutils" \ - --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ - --replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \ - --replace "wcwidth<0.2.0" "wcwidth" \ - --replace "distro>=1.5.0,<1.6.0" "distro" - ''; - - checkInputs = [ jsonschema mock pytestCheckHook pytest-xdist ]; - propagatedBuildInputs = [ awscrt bcdoc @@ -76,11 +64,26 @@ with py.pkgs; buildPythonApplication rec { pyyaml rsa ruamel-yaml - s3transfer - six wcwidth ]; + checkInputs = [ + jsonschema + mock + pytestCheckHook + pytest-xdist + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "colorama>=0.2.5,<0.4.4" "colorama" \ + --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ + --replace "docutils>=0.10,<0.16" "docutils" \ + --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "distro>=1.5.0,<1.6.0" "distro" + ''; + checkPhase = '' export PATH=$PATH:$out/bin From 80fb0564e99c2dd194a1b1bfeffe817f1f0ef35a Mon Sep 17 00:00:00 2001 From: Elliot Date: Mon, 10 Jan 2022 23:29:44 +0800 Subject: [PATCH 24/62] inherd-quake: 0.3.0 -> 0.4.0 --- pkgs/applications/misc/inherd-quake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 1b0de8a65811..e8bfa00406e2 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "1f7k68g18g3dpnrsmhgmz753bly1i3f4lmsljiyp9ap0c6w8ahgg"; + sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0="; }; - cargoSha256 = "17q9sjypa331gdfvmx1kbcbvnj34rnsf37b9rnji4jrqfysgrs5w"; + cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4="; nativeBuildInputs = [ pkg-config ]; From 9457af45a96c7093d684d845d4266ea783e09897 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 16:42:40 +0100 Subject: [PATCH 25/62] checkov: remove obsolete overrides --- .../tools/analysis/checkov/default.nix | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 92a6f9acfc67..695ac63863ed 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,30 +6,6 @@ let py = python3.override { packageOverrides = self: super: { - boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec { - version = "1.17.112"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1byqrffbgpp1mq62gnn3w3hnm54dfar0cwgvmkl7mrgbwz5xmdh8"; - }; - }); - - botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "1.20.112"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1ksdjh3mwbzgqgfj58vyrhann23b9gqam8id2svmpdmmdq5vgffh"; - }; - }); - - s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { - version = "0.4.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb"; - }; - }); - dpath = super.dpath.overridePythonAttrs (oldAttrs: rec { version = "1.5.0"; src = oldAttrs.src.override { @@ -52,7 +28,7 @@ buildPythonApplication rec { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE="; + hash = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE="; }; nativeBuildInputs = with py.pkgs; [ From 06a4b7c78768df3c1994fdc23fe24616c668205f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 21:35:35 +0100 Subject: [PATCH 26/62] python3Packages.adafruit-platformdetect: 3.19.1 -> 3.19.2 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6f4bba33ebba..a29c721b92ac 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.1"; + version = "3.19.2"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-mJ121SSoO7v2p+qCF5Va5+ppHQsHcFuyJDpyc6lykRI="; + sha256 = "sha256-zsnv3Lw+CWhNQ9ovXAuIujAXfkjiiWm797ncHIN3y/E="; }; nativeBuildInputs = [ From d222225ba6ebbed7b9cb42e33f0bdda03de0cabd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 21:39:43 +0100 Subject: [PATCH 27/62] python3Packages.hahomematic: 0.16.0 -> 0.17.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 7f7dc85fd111..b5cdf4e931d0 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.16.0"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-+l6VeF3vOO5MBW9FLlnE/Anm8vps2Sl6Nmf2N9QiArQ="; + sha256 = "sha256-Nhl2WLrqqvGaNEgJApcgZhSm4xoq62MzJC0MfEO5Xxw="; }; propagatedBuildInputs = [ From 14a538452be2ba4f436aad0e3c946b04a125afff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 21:42:10 +0100 Subject: [PATCH 28/62] python3Packages.pontos: 21.11.0 -> 22.1.0 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 955b384ed727..df98da582f8e 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "21.11.0"; + version = "22.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uP4M1ShhKsvqnUixc3JUJVpNQOwYn8Gm2uWVcXhFKLg="; + sha256 = "sha256-/C7BiKWdMcUuKXxPTdttT79YjBDmwj9CG5W38YZHw2c="; }; nativeBuildInputs = [ From 205b0f2c5e8216827126ddb73fd25c96d39d4b29 Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Sat, 8 Jan 2022 22:12:04 +0100 Subject: [PATCH 29/62] Idris2: Refactor default.nix We take the idris2 projects version of the derivation. Originally, Idris2 did not maintain their own nix derivation, so we created our own. Now they maintain their own derivation, so we should try to keep ours as close to theirs. This change comes with the following differences: * support files are in its own output, instead of packaged with idris2 - This makes it necessary to provide --package for contrib and network !!! This is a breaking change !!! * IDIRS2_PREFIX is set to ~/.idris2 instead of pointing to nix-store - This makes --install work as expected for the user * Properly set IDRIS2_PACKAGE_PATH * non-linux platform uses chez-racket instead of chez --- .../from_md/release-notes/rl-2205.section.xml | 9 +++ .../manual/release-notes/rl-2205.section.md | 2 + pkgs/development/compilers/idris2/default.nix | 67 ++++++++++--------- pkgs/development/compilers/idris2/tests.nix | 1 + 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 67c5a13421b0..c49cf223383d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -252,6 +252,15 @@ set autoSubUidGidRange = true. + + + idris2 now requires + --package when using packages + contrib and network, + while previously these idris2 packages were automatically + loaded. + + services.thelounge.private was removed in diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 35316a283190..4903774ad6e9 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -83,6 +83,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Normal users (with `isNormalUser = true`) which have non-empty `subUidRanges` or `subGidRanges` set no longer have additional implicit ranges allocated. To enable automatic allocation back set `autoSubUidGidRange = true`. +- `idris2` now requires `--package` when using packages `contrib` and `network`, while previously these idris2 packages were automatically loaded. + - `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes. ## Other Notable Changes {#sec-release-22.05-notable-changes} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 4bf8f7e4af6c..9c7a9e53a2e6 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,18 +1,27 @@ -{ lib -, stdenv +# Almost 1:1 copy of idris2's nix/platform.nix. Some work done in their flake.nix +# we do here instead. +{ stdenv +, lib +, chez +, chez-racket +, clang +, gmp , fetchFromGitHub , makeWrapper -, clang -, chez -, gmp +, gambit +, nodejs , zsh , callPackage }: # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs +let + # Taken from Idris2/idris2/flake.nix. Check if the idris2 project does it this + # way, still, every now and then. + platformChez = if stdenv.system == "x86_64-linux" then chez else chez-racket; # Uses scheme to bootstrap the build of idris2 -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "idris2"; version = "0.5.1"; @@ -23,14 +32,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-6CTn8o5geWSesXO7vTrrV/2EOQ3f+nPQ2M5cem13ZSY="; }; - # We do not add any propagatedNativeBuildInputs because we do not want the - # executables idris2 produces to depend on the nix-store. As such, it is left - # to the user to guarantee chez (or any other codgen dependency) is available - # in the path during compilation of programs with idris2. strictDeps = true; - nativeBuildInputs = [ makeWrapper clang chez ] + nativeBuildInputs = [ makeWrapper clang platformChez ] ++ lib.optional stdenv.isDarwin [ zsh ]; - buildInputs = [ gmp ]; + buildInputs = [ platformChez gmp ]; prePatch = '' patchShebangs --build tests @@ -43,44 +48,40 @@ stdenv.mkDerivation rec { buildFlags = [ "bootstrap" "SCHEME=scheme" ]; checkTarget = "test"; + checkInputs = [ gambit nodejs ]; # racket ]; + checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed # without having to recompile idris2 every time. postInstall = let - includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; - packagePaths = - builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; - additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; + globalLibraries = [ + "\\$HOME/.nix-profile/lib/${name}" + "/run/current-system/sw/lib/${name}" + "$out/${name}" + ]; + globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH rm $out/bin/idris2 - # Move actual idris2 binary + # The only thing we need from idris2_app is the actual binary mv $out/bin/idris2_app/idris2.so $out/bin/idris2 - - # After moving the binary, there is nothing left in idris2_app that isn't - # either contained in lib/ or is useless to us. rm $out/bin/idris2_app/* rmdir $out/bin/idris2_app - # idris2 needs to find scheme at runtime to compile - # idris2 installs packages with --install into the path given by PREFIX. - # Since PREFIX is in nix-store, it is immutable so --install does not work. - # If the user redefines PREFIX to be able to install packages, idris2 will - # not find the libraries and packages since all paths are relative to - # PREFIX by default. - # We explicitly make all paths to point to nix-store, such that they are - # independent of what IDRIS2_PREFIX is. This allows the user to redefine - # IDRIS2_PREFIX and use --install as expected. + # idris2 installs packages with --install into the path given by + # IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the + # behaviour of the standard Makefile install. # TODO: Make support libraries their own derivation such that # overriding LD_LIBRARY_PATH is unnecessary - # TODO: Maybe set IDRIS2_PREFIX to the users home directory wrapProgram "$out/bin/idris2" \ - --set-default CHEZ "${chez}/bin/scheme" \ + --set-default CHEZ "${platformChez}/bin/scheme" \ + --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \ --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ --suffix IDRIS2_DATA ':' "$out/${name}/support" \ - --suffix IDRIS2_PATH ':' "${additionalIdris2Paths}" \ - --suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} ':' "$out/${name}/lib" + --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \ + --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \ + --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" ''; # Run package tests diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index 1e84ca6b77aa..a8d48c26ca6f 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -50,6 +50,7 @@ in { # Data.Vect.Sort is available via --package contrib use-contrib = testCompileAndRun { testName = "use-contrib"; + packages = [ "contrib" ]; code = '' module Main From d0a0625e3c2bcf074454e94ff129e65d251e8453 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:25:47 +0100 Subject: [PATCH 30/62] python3Packages.requests-toolbelt: switch to pytestCheckHook --- .../requests-toolbelt/default.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 3ad219025a92..07c87bb17c0a 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -1,36 +1,48 @@ { lib +, betamax , buildPythonPackage , fetchPypi -, requests -, betamax , mock -, pytest , pyopenssl +, pytestCheckHook +, requests }: buildPythonPackage rec { pname = "requests-toolbelt"; version = "0.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"; + hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A="; }; - checkInputs = [ pyopenssl betamax mock pytest ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; - checkPhase = '' - # disabled tests access the network - py.test tests -k "not test_no_content_length_header \ - and not test_read_file \ - and not test_reads_file_from_url_wrapper \ - and not test_x509_der \ - and not test_x509_pem" - ''; + checkInputs = [ + betamax + mock + pyopenssl + pytestCheckHook + ]; + + disabledTests = [ + "test_no_content_length_header" + "test_read_file" + "test_reads_file_from_url_wrapper" + "test_x509_der" + "test_x509_pem" + ]; + + pythonImportsCheck = [ + "requests_toolbelt" + ]; meta = { - description = "A toolbelt of useful classes and functions to be used with python-requests"; + description = "Toolbelt of useful classes and functions to be used with requests"; homepage = "http://toolbelt.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; From 2f76e57f6a40b5e6e98fe5df99d4dca2fbfeeb01 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 10 Jan 2022 16:05:54 -0500 Subject: [PATCH 31/62] python3Packages.trio: fix python310 by not treating deprecation warnings as errors in tests --- pkgs/development/python-modules/trio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 0e95da38eaea..e667f146afc0 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { "fallback_when_no_hook_claims_it" ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + propagatedBuildInputs = [ attrs sortedcontainers From 7a8b98ee8d18880786e1463352814a353260022e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 20:23:19 +0100 Subject: [PATCH 32/62] python3Packages.oyaml: 1.0 -> unstable-2021-12-03 --- .../python-modules/oyaml/default.nix | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix index 9ea527e06f19..e2519c0b9720 100644 --- a/pkgs/development/python-modules/oyaml/default.nix +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -1,21 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -# pythonPackages -, pytest + # pythonPackages +, pytestCheckHook +, pythonOlder , pyyaml }: buildPythonPackage rec { pname = "oyaml"; - version = "1.0"; + version = "unstable-2021-12-03"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wimglenn"; repo = "oyaml"; - rev = "v${version}"; - sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j"; + rev = "d0195070d26bd982f1e4e604bded5510dd035cd7"; + hash = "sha256-1rSEhiULlAweLDqUFX+JBFxe3iW9kNlRA2zjcG8MYSg="; }; propagatedBuildInputs = [ @@ -23,19 +27,17 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest test_oyaml.py - ''; + pythonImportsCheck = [ + "oyaml" + ]; - meta = { - description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering"; + meta = with lib; { + description = "Drop-in replacement for PyYAML which preserves dict ordering"; homepage = "https://github.com/wimglenn/oyaml"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; }; } From 2625adb74f7ad94c30b0d02e7a8368357c4990de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 22:18:47 +0100 Subject: [PATCH 33/62] sqlfluff: 0.9.0 -> 0.9.1 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index f755c4593e89..260920b2d1e1 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-AxK5pRuNkhJokuuv/5/ZJxZ2J9d6XLFPZJWQfq9baaU="; + hash = "sha256-sA9iMTDQ7SjaRG0/Uy+wGQ/2yQDqbZP6M5r1lFLBex4="; }; propagatedBuildInputs = with python3.pkgs; [ From 64e2709015a866c2f02cc16875f931c7c8be988f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 22:27:23 +0100 Subject: [PATCH 34/62] python3Packages.aioconsole: disable failing tests --- .../python-modules/aioconsole/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 795b50d81166..14ff06324bbf 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -17,7 +17,9 @@ buildPythonPackage rec { pname = "aioconsole"; version = "0.3.3"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vxgmichel"; @@ -36,7 +38,13 @@ buildPythonPackage rec { --replace "--cov aioconsole --count 2" "" ''; - pythonImportsCheck = [ "aioconsole" ]; + disabledTests = [ + "test_interact_syntax_error" + ]; + + pythonImportsCheck = [ + "aioconsole" + ]; meta = with lib; { description = "Asynchronous console and interfaces for asyncio"; From 2218998b7ab636ed201bf0ca2083df6ee81961a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 23:01:49 +0100 Subject: [PATCH 35/62] python3Packages.vt-py: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index e584b3de3e2d..2d0988473ddb 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-yf1p56+mGVzG4HBlbIp/HvNSYJGQufzYjmPrtITaV5o="; + sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; }; propagatedBuildInputs = [ From c81213600a01134ea0b18f01bdb6d55f837a2181 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 10 Jan 2022 17:51:41 -0500 Subject: [PATCH 36/62] python310Packages.xarray: fix build --- pkgs/development/python-modules/xarray/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 37fb5edf7011..5f780a61ffc5 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,8 +5,8 @@ , pandas , pytestCheckHook , pythonOlder -, setuptools , setuptoolsBuildHook +, setuptools-scm }: buildPythonPackage rec { @@ -21,14 +21,16 @@ buildPythonPackage rec { sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc="; }; + SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; + nativeBuildInputs = [ setuptoolsBuildHook + setuptools-scm ]; propagatedBuildInputs = [ numpy pandas - setuptools ]; checkInputs = [ From de69cfae3c71ffcee468c28845c6b414d3302c7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 00:37:13 +0000 Subject: [PATCH 37/62] autosuspend: 4.0.1 -> 4.1.0 --- pkgs/os-specific/linux/autosuspend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/autosuspend/default.nix b/pkgs/os-specific/linux/autosuspend/default.nix index f25568f5a7cc..4283230f7ad7 100644 --- a/pkgs/os-specific/linux/autosuspend/default.nix +++ b/pkgs/os-specific/linux/autosuspend/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "languitar"; repo = pname; rev = "v${version}"; - sha256 = "149b4qn3nmz48ydnlcgks3as3zzzzn3f5cvj3kdxqxjy4c052lpz"; + sha256 = "0vn1qhsmjlgd7gn11w938kraz55xyixpzrgq06dar066hcsn1x8w"; }; postPatch = '' From d9d30199ec6d8b0a12b9e7d77c019e0fcac96f66 Mon Sep 17 00:00:00 2001 From: 1000teslas <47207223+1000teslas@users.noreply.github.com> Date: Tue, 11 Jan 2022 11:55:38 +1100 Subject: [PATCH 38/62] isabelle: patch zipperposition binary --- pkgs/applications/science/logic/isabelle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 32d89d7e22ae..419293c9bbbb 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { done '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} - for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS}; do + for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done ''); From 716fb1c04ed126149ad0038b6e5e9e8e84d1ee41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 01:23:57 +0000 Subject: [PATCH 39/62] assh: 2.12.1 -> 2.12.2 --- pkgs/tools/networking/assh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 9ceffb4ff882..0d3b08ae478a 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "assh"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "1r3fny4k1crpjasgsp09qf0p3l9vg8c0ddbb8jd6qnqnwwprqfxd"; + sha256 = "sha256-KVxEhA9tXAUhqMZ+MLX7Xk5aoaOcukiVFMLme9eHTUw="; }; - vendorSha256 = "14x7m900mxiwgbbxs56pdqsmx56c4qir5j4dz57bwr10rmh25fy4"; + vendorSha256 = "sha256-xLsiYM0gZL5O+Y3IkiMmzJReNW7XFN3Xejz2CkCqp5M="; doCheck = false; From d5f87a4a149e297514e9bb8533af7e309b9d470a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 03:16:06 +0000 Subject: [PATCH 40/62] cargo-generate: 0.11.1 -> 0.12.0 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index d432f5a50fae..0597b7abbecc 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-t0vIuJUGPgHQFBezmEMOlEJItwOJHlIQMFvcUZlx9is="; + sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs="; }; - cargoSha256 = "sha256-esfiMnnij3Tf1qROVViPAqXFJA4DAHarV44pK5zpDrc="; + cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo="; nativeBuildInputs = [ pkg-config ]; From 7d5300d2f2f20372ac9dafb53b75e48406005ea0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 11 Jan 2022 11:48:01 +0800 Subject: [PATCH 41/62] pantheon.elementary-videos: 2.8.1 -> 2.8.3 --- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index f7286c9108a6..494b50605e97 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-Ki6i9u+oXOBTH+dVJ9RgBxszD7Wvdrfahd9abyjFYJY="; + sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE="; }; nativeBuildInputs = [ From 9613e4a2708a97e81c9ec48765baf67f15664f77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 04:52:11 +0000 Subject: [PATCH 42/62] python310Packages.chiapos: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/chiapos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index a5ebf97b151a..f4047c26f5cf 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1e10ce00730d293ed83ed3a3c630d525c9256fe4e31e64abbda7aa054b8a753f"; + sha256 = "64529b7f03e9ec0c1b9be7c7c1f30d4498e5d931ff2dbb10a9cc4597029d69f0"; }; patches = [ From 69ccf66f8ab02adcad21ef29b53d19e7c2c335e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 05:10:19 +0000 Subject: [PATCH 43/62] crd2pulumi: 1.0.10 -> 1.1.0 --- pkgs/development/tools/crd2pulumi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix index 574228fa4cf0..51077c3178a3 100644 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.0.10"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "1xzr63brzqysvhm3fqj246c7s84kchpcm6wad3mvxcxjcab6xd1f"; + sha256 = "sha256-7eNjOVTbZVpjQZPo69DgVCLCXqWnb0UVKd/DIY9Tq08="; }; - vendorSha256 = "0xi5va2fy4nrxp3qgyzcw20a2089sbz8h1hvqx2ryxijr61wd93d"; + vendorSha256 = "sha256-XM1uedApVLkFzUpNPYS5YyMiWrOpzTvqKjWIV7s/1mI="; ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; From 24fa256045310dac062f09989620c11ababc8450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 05:17:41 +0000 Subject: [PATCH 44/62] crowdin-cli: 3.7.4 -> 3.7.5 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 9b2726443f40..ce71c44408b3 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-zsd95dkKzuhqtWFwc84tjZ05MnzE25UvfF459gfp+lA="; + sha256 = "sha256-p2lfE3fxUpgTGgIP6KojQ5uC3kF7KWDIU2ILpi90Sso="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 30ca2615e48fbf587ca9a447cbbf6adafe59d1d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 05:54:02 +0000 Subject: [PATCH 45/62] disfetch: 2.15 -> 3.2 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 96f2b28b5e3f..3d7b9c25cecd 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.15"; + version = "3.2"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8="; + sha256 = "sha256-NsYfKnWwkPLd//YU8p9e8jeoM8ZmbBlzi2jkHBOXT/M="; }; dontBuild = true; From 444baf106d54d186723d64f70c0768f6ce68a471 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 12:57:11 +0700 Subject: [PATCH 46/62] vyper: 0.3.0 -> 0.3.1 --- pkgs/development/compilers/vyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 4308710717ac..ad2fae32b252 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "3e50cd802696ea3f5e6ab1bf4c9a90a39c332591d416c99f3d2fa93d7d7ba394"; + sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q="; }; nativeBuildInputs = [ pytest-runner ]; From c7b6d5ffc190e488d08deae367edd41552402543 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Jan 2022 22:01:08 -0800 Subject: [PATCH 47/62] vscode-extensions.github.vscode-pull-request-github: 0.35.2021122109 -> 0.35.2022010609 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 55a2de116e81..af348305849b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -867,8 +867,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.35.2021122109"; - sha256 = "1n7vjwxm92ibwhgn2n57p54dqpi0vvyllmcgjxilgnr14irg5457"; + version = "0.35.2022010609"; + sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa"; }; meta = { license = lib.licenses.mit; }; }; From 21e5e2a54886d35d6df21a345c05b7527ce3801d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 06:10:27 +0000 Subject: [PATCH 48/62] ugrep: 3.4.0 -> 3.5.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 38e534932a44..1e6826ae85b6 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G9MM5dIc1B8tggCQKIk+f39cv/Xb0rTLOqDYEsHwI4A="; + sha256 = "sha256-4A0UrXSJhV330W6phNDfqd/iNWYmKuzYUwr4gfTndQw="; }; buildInputs = [ From 40d28cd73345bbb0b8f6ef520de1ed043c8904a1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 13:12:03 +0700 Subject: [PATCH 49/62] fq: 0.0.2 -> 0.0.3 --- pkgs/development/tools/fq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 5d1c730e925b..cafcc859b5ec 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,13 +7,13 @@ buildGo117Module rec { pname = "fq"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-ykjt9MPkN5dgTaY2VhApNt5DKh9TFapMpoHwLdpOKcw="; + sha256 = "sha256-yC2Hd7sUPA7SCJNWYlD1u3u9kfTEtkFwdUrNeYoi5xU="; }; vendorSha256 = "sha256-89rSpxhP35wreo+0AqM+rDICCPchF+yFVvrTtZ2Xwr4="; From 6faf96d5023042b1204310c107a33a950273bc15 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 11 Jan 2022 15:02:54 +0800 Subject: [PATCH 50/62] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 4 ++++ .../development/haskell-modules/hackage-packages.nix | 12 ++++++++++++ 3 files changed, 20 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e5aaf87f41c1..0919e1675059 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1783,6 +1783,7 @@ broken-packages: - graph-rewriting - graph-serialize - graphted + - graph-trace-dot - graphula-core - graph-utils - graql @@ -1801,6 +1802,7 @@ broken-packages: - gross - GroteTrap - groundhog-converters + - groundhog-inspector - groundhog-mysql - grouped-list - group-theory @@ -4081,6 +4083,7 @@ broken-packages: - refined-http-api-data - reflection-extras - reflex-basic-host + - reflex-dom-ace - reflex-dom-contrib - reflex-dom-helper - reflex-dom-helpers @@ -4108,6 +4111,7 @@ broken-packages: - regex-posix-unittest - regexpr-symbolic - regexqq + - regex-rure - regex-tdfa-pipes - regex-tdfa-quasiquoter - regex-tdfa-rc diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 1c22d7fcb640..1f42d38134d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1298,6 +1298,7 @@ dont-distribute-packages: - graph-rewriting-strategies - graph-rewriting-trs - graph-rewriting-ww + - graph-trace-viz - graph-visit - graphicsFormats - graphicstools @@ -2159,6 +2160,7 @@ dont-distribute-packages: - mpretty - mprover - mps + - mptcp - msgpack-aeson - msgpack-idl - msgpack-rpc @@ -2832,6 +2834,7 @@ dont-distribute-packages: - sounddelay - soundgen - source-code-server + - spade - sparkle - sparrow - sparsebit @@ -3017,6 +3020,7 @@ dont-distribute-packages: - toktok - too-many-cells - top + - topaz - topkata - total-map - toxcore diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a8a8dcbd1bd7..b94e9d070b8a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115780,6 +115780,8 @@ self: { ]; description = "Converts a graph-trace log into a DOT file for use with Graphviz"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graph-trace-viz" = callPackage @@ -115797,6 +115799,7 @@ self: { ]; description = "Converts a graph-trace log into an HTML document"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "graph-utils" = callPackage @@ -116938,6 +116941,8 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "groundhog-mysql" = callPackage @@ -188863,6 +188868,7 @@ self: { testHaskellDepends = [ base hspec ip text ]; description = "Datastructures to describe TCP and MPTCP connections"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "mptcp-pm" = callPackage @@ -229907,6 +229913,8 @@ self: { ]; description = "Basic support for using the Ace editor with Reflex"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-dom-colonnade" = callPackage @@ -231084,6 +231092,8 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "Bindings to Rust's regex library"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {rure = null;}; "regex-tdfa" = callPackage @@ -255586,6 +255596,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "spake2" = callPackage @@ -277361,6 +277372,7 @@ self: { ]; description = "Extensible records library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "tophat" = callPackage From b2737d4980a17cc2b7d600d7d0b32fd7333aca88 Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Tue, 11 Jan 2022 08:53:55 +0100 Subject: [PATCH 51/62] python3Packages.tensorflow-datasets: init at 4.4.0 (#154117) * python3Packages.tensorflow-datasets: init at 4.4.0 * Update pkgs/development/python-modules/tensorflow-datasets/default.nix Co-authored-by: Dmitry Kalinkin Co-authored-by: Samuel Ainsworth Co-authored-by: Dmitry Kalinkin --- .../tensorflow-datasets/corruptions.patch | 22 +++ .../tensorflow-datasets/default.nix | 141 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 165 insertions(+) create mode 100644 pkgs/development/python-modules/tensorflow-datasets/corruptions.patch create mode 100644 pkgs/development/python-modules/tensorflow-datasets/default.nix diff --git a/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch b/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch new file mode 100644 index 000000000000..71e5da5e11bb --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch @@ -0,0 +1,22 @@ +diff --git a/tensorflow_datasets/image_classification/corruptions.py b/tensorflow_datasets/image_classification/corruptions.py +index 066c4460..cb9a6667 100644 +--- a/tensorflow_datasets/image_classification/corruptions.py ++++ b/tensorflow_datasets/image_classification/corruptions.py +@@ -35,7 +35,7 @@ FROST_FILENAMES = [] + + + def _imagemagick_bin(): +- return 'imagemagick' # pylint: disable=unreachable ++ return 'convert' # pylint: disable=unreachable + + + # /////////////// Corruption Helpers /////////////// +@@ -675,7 +675,7 @@ def spatter(x, severity=1): + # ker = np.array([[-1,-2,-3],[-2,0,0],[-3,0,1]], dtype=np.float32) + # ker -= np.mean(ker) + ker = np.array([[-2, -1, 0], [-1, 1, 1], [0, 1, 2]]) +- dist = cv2.filter2D(dist, cv2.CVX_8U, ker) ++ dist = cv2.filter2D(dist, cv2.CV_8U, ker) + dist = cv2.blur(dist, (3, 3)).astype(np.float32) + + m = cv2.cvtColor(liquid_layer * dist, cv2.COLOR_GRAY2BGRA) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix new file mode 100644 index 000000000000..98e38bba56ad --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -0,0 +1,141 @@ +{ apache-beam +, attrs +, beautifulsoup4 +, buildPythonPackage +, dill +, dm-tree +, fetchFromGitHub +, ffmpeg +, future +, imagemagick +, importlib-resources +, jinja2 +, langdetect +, lib +, matplotlib +, mwparserfromhell +, networkx +, nltk +, numpy +, opencv4 +, pandas +, pillow +, promise +, protobuf +, pycocotools +, pydub +, pytestCheckHook +, requests +, scikitimage +, scipy +, six +, tensorflow +, tensorflow-metadata +, termcolor +, tifffile +, tqdm +}: + +buildPythonPackage rec { + pname = "tensorflow-datasets"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "datasets"; + rev = "v${version}"; + sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6"; + }; + + patches = [ + # addresses https://github.com/tensorflow/datasets/issues/3673 + ./corruptions.patch + ]; + + propagatedBuildInputs = [ + attrs + dill + dm-tree + future + importlib-resources + numpy + promise + protobuf + requests + six + tensorflow-metadata + termcolor + tqdm + ]; + + pythonImportsCheck = [ + "tensorflow_datasets" + ]; + + checkInputs = [ + apache-beam + beautifulsoup4 + ffmpeg + imagemagick + jinja2 + langdetect + matplotlib + mwparserfromhell + networkx + nltk + opencv4 + pandas + pillow + pycocotools + pydub + pytestCheckHook + scikitimage + scipy + tensorflow + tifffile + ]; + + disabledTestPaths = [ + # Sandbox violations: network access, filesystem write attempts outside of build dir, ... + "tensorflow_datasets/core/dataset_builder_test.py" + "tensorflow_datasets/core/dataset_info_test.py" + "tensorflow_datasets/core/features/features_test.py" + "tensorflow_datasets/core/github_api/github_path_test.py" + "tensorflow_datasets/core/utils/gcs_utils_test.py" + "tensorflow_datasets/scripts/cli/build_test.py" + + # Requires `pretty_midi` which is not packaged in `nixpkgs`. + "tensorflow_datasets/audio/groove_test.py" + + # Requires `crepe` which is not packaged in `nixpkgs`. + "tensorflow_datasets/audio/nsynth_test.py" + + # Requires `gcld3` and `pretty_midi` which are not packaged in `nixpkgs`. + "tensorflow_datasets/core/lazy_imports_lib_test.py" + + # Requires `tensorflow_io` which is not packaged in `nixpkgs`. + "tensorflow_datasets/image/lsun_test.py" + + # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` + # deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related + # to the differences in some of the dependencies? + "tensorflow_datasets/rl_unplugged/rlu_atari/rlu_atari_test.py" + + # Requires `tensorflow_docs` which is not packaged in `nixpkgs` and the test is for documentation anyway. + "tensorflow_datasets/scripts/documentation/build_api_docs_test.py" + + # Not a test, should not be executed. + "tensorflow_datasets/testing/test_utils.py" + + # Require `gcld3` and `nltk.punkt` which are not packaged in `nixpkgs`. + "tensorflow_datasets/text/c4_test.py" + "tensorflow_datasets/text/c4_utils_test.py" + ]; + + meta = with lib; { + description = "Library of datasets ready to use with TensorFlow"; + homepage = "https://www.tensorflow.org/datasets/overview"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55462c867ec9..2c723706c088 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9559,6 +9559,8 @@ in { lmdb-core = pkgs.lmdb; }; + tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; + tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; From 6b98aa0d5469f20c01835bbf36f0400e19ff0c08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Jan 2022 09:28:14 +0100 Subject: [PATCH 52/62] python3Packages.requests-toolbelt: disable warnings --- .../requests-toolbelt/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 07c87bb17c0a..0417154a4a31 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -1,6 +1,7 @@ { lib , betamax , buildPythonPackage +, fetchpatch , fetchPypi , mock , pyopenssl @@ -29,7 +30,17 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + (fetchpatch { + # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246 + name = "fix-collections-abc-deprecation.patch"; + url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch"; + sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4="; + }) + ]; + disabledTests = [ + # https://github.com/requests/toolbelt/issues/306 "test_no_content_length_header" "test_read_file" "test_reads_file_from_url_wrapper" @@ -41,10 +52,10 @@ buildPythonPackage rec { "requests_toolbelt" ]; - meta = { + meta = with lib; { description = "Toolbelt of useful classes and functions to be used with requests"; homepage = "http://toolbelt.rtfd.org"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + license = licenses.asl20; + maintainers = with maintainers; [ matthiasbeyer ]; }; } From ba434d950decf83597a1c73b2fb6af7cd24e7d5e Mon Sep 17 00:00:00 2001 From: Wayne Van Son Date: Tue, 11 Jan 2022 20:14:07 +1100 Subject: [PATCH 53/62] vscode-extensions.pkief.material-product-icons: init at 1.1.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index af348305849b..1bb755148272 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1391,6 +1391,18 @@ let }; }; + pkief.material-product-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "material-product-icons"; + publisher = "PKief"; + version = "1.1.1"; + sha256 = "a0bd0eff67793828768135fd839f28db0949da9a310db312beb0781f2164fd47"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; From e74ca28beda7b927f2372885e046698e3043b2dd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 11 Jan 2022 07:35:56 +0100 Subject: [PATCH 54/62] vim-plugins: Fix name of attribute Signed-off-by: Matthias Beyer --- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 92642016b24a..128b969c3575 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -258,7 +258,7 @@ let packages = { home-manager = { start = [vimPlugins.vim-fugitive]; opt = [];}; beforePlugins = ''; - customRc = ''let mapleader = " "''; + customRC = ''let mapleader = " "''; }; */ From 11a2ff4fb8e7dca4343458fe5c2152f6532529b5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 16:22:17 +0700 Subject: [PATCH 55/62] htmlq: 0.3.0 -> 0.4.0 --- pkgs/development/tools/htmlq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 165b7cd07007..1adcaf954d04 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "htmlq"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mgdm"; repo = "htmlq"; rev = "v${version}"; - sha256 = "sha256-pTw+dsbbFwrPIxCimMsYfyAF2zVeudebxVtMQV1cJnE="; + sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0="; }; - cargoSha256 = "sha256-jeoSA7w2bk0R3L+/FDn/b+ddTCqY8zFr/2GCxI7OCzM="; + cargoSha256 = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 009f8ca222425162c27c685d859b0596ae98fa8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Jan 2022 10:29:45 +0100 Subject: [PATCH 56/62] python310Packages.cirq-google: disable failing tests --- pkgs/development/python-modules/cirq-google/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 5c8306c27fe9..4aa20a237110 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "protobuf~=3.13.0" "protobuf" \ --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" ''; @@ -29,4 +28,10 @@ buildPythonPackage rec { freezegun pytestCheckHook ]; + + disabledTests = [ + # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient' + "test_get_engine_sampler_explicit_project_id" + "test_get_engine_sampler" + ]; } From 135519c7fa2985917e0c74a11b195a9f07db8dbf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 16:35:39 +0700 Subject: [PATCH 57/62] cyclone-scheme: 0.30.0 -> 0.34.0 --- pkgs/development/interpreters/cyclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index 0d2984904d85..7364cf7d4400 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libck, darwin }: let - version = "0.30.0"; + version = "0.34.0"; bootstrap = stdenv.mkDerivation { pname = "cyclone-bootstrap"; inherit version; @@ -10,7 +10,7 @@ let owner = "justinethier"; repo = "cyclone-bootstrap"; rev = "v${version}"; - sha256 = "sha256-/zAcCBdJ7YQXsspdjrMca1Oj9SUUFXQKLwZPoZLhHYg="; + sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM="; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation { owner = "justinethier"; repo = "cyclone"; rev = "v${version}"; - sha256 = "sha256-a3wiqKlIbnvIhyrI0lyVGciQiM7KSuYH5iUfGFrgOuM="; + sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U="; }; enableParallelBuilding = true; From 21769949dc5bb3c4f0a6bf74423f5fc1a4ef56b2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 16:51:48 +0700 Subject: [PATCH 58/62] python3Packages.labmath: 1.2.0 -> 2.2.0 --- pkgs/development/python-modules/labmath/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/labmath/default.nix b/pkgs/development/python-modules/labmath/default.nix index 24018fd7420e..5eaeeba9a06d 100644 --- a/pkgs/development/python-modules/labmath/default.nix +++ b/pkgs/development/python-modules/labmath/default.nix @@ -2,17 +2,14 @@ buildPythonPackage rec { pname = "labmath"; - version = "1.2.0"; + version = "2.2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/fZ61tJ6PVZsubr3OXlbg/VxyyKimz36uPV+r33kgD0="; + sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; }; - postPatch = '' - substituteInPlace setup.py --replace "labmath/DESCRIPTION.rst" "PKG-INFO" - ''; - pythonImportsCheck = [ "labmath" ]; meta = with lib; { From 087ce9fd018b414c412e447eb79f1487768b5ea2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 Jan 2022 17:01:24 +0700 Subject: [PATCH 59/62] mmixware: unstable-2019-02-19 -> unstable-2021-06-18 --- pkgs/development/tools/mmixware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix index b6d03f456712..4f0515eec2f5 100644 --- a/pkgs/development/tools/mmixware/default.nix +++ b/pkgs/development/tools/mmixware/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation { pname = "mmixware"; - version = "unstable-2019-02-19"; + version = "unstable-2021-06-18"; src = fetchFromGitLab { domain = "gitlab.lrz.de"; owner = "mmix"; repo = "mmixware"; - rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8"; - sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087"; + rev = "7c790176d50d13ae2422fa7457ccc4c2d29eba9b"; + sha256 = "sha256-eSwHiJ5SP/Nennalv4QFTgVnM6oan/DWDZRqtk0o6Z0="; }; hardeningDisable = [ "format" ]; From bd9bf2ee927d947af2b054b93016d53f897cce25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Jan 2022 11:04:22 +0100 Subject: [PATCH 60/62] python3Packages.annexremote: disable failing tests --- .../python-modules/annexremote/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 9ea365079451..c9ed6bd90ede 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -2,33 +2,41 @@ , isPy3k , buildPythonPackage , fetchFromGitHub -, future -, mock +, pytestCheckHook , nose +, pythonOlder }: buildPythonPackage rec { pname = "annexremote"; version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # use fetchFromGitHub instead of fetchPypi because the test suite of - # the package is not included into the PyPI tarball src = fetchFromGitHub { - rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; + rev = "v${version}"; sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; - propagatedBuildInputs = [ future ]; + checkInputs = [ + nose + ]; - checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock; - checkPhase = "nosetests -v"; + checkPhase = '' + nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory" + ''; + + pythonImportsCheck = [ + "annexremote" + ]; meta = with lib; { description = "Helper module to easily develop git-annex remotes"; homepage = "https://github.com/Lykos153/AnnexRemote"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ montag451 ]; }; } From a4b6785de97e0f0524281647671cee7ce23a911c Mon Sep 17 00:00:00 2001 From: 1000teslas <47207223+1000teslas@users.noreply.github.com> Date: Tue, 11 Jan 2022 19:22:30 +1100 Subject: [PATCH 61/62] isabelle: patch jni libs for nitpick --- .../science/logic/isabelle/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 419293c9bbbb..5427f42a7588 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -7,18 +7,22 @@ stdenv.mkDerivation rec { dirname = "Isabelle${version}"; - src = if stdenv.isDarwin - then fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; - } - else fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; - }; + src = + if stdenv.isDarwin + then + fetchurl + { + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; + sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; + } + else + fetchurl { + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; + sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; + }; buildInputs = [ polyml z3 veriT vampire eprover-ho ] - ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; + ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -69,12 +73,15 @@ stdenv.mkDerivation rec { for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do rm -rf $comp/x86* done - '' + (if ! stdenv.isLinux then "" else '' + '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done - ''); + for d in contrib/kodkodi-*/jni/$arch; do + patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so + done + ''); installPhase = '' mkdir -p $out/bin From de4f35243daff2e3f04b29642bd7915e3089fb3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 10:17:12 +0000 Subject: [PATCH 62/62] ginkgo: 1.16.5 -> 2.0.0 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index b7aa02eec01d..0566f0276fbd 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-v2JcH2jqB7ffF0mS6aOHM3bODf9eyGwmigp4kfCxBsI="; + sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc="; }; - vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; + vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; doCheck = false; meta = with lib; {