From bbcc162a42be96579ce25dd67b93f7cfad8b9f5c Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Oct 2022 11:15:15 -0400 Subject: [PATCH 01/20] haskellPackages: stackage LTS 19.25 -> LTS 19.27 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../haskell-modules/configuration-hackage2nix/stackage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 40512dd991f8..081be641891b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.25 +# Stackage LTS 19.27 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: From c0078a4d3026c687415d0a5511e688494093fde9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Oct 2022 11:15:52 -0400 Subject: [PATCH 02/20] all-cabal-hashes: 2022-10-01T15:28:21Z -> 2022-10-05T14:24:18Z 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 02f113dd1c43..8ce6780cf35a 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3f8bc936ca1b36ede05f3cec8166c6ae6c61808d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f8bc936ca1b36ede05f3cec8166c6ae6c61808d.tar.gz", - "sha256": "0bjd6znvwipc8gd0s4bryjbcj29h1lryxc2cqy0xgy07b7dpz245", - "msg": "Update from Hackage at 2022-10-01T15:28:21Z" + "commit": "d9b306138608746f6f686e7f3af6f35e635eacc8", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d9b306138608746f6f686e7f3af6f35e635eacc8.tar.gz", + "sha256": "11c7x0b1ivcx8z96yr7rwnsby5bmjrwsjbak2pa4kknsklxd1iba", + "msg": "Update from Hackage at 2022-10-05T14:24:18Z" } From bbd00e8632c232da12a610d53b53951c0441b18e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 5 Oct 2022 11:17:12 -0400 Subject: [PATCH 03/20] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 659 ++++++++++++++---- 1 file changed, 528 insertions(+), 131 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 08b21ad0bd79..5c98aace58c5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21574,8 +21574,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.3.1"; - sha256 = "1ncjrn2dcxpi8gykn0axi7wwi35frpp5wqvbm7zyd2pp2wfi2f3i"; + version = "0.10.4"; + sha256 = "1bdab2pbxyyxlmvjicxd2mpa4lwf29s4kpgp2xv7nvwgfbazk9w3"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -25864,8 +25864,8 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.5.3"; - sha256 = "0j4qddxxr0pfjz2d4hwvxdgmb4vb343ysw6g1fms4shdk41h1kz5"; + version = "1.6.0"; + sha256 = "14phbs7m1zs7dlc1cpbmawlzq99h9bz6wq5shdsllg5mwzzhskia"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers either haskell-src-meta pretty scientific template-haskell text @@ -34715,8 +34715,8 @@ self: { }: mkDerivation { pname = "arrayfire"; - version = "0.6.0.0"; - sha256 = "0vm1m3bc3c29dwbpzkp0pnxnz7rah8gqrgc0p4haivm5w4r10bf8"; + version = "0.7.0.0"; + sha256 = "0id1safpvd6lmjddgnkw94i6c586ba71yid4xfjq06wjx52l33rk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -34724,8 +34724,7 @@ self: { librarySystemDepends = [ af ]; executableHaskellDepends = [ base directory parsec text vector ]; testHaskellDepends = [ - base directory hspec hspec-discover QuickCheck quickcheck-classes - vector + base directory hspec QuickCheck quickcheck-classes vector ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings to the ArrayFire general-purpose GPU library"; @@ -35013,8 +35012,8 @@ self: { pname = "ascii"; version = "1.2.3.0"; sha256 = "0s6w1wv6hjx1abz038cw7fyl8ilbs3cxmcs989c3hh9659l82p2j"; - revision = "1"; - editedCabalFile = "1fxvasc860zdnbycblvv3b5ak5dzz1qvpjijzbn8zdc0hng4gw4v"; + revision = "2"; + editedCabalFile = "16b1dmjl0p2zdn05h2iwm1ymhrvgr19c1gzankrn0i7jj89nf979"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35053,6 +35052,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_11" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.11"; + sha256 = "03rhq303igzvx9yil5qli2ga9iz47psrlnbb494785w9whwayxq1"; + revision = "1"; + editedCabalFile = "0a4nz34a5034lkq42q2l7xqdkjpakcy44syqy0gvx8p6h83ccrb1"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -35065,6 +35079,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_0_15" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.15"; + sha256 = "10vvhpl7y1gpw7gw2hpcckl0pmx7rkn35zy6yl6c9mx0hib0745a"; + revision = "1"; + editedCabalFile = "0b73pm9z5k3xbpn49fz4m8jwzw3r4z0l2v4alinf5l7n6vx4wvj0"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -35108,6 +35137,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_13" = callPackage + ({ mkDerivation, ascii-char, base, hashable, hedgehog }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.13"; + sha256 = "1xynfvrr8lwmrxqww2c2bwp6r3162mqgmx7hljwmbvdmnc0na30d"; + revision = "1"; + editedCabalFile = "0snp4qfj20jjchhhf7v8lyssjydv57sd2wy88fbc0aaba4c5lq7y"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base hedgehog ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -35152,8 +35196,8 @@ self: { pname = "ascii-numbers"; version = "1.1.0.0"; sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv"; - revision = "1"; - editedCabalFile = "05w36jqzy1r6bhp6gsnbfgbx5765w6bxa511j2z0z5wrzzdbnqp9"; + revision = "2"; + editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35184,8 +35228,8 @@ self: { pname = "ascii-predicates"; version = "1.0.1.0"; sha256 = "1zqlly878qlrkjw2m4mgs4cgw6xspn0alx6xnvnrp1r2b412ykyn"; - revision = "1"; - editedCabalFile = "16l7vij4k3qnrny8sfrg90b5m60ixqwa7shb23yq467y13x4s7da"; + revision = "2"; + editedCabalFile = "15jb8yq55dwwbbq0k0vzcznsk4xvxylm61i2jspyhjhgzq9w34ik"; libraryHaskellDepends = [ ascii-char base ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "Various categorizations of ASCII characters"; @@ -35245,8 +35289,8 @@ self: { pname = "ascii-superset"; version = "1.0.1.13"; sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s"; - revision = "1"; - editedCabalFile = "06j1anb8h5lppa4mlk67sbx1xkfra1v3717lj437i12bm9pf0bap"; + revision = "2"; + editedCabalFile = "1551j1x284zdv9w233ma5r15bwmwizh5zi2ifcsp86d09c38505n"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -35292,6 +35336,27 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_11" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, bytestring + , hedgehog, template-haskell, text + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.11"; + sha256 = "14a50pxmri17nch7bcmrdflrqq5qq2z5012aiqh260iq4qsw74xq"; + revision = "1"; + editedCabalFile = "037i6n02c9xsxj5zz1nxihwgzhksbzjzd0s2a2m8ndsq3a5hgc61"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + testHaskellDepends = [ + ascii-char ascii-superset base bytestring hedgehog text + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -36651,8 +36716,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.2"; - sha256 = "1whx2yyjxc3b4s7nrwrxvyz9bwy7n15gmr9m6lcs3zxr7dvwvlmk"; + version = "3.5.0.3"; + sha256 = "0dnaa14jwsi60b9jxgpm60nkw9q8zljz5vsl93dffqnr32znryss"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67178,6 +67243,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "construct_0_3_1_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest + , cereal, directory, doctest, filepath, incremental-parser + , input-parsers, markdown-unlit, monoid-subclasses, parsers + , rank2classes, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "construct"; + version = "0.3.1.1"; + sha256 = "0ja4xxlr9pyd2gq3w07847zz3glcx3ygd9bygjhr3ppi2n3fiwx0"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base bytestring cereal incremental-parser input-parsers + monoid-subclasses parsers rank2classes text + ]; + testHaskellDepends = [ + attoparsec base bytestring cereal directory doctest filepath + incremental-parser monoid-subclasses rank2classes tasty tasty-hunit + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Haskell version of the Construct library for easy specification of file formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, base, binary-search, complex-generic , integer-roots @@ -68552,6 +68644,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.8.0"; + sha256 = "16gkll00awgb0l5mdpxd33f3szgvfsbwxlh3nkj1jsdkjrir4ggc"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -68591,22 +68701,22 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_5_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, core-data, core-text - , directory, exceptions, filepath, fsnotify, hashable, hourglass - , mtl, prettyprinter, safe-exceptions, stm, template-haskell + "core-program_0_6_0_1" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, hashable, hourglass, mtl + , prettyprinter, safe-exceptions, stm, template-haskell , terminal-size, text, text-short, transformers, typed-process , unix }: mkDerivation { pname = "core-program"; - version = "0.5.2.0"; - sha256 = "1yagjv69q49lchbp6qb51qb5s6pmszz522y0r645kmqp7chb9nqf"; + version = "0.6.0.1"; + sha256 = "1fmqq65aq6z99jjw11csqpzxwgn1l54nrf2lylqvvcd3x6ysay3h"; libraryHaskellDepends = [ - async base bytestring core-data core-text directory exceptions - filepath fsnotify hashable hourglass mtl prettyprinter - safe-exceptions stm template-haskell terminal-size text text-short - transformers typed-process unix + base bytestring core-data core-text directory exceptions filepath + fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm + template-haskell terminal-size text text-short transformers + typed-process unix ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; @@ -68614,17 +68724,17 @@ self: { }) {}; "core-telemetry" = callPackage - ({ mkDerivation, async, base, bytestring, core-data, core-program + ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl , network-info, random, safe-exceptions, scientific, stm , template-haskell, text, time, unix, uuid-types, zlib }: mkDerivation { pname = "core-telemetry"; - version = "0.2.6.0"; - sha256 = "04a0blnkap9mdlryikvn5dri60k0dvhkbbp9112p8417ywp0gsh7"; + version = "0.2.6.1"; + sha256 = "0i74ij12q99dap4yvwf4rkirq9wwib9w6ygwav29j2rv8rni6pim"; libraryHaskellDepends = [ - async base bytestring core-data core-program core-text exceptions + base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions scientific stm template-haskell text time unix uuid-types zlib ]; @@ -80191,8 +80301,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; - revision = "2"; - editedCabalFile = "0cxg21lsahkrf129k5h82d4znm3861dqc597mgzwyl5f0ywhllzr"; + revision = "3"; + editedCabalFile = "1rp3rxpv0dp810rsxwqj8n8lgx60pyh6dxyc27lflp1ag38v8887"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -93577,37 +93687,36 @@ self: { }) {}; "eventuo11y" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, resourcet - , text, time, unliftio-core, uuid + ({ mkDerivation, aeson, base, bytestring, exceptions, primitive + , resourcet, text, time, unliftio-core, uuid }: mkDerivation { pname = "eventuo11y"; - version = "0.1.0.1"; - sha256 = "1mrjmyn2dscn05n6il1h0n09kim1mihh9v6jimvipsfbm4kjxsb9"; + version = "0.3.2.0"; + sha256 = "1dx6q09bymvr7f4l7bnmb8c9gn46yp95qfhf9dml5i33x4scr2s8"; libraryHaskellDepends = [ - aeson base bytestring exceptions resourcet text time unliftio-core - uuid + aeson base bytestring exceptions primitive resourcet text time + unliftio-core uuid ]; description = "An event-oriented observability library"; license = lib.licenses.asl20; }) {}; "eventuo11y-batteries" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring - , case-insensitive, containers, eventuo11y, exceptions, http-media - , http-types, monad-control, mtl, network, semigroupoids - , servant-client, servant-client-core, text, transformers-base - , unliftio-core, wai, warp + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , containers, eventuo11y, exceptions, http-media, http-types + , monad-control, mtl, network, semigroupoids, servant-client + , servant-client-core, text, transformers-base, wai, warp }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.1.0.1"; - sha256 = "135976nic8ficph20dani0m4clsv361324jwmhw8hywrla56mz36"; + version = "0.2.1.0"; + sha256 = "0hdhryk7srb0dcjbqfk6ah2l7x3bbl3rqhncwx0wc3nfcx97dr0v"; libraryHaskellDepends = [ - aeson async base binary bytestring case-insensitive containers - eventuo11y exceptions http-media http-types monad-control mtl - network semigroupoids servant-client servant-client-core text - transformers-base unliftio-core wai warp + aeson base binary bytestring case-insensitive containers eventuo11y + exceptions http-media http-types monad-control mtl network + semigroupoids servant-client servant-client-core text + transformers-base wai warp ]; description = "Grab bag of eventuo11y-enriched functionality"; license = lib.licenses.asl20; @@ -99998,6 +100107,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "flat_0_5" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, filepath, ghc-prim, hashable, list-t, mono-traversable + , pretty, primitive, QuickCheck, quickcheck-text, tasty + , tasty-hunit, tasty-quickcheck, text, timeit, unordered-containers + , vector + }: + mkDerivation { + pname = "flat"; + version = "0.5"; + sha256 = "1338h8w2s1vpjl019rv1qmc5s0xlpn3jdi4jzycc805l9cxdqa7w"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist ghc-prim hashable + list-t mono-traversable pretty primitive text unordered-containers + vector + ]; + testHaskellDepends = [ + array base bytestring containers deepseq dlist filepath ghc-prim + list-t mono-traversable pretty QuickCheck quickcheck-text tasty + tasty-hunit tasty-quickcheck text timeit unordered-containers + vector + ]; + description = "Principled and efficient bit-oriented binary serialization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "flat-maybe" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -109639,14 +109776,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-exactprint_1_5_0" = callPackage + "ghc-exactprint_1_6_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.5.0"; - sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp"; - revision = "1"; - editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"; + version = "1.6.0"; + sha256 = "1yj0vn42sysilikylabnncq2g005mnmpf8n7sn0a6lphpcv9gdcf"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -110679,8 +110814,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.8.0.0"; - sha256 = "1xk6ircvrx0dy0dff5vlxz7sjf1i1dkpkd3vaifc2sifmb9m5j3y"; + version = "0.8.3.0"; + sha256 = "0qrb8zz93rb25p8f4dhh2bxx3vb0yc92rx59xbh23ixijiszhas8"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -113257,8 +113392,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220927"; - sha256 = "1bqcaddw47g6i3z9g0iym5x7zy1q8fsirzqnjsa63n2bwm6zzplc"; + version = "10.20221003"; + sha256 = "0nyhmwkzd8gyd9mvlnjyalfix32x5y4g89d5g36jp3jp1bkwg9i4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -115670,6 +115805,8 @@ self: { pname = "gnuidn"; version = "0.2.2"; sha256 = "0vxrcp9xz5gsvx60k12991zn5c9nk3fgg0yw7dixbsjcfqgnnd31"; + revision = "1"; + editedCabalFile = "11aq4k74fdl12i73vqbxppdz23f8aafkxgdp59sw8wi9qby0rljd"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ libidn ]; libraryPkgconfigDepends = [ libidn ]; @@ -127564,15 +127701,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashtables_1_3" = callPackage + "hashtables_1_3_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector }: mkDerivation { pname = "hashtables"; - version = "1.3"; - sha256 = "1lqdz4hp6lrzi37f6d2448dmk8jpv56igv5h0kcbnbl42dnmly5g"; + version = "1.3.1"; + sha256 = "1hsrihk948xfpy14qrhar50b41kp60i1rx8bkadjg1xb4bml0gbg"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -132258,14 +132395,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_8_0_3" = callPackage + "hasql-pool_0_8_0_4" = callPackage ({ mkDerivation, async, base, hasql, hspec, rerebase, stm, time , transformers }: mkDerivation { pname = "hasql-pool"; - version = "0.8.0.3"; - sha256 = "1drr82mkcapkzvvx7fhrp1nvps4xr9lcam8110f4b0idgq826z9c"; + version = "0.8.0.4"; + sha256 = "1zpc79k63pysc5zj7lcj81qm48gs0f6zqv455dpwgyipj7g0ba65"; libraryHaskellDepends = [ base hasql stm time transformers ]; testHaskellDepends = [ async hasql hspec rerebase stm ]; description = "Pool of connections for Hasql"; @@ -132557,8 +132694,8 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.1.0.0"; - sha256 = "0cqm6c4axivxvw5r35ass9qa0bmgxnz7n8d8l12vz78nsfxp76ci"; + version = "0.2.0.0"; + sha256 = "1d6dmswc40ywr62fxywv1phsq2fxn6vg7q7247kzacrd0kkgs0ja"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder hasql mtl resourcet safe-exceptions transformers unliftio-core @@ -159737,6 +159874,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "incremental-parser_0_5_0_4" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , input-parsers, monoid-subclasses, parsers, QuickCheck + , rank2classes, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.5.0.4"; + sha256 = "1gk3qxn8hg15h6aw7aswjr302pda2m20irzmbc6av2hw254d8b9p"; + libraryHaskellDepends = [ + base input-parsers monoid-subclasses parsers rank2classes + transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -160691,6 +160852,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "input-parsers_0_3" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , monoid-subclasses, parsec, parsers, text, transformers + }: + mkDerivation { + pname = "input-parsers"; + version = "0.3"; + sha256 = "00xiaxf135v3g8l8gn0lzhfkc1lffvjblrij6lwyfigicm2ggff0"; + libraryHaskellDepends = [ + attoparsec base binary bytestring monoid-subclasses parsec parsers + text transformers + ]; + description = "Extension of the parsers library with more capability and efficiency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -161097,8 +161275,8 @@ self: { }: mkDerivation { pname = "int-like"; - version = "0.1.0"; - sha256 = "1v7cv0f6bg8lkr1m8fbfrkysggysrli76q6l04y66cvwcjniz6i6"; + version = "0.1.1"; + sha256 = "19dblzvwjbvvlz8xi5k3x1rciwm2zwxvmsg9vf997xk4shrxswn1"; libraryHaskellDepends = [ algebraic-graphs base containers deepseq hashable ]; @@ -162071,8 +162249,8 @@ self: { pname = "invert"; version = "1.0.0.2"; sha256 = "13zl9i6g7ygkm3pgm7b72815cfp66mykxzp5vwy5kqakr8c3w1fp"; - revision = "2"; - editedCabalFile = "1kc8nfwwy3vr6sc6pdw23lpyc1x91bp9rinmrkjp3zl94ck8y179"; + revision = "3"; + editedCabalFile = "1jrpqnd03j5h1g879n63ygj561db7kvk43xjvhhv4f4h1rmpzpri"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector @@ -194254,6 +194432,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_2" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, primes, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.2"; + sha256 = "10ajd7pm0jgqvsyp61sjyfg4392nmrxir0fry4zc4l2rl8vw1q9s"; + libraryHaskellDepends = [ + base bytestring commutative-semigroups containers primes text + vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -200999,8 +201199,8 @@ self: { pname = "nettle"; version = "0.3.0"; sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg"; - revision = "1"; - editedCabalFile = "1j8h6m4cj1ykxrsxmjiyb1c4mv6cawssgb8phl0aijrjn3b79f2b"; + revision = "2"; + editedCabalFile = "0szkcrp9ws984ah282jwwfsmzn85khvpmkphv2b1jgxfwzqg426z"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -210698,6 +210898,29 @@ self: { mainProgram = "SortLines"; }) {}; + "overeasy" = callPackage + ({ mkDerivation, algebraic-graphs, base, containers, deepseq + , hashable, hedgehog, int-like, logict, mtl, prop-unit + , recursion-schemes, text, transformers, unfree + , unordered-containers + }: + mkDerivation { + pname = "overeasy"; + version = "0.2.0"; + sha256 = "1yyh79l9fjb1r769wm878ldi4g81i3iqmjwng02frs9c2fzbsp3w"; + libraryHaskellDepends = [ + algebraic-graphs base containers deepseq hashable int-like logict + mtl recursion-schemes text transformers unfree unordered-containers + ]; + testHaskellDepends = [ + algebraic-graphs base containers deepseq hashable hedgehog int-like + logict mtl prop-unit recursion-schemes text transformers unfree + unordered-containers + ]; + description = "A purely functional E-Graph library"; + license = lib.licenses.bsd3; + }) {}; + "overhang" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -224445,6 +224668,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "posit" = callPackage + ({ mkDerivation, base, data-dword, deepseq, scientific }: + mkDerivation { + pname = "posit"; + version = "3.2.0.0"; + sha256 = "1qbf413cj0z35gc5dglkrzk5l20fvrcqs964jpn927k37i3dmxx1"; + libraryHaskellDepends = [ base data-dword deepseq scientific ]; + testHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + }) {}; + "positive" = callPackage ({ mkDerivation, base, nats, semigroups }: mkDerivation { @@ -227405,6 +227639,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "prettyprinter-interp" = callPackage + ({ mkDerivation, base, prettyprinter, string-interpolate, tasty + , tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "prettyprinter-interp"; + version = "0.1.0.0"; + sha256 = "0p5mqvgdmh76yndf2agrmbs3qzb9wx9rimw1jcb2xdaixjrc7gzm"; + libraryHaskellDepends = [ + base prettyprinter string-interpolate template-haskell text + ]; + testHaskellDepends = [ + base prettyprinter string-interpolate tasty tasty-hunit text + ]; + description = "Efficient interpolation for Prettyprinter"; + license = lib.licenses.bsd2; + }) {}; + "prettyprinter-lucid" = callPackage ({ mkDerivation, base, lucid, prettyprinter, text }: mkDerivation { @@ -229080,8 +229332,8 @@ self: { }: mkDerivation { pname = "project-forge"; - version = "0.2.0.0"; - sha256 = "1zn5djbfxgh1sxmf7w91isjii6p7d1l0ik7jpim1id9fzvcn7yk7"; + version = "0.3.0.0"; + sha256 = "0ppi64aa49970iig292bhnc48v37yvvcc2smjskvjjgka5nv4855"; libraryHaskellDepends = [ aeson base Blammo bytestring containers directory filepath pretty-simple stache temporary text typed-process @@ -229337,8 +229589,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.27"; - sha256 = "14av500898qy24kjwnhlnllh6mdmwi458843wsmii2xc7c29rg4c"; + version = "0.0.0.29"; + sha256 = "16nj96rhkfl5h9prqsfr8n1i20vcqlpfz8plbp2vsfha8kzsi2wl"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -229548,6 +229800,21 @@ self: { broken = true; }) {}; + "prop-unit" = callPackage + ({ mkDerivation, base, hedgehog, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "prop-unit"; + version = "0.1.0"; + sha256 = "1sz04samdhac9czcym2rra5fgncccvj6hjsymljxsvgcs2h7429i"; + libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Conveniences for using Hedgehog as a unit test runner"; + license = lib.licenses.bsd3; + }) {}; + "propane" = callPackage ({ mkDerivation, base, colour, containers, directory, filepath , repa, repa-devil, spawn @@ -238869,8 +239136,8 @@ self: { }: mkDerivation { pname = "reflex-dom-th"; - version = "0.3.3"; - sha256 = "1h4iwn3x2jqyb7hdf2p146lvl8qqm4p1b0l43wmm3xqw8qxpxj8g"; + version = "0.3.4"; + sha256 = "1di5sf4larka8k8acpp68wdp6l09sz8sr1syqwp9caawgzwgdy9i"; libraryHaskellDepends = [ array base containers gettext-th megaparsec mtl reflex-dom-core template-haskell text th-lift-instances @@ -248132,7 +248399,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "sandwich_0_1_1_1" = callPackage + "sandwich_0_1_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lifted-async, microlens, microlens-th @@ -248143,8 +248410,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.1.1"; - sha256 = "0dbbjd0q5nilb40qmjl5ddcwpm1p00pclh53brnr6v4jypvxhj0z"; + version = "0.1.1.2"; + sha256 = "1flac21bgxq07xq5ax9ga7xm1bg2bwld88msbginqxycx21dvcdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250604,14 +250871,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2_2_5_3_3" = callPackage + "sdl2_2_5_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: mkDerivation { pname = "sdl2"; - version = "2.5.3.3"; - sha256 = "1a0vdw7nhwhq9zz1wq1w8j9za02js55h92n2rj8zrbqxcr2091ma"; + version = "2.5.4.0"; + sha256 = "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -264954,14 +265221,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "some_1_0_4" = callPackage + "some_1_0_4_1" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; - version = "1.0.4"; - sha256 = "0x1qivqnayybxa6nbnaqyay73yfglxwb3xwfy03pb6ycs639avs4"; - revision = "1"; - editedCabalFile = "0hwq21d0y2iwcrkdhqkq76fna90dsdzrkk6ryh9hbg71lf768ih9"; + version = "1.0.4.1"; + sha256 = "1qy840b2f58f0jxmw4q9sfgbx64kypzdlqnwc72md5wwv84b9b1d"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -265439,6 +265704,39 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "spacecookie_1_0_0_2" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, directory, download-curl, fast-logger + , filepath-bytestring, hxt-unicode, mtl, process, socket, systemd + , tasty, tasty-expected-failure, tasty-hunit, text, transformers + , unix + }: + mkDerivation { + pname = "spacecookie"; + version = "1.0.0.2"; + sha256 = "0f60ak4i6msyxk4bypgiijsm8wg2qvj96lr7chy20kdy44wghnxp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring containers directory + filepath-bytestring hxt-unicode mtl socket text transformers unix + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers directory fast-logger + filepath-bytestring mtl socket systemd text transformers unix + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory download-curl + filepath-bytestring process tasty tasty-expected-failure + tasty-hunit + ]; + description = "Gopher server library and daemon"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "spacecookie"; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -265484,40 +265782,44 @@ self: { "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, terminal, text, time, unordered-containers - , vector, WAVE, with-utf8 + , constraints, containers, cryptonite, Decimal, directory + , exceptions, file-embed, filepath, hedgehog, hex-text, hspec + , hspec-discover, hspec-hedgehog, memory, monad-loops, mtl + , neat-interpolation, ordered-containers, process, random + , regex-tdfa, scientific, sdl2, sdl2-mixer, stm, strip-ansi-escape + , template-haskell, terminal, text, time, unix + , unordered-containers, vector, WAVE, with-utf8 }: mkDerivation { pname = "spade"; - version = "0.1.0.6"; - sha256 = "12ffyb1hx2zgb7cmfbvr88xjxs423734w048nw3c3sa4qyfc0hyk"; + version = "0.1.0.7"; + sha256 = "02pih7d5jv231gj674rilyfkbc27his7ibs50whkjqnfbf673fzl"; 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 terminal text time + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-hedgehog memory monad-loops mtl + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-mixer stm template-haskell terminal text time unix unordered-containers vector WAVE with-utf8 ]; 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 terminal text time + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-hedgehog memory monad-loops mtl + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-mixer stm template-haskell terminal text time unix unordered-containers vector WAVE with-utf8 ]; 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 terminal text time - unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-discover hspec-hedgehog memory + monad-loops mtl neat-interpolation ordered-containers process + random regex-tdfa scientific sdl2 sdl2-mixer stm strip-ansi-escape + template-haskell terminal text time unix unordered-containers + vector WAVE with-utf8 ]; testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; @@ -274455,8 +274757,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.2.0.0"; - sha256 = "1paqpv99kwdphm508bka610g6wkm12yq8mfs20q6ayx1i9akm0rh"; + version = "2.2.0.1"; + sha256 = "1wkncrg2jc5mbmdmsjx4i02d2ldsb7ydz3h8z55x8g1nzgby2pzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278780,16 +279082,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hedgehog_1_3_0_0" = callPackage + "tasty-hedgehog_1_3_1_0" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.3.0.0"; - sha256 = "1dk4bcm0a8vl1y5d3c89ypc688rp59fn11hyr2jx5kd8yvpzh0bj"; - revision = "1"; - editedCabalFile = "1bcc9sn60ca5x4jld5s4lzvmvz26vi67xgk5s7nkd8a7kp230hrl"; + version = "1.3.1.0"; + sha256 = "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -283034,6 +283334,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_10" = 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 + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.10"; + sha256 = "1iq24lpy59c8wc62ss4bwsaks6wlcr73c8vdyd2xha2p4fswmfyf"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + template-haskell text th-abstraction th-lift transformers + transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -283069,7 +283400,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show-instances_3_9_1" = callPackage + "text-show-instances_3_9_2" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -283080,8 +283411,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.1"; - sha256 = "0jh4lb2hzyfkp39kpnl82bnx5sz4d9gf0hjk4zasqvra456y5nbh"; + version = "3.9.2"; + sha256 = "1j1mcmw9l7hfmvhmv083bssc2w6zbvibaq3w4c7g7a2vxxcqwh3y"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -294642,6 +294973,24 @@ self: { license = lib.licenses.asl20; }) {}; + "unfree" = callPackage + ({ mkDerivation, base, deepseq, hashable, recursion-schemes, tasty + , tasty-hunit + }: + mkDerivation { + pname = "unfree"; + version = "0.1.0"; + sha256 = "0k1ksbq4nkc5bwgpg47x59m0ik5pfczdisyvy3zxhpxg1gvpw1ac"; + libraryHaskellDepends = [ + base deepseq hashable recursion-schemes + ]; + testHaskellDepends = [ + base deepseq hashable recursion-schemes tasty tasty-hunit + ]; + description = "Simplistic free monad with deriving through UndecidableInstances"; + license = lib.licenses.bsd3; + }) {}; + "ungadtagger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -294805,6 +295154,34 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-collation_0_1_3_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu + , th-lift-instances, unicode-transforms + }: + mkDerivation { + pname = "unicode-collation"; + version = "0.1.3.3"; + sha256 = "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ + base QuickCheck quickcheck-instances tasty-bench text text-icu + ]; + description = "Haskell implementation of the Unicode Collation Algorithm"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data" = callPackage ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty , tasty-bench @@ -298615,8 +298992,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.13"; - sha256 = "04cdzlbcx95r7x3nz0r676c376j0lfiidp0160maw651in2a3b5f"; + version = "0.0.14"; + sha256 = "17qj6s6aypypc8yn9jsjqcjkravs90c3xcszpm0rgrjpmqwc0718"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -301873,8 +302250,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.22.1"; - sha256 = "0v5x3kbw0z7cvw4s10f79i50i4yk415v0jdn0rw4m50bgl9y2icd"; + version = "3.23"; + sha256 = "0859b2nq2rifaa0xjwfv1shdc501xynd8w84dv93xkqil932ax98"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -301908,8 +302285,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10"; - sha256 = "0pa0vmwjjqwyiyrzz2bhzlbvv8y4wcwky51bnmshj7xsnqp755n5"; + version = "0.5.10.1"; + sha256 = "0jr5pl13plmg1fm2ai4f24c0lviazjinqrrafxb948ajrlwm8la1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -305805,8 +306182,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.4.3"; - sha256 = "177qh668fx41sizb7lq4w3f43ii0n54vcqgv20a5hywbygzfz9hy"; + version = "0.14.4.4"; + sha256 = "03x9nzdw13j5zwi2l5hz78lz12j6fcf96k6k0iw6bgmcyi4i6w59"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -307106,6 +307483,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.1.0.0"; + sha256 = "1lnx18mlcpdkj0dl1fbgjkxr14fqf5y36cds3p6l07kvin29qa27"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { From d0474997c548c664ed956af903ec20cb054250c3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 5 Oct 2022 23:46:41 +0200 Subject: [PATCH 04/20] haskellPackages.gnuidn: unmark as broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 04684effd6fd..b6c31d273939 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1769,7 +1769,6 @@ broken-packages: - glue - gluturtle - g-npm - - gnuidn - goa - goal-core - goatee diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5c98aace58c5..98d6963853e2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115819,8 +115819,6 @@ self: { testToolDepends = [ c2hs ]; description = "Bindings for GNU IDN"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage From dcda00d4ac91823f7dd7ae96ba71f26ec188fbfb Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 6 Oct 2022 00:52:03 +0200 Subject: [PATCH 05/20] haskell.packages.ghc942.haskell-language-server: Disable unsupported plugins to fix build --- .../configuration-ghc-9.4.x.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 6d2335fefe73..ea4bea38cee6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -224,4 +224,25 @@ in { # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; + # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 + ghc-check = dontHaddock super.ghc-check; + + # 2022-10-06: plugins disabled for hls 1.8.0.0 based on + # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers + haskell-language-server = super.haskell-language-server.override { + hls-refactor-plugin = null; + hls-class-plugin = null; + hls-eval-plugin = null; + hls-floskell-plugin = null; + hls-fourmolu-plugin = null; + hls-gadt-plugin = null; + hls-hlint-plugin = null; + hls-ormolu-plugin = null; + hls-rename-plugin = null; + hls-stylish-haskell-plugin = null; + hls-tactics-plugin = null; + hls-haddock-comments-plugin = null; + hls-retrie-plugin = null; + hls-splice-plugin = null; + }; } From 193ffabf5589d87ff35c32f0d90be11b8c5fd179 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 6 Oct 2022 00:55:43 +0200 Subject: [PATCH 06/20] haskell.packages.ghc942.haskell-language-server: Enable hydra job --- pkgs/top-level/release-haskell.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0f9c461539e6..ef66710b7510 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -359,13 +359,7 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - haskell-language-server = [ - compilerNames.ghc884 - compilerNames.ghc8107 - compilerNames.ghc902 - compilerNames.ghc924 - # https://github.com/haskell/haskell-language-server/issues/3190 - ]; + haskell-language-server = released; hoogle = released; hlint = [ compilerNames.ghc884 From 1fdd1a462b530ab7ec61bfcdeae7d1942a4e64e7 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 6 Oct 2022 01:13:30 +0200 Subject: [PATCH 07/20] haskell.packages.ghc924.haskell-language-server: Fix eval by pinning ghc-exactprint --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 21009fa9cb21..ca5decb685b5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -161,6 +161,7 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 + - ghc-exactprint == 1.5.0 # 2022-10-06: newer versions of ghc-exactprint require ghc 9.4.2 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 98d6963853e2..9e4f568fe942 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -109776,6 +109776,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-exactprint_1_5_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.5.0"; + sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp"; + revision = "1"; + editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-exactprint_1_6_0" = callPackage ({ mkDerivation }: mkDerivation { From e7b47a72fef2eb23342cd4f395ac305b8afa1ad4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Oct 2022 00:24:25 +0200 Subject: [PATCH 08/20] haskell.packages.ghc884.cabal-fmt: drop stale override It is possible to get it to work again, but a bit annoying, so probably not worth it. PRs fixing this again (if anyone needs it) will be accepted. --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 071cdeaa5030..1c1579566a9a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -110,9 +110,6 @@ self: super: { # of issues with Cabal 3.x. darcs = dontDistribute super.darcs; - # cabal-fmt requires Cabal3 - cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; - # liquidhaskell does not support ghc version 8.8.x. liquid = markBroken super.liquid; liquid-base = markBroken super.liquid-base; From ac1f1ad0e0a8cfd35db476529c82354e033a48cc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 9 Sep 2022 20:33:20 +0200 Subject: [PATCH 09/20] haskell: support cross in generateOptparseApplicativeCompletions Deprecate haskell.lib{,.compose}.generateOptparseApplicativeCompletion* in favor of the newly added haskell.packages.*.generateOptparseApplicativeCompletions (plural!) which takes into account whether we are cross-compiling or not. If we are, generating completions is disabled, since we can't execute software built for a different platform. The move is necessary, so we can receive the /same/ stdenv as the package we are overriding in order to accurately check whether we can execute produced binaries. Resolves #174040. Resolves #49648. --- .../from_md/release-notes/rl-2211.section.xml | 21 +++++++++ .../manual/release-notes/rl-2211.section.md | 9 ++++ .../haskell-modules/configuration-common.nix | 30 +++++++------ .../configuration-ghc-8.10.x.nix | 2 +- .../haskell-modules/configuration-nix.nix | 14 +++--- .../haskell-modules/lib/compose.nix | 45 ++++++++----------- .../haskell-modules/make-package-set.nix | 30 +++++++++++++ pkgs/top-level/all-packages.nix | 6 ++- 8 files changed, 107 insertions(+), 50 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 0b59f19a934e..294f13ded239 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -550,6 +550,27 @@ module removed, due to lack of maintainers. + + + generateOptparseApplicativeCompletions and + generateOptparseApplicativeCompletion from + haskell.lib.compose (and + haskell.lib) have been deprecated in favor + of generateOptparseApplicativeCompletions + (plural!) as provided by the haskell package sets (so + haskellPackages.generateOptparseApplicativeCompletions + etc.). The latter allows for cross-compilation (by + automatically disabling generation of completion in the cross + case). For it to work properly you need to make sure that the + function comes from the same context as the package you are + trying to override, i.e. always use the same package set as + your package is coming from or – even better – use + self.generateOptparseApplicativeCompletions + if you are overriding a haskell package set. The old functions + are retained for backwards compatibility, but yield are + warning. + + The services.graphite.api and diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 7201b0e1cc09..7667e09c3575 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -185,6 +185,15 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. +- `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose` + (and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as + provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.). + The latter allows for cross-compilation (by automatically disabling generation of completion in the cross case). + For it to work properly you need to make sure that the function comes from the same context as the package + you are trying to override, i.e. always use the same package set as your package is coming from or – even + better – use `self.generateOptparseApplicativeCompletions` if you are overriding a haskell package set. + The old functions are retained for backwards compatibility, but yield are warning. + - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f056ac25ef3..4d3ab525ef78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -247,7 +247,7 @@ self: super: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck ( + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck ( super.hnix.overrideScope (hself: hsuper: { hnix-store-core = hself.hnix-store-core_0_5_0_0; hnix-store-remote = hself.hnix-store-remote_0_5_0_0; @@ -719,7 +719,7 @@ self: super: { # updated dependencies (haskeline and megaparsec) which can be # removed when the next idris release (1.3.4 probably) comes # around. - idris = generateOptparseApplicativeCompletion "idris" + idris = self.generateOptparseApplicativeCompletions [ "idris" ] (doJailbreak (dontCheck super.idris)); # https://github.com/pontarius/pontarius-xmpp/issues/105 @@ -998,14 +998,14 @@ self: super: { servant-auth-server = doJailbreak super.servant-auth-server; # Generate cli completions for dhall. - dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; + dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. - dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; - dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - dhall-nixpkgs = generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs; + dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix; + dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; + dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] super.dhall-nixpkgs; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -1014,7 +1014,7 @@ self: super: { hgettext = doJailbreak super.hgettext; stack = - generateOptparseApplicativeCompletion "stack" + self.generateOptparseApplicativeCompletions [ "stack" ] # stack has a bunch of constraints in its .cabal file that don't seem to be necessary (doJailbreak (super.stack.overrideScope (self: super: { @@ -1067,7 +1067,7 @@ self: super: { hoopl = dontCheck super.hoopl; # Generate shell completion for spago - spago = generateOptparseApplicativeCompletion "spago" super.spago; + spago = self.generateOptparseApplicativeCompletions [ "spago" ] super.spago; # 2020-06-05: HACK: Package can not pass test suite, # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 @@ -1505,7 +1505,7 @@ self: super: { # PATH. # - Patch can be removed on next package set bump update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; - in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal + in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1633,7 +1633,9 @@ self: super: { http-media = doJailbreak super.http-media; # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2 - hinit = doJailbreak (generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; })); + hinit = doJailbreak + (self.generateOptparseApplicativeCompletions [ "hi" ] + (super.hinit.override { haskeline = self.haskeline_0_8_2; })); # 2022-03-19: Keeping jailbreak because of tons of strict bounds: https://github.com/snapframework/snap/issues/220 snap = doJailbreak super.snap; @@ -1676,7 +1678,7 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; + hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 @@ -1687,7 +1689,7 @@ self: super: { (overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) # See hercules-ci-optparse-applicative in non-hackage-packages.nix. (addBuildDepend super.hercules-ci-optparse-applicative) - (generateOptparseApplicativeCompletion "hci") + (self.generateOptparseApplicativeCompletions [ "hci" ]) ]; pipes-aeson = appendPatches [ @@ -2571,7 +2573,7 @@ in { # likely be removed when purescript-0.14.6 is released. doJailbreak # Generate shell completions - (generateOptparseApplicativeCompletion "purs") + (self.generateOptparseApplicativeCompletions [ "purs" ]) ]; purescript-cst = purescriptStOverride super.purescript-cst; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 1eb8e4af80f7..85708b5e7774 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -90,7 +90,7 @@ self: super: { }) (doJailbreak super.language-haskell-extract); # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. - hnix = generateOptparseApplicativeCompletion "hnix" + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (overrideCabal (drv: { # executable is allowed for ghc >= 8.10 and needs repline executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2b04d881b01d..c29963bb1d1e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,12 +95,12 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio; # avoid compiling twice by providing executable as a separate output (with small closure size) - niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv); + niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv); ghcid = enableSeparateBinOutput super.ghcid; - ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu); + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu); # Generate shell completion. - cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; + cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; arbtt = overrideCabal (drv: { # The test suite needs the packages's executables in $PATH to succeed. @@ -814,7 +814,7 @@ self: super: builtins.intersectAttrs super { install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 '' + (drv.postInstall or ""); }) - (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup); + (self.generateOptparseApplicativeCompletions [ "pnbackup" ] super.pinboard-notes-backup); # Pass the correct libarchive into the package. streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; @@ -875,7 +875,7 @@ self: super: builtins.intersectAttrs super { }) super.tophat; # Runtime dependencies and CLI completion - nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal + nvfetcher = self.generateOptparseApplicativeCompletions [ "nvfetcher" ] (overrideCabal (drv: { # test needs network doCheck = false; @@ -889,7 +889,7 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; hercules-ci-cnix-expr = @@ -917,7 +917,7 @@ self: super: builtins.intersectAttrs super { # to arbitrary files in $HOME. This doesn't either not achieve anything # or even fail, so we prevent it and install everything necessary ourselves. # See also: https://hackage.haskell.org/package/cli-setup-0.2.1.4/docs/src/Distribution.CommandLine.html#setManpathGeneric - ats-format = generateOptparseApplicativeCompletion "atsfmt" ( + ats-format = self.generateOptparseApplicativeCompletions [ "atsfmt" ] ( justStaticExecutables ( overrideCabal (drv: { # use vanilla Setup.hs diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 4c11a4e1e8bc..43ad7313e6ee 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -418,23 +418,14 @@ rec { builtins.listToAttrs (map toKeyVal haskellPaths); addOptparseApplicativeCompletionScripts = exeName: pkg: - builtins.trace "addOptparseApplicativeCompletionScripts is deprecated in favor of generateOptparseApplicativeCompletion. Please change ${pkg.name} to use the latter or its plural form." - (generateOptparseApplicativeCompletion exeName pkg); + lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (__generateOptparseApplicativeCompletion exeName pkg); /* - Modify a Haskell package to add shell completion scripts for the - given executable produced by it. These completion scripts will be - picked up automatically if the resulting derivation is installed, - e.g. by `nix-env -i`. - - Invocation: - generateOptparseApplicativeCompletion command pkg - - - command: name of an executable - pkg: Haskell package that builds the executables + INTERNAL function retained for backwards compatibility, use + haskell.packages.*.generateOptparseApplicativeCompletions instead! */ - generateOptparseApplicativeCompletion = exeName: overrideCabal (drv: { + __generateOptparseApplicativeCompletion = exeName: overrideCabal (drv: { postInstall = (drv.postInstall or "") + '' bashCompDir="''${!outputBin}/share/bash-completion/completions" zshCompDir="''${!outputBin}/share/zsh/vendor-completions" @@ -453,20 +444,22 @@ rec { }); /* - Modify a Haskell package to add shell completion scripts for the - given executables produced by it. These completion scripts will be - picked up automatically if the resulting derivation is installed, - e.g. by `nix-env -i`. - - Invocation: - generateOptparseApplicativeCompletions commands pkg - - - commands: name of an executable - pkg: Haskell package that builds the executables + Retained for backwards compatibility. + Use haskell.packages.*.generateOptparseApplicativeCompletions + which is cross aware instead. */ generateOptparseApplicativeCompletions = commands: pkg: - pkgs.lib.foldr generateOptparseApplicativeCompletion pkg commands; + lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (pkgs.lib.foldr __generateOptparseApplicativeCompletion pkg commands); + + /* + Retained for backwards compatibility. + Use haskell.packages.*.generateOptparseApplicativeCompletions + which is cross aware instead. + */ + generateOptparseApplicativeCompletion = command: pkg: + lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (__generateOptparseApplicativeCompletion command pkg); # Don't fail at configure time if there are multiple versions of the # same package in the (recursive) dependencies of the package being diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9d7cbe6f8f1b..843d1a9694c3 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -597,4 +597,34 @@ in package-set { inherit pkgs lib callPackage; } self // { } pkg; + /* + Modify a Haskell package to add shell completion scripts for the + given executables produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + This depends on the `--*-completion` flag `optparse-applicative` provides + automatically. Since we need to invoke installed executables, completions + are not generated if we are cross-compiling. + + commands: names of the executables built by the derivation + pkg: Haskell package that builds the executables + + Example: + generateOptparseApplicativeCompletions [ "exec1" "exec2" ] pkg + + Type: [str] -> drv -> drv + */ + generateOptparseApplicativeCompletions = + self.callPackage ( + { stdenv }: + + commands: + pkg: + + if stdenv.buildPlatform.canExecute stdenv.hostPlatform + then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands + else pkg + ) { }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cfdc1f70e02..79004866d390 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3230,7 +3230,8 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix); + cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables + (haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix); cabal2nix = symlinkJoin { inherit (cabal2nix-unwrapped) name meta; @@ -9377,7 +9378,8 @@ with pkgs; ngrep = callPackage ../tools/networking/ngrep { }; - neuron-notes = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); + neuron-notes = haskell.lib.compose.justStaticExecutables + (haskellPackages.generateOptparseApplicativeCompletions [ "neuron" ] haskellPackages.neuron); ngrok = callPackage ../tools/networking/ngrok { }; From 9e9b7f4d99086901f95d856fb8cdd63e7818fc6e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 10 Sep 2022 00:47:22 +0200 Subject: [PATCH 10/20] haskell.lib.compose.addOptparseApplicativeCompletionScripts: remove This function was deprecated when it was first added to haskell.lib.compose, so we can probably safely drop it. --- pkgs/development/haskell-modules/lib/compose.nix | 4 ---- pkgs/development/haskell-modules/lib/default.nix | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 43ad7313e6ee..5f7e127c0b4d 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -417,10 +417,6 @@ rec { in builtins.listToAttrs (map toKeyVal haskellPaths); - addOptparseApplicativeCompletionScripts = exeName: pkg: - lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" - (__generateOptparseApplicativeCompletion exeName pkg); - /* INTERNAL function retained for backwards compatibility, use haskell.packages.*.generateOptparseApplicativeCompletions instead! diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index a4f4104e9768..581e9aa1016f 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -316,7 +316,9 @@ rec { # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet packagesFromDirectory = compose.packagesFromDirectory; - addOptparseApplicativeCompletionScripts = compose.addOptparseApplicativeCompletionScripts; + addOptparseApplicativeCompletionScripts = exeName: pkg: + lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (compose.__generateOptparseApplicativeCompletion exeName pkg); /* Modify a Haskell package to add shell completion scripts for the From 26e666d33ce5351061bff37aafe15d3cb3a365e4 Mon Sep 17 00:00:00 2001 From: Deniz Alp Durmaz Date: Sun, 9 Oct 2022 12:27:34 +0300 Subject: [PATCH 11/20] haskellPackages.espial: Apply patch to work with GHC 9.X --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d3ab525ef78..fbc72ab16270 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1380,6 +1380,13 @@ self: super: { }) ] super.svgcairo; + # Espial is waiting for a hackage release to be compatible with GHC 9.X. + espial = appendPatch (fetchpatch { + url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; + sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; + excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; + }) super.espial; + # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b6c31d273939..11c95037d3b2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1341,7 +1341,6 @@ broken-packages: - ert - escape-artist - escoger - - espial - esqueleto-pgcrypto - ess - essence-of-live-coding-gloss-example diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9e4f568fe942..4b3c13ede1e8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -92409,8 +92409,6 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "esqueleto" = callPackage From 903b57513e96a761a3efccdaef1f02f6b83c25ac Mon Sep 17 00:00:00 2001 From: Deniz Alp Durmaz Date: Sun, 9 Oct 2022 14:42:57 +0300 Subject: [PATCH 12/20] haskellPackages.snaplet-purescript: GHC9 compatibility --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d3ab525ef78..2dffdd144584 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -60,6 +60,13 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # Patch providing GHC9 compat, can be removed once the following gets released: + # > https://github.com/adinapoli/snaplet-purescript/pull/25 + snaplet-purescript = appendPatch (fetchpatch { + url = "https://github.com/adinapoli/snaplet-purescript/commit/4c7457d9357558524d4d19ff7c7f13f85b442539.patch"; + sha256 = "sha256-wpNvCO6txEvSv8LjQaaEIbBBPJnFaMpFx5ER8BT9lXo="; + }) super.snaplet-purescript; + # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b6c31d273939..5f885038aca8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4725,7 +4725,6 @@ broken-packages: - snaplet-mandrill - snaplet-mongodb-minimalistic - snaplet-postgresql-simple - - snaplet-purescript - snaplet-redis - snaplet-sass - snaplet-scoped-session diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9e4f568fe942..7214cd566c56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -264035,8 +264035,6 @@ self: { ]; description = "Automatic (re)compilation of purescript projects"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-recaptcha" = callPackage From 88c678cae81ce989c2c7d37cbeb0cc475cf97fc9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 9 Oct 2022 12:00:11 -0400 Subject: [PATCH 13/20] haskell.packages.ghc942.cabal2nix: mark as broken on aarch64-linux --- .../haskell-modules/configuration-ghc-9.4.x.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index ea4bea38cee6..b5bf696cc761 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -74,7 +74,12 @@ in { # removed after https://github.com/NixOS/cabal2nix/pull/571 is merged. # TODO(@sternenseemann): merge and release a fixed version distribution-nixpkgs = dontCheck super.distribution-nixpkgs; - cabal2nix = dontCheck super.cabal2nix; + cabal2nix = + # cabal2nix depends on foundation, which is broken on aarch64-linux. + # https://github.com/haskell-foundation/foundation/issues/571 + overrideCabal + (drv: { badPlatforms = [ "aarch64-linux" ]; }) + (dontCheck super.cabal2nix); cabal2nix-unstable = dontCheck super.cabal2nix-unstable; # build fails on due to ghc api changes From da5ca3c24539083f7156103a06ef35f1e759dd00 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 12 Oct 2022 12:58:28 +0200 Subject: [PATCH 14/20] git-annex: update sha256 for 10.20221003 --- 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 f83e6713cc4a..22e0152547ed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -106,7 +106,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 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p"; + sha256 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; # 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 ff920c5f7b736a7dd41f71a7d830340499c3df39 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 12 Oct 2022 14:51:01 +0200 Subject: [PATCH 15/20] haskellPackages.cabal2nix-unstable: 2022-07-22 -> 2022-10-10 --- maintainers/scripts/haskell/update-cabal2nix-unstable.sh | 2 +- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index 415837045602..545c5773ff48 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -14,4 +14,4 @@ commit="$(jq -r .commit.sha <<< "$head_info")" date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)" # generate nix expression from cabal file, replacing the version with the commit date echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix -cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix +cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 0c12426434c5..4dc6ca80d125 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,11 +8,12 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-07-22"; + version = "unstable-2022-10-10"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e00ab24821be85cb025432f8e9c4ff56dbb00a81.tar.gz"; - sha256 = "11a5l0fdj67bpqv30af4v5zxr3c7n9p81pfs4c0d3w65bmr9sa1y"; + url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz"; + sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr"; }; + postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 5b0a0774819be007ce58eb8b25afe3d46e28a1ba Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 13 Oct 2022 21:14:34 +0200 Subject: [PATCH 16/20] haskellPackages.haskellish: unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5c1c94fd2aea..0c7b69e99728 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1999,7 +1999,6 @@ broken-packages: - haskell-igraph - haskell-import-graph - haskell-in-space - - haskellish - haskell-kubernetes - HaskellLM - haskell-lsp diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7bf833bad20..c90109c715f0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -130622,8 +130622,6 @@ self: { ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskellscrabble" = callPackage From 8d0a5da0072b048c09b240a037b71f7dc249b9f1 Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Tue, 11 Oct 2022 17:16:49 +0200 Subject: [PATCH 17/20] haskellPackages.sv2v: Do Jailbreak --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 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 9cc6a3ecd243..8951319e1bbb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -147,4 +147,7 @@ self: super: { # 2022-05-31: weeder 2.3.0 requires GHC 9.2 weeder = doDistribute self.weeder_2_3_1; + + # Restrictive upper bound on base and containers + sv2v = doJailbreak super.sv2v; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5c1c94fd2aea..b06c187fe9c1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4940,7 +4940,6 @@ broken-packages: - supervisors - supplemented - surjective - - sv2v - sv-core - SVD2HS - svfactor diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7bf833bad20..72c800060085 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -274696,9 +274696,7 @@ self: { executableToolDepends = [ alex happy ]; description = "SystemVerilog to Verilog conversion"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sv2v"; - broken = true; }) {}; "svfactor" = callPackage From c76bbaa0f50d4a68213b0fd8150b26bd616b030e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 15 Oct 2022 15:28:37 +0200 Subject: [PATCH 18/20] nix-output-monitor: 1.1.3.0 -> 2.0.0.0 --- .../configuration-ghc-9.2.x.nix | 3 +++ pkgs/tools/nix/nix-output-monitor/default.nix | 5 ++--- .../nix-output-monitor/generated-package.nix | 22 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) 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 7dd63c579934..e1c5a414fef5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -226,4 +226,7 @@ self: super: { inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) super.inline-c-cpp; + + relude = dontCheck self.relude_1_1_0_0; + hermes-json = doJailbreak super.hermes-json; } diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a79b41a4a5dd..e0bde4d99119 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -10,9 +10,8 @@ testTarget = "unit-tests"; buildTools = [installShellFiles]; postInstall = '' - substitute "exe-sh/nom-build" "$out/bin/nom-build" \ - --replace 'unbuffer' '${expect}/bin/unbuffer' \ - --replace 'nom' "$out/bin/nom" + ln -s nom "$out/bin/nom-build" + ln -s nom "$out/bin/nom-shell" chmod a+x $out/bin/nom-build installShellCompletion --zsh --name _nom-build completions/completion.zsh ''; diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index c95b839b4f63..922a7f4e3994 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -15,6 +15,7 @@ fetchzip, filepath, generic-optics, + hermes-json, HUnit, lib, lock-file, @@ -31,17 +32,16 @@ terminal-size, text, time, - unix, - vector, + typed-process, wcwidth, word8, }: mkDerivation { pname = "nix-output-monitor"; - version = "1.1.3.0"; + version = "2.0.0.0"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.3.0.tar.gz"; - sha256 = "085phr84m0b056mj3c09gzcwv7b1wax7nhsg2qscahfz0q8f4ym7"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.0.tar.gz"; + sha256 = "033582nzyi0hfis062cnz8lgx918lk1bmzfimsd78a9zzxn20frg"; }; isLibrary = true; isExecutable = true; @@ -58,12 +58,12 @@ mkDerivation { extra filepath generic-optics + hermes-json lock-file MemoTrie mtl nix-derivation optics - random relude safe stm @@ -71,8 +71,6 @@ mkDerivation { terminal-size text time - unix - vector wcwidth word8 ]; @@ -89,12 +87,12 @@ mkDerivation { extra filepath generic-optics + hermes-json lock-file MemoTrie mtl nix-derivation optics - random relude safe stm @@ -102,8 +100,7 @@ mkDerivation { terminal-size text time - unix - vector + typed-process wcwidth word8 ]; @@ -120,6 +117,7 @@ mkDerivation { extra filepath generic-optics + hermes-json HUnit lock-file MemoTrie @@ -135,8 +133,6 @@ mkDerivation { terminal-size text time - unix - vector wcwidth word8 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cbbb7966ae9..5e56de227cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4541,7 +4541,7 @@ with pkgs; nixel = callPackage ../tools/nix/nixel { }; - nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; + nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { haskellPackages = haskell.packages.ghc92; }; nix-template = callPackage ../tools/package-management/nix-template { inherit (darwin.apple_sdk.frameworks) Security; From 1445c56426e2078a9ee606ca0b0a177589eb9209 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 15 Oct 2022 11:49:02 -0400 Subject: [PATCH 19/20] termonad: remove top-level termonad-with-packages alias --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- pkgs/top-level/release-haskell.nix | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index ee9920dccc38..5b9e561fd48f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -680,6 +680,12 @@ system timezone. + + + The top-level termonad-with-packages alias + for termonad has been removed. + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index e8571bee3a6a..6bdd19d8e414 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -220,6 +220,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. +- The top-level `termonad-with-packages` alias for `termonad` has been removed. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. - Neovim can not be configured with plug anymore (still works for vim). diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 183d93114cfd..b90704a16184 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1142,6 +1142,7 @@ mapAliases ({ telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 + termonad-with-packages = throw "termonad-with-packages has been renamed to just 'termonad'"; # Added 2022-10-15 terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fb151d41755..0c725a0d36e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1919,9 +1919,7 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { }; - - termonad = termonad-with-packages; + termonad = callPackage ../applications/terminal-emulators/termonad { }; tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef66710b7510..61e577bb31aa 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -248,7 +248,7 @@ let taffybar tamarin-prover taskell - termonad-with-packages + termonad tldr-hs tweet-hs update-nix-fetchgit From 8ebb942007a5469fd92aa4a907cc3dfe85a5c1f5 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 15 Oct 2022 11:55:44 -0400 Subject: [PATCH 20/20] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../transitive-broken.yaml | 8 ++++++-- .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 90696d399556..babbe6a44456 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2061,6 +2061,7 @@ broken-packages: - hasql-resource-pool - hasql-simple - hasql-streams-example + - hasql-transaction-io - hastache - haste - haste-prim @@ -3962,6 +3963,7 @@ broken-packages: - PortFusion - portray-pretty - portray-prettyprinter + - posit - positron - posix-acl - posix-api @@ -4427,6 +4429,8 @@ broken-packages: - sandman - sarasvati - sat + - satchmo-backends + - satchmo-minisat - Saturnin - satyros - savage @@ -4469,6 +4473,7 @@ broken-packages: - sdl2-cairo-image - sdl2-compositor - sdl2-fps + - SDL-mpeg - sdr - seacat - seakale diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 677566d60fb6..7343aeb94400 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1984,6 +1984,11 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options + - hasql-streams-conduit + - hasql-streams-core + - hasql-streams-pipes + - hasql-streams-streaming + - hasql-streams-streamly - hasqlator-mysql - hasqly-mysql - hastache-aeson @@ -2221,7 +2226,6 @@ dont-distribute-packages: - hws - hwsl2-bytevector - hwsl2-reducers - - hxmppc - hxournal - hxt-binary - hxt-filter @@ -2805,7 +2809,6 @@ dont-distribute-packages: - network-minihttp - network-netpacket - network-pgi - - network-protocol-xmpp - network-rpca - network-stream - network-topic-models @@ -3328,6 +3331,7 @@ dont-distribute-packages: - sarsi - sasl - sat-micro-hs + - satchmo-examples - satchmo-funsat - satchmo-toysat - sauron diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 541e1bd23f65..9caa2a21956c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18080,6 +18080,8 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -132554,6 +132556,7 @@ self: { ]; description = "Stream Hasql queries with Conduit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-core" = callPackage @@ -132565,6 +132568,7 @@ self: { libraryHaskellDepends = [ base hasql hasql-transaction-io ]; description = "Stream Hasql queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-example" = callPackage @@ -132608,6 +132612,7 @@ self: { ]; description = "Stream Hasql queries with Pipes"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-streaming" = callPackage @@ -132624,6 +132629,7 @@ self: { ]; description = "Stream Hasql queries with Streaming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-streamly" = callPackage @@ -132640,6 +132646,7 @@ self: { ]; description = "Stream Hasql queries with Streamly"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-th" = callPackage @@ -132711,6 +132718,8 @@ self: { ]; description = "Perform IO actions during transactions for Hasql"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasql-url" = callPackage @@ -156416,7 +156425,6 @@ self: { ]; description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hxmppc"; }) {}; @@ -202050,7 +202058,6 @@ self: { ]; description = "Client library for the XMPP protocol"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -224686,6 +224693,8 @@ self: { libraryHaskellDepends = [ base data-dword deepseq scientific ]; testHaskellDepends = [ base ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "positive" = callPackage @@ -248725,6 +248734,8 @@ self: { ]; description = "driver for external satchmo backends"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "satchmo-examples" = callPackage @@ -248742,6 +248753,7 @@ self: { ]; description = "examples that show how to use satchmo"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "satchmo-funsat" = callPackage @@ -248769,6 +248781,8 @@ self: { libraryHaskellDepends = [ base containers process satchmo ]; description = "minisat driver as backend for satchmo"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "satchmo-toysat" = callPackage