From 5d2035aa6edacc7255e9359ba5886fb218691eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 4 Dec 2023 19:02:56 +0100 Subject: [PATCH 01/49] haskellPackages: stackage LTS 21.21 -> LTS 21.23 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c22e2f2c31ca..fa9559a1b668 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 21.21 +# Stackage LTS 21.23 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -6,7 +6,7 @@ default-package-overrides: - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 - - acc ==0.2.0.2 + - acc ==0.2.0.3 - ace ==0.6 - acid-state ==0.16.1.3 - action-permutations ==0.0.0.1 @@ -24,7 +24,7 @@ default-package-overrides: - aeson-combinators ==0.1.1.0 - aeson-diff ==1.1.0.13 - aeson-extra ==0.5.1.2 - - aeson-generic-compat ==0.0.1.3 + - aeson-generic-compat ==0.0.2.0 - aeson-iproute ==0.3.0 - aeson-optics ==1.2.1 - aeson-picker ==0.1.0.6 @@ -95,7 +95,7 @@ default-package-overrides: - assert-failure ==0.1.3.0 - assoc ==1.1 - astro ==0.4.3.0 - - async ==2.2.4 + - async ==2.2.5 - async-extra ==0.2.0.0 - async-refresh ==0.3.0.0 - async-refresh-tokens ==0.4.0.0 @@ -117,7 +117,7 @@ default-package-overrides: - audacity ==0.0.2.1 - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.1.0 + - autodocodec ==0.2.2.0 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 @@ -247,7 +247,7 @@ default-package-overrides: - bugsnag-haskell ==0.0.4.4 - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.0.1 - - bugsnag-yesod ==1.0.0.1 + - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - burrito ==2.0.1.7 - bv ==0.5 @@ -279,7 +279,7 @@ default-package-overrides: - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-install-solver ==3.8.1.0 - - cabal-rpm ==2.1.4 + - cabal-rpm ==2.1.5 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -350,7 +350,7 @@ default-package-overrides: - cmark-gfm ==0.2.6 - cmdargs ==0.10.22 - codec-beam ==0.2.0 - - code-conjure ==0.5.2 + - code-conjure ==0.5.6 - code-page ==0.2.1 - coinor-clp ==0.0.0.1 - cointracking-imports ==0.1.0.2 @@ -610,7 +610,7 @@ default-package-overrides: - doctemplates ==0.11 - doctest ==0.20.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.7 + - doctest-driver-gen ==0.3.0.8 - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1.1.1 - doctest-lib ==0.1 @@ -708,7 +708,7 @@ default-package-overrides: - evm-opcodes ==0.1.2 - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.2 - - exception-hierarchy ==0.1.0.8 + - exception-hierarchy ==0.1.0.10 - exception-mtl ==0.4.0.2 - exception-transformers ==0.4.0.12 - executable-hash ==0.2.0.4 @@ -718,7 +718,7 @@ default-package-overrides: - exomizer ==1.0.0 - experimenter ==0.1.0.14 - expiring-cache-map ==0.0.6.1 - - explainable-predicates ==0.1.2.3 + - explainable-predicates ==0.1.2.4 - explicit-exception ==0.2 - exp-pairs ==0.2.1.0 - express ==1.0.12 @@ -816,7 +816,7 @@ default-package-overrides: - friday ==0.2.3.2 - friday-juicypixels ==0.1.2.4 - friendly-time ==0.4.1 - - frisby ==0.2.4 + - frisby ==0.2.5 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 - fsnotify ==0.4.1.0 @@ -1035,13 +1035,13 @@ default-package-overrides: - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.4.0 + - HaTeX ==3.22.4.1 - HaXml ==1.25.13 - haxr ==3000.11.5 - HCodecs ==0.5.2 - hdaemonize ==0.5.7 - HDBC ==2.4.0.4 - - HDBC-session ==0.1.2.0 + - HDBC-session ==0.1.2.1 - headed-megaparsec ==0.2.1.2 - heap ==1.0.4 - heaps ==0.4 @@ -1214,7 +1214,7 @@ default-package-overrides: - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - http-streams ==0.8.9.9 - - http-types ==0.12.3 + - http-types ==0.12.4 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 - HUnit-approx ==1.1.1.1 @@ -1293,7 +1293,7 @@ default-package-overrides: - inline-c ==0.9.1.10 - inline-c-cpp ==0.5.0.2 - inline-r ==1.0.1 - - input-parsers ==0.3.0.1 + - input-parsers ==0.3.0.2 - insert-ordered-containers ==0.2.5.3 - inspection-testing ==0.5.0.2 - instance-control ==0.1.2.0 @@ -1363,7 +1363,7 @@ default-package-overrides: - jwt ==0.11.0 - kan-extensions ==5.2.5 - kansas-comet ==0.4.2 - - katip ==0.8.7.4 + - katip ==0.8.8.0 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.2 - kazura-queue ==0.1.0.4 @@ -1435,7 +1435,7 @@ default-package-overrides: - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - - libBF ==0.6.6 + - libBF ==0.6.7 - libffi ==0.2.1 - libgit ==0.3.1 - liboath-hs ==0.0.1.2 @@ -1707,7 +1707,7 @@ default-package-overrides: - nfc ==0.1.1 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - - nix-derivation ==1.1.2 + - nix-derivation ==1.1.3 - nix-paths ==1.0.1 - NoHoed ==0.1.1 - nonce ==1.0.7 @@ -1756,7 +1756,7 @@ default-package-overrides: - oops ==0.2.0.1 - opaleye ==0.9.7.0 - OpenAL ==1.7.0.5 - - openapi3 ==3.2.3 + - openapi3 ==3.2.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -2137,7 +2137,7 @@ default-package-overrides: - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - - rrb-vector ==0.2.0.1 + - rrb-vector ==0.2.1.0 - RSA ==2.4.1 - rss ==3000.2.0.7 - rss-conduit ==0.6.0.1 @@ -2349,11 +2349,11 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - - spreadsheet ==0.1.3.9 + - spreadsheet ==0.1.3.10 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.2 - - sql-words ==0.1.6.4 + - sql-words ==0.1.6.5 - squeather ==0.8.0.0 - srcloc ==0.6.0.1 - srt ==0.1.2.0 @@ -2573,7 +2573,7 @@ default-package-overrides: - th-bang-compat ==0.0.1.0 - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.2.0 + - th-data-compat ==0.1.3.0 - th-desugar ==1.14 - th-env ==0.1.1 - these ==1.2 @@ -2633,7 +2633,7 @@ default-package-overrides: - token-bucket ==0.1.0.1 - toml-reader ==0.2.1.0 - toml-reader-parse ==0.1.1.1 - - tophat ==1.0.6.1 + - tophat ==1.0.7.0 - topograph ==1.0.0.2 - torrent ==10000.1.3 - torsor ==0.1 @@ -2928,7 +2928,7 @@ default-package-overrides: - yesod-auth-oauth2 ==0.7.1.3 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.25.0 + - yesod-core ==1.6.25.1 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.6 From a87e99f7775b2fbfca86ad025599cbddc72a79d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 4 Dec 2023 19:03:08 +0100 Subject: [PATCH 02/49] all-cabal-hashes: 2023-11-20T05:37:18Z -> 2023-12-04T17:35:08Z 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 7ed0f4abfd4a..a45f47bee685 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "def4ad933fb86415a9802d7833369d12520e7744", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/def4ad933fb86415a9802d7833369d12520e7744.tar.gz", - "sha256": "0nfqz1mwzgvkkk22igq5jxfwfcc0l8i1ihlgxaixf2ip1qqlqzs6", - "msg": "Update from Hackage at 2023-11-20T05:37:18Z" + "commit": "6a46f981138e6d012bfcced5f1d2b309b5452766", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a46f981138e6d012bfcced5f1d2b309b5452766.tar.gz", + "sha256": "1v297xyfv9nv1bji08gq8s6wrgmxjnhklvf6p0mvslyrj36w7mlj", + "msg": "Update from Hackage at 2023-12-04T17:35:08Z" } From 1bd6371376766bcd72fdff63887f6e5aa89c92d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 4 Dec 2023 19:05:17 +0100 Subject: [PATCH 03/49] 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 | 1779 +++++++++++------ 1 file changed, 1213 insertions(+), 566 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d67256774b40..1107caf816ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -822,10 +822,8 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.6.4"; - sha256 = "0jzgynv737f4lwamyx1lihrabib0qcaik3cs5zrxryjpj5qvqb2v"; - revision = "1"; - editedCabalFile = "1n3w7ajswgafyjzc8ym1dqpmralnsaj3923qxvs4n0xdc6rc72r9"; + version = "2.6.4.1"; + sha256 = "106hrg4kpqslddl054jsd9xn2i3159psc60mfnj1xj2h7jdql913"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1169,18 +1167,19 @@ self: { }) {}; "AsyncRattus" = callPackage - ({ mkDerivation, base, Cabal, containers, ghc, hashtables - , simple-affine-space, transformers + ({ mkDerivation, base, Cabal, containers, ghc, ghc-boot, hashtables + , simple-affine-space, text, transformers }: mkDerivation { pname = "AsyncRattus"; - version = "0.1.0.1"; - sha256 = "0q1ly8452dyyhgfy94k122mrk6v9wwzmszfp41rs8asqfvlj905f"; + version = "0.1.0.2"; + sha256 = "1vbkhk99m8gxdfldh3fz1ls5cpc27hj6fal6jyls6fzxlws5arkn"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc hashtables simple-affine-space transformers + base containers ghc ghc-boot hashtables simple-affine-space + transformers ]; - testHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers text ]; description = "An asynchronous modal FRP language"; license = lib.licenses.bsd3; }) {}; @@ -5297,8 +5296,8 @@ self: { }: mkDerivation { pname = "EVP"; - version = "0"; - sha256 = "1hix7vl8yaagmdzr6flxfxqmnvv04mcja9rp539iiixmams5q5jd"; + version = "0.1"; + sha256 = "02xvxykxn4ishy12sscssdj9xnpvirpq7fk0jg7wvgrmm2ya7mkv"; libraryHaskellDepends = [ base containers data-default-class text yaml ]; @@ -8426,8 +8425,8 @@ self: { ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; - version = "0.1.2.0"; - sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da"; + version = "0.1.2.1"; + sha256 = "12l135ywdb1jpgvcwsv8259xdwl18x1mnf3zjv9x8x3mvvdvpwy3"; libraryHaskellDepends = [ base HDBC ]; description = "Bracketed connection for HDBC"; license = lib.licenses.bsd3; @@ -9206,10 +9205,8 @@ self: { }: mkDerivation { pname = "HMock"; - version = "0.5.1.0"; - sha256 = "1nbdgndk5bmd45wabfnndzmava9d8cf24li0w1093yl6099gmwas"; - revision = "1"; - editedCabalFile = "0dimg8vcppmz0f3jg3yjghfn1cvn46xns8y3p54nxnngh6fxl7ph"; + version = "0.5.1.2"; + sha256 = "1y2kfhkpaph3j7l38mfjgsnc95azl7fbd0mlwg8h3cyifs20bjds"; libraryHaskellDepends = [ base constraints containers data-default exceptions explainable-predicates extra monad-control mtl stm syb @@ -10135,8 +10132,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.4.0"; - sha256 = "1amna2ya9ika0x9nzxnn7a6450lz5nivm9kn8c9qz9g5d41fayx6"; + version = "3.22.4.1"; + sha256 = "0iql04fbv5ldjpcdkl1ah563v7a29p2l1525pp5dkwjq21lys40b"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10457,8 +10454,8 @@ self: { }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.4"; - sha256 = "093qbknl2isl91446rvrvi53vbnpiny2m0h4gl8sr48bivhilqvx"; + version = "0.2.0.0"; + sha256 = "1qq8ng6rsj94jkbb0xnrf9w2b250bv1p4m78bf66y9y2mpmsdl14"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; @@ -12364,8 +12361,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "10"; - editedCabalFile = "0p522zd42pnpgzp6x9agd5pnz3shsy873r0v84a0dj8c50njhm02"; + revision = "11"; + editedCabalFile = "1xsd1kw1m379sgqv7z9l0i0ddxwhsl57hlm257xqqajvn8v2yi1y"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -14122,6 +14119,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "MicroHs" = callPackage + ({ mkDerivation, base, containers, deepseq, directory, ghc-prim + , mtl, pretty, process, time + }: + mkDerivation { + pname = "MicroHs"; + version = "0.8.5.0"; + sha256 = "0l9rwzpia71f2m9mmfklyihhmpc5dk6kc02bq0nsrmd14i9ldip2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers deepseq directory ghc-prim mtl pretty process time + ]; + description = "A compiler for a subset of Haskell"; + license = lib.licenses.asl20; + mainProgram = "mhs"; + }) {}; + "MicrosoftTranslator" = callPackage ({ mkDerivation, aeson, base, bytestring, datetime, exceptions , http-client, lens, text, transformers, url, wreq, xml @@ -22306,6 +22321,8 @@ self: { pname = "Win32"; version = "2.13.4.0"; sha256 = "1nm8nx595cndbni2arbg0q27k5ghdsgzg2nvp711f6ah9svk0iji"; + revision = "1"; + editedCabalFile = "16bxm73r4q94vk3040xh81lsmh76dgwgazmpqxdal565a789j4ka"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -23573,15 +23590,15 @@ self: { "acc" = callPackage ({ mkDerivation, base, criterion, deepseq, quickcheck-instances - , rerebase, semigroupoids, tasty, tasty-quickcheck + , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "acc"; - version = "0.2.0.2"; - sha256 = "1qabsxhsl69vvp3kslmhyv1vlhryqa2ksvm4w2xz48p30150zbp2"; + version = "0.2.0.3"; + sha256 = "13gx2d2bdwkcdk8q06hq3q4a6jlamljbimd57ck2lfmr1lm5r1w9"; libraryHaskellDepends = [ base deepseq semigroupoids ]; testHaskellDepends = [ - quickcheck-instances rerebase tasty tasty-quickcheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "Sequence optimized for monoidal construction and folding"; @@ -26078,6 +26095,8 @@ self: { pname = "aeson-extra"; version = "0.5.1.3"; sha256 = "0w843dr9rj7mmgqsa93dxslsjakh1vsq601bfd89pjgx8ypd8bbh"; + revision = "1"; + editedCabalFile = "0crlzqmmwmch56b5f9c8bn6vdqsfl2mkbjx4xb5xbpihi7dg46bp"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base base-compat-batteries bytestring deepseq recursion-schemes scientific semialign @@ -26198,12 +26217,12 @@ self: { }) {}; "aeson-generic-compat" = callPackage - ({ mkDerivation, aeson, base }: + ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "aeson-generic-compat"; - version = "0.0.1.3"; - sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6"; - libraryHaskellDepends = [ aeson base ]; + version = "0.0.2.0"; + sha256 = "07yidr6cdw10pdzis8m34hah8fbvmq2qsyn95m8wiih7v5hws5bb"; + libraryHaskellDepends = [ aeson base text ]; description = "Compatible generic class names of Aeson"; license = lib.licenses.bsd3; }) {}; @@ -26227,8 +26246,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.2.0.0"; - sha256 = "1q7hcclg0lycjgayyb9sgmh8rbjiw6cck7wl7xkxvf5ivy0jppz9"; + version = "2.0.0.0"; + sha256 = "01bmsg6lvv9p9yirvayb8fzv9l7dw6gpipqjc82vkbskwmrk7j25"; libraryHaskellDepends = [ aeson attoparsec base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -26985,8 +27004,8 @@ self: { }: mkDerivation { pname = "agda-language-server"; - version = "0.2.1"; - sha256 = "19zxhz5j9vzxr45q4hasvi41cr66pgnxanv1894zgxnpszgj9v10"; + version = "0.2.6.3.0"; + sha256 = "01n81qkvqy9ajc59sljmrhsxlxwxl9mx1znlb4v0x4ckn1bgianj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37283,6 +37302,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "apigen" = callPackage + ({ mkDerivation, base, casing, cimple, data-fix, hspec + , hspec-discover, mtl, text + }: + mkDerivation { + pname = "apigen"; + version = "0.0.1"; + sha256 = "0ynbfqdkxkv8vjg7cd23gzyly0z6myzib4090y8bkbg7dpjj752c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base casing cimple data-fix mtl text ]; + executableHaskellDepends = [ base cimple text ]; + testHaskellDepends = [ base cimple hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "FFI API generator for several languages"; + license = lib.licenses.gpl3Only; + mainProgram = "apigen"; + }) {}; + "apioiaf-client" = callPackage ({ mkDerivation, aeson, base, bytestring, lens, wreq }: mkDerivation { @@ -40309,10 +40347,8 @@ self: { }: mkDerivation { pname = "async"; - version = "2.2.4"; - sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "4"; - editedCabalFile = "0bax7cvg85jhg7n1rl2mdj90j4qn27ssaprkw7wr1r0lw3yfx34v"; + version = "2.2.5"; + sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -41980,8 +42016,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.1.0"; - sha256 = "0i65xldrrygy7y64y2s47fwm1n87zr753q777ii7gd2qs8hqx1wy"; + version = "0.2.2.0"; + sha256 = "1dvrd08bzay1c59bklqn55ba1k2p0pjdzlnj807g28v9wb2ahkgf"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -43813,8 +43849,8 @@ self: { pname = "b-tree"; version = "0.1.4"; sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg"; - revision = "3"; - editedCabalFile = "1xri692y7l1q5aa5a9ijwhxjy3gf181paqrqf2lqgmbfzci2ii58"; + revision = "4"; + editedCabalFile = "1nwmc49q9afxchrldpcwpanpfxzgcfkmcvcwmhhsgnx3xa8bh5lq"; libraryHaskellDepends = [ base binary bytestring containers directory errors exceptions filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -45145,8 +45181,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "18"; - editedCabalFile = "0ykjgy3c7f6rmx9mj99y21lxsb81pd999pl98x0kvw0fai762hbp"; + revision = "19"; + editedCabalFile = "001hlnsldkiw1lr188n13j41fzfl157ba0y4qdcnzygnj5wa66ac"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -45399,6 +45435,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "basic-gps" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-gps"; + version = "0.1.0.0"; + sha256 = "0dgckarxy6lyaq2m02yisv41k7q0k40xph7v039rxx71bgih196d"; + libraryHaskellDepends = [ base ]; + description = "Basic implementation of General Problem Solver algorithm"; + license = lib.licenses.mit; + }) {}; + "basic-lens" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -46356,6 +46403,8 @@ self: { pname = "bech32"; version = "1.1.4"; sha256 = "0f4s2dc5dh5gq1hqcdlbvddk93h117nji9nca0sfqzbx04n3sma8"; + revision = "1"; + editedCabalFile = "1w86km0kq03vzp7j58sva1a9xlspbkh2zycl3c8r34jjpbqxzyw9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51745,8 +51794,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "2"; - editedCabalFile = "0nrppsjb43pf4ifng35gp7wrn62ss6c6rkc843gllhr6ac74pj06"; + revision = "3"; + editedCabalFile = "0nz83kp7gymlvnsap29ki2m6gy3aal902bazal5232slmsg49d7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52114,8 +52163,8 @@ self: { }: mkDerivation { pname = "bookhound"; - version = "0.2.0"; - sha256 = "0gv9n2nfgcfj1sv68c9llkf4f60vcb5qmcyjw4ijg2dd344yl6z1"; + version = "0.2.2"; + sha256 = "0lyba9fd4n9zpsdxfd9pig3h7dpw0z88vs561ygdqqsphjis4i06"; libraryHaskellDepends = [ base containers mtl text time ]; testHaskellDepends = [ base containers hspec mtl QuickCheck quickcheck-instances text time @@ -53210,6 +53259,25 @@ self: { license = lib.licenses.mit; }) {}; + "breakpoint_0_1_3_0" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, deepseq, ghc + , haskeline, mtl, pretty-simple, tasty, tasty-hunit + , template-haskell, text, transformers + }: + mkDerivation { + pname = "breakpoint"; + version = "0.1.3.0"; + sha256 = "0dx2b9gk1hpkr5vv8w2jbai83ynz714ygg7kc4wipvw5f1hy6c85"; + libraryHaskellDepends = [ + ansi-terminal base containers deepseq ghc haskeline mtl + pretty-simple template-haskell text transformers + ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + description = "Set breakpoints using a GHC plugin"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "breve" = callPackage ({ mkDerivation, aeson, base, binary, blaze-html, bytestring , configurator, cryptohash, directory, hashtables, http-api-data @@ -54497,17 +54565,18 @@ self: { }) {}; "bugsnag-yesod" = callPackage - ({ mkDerivation, base, bugsnag, bugsnag-wai, unliftio, wai - , yesod-core + ({ mkDerivation, annotated-exception, base, bugsnag, bugsnag-wai + , unliftio, wai, yesod-core }: mkDerivation { pname = "bugsnag-yesod"; - version = "1.0.0.1"; - sha256 = "06w2ndxk8czwdfwyy3ylkhzagbaxx6gkix8lwybks0vsxwjr6w83"; + version = "1.0.1.0"; + sha256 = "0g0saqs3a6bzqsw2rcfqgm1jr0zdynq9gbsrwkaw214wfcvj5zxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bugsnag bugsnag-wai unliftio wai yesod-core + annotated-exception base bugsnag bugsnag-wai unliftio wai + yesod-core ]; description = "Yesod integration for Bugsnag error reporting for Haskell"; license = lib.licenses.mit; @@ -57481,8 +57550,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "2.1.4"; - sha256 = "059vqbh97cydybvbwbn5cgrpw3bx7rkizy8j0nsqfyaxjvvj8lvg"; + version = "2.1.5"; + sha256 = "1ksd0q2hzmb5fszrmq5lzc0qfliqrkc51r07kzpd1p8bngcvmb2m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58450,6 +58519,20 @@ self: { broken = true; }) {inherit (pkgs) cairo;}; + "cairo-image" = callPackage + ({ mkDerivation, base, c-enum, cairo, primitive, template-haskell + }: + mkDerivation { + pname = "cairo-image"; + version = "0.1.0.0"; + sha256 = "138aihpvys624c1kksg2d7vn7m74vilrfl3w05rgdfl2l6icgcvn"; + libraryHaskellDepends = [ base c-enum primitive template-haskell ]; + libraryPkgconfigDepends = [ cairo ]; + testHaskellDepends = [ base c-enum primitive template-haskell ]; + description = "Image for Cairo"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + "cake" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmdargs , containers, derive, directory, filepath, mtl, parsek, process @@ -60746,8 +60829,8 @@ self: { }: mkDerivation { pname = "cattrap"; - version = "0.4.0.0"; - sha256 = "0j9pkj5lnyxmi9bvmbkaf73hfy923hz3s20lpaljh092cfw5dh31"; + version = "0.5.0.0"; + sha256 = "07nkmqq977afj4xjmvij6pcickqfiqrjicmrmdqy1v1x1pjn1ry3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62217,8 +62300,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.5.1.1"; - sha256 = "1jvlqp1cdszc0hrlma01kx34wvdmh1pz4gkavd20w76v0p7485rb"; + version = "0.5.2.0"; + sha256 = "0czyciw0z4cxc1xkwzw0vx5g39kc01rfnii01bxnv8cbll9hbsi7"; libraryHaskellDepends = [ adjunctions attoparsec base bytestring Color containers cubicbezier flatparse foldl formatn markup-parse mtl numhask numhask-array @@ -67057,8 +67140,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.5.2"; - sha256 = "0vv4hmqirvf24pizbb47qvzl80il2n79k9sqvvwrds4ls0dsyavh"; + version = "0.5.6"; + sha256 = "1spkh1ahjjxv46dw799kb9ax1mhp1lqg73dw5gv66snillqbz2a7"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -69949,6 +70032,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composition-extra_2_1_0" = callPackage + ({ mkDerivation, base, composition, contravariant }: + mkDerivation { + pname = "composition-extra"; + version = "2.1.0"; + sha256 = "0qnli93bpj6088lxs66k2gjpj791jydk3v98461m9q8m45jfg5ys"; + libraryHaskellDepends = [ base composition contravariant ]; + description = "Combinators for unorthodox structure composition"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composition-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -71822,8 +71917,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "3"; - editedCabalFile = "1awzybmy87y3am6qsvcx083g2xs62p1gk9jhbnpnr39kgld5zn17"; + revision = "4"; + editedCabalFile = "0c6dqygjnsyf986j2f10xvvzkq8h85sad0g9x7wxl42fxlcj1gb6"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -71858,8 +71953,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "4"; - editedCabalFile = "0l6s3pp6jdqbz8v4v9pc5lxpfvkcxli3i06nx5953pd68nd2viqs"; + revision = "5"; + editedCabalFile = "159xbw9657j7icaway9vv22b0r8bz2s6c8v4w24sldzs7dcbc3sp"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -72684,8 +72779,8 @@ self: { pname = "constraints-extras"; version = "0.4.0.0"; sha256 = "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"; - revision = "1"; - editedCabalFile = "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf"; + revision = "2"; + editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -72790,21 +72885,18 @@ self: { }) {}; "consumers" = callPackage - ({ mkDerivation, base, containers, exceptions, extra, hpqtypes + ({ mkDerivation, base, containers, exceptions, hpqtypes , hpqtypes-extras, HUnit, lifted-base, lifted-threads, log-base , monad-control, monad-loops, monad-time, mtl, stm, text, text-show , time, transformers, transformers-base }: mkDerivation { pname = "consumers"; - version = "2.3.0.0"; - sha256 = "0kx4kfs9sp9mkwxdwb0c2dicbxb7k4cyfmvqzln4vrzqxykc73wv"; - revision = "1"; - editedCabalFile = "0hw2s92fy55l79byz1wsmyhxf2qvpch3827k5agccn7j97k33bcr"; + version = "2.3.1.0"; + sha256 = "084i9lgrdn0f7pwk9b7rap66rg5z5f24az41jw7a9g9ddfq39fai"; libraryHaskellDepends = [ - base containers exceptions extra hpqtypes lifted-base - lifted-threads log-base monad-control monad-time mtl stm time - transformers-base + base containers exceptions hpqtypes lifted-base lifted-threads + log-base monad-control monad-time mtl stm time transformers-base ]; testHaskellDepends = [ base exceptions hpqtypes hpqtypes-extras HUnit log-base @@ -73797,6 +73889,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "convexHullNd" = callPackage + ({ mkDerivation, base, containers, extra, hashable, ilist + , insert-ordered-containers, regex-compat, Unique + }: + mkDerivation { + pname = "convexHullNd"; + version = "0.1.0.0"; + sha256 = "16ysb9z4b4qf0vmfqlh3b8px2hl592xgxdg696lqm3db4wdc8zjp"; + libraryHaskellDepends = [ + base containers extra hashable ilist insert-ordered-containers + regex-compat Unique + ]; + description = "Convex hull"; + license = lib.licenses.gpl3Only; + }) {}; + "cookbook" = callPackage ({ mkDerivation, base, directory, strict }: mkDerivation { @@ -74107,6 +74215,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "copr-api_0_2_0" = callPackage + ({ mkDerivation, aeson, base, http-query, text + , unordered-containers + }: + mkDerivation { + pname = "copr-api"; + version = "0.2.0"; + sha256 = "1ygvgfbivagg01a1l8826v6002wb9cxisrp7rhwb11z10nz39gms"; + libraryHaskellDepends = [ + aeson base http-query text unordered-containers + ]; + description = "Copr API client libary"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "coquina" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, exceptions, filepath, hspec, lens, markdown-unlit @@ -74420,6 +74544,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) rocksdb;}; + "corenlp-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, HUnit + , raw-strings-qq, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "corenlp-types"; + version = "0.1.0.0"; + sha256 = "03racnd1yqj43azrpf858bdzang85jsdrhihdj1860s83lp38zl5"; + libraryHaskellDepends = [ aeson base containers text ]; + testHaskellDepends = [ + aeson base bytestring HUnit raw-strings-qq tasty tasty-hunit text + ]; + description = "Types for interaction with CoreNLP"; + license = lib.licenses.agpl3Plus; + }) {}; + "cornea" = callPackage ({ mkDerivation, base, either, hedgehog, lens, lifted-base , monad-control, mtl, relude, tasty, tasty-hedgehog @@ -74671,7 +74811,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "country_0_2_4_0" = callPackage + "country_0_2_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash , byteslice, bytestring, compact, contiguous, deepseq, entropy , gauge, hashable, primitive, primitive-unlifted, QuickCheck @@ -74680,8 +74820,8 @@ self: { }: mkDerivation { pname = "country"; - version = "0.2.4.0"; - sha256 = "0z6r06f9y5w79sj5r3ifdm9pfz07dqkn39ywdxzpxajnlzsmkka7"; + version = "0.2.4.1"; + sha256 = "1nn3vkyczpc3m4bxfkl6px893l63cp0281z4nlp2063d2azb20r8"; libraryHaskellDepends = [ aeson attoparsec base bytebuild bytehash byteslice bytestring contiguous deepseq entropy hashable primitive primitive-unlifted @@ -78317,6 +78457,27 @@ self: { mainProgram = "currycarbon"; }) {}; + "currycarbon_0_3_0_0" = callPackage + ({ mkDerivation, base, filepath, hspec, math-functions, MonadRandom + , optparse-applicative, parsec, process, random, vector + }: + mkDerivation { + pname = "currycarbon"; + version = "0.3.0.0"; + sha256 = "0vdalraqcwvn2w530y7yzwvjrq7f7l727xsnx7k8ajwrvs13dfng"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath math-functions MonadRandom parsec random vector + ]; + executableHaskellDepends = [ base filepath optparse-applicative ]; + testHaskellDepends = [ base hspec process ]; + description = "A package for simple, fast radiocarbon calibration"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "currycarbon"; + }) {}; + "curryer" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, cookie, http-types, mtl, regex-pcre @@ -83730,15 +83891,15 @@ self: { "delaunayNd" = callPackage ({ mkDerivation, base, containers, extra, hashable, ilist - , insert-ordered-containers, split, Unique + , insert-ordered-containers, Unique }: mkDerivation { pname = "delaunayNd"; - version = "0.1.0.1"; - sha256 = "13zqzfbhm5hqij2ispk4b6gy04nm5fnlzmcrp07yn68m5mny3lp1"; + version = "0.1.0.2"; + sha256 = "01zjkmjb3fi08jxqk047hb0xcp0hqyjpg8wbs6qzv5mq65gqvw8v"; libraryHaskellDepends = [ base containers extra hashable ilist insert-ordered-containers - split Unique + Unique ]; description = "Delaunay tessellation"; license = lib.licenses.gpl3Only; @@ -84239,8 +84400,8 @@ self: { pname = "dependent-sum"; version = "0.7.2.0"; sha256 = "1frw5965v8i6xqdgs95gg8asgdqcqnmfahz0pmbwiaw5ybn62rc2"; - revision = "1"; - editedCabalFile = "0qybk8x6gyvg8pgf84mywlfajlcvg9pp4rs1wfn9fa7ns6sms88n"; + revision = "2"; + editedCabalFile = "09648zwf1wg42yk5ykbv1wvgz2bibjrwvcx6wpm4jscv8d2h61pi"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; @@ -88857,8 +89018,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.4.2.0"; - sha256 = "0l2pm3b3g539p0ll30x5csyzx51q7ydmdl9m94yx988sx9dv7l0n"; + version = "0.5.0.0"; + sha256 = "1nf1ysbnxfdymymr67c114kfmyl7bxxfdlsssqz48rdhafmmvh81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90758,8 +90919,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.3.0.7"; - sha256 = "0xxfp1x92qi8p5xkhyymylm8m3s56c7ivc82mv13sw14msds8miq"; + version = "0.3.0.8"; + sha256 = "0x6d2crc8jibixq0fdzbbqls7l79hb8la3mp9yd1dgikwp1bbncz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -90991,6 +91152,49 @@ self: { mainProgram = "doi"; }) {}; + "dojang" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, code-page + , containers, deepseq, Diff, directory, extra, filepath + , filepattern, fortytwo, hashable, hedgehog, hspec, hspec-discover + , hspec-expectations-pretty-diff, hspec-hedgehog + , hspec-junit-formatter, hspec-megaparsec, megaparsec, monad-logger + , mtl, optparse-applicative, parser-combinators, pretty-terminal + , process, random, regex-tdfa, semver, temporary, text, text-show + , toml-parser, unordered-containers + }: + mkDerivation { + pname = "dojang"; + version = "0.1.0"; + sha256 = "1bdyq39lphjlpc3agnbwdqvkqg8r4lmg7pzi87gd4kyx9wc8waw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq Diff directory + extra filepath filepattern fortytwo hashable megaparsec + monad-logger mtl optparse-applicative parser-combinators + pretty-terminal process semver text text-show toml-parser + unordered-containers + ]; + executableHaskellDepends = [ + base bytestring case-insensitive code-page containers Diff + directory filepath hashable megaparsec monad-logger mtl + optparse-applicative pretty-terminal text text-show toml-parser + unordered-containers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers Diff directory filepath + hashable hedgehog hspec hspec-discover + hspec-expectations-pretty-diff hspec-hedgehog hspec-junit-formatter + hspec-megaparsec megaparsec monad-logger mtl optparse-applicative + pretty-terminal random regex-tdfa temporary text text-show + toml-parser unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A cross-platform dotfiles manager"; + license = lib.licenses.gpl3Plus; + mainProgram = "dojang"; + }) {}; + "doldol" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -96293,8 +96497,8 @@ self: { }: mkDerivation { pname = "elm-syntax"; - version = "0.3.2.0"; - sha256 = "0liy0h4w6yx0ksnb05ilq9w3qb1rgpiqmqpc5iq2k4h18z61vza2"; + version = "0.3.3.0"; + sha256 = "1hql8hfa7s5lr6y62zgr3hc1jk4k03807zi3y7ckfdi5mqnm7m01"; libraryHaskellDepends = [ base bound deriving-compat hashable prettyprinter text unordered-containers @@ -100589,25 +100793,13 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-hierarchy"; - version = "0.1.0.8"; - sha256 = "17wx40kic0gw5lbz1nr094ps612i0j0pbf0wfj4kgzsl6cj80hih"; + version = "0.1.0.10"; + sha256 = "1xvbx4b68hsdj4wsxff2qd5b9342vk3iqjdv9ilxpf3wpg3xq3x2"; libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = lib.licenses.bsd3; }) {}; - "exception-hierarchy_0_1_0_9" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "exception-hierarchy"; - version = "0.1.0.9"; - sha256 = "0xplq1kfmymfnb68hba66qzj2jmhazbhpm154lyjm9ybkn23hl7g"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Exception type hierarchy with TemplateHaskell"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -101301,8 +101493,8 @@ self: { }: mkDerivation { pname = "exotic-list-monads"; - version = "1.1.0"; - sha256 = "155h7zl431j5dr0qgds2dlavm2mqg1xjadp8pknrjbfyh8sz95g3"; + version = "1.1.1"; + sha256 = "063nmcqp9swzmhbdbdvl63kll1mqw3gywwrzx64s5hdk893rzkrf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -101516,10 +101708,8 @@ self: { }: mkDerivation { pname = "explainable-predicates"; - version = "0.1.2.3"; - sha256 = "1ch86wb7bz9ydvrbdd2arskaj5pdc2x9vby4pbvnwv1r4d8n40la"; - revision = "1"; - editedCabalFile = "1qc1ys87q05q4mibqncvidb2v6988qk7fikhz52f40l3sbrydrcp"; + version = "0.1.2.4"; + sha256 = "0j446vnzppr215a0mw56vqnzmka8y7il9hv4b4bs4k6mipq4ahpk"; libraryHaskellDepends = [ array base HUnit mono-traversable QuickCheck regex-tdfa syb template-haskell @@ -102166,6 +102356,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra-data-yj" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "extra-data-yj"; + version = "0.1.0.0"; + sha256 = "1v5jp4545hg0ds2xyknqxxc6rf6aj2klp7ax9vz2rkj1yx6hczx7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Additional data types"; + license = lib.licenses.bsd3; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -102917,10 +103119,8 @@ self: { }: mkDerivation { pname = "fast-bech32"; - version = "1.0.0"; - sha256 = "1kvf9mk0dgrnm3wrb6pvgrjb3z35wk4bzc9kdilpiv3z4jvkacy9"; - revision = "1"; - editedCabalFile = "106qlfgkvsmz025f4k5ql10df9b20yraid3za93fl8c1bl3sx4ix"; + version = "1.0.1"; + sha256 = "0q5986jpqffkqb6vh67mmxbnx12kbvf6vv05348frfpffgklpdad"; libraryHaskellDepends = [ base bytestring relude text ]; testHaskellDepends = [ base base16 bech32 bytestring hspec QuickCheck text @@ -105438,21 +105638,25 @@ self: { broken = true; }) {}; - "filepath_1_4_100_4" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, QuickCheck - , quickcheck-classes-base, tasty-bench, template-haskell + "filepath_1_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, os-string + , QuickCheck, quickcheck-classes-base, tasty-bench + , template-haskell }: mkDerivation { pname = "filepath"; - version = "1.4.100.4"; - sha256 = "1bg9jr7nr6ki62d1srqvjlvrylq29zj8qi75kl7xybvw6i8651w2"; + version = "1.5.0.0"; + sha256 = "05v49dln4ya56xlgjx6kp43xn163yg52v4ayp8fc8m74j7bkm2bp"; libraryHaskellDepends = [ - base bytestring deepseq exceptions template-haskell + base bytestring deepseq exceptions os-string template-haskell ]; testHaskellDepends = [ - base bytestring deepseq QuickCheck quickcheck-classes-base + base bytestring deepseq os-string QuickCheck + quickcheck-classes-base + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq os-string tasty-bench ]; - benchmarkHaskellDepends = [ base bytestring deepseq tasty-bench ]; description = "Library for manipulating FilePaths in a cross platform way"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -109224,8 +109428,8 @@ self: { }: mkDerivation { pname = "forms-data-format"; - version = "0.2"; - sha256 = "0p62p9crw6aq1b4zd8p89i68mv4ghbrqryvi3r0gbjnsiq4agfw8"; + version = "0.2.0.1"; + sha256 = "0w5zqriaqhga9jfnr9n634aa715dv1zmnq5bv7cf67v6bck0laxy"; libraryHaskellDepends = [ base bytestring grammatical-parsers monoid-subclasses parsers rank2classes text @@ -110036,11 +110240,12 @@ self: { }) {}; "freckle-app" = callPackage - ({ mkDerivation, aeson, aws-xray-client-persistent - , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring - , case-insensitive, cassava, conduit, conduit-extra, containers - , cookie, datadog, doctest, dotenv, ekg-core, envparse, errors - , exceptions, extra, filepath, Glob, hashable, hs-opentelemetry-api + ({ mkDerivation, aeson, annotated-exception + , aws-xray-client-persistent, aws-xray-client-wai, base, bcp47 + , Blammo, bugsnag, bytestring, case-insensitive, cassava, conduit + , conduit-extra, containers, cookie, datadog, doctest, dotenv + , ekg-core, envparse, errors, exceptions, extra, filepath, Glob + , hashable, hs-opentelemetry-api , hs-opentelemetry-instrumentation-persistent , hs-opentelemetry-instrumentation-wai , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec @@ -110058,14 +110263,15 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.10.4.0"; - sha256 = "113nkqv47v2fkn6dpvx6dl58192jsr79c9yc8bfqjkxkbqg72py1"; + version = "1.10.5.1"; + sha256 = "0ska32n9cx7q3hn92kk2lwxwlp7yg0qgr8pjlxfpbkp9r4hp5r4s"; libraryHaskellDepends = [ - aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 - Blammo bugsnag bytestring case-insensitive cassava conduit - conduit-extra containers cookie datadog doctest dotenv ekg-core - envparse errors exceptions extra filepath Glob hashable - hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent + aeson annotated-exception aws-xray-client-persistent + aws-xray-client-wai base bcp47 Blammo bugsnag bytestring + case-insensitive cassava conduit conduit-extra containers cookie + datadog doctest dotenv ekg-core envparse errors exceptions extra + filepath Glob hashable hs-opentelemetry-api + hs-opentelemetry-instrumentation-persistent hs-opentelemetry-instrumentation-wai hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter @@ -110081,8 +110287,8 @@ self: { testHaskellDepends = [ aeson base Blammo bugsnag bytestring cassava conduit errors hspec http-types lens lens-aeson memcache monad-validate - nonempty-containers postgresql-simple QuickCheck unliftio vector - wai wai-extra + nonempty-containers postgresql-simple QuickCheck vector wai + wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -110612,6 +110818,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "freer-par-monad" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "freer-par-monad"; + version = "0.1.0.0"; + sha256 = "10nawwl7ikz90qqb09370g5ymc08alfcx6l5s0kddwjziabp2s57"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Freer par monad"; + license = lib.licenses.bsd3; + }) {}; + "freer-simple" = callPackage ({ mkDerivation, base, criterion, extensible-effects, free, mtl , natural-transformation, QuickCheck, tasty, tasty-hunit @@ -110867,8 +111085,8 @@ self: { }: mkDerivation { pname = "fresnel"; - version = "0.0.0.1"; - sha256 = "0lhqm9khjkwfmkyzfz4a12d52wn7z3i0m1rvsxkc9rmhr0wx49wq"; + version = "0.0.0.3"; + sha256 = "1gimnk2f3b183xfr33lp52mwhr9q8hbpp72hgqir48phawkicrca"; libraryHaskellDepends = [ base containers hashable profunctors transformers unordered-containers @@ -111005,8 +111223,8 @@ self: { ({ mkDerivation, array, base, containers, fail, mtl, semigroups }: mkDerivation { pname = "frisby"; - version = "0.2.4"; - sha256 = "02dywihwkyk80viny3lq213qia2ksaylk7gphjiq0jzx9smswgyb"; + version = "0.2.5"; + sha256 = "0r6y055nrq9iv95vkgx0md7f6wimpcvc6lwbqhaa5vr16igyh8gw"; libraryHaskellDepends = [ array base containers fail mtl semigroups ]; @@ -111371,6 +111589,8 @@ self: { pname = "fswait"; version = "1.1.0"; sha256 = "1iqnawsxrx21q9g34dc1pp451z9s37m7z3fswrwd8bs3fw9mgbb3"; + revision = "1"; + editedCabalFile = "1hbzmln5n8j134i5amal6qcb92fsr2fhv4zfbpja093xprnn3xm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112474,8 +112694,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.8"; - sha256 = "1jqai6y63lvl80ha7rg7wv4qiykb41sah27h87qxjyzp3vkigsf5"; + version = "0.25.9"; + sha256 = "13zanshqqfjik37ax5bfg5xi52zldrl0hywk2v6wik9gmniik7nc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114002,6 +114222,20 @@ self: { mainProgram = "gemini-textboard"; }) {}; + "gemmula" = callPackage + ({ mkDerivation, base, HUnit, raw-strings-qq, text }: + mkDerivation { + pname = "gemmula"; + version = "0.1.0.0"; + sha256 = "1zswha3siximp7yp5gmawxm1n8c0bhnn9ybs0290f81vi5bw47lw"; + revision = "1"; + editedCabalFile = "0pa7pl8kgc6qmd8n4p05lzk6bvgip5pl94xys20ibqfa5a7irsnz"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base HUnit raw-strings-qq text ]; + description = "A tiny Gemtext parser"; + license = lib.licenses.agpl3Only; + }) {}; + "gemstone" = callPackage ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image @@ -114459,6 +114693,8 @@ self: { pname = "generic-lens"; version = "2.2.2.0"; sha256 = "0s4b51s11ssmndmx9m9zbwgv9rb27ajwihsrk10hn582rp4ck3c6"; + revision = "1"; + editedCabalFile = "0ib9848rh56v0dc1giiax2zi2w7is6ahb2cj6ry3p0hwapfd3p49"; libraryHaskellDepends = [ base generic-lens-core profunctors text ]; @@ -114475,8 +114711,8 @@ self: { pname = "generic-lens-core"; version = "2.2.1.0"; sha256 = "08i4c9yb6z84iknrnl9f3f343121j7ilp0a679v81nsjm9xz3rlf"; - revision = "1"; - editedCabalFile = "1dbjhd6k7ypqa9f4h9v2xndgb4mjhfli3n1vjm8r8ga0kfndbqfn"; + revision = "2"; + editedCabalFile = "028vm0h89civn7f4cvrh3b67s2qd82g4qn5src0mkm68gngz6bqd"; libraryHaskellDepends = [ base indexed-profunctors text ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; @@ -114591,8 +114827,8 @@ self: { pname = "generic-optics"; version = "2.2.1.0"; sha256 = "1bw7bbkrd1sfshzx7v1nbdnkxc82krw96x7vnl7myz9748m4472z"; - revision = "1"; - editedCabalFile = "13wkbs8x0clkqzi4xqin89qywpky8jkpz9cxgwsglbpcyw11jvgq"; + revision = "2"; + editedCabalFile = "08g71y2wdmfqfygzyazyzd7n9768dxbam329n31f2jidd7p8yk02"; libraryHaskellDepends = [ base generic-lens-core optics-core text ]; @@ -116866,6 +117102,8 @@ self: { pname = "ghc-events-analyze"; version = "0.2.8"; sha256 = "1aam80l76dy76b8wbkjnbmxkmbgvczs591yjnbb9rm5bv9ggcb29"; + revision = "1"; + editedCabalFile = "12p15xrlqfjwz2izp39b2yyvdjhsvpv89djskym9f6fpcki8ij4y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117248,7 +117486,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_6_3_20231014" = callPackage + "ghc-lib_9_6_3_20231121" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -117256,8 +117494,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.6.3.20231014"; - sha256 = "0ax6g4vvwv2913dl2l1jisf7v3c28p4h0mc0z45g6iap6gkndnf7"; + version = "9.6.3.20231121"; + sha256 = "1ri4nwwyzkk6rbkx8pr2njf8hdhvr0k8gdh7030g4i51j64kcq9h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -117270,7 +117508,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_8_1_20231009" = callPackage + "ghc-lib_9_8_1_20231121" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -117278,10 +117516,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.1.20231009"; - sha256 = "09qlh8yjfi1380p3sibhfc16n7kx1yz22g1lvr5zjpwq4i3pjnpm"; + version = "9.8.1.20231121"; + sha256 = "1ccnlj8cgk0laqh9zzdzsxg7j1mycfmfzlynqiqk76afypmsvaf4"; revision = "1"; - editedCabalFile = "1y25kfansr726l508mc86a6i20gvca6mr0b5fibicjmg4s5z908l"; + editedCabalFile = "09wmv9ndkr239myvxqbns0qw6qrx3m1rgqikbqsbgwb2cfd3a96r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -117355,15 +117593,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_6_3_20231014" = callPackage + "ghc-lib-parser_9_6_3_20231121" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.3.20231014"; - sha256 = "1k3p7j63cbr4v9cyj5acqbhj16198x7fjc7cpl8pvyv6m4lr571q"; + version = "9.6.3.20231121"; + sha256 = "17z3l2n5id5kyyzljj490a32za2xna6yfif2bngbwinisklcyv2n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -117376,17 +117614,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_8_1_20231009" = callPackage + "ghc-lib-parser_9_8_1_20231121" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.1.20231009"; - sha256 = "1s3w8ggzil7dskns0fyk744xmi8b5q98lcqvw188z92h5md9yi2j"; - revision = "1"; - editedCabalFile = "1sck4dgbl8sakz7r1vc79paacic4ll92cw8hzbl658ykkn3qr6mh"; + version = "9.8.1.20231121"; + sha256 = "1vbsgvnk9rj3vf1dscwq19kkb8pkm1dzy8687fgmypnj7aipa7sp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -118366,8 +118602,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.21.0"; - sha256 = "0ws7rm0flw9mgajnr2m017xjj8lg0564q46p9rl98sa50nl91g6h"; + version = "0.0.22.0"; + sha256 = "1c85yb7i3j5v5bspi3fakzs35cs2d966ddi5cjb1ffxkk6ca0ddf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120806,8 +121042,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230926"; - sha256 = "06m4f0prdcdhg5glqw9dknsiglb3bisk0jk2r1p95dqhma4x3pp7"; + version = "10.20231129"; + sha256 = "0syf5asgzggdd042zyacyazzq04q9g3jirrvjwcnll6kg4g0jp78"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -122375,6 +122611,19 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "glib-stopgap" = callPackage + ({ mkDerivation, base, c-enum, glib, primitive, text }: + mkDerivation { + pname = "glib-stopgap"; + version = "0.1.0.0"; + sha256 = "1m2simqsnl1pm9xmvnz2n3h0y6dgaqkb3h6rv3xn6jdg2cx8h6vg"; + libraryHaskellDepends = [ base c-enum primitive text ]; + libraryPkgconfigDepends = [ glib ]; + testHaskellDepends = [ base c-enum primitive text ]; + description = "Stopgap package of binding for GLib"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) glib;}; + "glicko" = callPackage ({ mkDerivation, base, containers, data-default, deepseq, hspec , parallel, statistics @@ -122427,14 +122676,16 @@ self: { , bytestring, Cabal, config-schema, config-value, containers , curve25519, directory, filepath, free, githash, hashable, hookup , HsOpenSSL, HUnit, irc-core, kan-extensions, lens, network - , process, psqueues, random, regex-tdfa, split, stm - , template-haskell, text, time, transformers, unix - , unordered-containers, vector, vty + , psqueues, random, regex-tdfa, semigroupoids, split, stm + , template-haskell, text, time, transformers, typed-process, unix + , unordered-containers, vector, vty, vty-unix }: mkDerivation { pname = "glirc"; - version = "2.39.0.1"; - sha256 = "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r"; + version = "2.40"; + sha256 = "0zyj2jc8j61y6cp1p4f3lq2hhsph8hjybkbf4drxxlgm0zmyjkvh"; + revision = "1"; + editedCabalFile = "1yrmppkwhmy9k1fsw41dvsl2k115kmj55fn10x0a1nf8jjx7v61j"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -122442,10 +122693,11 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers curve25519 directory filepath free githash hashable hookup HsOpenSSL irc-core kan-extensions lens network - process psqueues random regex-tdfa split stm template-haskell text - time transformers unix unordered-containers vector vty + psqueues random regex-tdfa semigroupoids split stm template-haskell + text time transformers typed-process unix unordered-containers + vector vty ]; - executableHaskellDepends = [ base lens text vty ]; + executableHaskellDepends = [ base lens text vty vty-unix ]; testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = lib.licenses.isc; @@ -127024,8 +127276,8 @@ self: { ({ mkDerivation, base, base-unicode-symbols, containers, mtl }: mkDerivation { pname = "graph-rewriting"; - version = "0.7.10"; - sha256 = "14gggfh1z6p4i8x8pf5744a6jbw7wz7kvdqvlzmmf6rf5cb68a35"; + version = "0.8.0"; + sha256 = "1i0fphw0ch4rpj46bvvpldgnzl044kzrf9678b3dx81yg0s36vxv"; libraryHaskellDepends = [ base base-unicode-symbols containers mtl ]; @@ -132159,6 +132411,8 @@ self: { pname = "hakyll"; version = "4.16.2.0"; sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; + revision = "1"; + editedCabalFile = "0q76bigg5jwbs7bawxx9k7y3jng0nl8yfypzz2hz1nhw3lc2wd76"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137374,6 +137628,8 @@ self: { pname = "haskell-to-elm"; version = "0.3.2.0"; sha256 = "17r1yf2xp1idpq22f67192i511w7ydpfw728f5g3fz67lbahpq3k"; + revision = "1"; + editedCabalFile = "1i4d4n25mqimzgv7fl2cdcdngkn8mam936bgrljvygf2zyi5f7a4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142941,8 +143197,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; - revision = "2"; - editedCabalFile = "1x66hrfnw3aqvhcvasfj8vk69nqss32ygnl9lfpy6rhhbwvpsf8c"; + revision = "3"; + editedCabalFile = "1fgvv1bmipai8dh8vin92lzi642n5c8vynmvi3wfi4mynlacm5zb"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -142969,18 +143225,17 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog , http-conduit, mmorph, mtl, network, process, resourcet, stm, tar - , temporary, text, time, transformers, unliftio - , unordered-containers, yaml, zlib + , temporary, text, time, transformers, unliftio, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.7.1"; - sha256 = "03inmpmfh5lmrv62szrz96wrknsmpfivcgyilklpmw1k3ijm8a9x"; + version = "0.5.0.0"; + sha256 = "07i2pgmrpnffip5ng3fszhc8xlcvmzl02myw2m66kj3hmp5pps03"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory exceptions filepath hedgehog http-conduit mmorph mtl network process resourcet stm tar temporary text time transformers unliftio - unordered-containers yaml zlib + yaml zlib ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; @@ -143006,8 +143261,8 @@ self: { pname = "hedgehog-fn"; version = "1.0"; sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; - revision = "2"; - editedCabalFile = "1x7n1r640mc6b4s6pfk96157y3r2z4mcx4i3lbq1k04cnzivd5n2"; + revision = "3"; + editedCabalFile = "1nz3ndndvb0xpnlrkx02l02a62jmrx01jcgxd36k843aacjklyax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148434,7 +148689,7 @@ self: { ]; }) {}; - "hledger_1_31" = callPackage + "hledger_1_32" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -148445,8 +148700,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.31"; - sha256 = "0pzzllcd6g1sg0ax3287k5dsrf537al4zz36nw70awdpb24ij8h3"; + version = "1.32"; + sha256 = "0vgz7fv66bq7q1dc83na6jx2ihi8xvp69rj88n002hzssv8cnyjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148691,7 +148946,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_31" = callPackage + "hledger-lib_1_32" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -148704,8 +148959,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.31"; - sha256 = "16lhcjbm6nkpdiawwj71d5y4g3k2l3674g30sc7mv5qckfwhxaal"; + version = "1.32"; + sha256 = "09yhnkwd40b86mpn38y390wznxhr18fhfp9vqhs6iglfcyqwa7wf"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -148726,7 +148981,7 @@ self: { template-haskell terminal-size text text-ansi time timeit transformers uglymemo unordered-containers utf8-string ]; - description = "A reusable library providing the core functionality of hledger"; + description = "A library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -148812,7 +149067,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_31" = callPackage + "hledger-ui_1_32" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -148821,17 +149076,18 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.31"; - sha256 = "14rflgkmx2b7gl0c3c30chqqm12lhwc4kaqja3cy6fcwyl0dz9yb"; - isLibrary = false; + version = "1.32"; + sha256 = "1my838nxyrm2751n6p8nxq7q8rkg4p7vwiqzig2z65r3fixqyj6g"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ ansi-terminal async base brick cmdargs containers data-default directory doclayout extra filepath fsnotify hledger hledger-lib megaparsec microlens microlens-platform mtl process safe split text text-zipper time transformers unix vector vty ]; - description = "Curses-style terminal interface for the hledger accounting system"; + executableHaskellDepends = [ base ]; + description = "Terminal interface for the hledger accounting system"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-ui"; @@ -148897,21 +149153,21 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_31" = callPackage + "hledger-web_1_32" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, http-types, megaparsec, mtl, network, shakespeare - , template-haskell, text, time, transformers, unix-compat - , unordered-containers, utf8-string, wai, wai-cors, wai-extra - , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form - , yesod-static, yesod-test + , http-conduit, http-types, megaparsec, mtl, network, safe + , shakespeare, template-haskell, text, time, transformers + , unix-compat, unordered-containers, utf8-string, wai, wai-cors + , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core + , yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.31"; - sha256 = "0g5cc5bscxqrj6lij9gyh7sbl39s968ksm3xglccszg2pzgsnl90"; + version = "1.32"; + sha256 = "1wikhzvv3s71nlpkfpxy7df8crdmvfhh5s1zy4x9xvd3ryv901h1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148919,16 +149175,14 @@ self: { case-insensitive clientsession cmdargs conduit conduit-extra containers data-default Decimal directory extra filepath hjsmin hledger hledger-lib hspec http-client http-conduit http-types - megaparsec mtl network shakespeare template-haskell text time + megaparsec mtl network safe shakespeare template-haskell text time transformers unix-compat unordered-containers utf8-string wai wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form yesod-static yesod-test ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hledger hledger-lib hspec text yesod yesod-test - ]; - description = "Web-based user interface for the hledger accounting system"; + testHaskellDepends = [ base ]; + description = "Web user interface for the hledger accounting system"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-web"; @@ -150794,35 +151048,36 @@ self: { "hnix" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, criterion, cryptonite, data-fix - , deepseq, deriving-compat, Diff, directory, exceptions, filepath - , free, gitrev, Glob, hashable, hashing, haskeline, hedgehog - , hnix-store-core, hnix-store-remote, http-client, http-client-tls - , http-types, lens-family, lens-family-core, lens-family-th, logict - , megaparsec, monad-control, monadlist, mtl, neat-interpolation - , optparse-applicative, parser-combinators, pretty-show - , prettyprinter, process, ref-tf, regex-tdfa, relude, repline - , scientific, semialign, serialise, some, split, syb, tasty - , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text - , th-lift-instances, these, time, transformers, transformers-base - , unix-compat, unordered-containers, vector, xml + , deepseq, deriving-compat, Diff, directory, exceptions, extra + , filepath, free, gitrev, Glob, hashable, hashing, haskeline + , hedgehog, hnix-store-core, hnix-store-remote, http-client + , http-client-tls, http-types, lens-family, lens-family-core + , lens-family-th, logict, megaparsec, monad-control, monadlist, mtl + , neat-interpolation, optparse-applicative, parser-combinators + , pretty-show, prettyprinter, process, ref-tf, regex-tdfa, relude + , repline, scientific, semialign, serialise, some, split, syb + , tasty, tasty-hedgehog, tasty-hunit, tasty-th, template-haskell + , text, th-lift-instances, these, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.16.0"; - sha256 = "0qab6wxa21n0nlxdy5hnvm0554yldjz06rxgn6s9gv3bzqzakdfh"; + version = "0.17.0"; + sha256 = "0bnkb5iawj5l4l7slijlmqlpljz1w8ac9ds4391lv13609ia1n37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad containers cryptonite data-fix deepseq deriving-compat directory - exceptions filepath free gitrev hashable hashing hnix-store-core - hnix-store-remote http-client http-client-tls http-types - lens-family lens-family-core lens-family-th logict megaparsec - monad-control monadlist mtl neat-interpolation optparse-applicative - parser-combinators pretty-show prettyprinter process ref-tf - regex-tdfa relude scientific semialign serialise some split syb - template-haskell text th-lift-instances these time transformers - transformers-base unix-compat unordered-containers vector xml + exceptions extra filepath free gitrev hashable hashing + hnix-store-core hnix-store-remote http-client http-client-tls + http-types lens-family lens-family-core lens-family-th logict + megaparsec monad-control monadlist mtl neat-interpolation + optparse-applicative parser-combinators pretty-show prettyprinter + process ref-tf regex-tdfa relude scientific semialign serialise + some split syb template-haskell text th-lift-instances these time + transformers transformers-base unix-compat unordered-containers + vector xml ]; executableHaskellDepends = [ aeson base comonad containers data-fix deepseq exceptions filepath @@ -152201,10 +152456,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.7"; - sha256 = "02prkwj4rj8g330z17bpjh7hpwfdvasaxsk74mcvbi03gjpydrib"; - revision = "1"; - editedCabalFile = "1x4hxcb81rczpywcda3s9jbh2gs1sfwvd7wzv3cxxkbd4smlrh1r"; + version = "0.8"; + sha256 = "1p8mkb71bbs3lv7n1krcngaskn2s2icm3sl30qs8dsla7ww8afqm"; libraryHaskellDepends = [ async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network stm @@ -152666,8 +152919,8 @@ self: { pname = "horizontal-rule"; version = "0.6.0.0"; sha256 = "03rh58znaghcf1gicbwbxkx5ya4lv7qi8b2lq5nawi35ljars02x"; - revision = "2"; - editedCabalFile = "064dg5g0ya8bsmb7rid80lmlvnn12ry0plza6vxgqlhif0ihnhry"; + revision = "3"; + editedCabalFile = "06jfn80vrss7vz4g3wxbn2cz5x77sm8mw03d9lvchsnxmpw1yhxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base terminal-size text ]; @@ -153132,6 +153385,8 @@ self: { pname = "hpack"; version = "0.36.0"; sha256 = "0ypaagr7a5bvziybbzr3b4lixs3dv6fdkjj3lq7h71z51wd4xpm0"; + revision = "1"; + editedCabalFile = "1zh5rsf38xmwp7lf80iifrhnkl80lri4xzlhz2n5df3vc0dqzya8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162432,8 +162687,8 @@ self: { }: mkDerivation { pname = "http-types"; - version = "0.12.3"; - sha256 = "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf"; + version = "0.12.4"; + sha256 = "0jg53cw8dzry951m042sqh0d7x39gxjcjxlw1kpmyzl1rjq1njsd"; libraryHaskellDepends = [ array base bytestring case-insensitive text ]; @@ -162525,24 +162780,24 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_4_2_2" = callPackage + "http2_5_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover - , http-types, network, network-byte-order, network-run, psqueues - , random, stm, text, time-manager, typed-process, unix-time - , unliftio, unordered-containers, vector + , http-types, network, network-byte-order, network-control + , network-run, random, stm, text, time-manager, typed-process + , unix-time, unliftio, unordered-containers, vector }: mkDerivation { pname = "http2"; - version = "4.2.2"; - sha256 = "0kdd4r52jfh1j8jfjcs1mshfasfk1m2ffrcrxxj6cdi7sgxm2377"; + version = "5.0.0"; + sha256 = "1bccbndd7nvqr9rdia1pdha50w3hxca5vpb0qv8zd2w9acy2flk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager unix-time - unliftio + network network-byte-order network-control stm time-manager + unix-time unliftio ]; testHaskellDepends = [ aeson aeson-pretty async base base16-bytestring bytestring crypton @@ -162677,16 +162932,16 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store , crypton-x509-validation, data-default-class, http2, network - , network-run, recv, time-manager, tls, unliftio + , network-control, network-run, recv, time-manager, tls, unliftio }: mkDerivation { pname = "http2-tls"; - version = "0.1.0"; - sha256 = "1sans4zmcpc48xw8k1g6kgfg68xka5azgpcr3rd7g70ijj6zchjs"; + version = "0.2.0"; + sha256 = "0ijg8kqfl6dzlacplqlqra5yvsaqhyazb90mj6kbqvcll39sbzbc"; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation - data-default-class http2 network network-run recv time-manager tls - unliftio + data-default-class http2 network network-control network-run recv + time-manager tls unliftio ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -162703,8 +162958,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.6"; - sha256 = "12pjwmiplch1pn89qnc5ijsb9kf554wdw7w3lf6xfi1fjzkizjr0"; + version = "0.0.7"; + sha256 = "0230cd5vvysbqd256zxz3dz92acps1dyvwmy6hrwmmjv1ghnpcvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169868,8 +170123,8 @@ self: { }: mkDerivation { pname = "input-parsers"; - version = "0.3.0.1"; - sha256 = "1f7q6m0wi6pa9j7mw8gsbc16drgcw8sh6ghq9hdgcrkqzbhp990g"; + version = "0.3.0.2"; + sha256 = "17dr68z8r53nyc039a1z5d7z223f4pblzjfbnmlq9maxcrkvriy5"; libraryHaskellDepends = [ attoparsec base binary bytestring monoid-subclasses parsec parsers text transformers @@ -170293,8 +170548,8 @@ self: { }: mkDerivation { pname = "int-like"; - version = "0.1.1"; - sha256 = "19dblzvwjbvvlz8xi5k3x1rciwm2zwxvmsg9vf997xk4shrxswn1"; + version = "0.1.2"; + sha256 = "09874k3ria5nwb6rv2z3hgfxcm5hynvb2qgbyr7i09nwj4021hgq"; libraryHaskellDepends = [ algebraic-graphs base containers deepseq hashable ]; @@ -170330,6 +170585,17 @@ self: { broken = true; }) {}; + "int-supply" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "int-supply"; + version = "1.0.0"; + sha256 = "0h7yi4clvy44gb2nxjv50m5lnlgqdkj781pv0iqlgwyqjigwappz"; + libraryHaskellDepends = [ base ]; + description = "A simple, efficient supply of integers using atomic fetch-and-add"; + license = lib.licenses.bsd3; + }) {}; + "intcode" = callPackage ({ mkDerivation, base, containers, doctest, primitive }: mkDerivation { @@ -171451,8 +171717,8 @@ self: { ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: mkDerivation { pname = "io-classes"; - version = "1.3.0.0"; - sha256 = "1k2ngdrpnczdv9kz79bdb9mzwlshba4zas6kksz1qc7fsm7afnj8"; + version = "1.3.1.0"; + sha256 = "1qglx07ng6gf0h5qp758987m90r7mph4x14azb83jmm7p70igzh9"; libraryHaskellDepends = [ array async base bytestring mtl stm time ]; @@ -171545,8 +171811,10 @@ self: { }: mkDerivation { pname = "io-sim"; - version = "1.3.0.0"; - sha256 = "0mrq1mxlfkwh49skrdk7c3h3qdyf55mkfn6iii5qd3q5x5y7ggc1"; + version = "1.3.1.0"; + sha256 = "069ig3h5ykcf7m3lfz9z5qaz4namrm65hblad3k1wlwc42sjal0j"; + revision = "1"; + editedCabalFile = "029nvs63x9bfq7c21qba5ms27hjmkjmadhddr3zdqvs4m6k0d935"; libraryHaskellDepends = [ base containers deepseq exceptions io-classes nothunks psqueues QuickCheck quiet si-timers strict-stm time @@ -172237,8 +172505,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.11"; - sha256 = "13jkfb30kynqd55c2slxjg98lr076rn1ymsxniwp0bssjzizgnfc"; + version = "2.12"; + sha256 = "09w4i2f7zsl82w6ly6f9khwk9ki3k2yv9izhhxsjjwpffam2lxs2"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -172837,6 +173105,28 @@ self: { license = lib.licenses.mit; }) {}; + "isomorphism-class_0_1_0_12" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.12"; + sha256 = "1ffcjf2lic1mvvxfrfi0cc9qnz5qh73yjd3dsaq5p0h0amp8gppr"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text + unordered-containers vector + ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -174296,6 +174586,36 @@ self: { broken = true; }) {}; + "javelin" = callPackage + ({ mkDerivation, base, containers, criterion, csv, deepseq + , directory, foldl, hedgehog, HUnit, ieee754, indexed-traversable + , mono-traversable, random, statistics, tasty, tasty-hedgehog + , tasty-hspec, tasty-hunit, vector, vector-algorithms + }: + mkDerivation { + pname = "javelin"; + version = "0.1.0.0"; + sha256 = "0y9x0sh942id7nj01f51kaz6bk3d3lqlwngchmgv7jlkndxg8i2y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq foldl indexed-traversable vector + vector-algorithms + ]; + executableHaskellDepends = [ base csv ]; + testHaskellDepends = [ + base containers foldl hedgehog HUnit ieee754 statistics tasty + tasty-hedgehog tasty-hspec tasty-hunit vector + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq directory foldl mono-traversable + random vector + ]; + description = "Labeled one-dimensional arrays"; + license = lib.licenses.mit; + mainProgram = "bench-report"; + }) {}; + "jbi" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory , filepath, monad-parallel, optparse-applicative, process, tagged @@ -176133,8 +176453,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.2.1.1"; - sha256 = "0p8hyl06cprribjh6p1zdhkamyfxlv8s6az3k5jax4xazzm6rji8"; + version = "0.2.1.3"; + sha256 = "02d7ynl24xsqcxb6bybndc9nqp7k6wd8ymcrr1ni6w04vr56s7rj"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -176154,8 +176474,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.3.0.3"; - sha256 = "00w04dv56z97wdps2y6467jhzg93fw6qddswg219ixjjgdl6r723"; + version = "0.3.0.4"; + sha256 = "0fpqvl7cs5wg27ifzis7gmmvrp6n8b252g2vi9yaf8s05qxq93w1"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl prettyprinter text unordered-containers @@ -176177,8 +176497,8 @@ self: { }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.3.1.1"; - sha256 = "07k7ccn2j0jyfslzpq6nvvkc0yng9xwkly6jzrgmcbidd2gc831k"; + version = "0.3.1.2"; + sha256 = "1w3pydypk2ay20c3rdfl9r0jhy1ffj4q3h83kv29jrypcbdb5f19"; libraryHaskellDepends = [ base bound containers directory elm-syntax http-types json-spec json-spec-elm mtl prettyprinter process servant text @@ -177784,17 +178104,18 @@ self: { , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell , text, time, time-locale-compat, transformers, transformers-base , transformers-compat, unix, unliftio-core, unordered-containers + , vector }: mkDerivation { pname = "katip"; - version = "0.8.7.4"; - sha256 = "0gikcg4cya8gn7cs6n5i3a1xavzzn26y6hwnxng2s362bcscjqjv"; + version = "0.8.8.0"; + sha256 = "0p8xxbjfw7jcsbxdvypn3594f44wf6qizyrzmg1vvscqchqfaykl"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet safe-exceptions scientific semigroups stm string-conv template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers + transformers-compat unix unliftio-core unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers directory microlens @@ -181562,19 +181883,19 @@ self: { "lambdasound" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring - , bytestring-to-vector, deepseq, directory, falsify, filepath - , hashable, hashtables, massiv, proteaaudio-sdl, random, tasty + , bytestring-to-vector, deepseq, directory, dsp, falsify, filepath + , hashable, hashtables, massiv, proteaaudio, random, tasty , tasty-bench, tasty-hunit, text, transformers, vector, wave, zlib }: mkDerivation { pname = "lambdasound"; - version = "1.1"; - sha256 = "0lvryqcqpvab87y0ks05l4li1ycawfzf90dhrcwhwyn8h6rh3a68"; + version = "1.2.0"; + sha256 = "0x16hv0pmsmxnzkpvch25qzsg7qgznpl34lxnd9y5dwm3jdgvhhg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring bytestring-to-vector deepseq - directory filepath hashable hashtables massiv proteaaudio-sdl + directory dsp filepath hashable hashtables massiv proteaaudio random text transformers vector wave zlib ]; executableHaskellDepends = [ base ]; @@ -182362,6 +182683,8 @@ self: { pname = "language-gemini"; version = "0.1.0.1"; sha256 = "1vnl280ld0wazffzx19an5d6gybx4396z57idcfvdvzkap97qbh9"; + revision = "1"; + editedCabalFile = "0a3ah5y4nadgdy7jhaa8yswm0hcwq8mzvy25nr1z02garkx8382f"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; @@ -185675,8 +185998,8 @@ self: { pname = "lentil"; version = "1.5.6.0"; sha256 = "0sjhhvrw3xbisg8mi1g67yj5r43wzyhqav61wm0ynb1wakc7das1"; - revision = "3"; - editedCabalFile = "0zaky33crps113gar0hh2zbi69ijfhhhfp6rg64jnl41vby83dhk"; + revision = "4"; + editedCabalFile = "1c9095xlyngjvh27vna329b3r5rk2s8zd470rpwmdz47ch67nrdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186102,19 +186425,15 @@ self: { }) {}; "libBF" = callPackage - ({ mkDerivation, base, deepseq, hashable }: + ({ mkDerivation, base, deepseq, hashable, tasty, tasty-hunit }: mkDerivation { pname = "libBF"; - version = "0.6.6"; - sha256 = "1wjfcpvcp749mipyj7j9s8qwj68kvhn1516l43gnq2hhfy9bpsvs"; - isLibrary = true; - isExecutable = true; + version = "0.6.7"; + sha256 = "0kdazhqxn3wr6mi20qwlkn6n5vl9sviij0p141svs77zpc3cxk09"; libraryHaskellDepends = [ base deepseq hashable ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; description = "A binding to the libBF library"; license = lib.licenses.mit; - mainProgram = "bf-test"; }) {}; "libGenI" = callPackage @@ -189416,8 +189735,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "list-fusion-probe"; - version = "0.1.0.8"; - sha256 = "1ycxgna71sd0ppk7fw2yap1mabj7vvkmzkr7rybvgrrin4m52jh0"; + version = "0.1.0.9"; + sha256 = "0mzb6gj19h1gbc6dk8pigggdcvn8scppqip2fr8n2xnrk3fy9yr6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "testing list fusion for success"; @@ -189924,8 +190243,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "5"; - editedCabalFile = "16vs060sfdbkmrl8p9cvmn0rl7zwr4l7lvm9lwvmnl0vww1f41r1"; + revision = "6"; + editedCabalFile = "0kg4sqfjqx3abd0y0qhakaabpz62x6j535gkqgiz3zkkbkc0drpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192776,6 +193095,8 @@ self: { pname = "lsp"; version = "2.3.0.0"; sha256 = "0jxvwhmfvnyp6r1kqfg13qpkd1a6a26r8z1aqhg2lj62lnz6d672"; + revision = "1"; + editedCabalFile = "15jx8x106lnv824yw6mip10gxjbgqww4557xfbyi9nvmgb83h7xj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192860,8 +193181,8 @@ self: { pname = "lsp-types"; version = "1.4.0.1"; sha256 = "0dxf5nnaxs2564hgjldkclhm5gvszjxxvz6gk00jmx0gf8k6dm8z"; - revision = "1"; - editedCabalFile = "0p5yywd6lam533arwfw9b4xvmibg9glmfd69j0h5268l62fqdh10"; + revision = "2"; + editedCabalFile = "02vaq4x40l9v67zv3bimxvxa06nwawkcnrjjn6k3k721j15v2li5"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq Diff directory dlist filepath hashable hslogger lens mod mtl network-uri @@ -195765,23 +196086,25 @@ self: { "mappings" = callPackage ({ mkDerivation, base, cond, containers, formatting, hspec - , partialord + , hspec-discover, indexed-traversable, partialord }: mkDerivation { pname = "mappings"; - version = "0.1.0.0"; - sha256 = "0xkb3zqr1iqjz4kfk6pzq17jxywx96lbxs59izg4fc4wwfz08l2w"; + version = "0.2.2.0"; + sha256 = "1jsv6w8bm0zp8j03r0348aikpn73f7rh49hcildihxal24jkl5kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cond containers formatting partialord + base cond containers formatting indexed-traversable partialord ]; executableHaskellDepends = [ - base cond containers formatting partialord + base cond containers formatting indexed-traversable partialord ]; testHaskellDepends = [ - base cond containers formatting hspec partialord + base cond containers formatting hspec indexed-traversable + partialord ]; + testToolDepends = [ hspec-discover ]; description = "Types which represent functions k -> v"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -200206,16 +200529,16 @@ self: { ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, exceptions, extra, filepath, hspec , http-api-data, http-media, http-types, insert-ordered-containers - , lens, lrucache, mtl, openapi3, safe, text, transformers + , lens, lrucache, mtl, openapi3, safe, text, time, transformers }: mkDerivation { pname = "mig"; - version = "0.2.0.1"; - sha256 = "15ljws449p8w8rya8frr6zkagryw84lrpxfs1xjxff8vjgg1n6hw"; + version = "0.2.1.0"; + sha256 = "08jirnwg73n2d6065rdy5za0l9w2s7xnx5va92m73z149ljwjxrb"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers exceptions extra filepath http-api-data http-media http-types - insert-ordered-containers lens lrucache mtl openapi3 safe text + insert-ordered-containers lens lrucache mtl openapi3 safe text time transformers ]; testHaskellDepends = [ @@ -200233,8 +200556,8 @@ self: { }: mkDerivation { pname = "mig-client"; - version = "0.1.0.1"; - sha256 = "17zlcryagzb7mv9pbfqp7gy47va4mamkxzf01cavzac1cm23hh3w"; + version = "0.1.1.0"; + sha256 = "1q0qlkq1n5cmmfyrs6md98b87nn6hdp2j0hki2sfwnzzcxm2zcz0"; libraryHaskellDepends = [ base bytestring containers http-api-data http-client http-media http-types mig mtl text @@ -200252,8 +200575,8 @@ self: { }: mkDerivation { pname = "mig-extra"; - version = "0.1.0.1"; - sha256 = "0zwzpicvm8fb3hm6f0g0g0zapijz20yzr8hw7i148cc4ihwdxpl9"; + version = "0.1.1.0"; + sha256 = "1jgkim9vw3lg5qdgvf6kcx99zzn1rqlpv4zpyi0svjh4xzx7nrsm"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers data-default exceptions extra http-api-data http-media http-types @@ -200272,8 +200595,8 @@ self: { }: mkDerivation { pname = "mig-server"; - version = "0.1.0.1"; - sha256 = "0hv58843asha2wqjh6y2pfx6zs3y5azisrdfihd5ml82s92d374d"; + version = "0.2.1.0"; + sha256 = "19n68hf0gv032lmpmg31gi1g7g4ps3padm8gs31rf6yp1pbzv5k1"; libraryHaskellDepends = [ aeson base blaze-html data-default http-api-data http-types mig mig-extra mig-swagger-ui mig-wai openapi3 text transformers warp @@ -200307,8 +200630,8 @@ self: { }: mkDerivation { pname = "mig-wai"; - version = "0.1.0.1"; - sha256 = "1jayzfss1kz4fnyadxjpv4v0dms4j2zgbsddnjvgysgp8fwkb1x8"; + version = "0.1.1.0"; + sha256 = "133kmcc3lvqhs08syad0s8czqkavb7mj70vfnn33vi68z7ms6gbm"; libraryHaskellDepends = [ base bytestring containers data-default exceptions mig text wai ]; @@ -202641,6 +202964,24 @@ self: { broken = true; }) {}; + "moffy" = callPackage + ({ mkDerivation, base, extra-data-yj, freer-par-monad, time + , type-flip, type-set + }: + mkDerivation { + pname = "moffy"; + version = "0.1.0.0"; + sha256 = "131dxjsqqcpm3x5y34k311bnz8fnlaqkf65qzywv3dph1slsqqkm"; + libraryHaskellDepends = [ + base extra-data-yj freer-par-monad time type-flip type-set + ]; + testHaskellDepends = [ + base extra-data-yj freer-par-monad time type-flip type-set + ]; + description = "Monadic Functional Reactive Programming"; + license = lib.licenses.bsd3; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, fail, filepath, html, HTTP @@ -211354,6 +211695,18 @@ self: { mainProgram = "neolua"; }) {}; + "neononempty" = callPackage + ({ mkDerivation, base, base-compat, hedgehog }: + mkDerivation { + pname = "neononempty"; + version = "1.1.0"; + sha256 = "1gxjw9q99d3dbc72fp62mlm642cq2h48hnpnppi3lhw1zhn9d67h"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hedgehog ]; + description = "NonEmpty lists that look [more, like, this]"; + license = lib.licenses.bsd3; + }) {}; + "neptune-backend" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, concurrent-extra, containers, deepseq, envy @@ -212615,8 +212968,8 @@ self: { ({ mkDerivation, base, psqueues, unix-time }: mkDerivation { pname = "network-control"; - version = "0.0.1"; - sha256 = "1fhxnfc62kqnb24jj3ydl4mf43skgpjyhvirn1pjp30hnki8p8p9"; + version = "0.0.2"; + sha256 = "1m16cfq7b9nvb30g8f0iwwajfsm7pibkk34da2xvyhcn61prqkhk"; libraryHaskellDepends = [ base psqueues unix-time ]; description = "Library to control network protocols"; license = lib.licenses.bsd3; @@ -214437,34 +214790,6 @@ self: { }) {}; "nix-derivation" = callPackage - ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , filepath, pretty-show, QuickCheck, text, vector - }: - mkDerivation { - pname = "nix-derivation"; - version = "1.1.2"; - sha256 = "0248xbxq4889hc3qp9z0yr21f97j3lxrjjx2isxdf8ah4hpidzy7"; - revision = "4"; - editedCabalFile = "1bvrnaw0qpiaxdnwvdf7w1ybds4b5c5z8wfizla5pby2lnf8cv0x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers deepseq filepath text vector - ]; - executableHaskellDepends = [ attoparsec base pretty-show text ]; - testHaskellDepends = [ - attoparsec base filepath QuickCheck text vector - ]; - benchmarkHaskellDepends = [ attoparsec base criterion text ]; - description = "Parse and render *.drv files"; - license = lib.licenses.bsd3; - mainProgram = "pretty-derivation"; - maintainers = [ - lib.maintainers.Gabriella439 lib.maintainers.sorki - ]; - }) {}; - - "nix-derivation_1_1_3" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq , filepath, pretty-show, QuickCheck, text, vector }: @@ -214484,7 +214809,6 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "pretty-derivation"; maintainers = [ lib.maintainers.Gabriella439 lib.maintainers.sorki @@ -214606,8 +214930,8 @@ self: { }: mkDerivation { pname = "nix-narinfo"; - version = "0.1.0.2"; - sha256 = "047qdxq27siwkvhs2sc7p380k8dlzdinkbj3d7g63i3qv0vz4lci"; + version = "0.1.1.0"; + sha256 = "0vvmhfghh9i8w8wk4cigr4ycvd4fxqjcdy7fjmj3n83xxhpbc9ig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text ]; @@ -214733,8 +215057,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.3.1"; - sha256 = "13prwlkiy6cjp49clx3fw3rbhp7p1p6cx9lya06d58rqys782qkr"; + version = "0.3.2"; + sha256 = "0sm582mvkca6xhz1svggjqnp3ks3i1zmgaakiwnimfsbpysywar1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217076,8 +217400,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.11.0.1"; - sha256 = "19j8zlf8hmfzdk68j1di9mdw4fhqizpirnpn1wg5kbff0xbavjpr"; + version = "0.11.1.0"; + sha256 = "0hl6f91c86i0yv9pv97m4kqyx3mb6kzixcxianxvgmv10gbn2c82"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector @@ -218219,8 +218543,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.11"; - sha256 = "0q0hfmckply8n3jg1jkj4n4gaf6bc7l86amrjmdiml1mmfmaqvqf"; + version = "1.1.0"; + sha256 = "0kxkfc5gqkz485r6qnpd51ms1v9sr9yih8ml7608x99bvjjkd5bv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -218242,8 +218566,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.0.11"; - sha256 = "13bqy731qbhszjxy0l06zff5lyqiypnybxxg8hvmsj0r4p041fa2"; + version = "1.1.0"; + sha256 = "0q8f59cv6mjc6dx89klzklr0iyhk608n1m68da4zn0sm35vlsswn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base filepath IfElse mtl ogma-extra ogma-language-c @@ -218265,8 +218589,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.11"; - sha256 = "0ksrf2ahbnlydklvmgpkhxwcykxwxvaisr8ch6vbhv34r123rg45"; + version = "1.1.0"; + sha256 = "1asrk0222jwf92phdw1jlcc8cjmmx9vm59p3fxrih4fm9lif8iz1"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -218283,8 +218607,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.11"; - sha256 = "0kpmw1jkjw7adg05ijd1cr72d85jnwq5vywhpnx9lczsns7vp6i8"; + version = "1.1.0"; + sha256 = "1sr6hkidj585l3myzy6sisafw13hq5j9yxfwqy3sjq14g566ch2k"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -218302,8 +218626,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.11"; - sha256 = "0xv2crz6qzskc0k94pv7p4y3xdw4vg1axp559hw47yn6q7nlvbkh"; + version = "1.1.0"; + sha256 = "0bw8ygnpacgyyaysxw9pyw4ddpvp6h095k7chhvylvp5p70kkkbf"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -218319,8 +218643,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.11"; - sha256 = "0js0xg83j2g6s6zja4sa81vhccj0w1jsjba2c9cw8r8pinr97jjb"; + version = "1.1.0"; + sha256 = "0rgll490zkkblanh9zgalq9zsj1rc8w72fzh1r2bfrjljbiq5ncv"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -218333,8 +218657,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.11"; - sha256 = "1cqbxa5nrfczjzq9jnn3b5g737x08q6ca0kflcj9d6my53381v2h"; + version = "1.1.0"; + sha256 = "0bvraiq93f733drln74fzk6fjqrkngjhha08xx91lqvrd1bjh9p5"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -218354,8 +218678,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.11"; - sha256 = "0096phlf3sp6fw7bq16wra304gxf1s1kpqzjzp49z8xdnszhl0ln"; + version = "1.1.0"; + sha256 = "073lrr650250d8r02dv0l3yvbjrhdjy9gv5gbf42va40snrf43j6"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -218374,8 +218698,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.11"; - sha256 = "1ixxsbh443zd83xl9m329myfw91a316kc1f9a58a60x8akmafvqx"; + version = "1.1.0"; + sha256 = "1lcgh27vxp8ncvma380z7i03dd4j029b583jviq1hg3bywc8690l"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -218777,23 +219101,19 @@ self: { ({ mkDerivation, base, containers, ghc, safe }: mkDerivation { pname = "om-plugin-imports"; - version = "0.1.0.3"; - sha256 = "1yyp068ybyy7jmizqmmnwjx2hdw113h5vv8jrl0ydc88p5kxraxa"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.4"; + sha256 = "0r8iw67pid9wy8h859j92sb08camky1d12hsak2bsbiqwc10rijz"; libraryHaskellDepends = [ base containers ghc safe ]; - executableHaskellDepends = [ base containers ghc safe ]; description = "Plugin-based import warnings"; license = lib.licenses.mit; - mainProgram = "om-import-warnings-test"; }) {}; "om-show" = callPackage ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "om-show"; - version = "0.1.2.8"; - sha256 = "0j80r7cmf2rrml39mpm1vg2jsv1mkhqin1c1qxa127nxbm3zainc"; + version = "0.1.2.9"; + sha256 = "154x7l81chfj91bwrh9v1a8bcazkn99a8hzxkaadszb65wwi6jr8"; libraryHaskellDepends = [ aeson base text ]; description = "Utilities for showing string-like things"; license = lib.licenses.mit; @@ -219698,10 +220018,10 @@ self: { }: mkDerivation { pname = "openapi3"; - version = "3.2.3"; - sha256 = "0svkzafxfmhjakv4h57p5sw59ksbxz1hn1y3fbg6zimwal4mgr6l"; - revision = "4"; - editedCabalFile = "1wpdmp3xp948052y325h64smp6l809r8mcvh220bfbrb4vrbk43b"; + version = "3.2.4"; + sha256 = "182bl4z9npcci85771adg7iar1377b5clgzs6wya04j79d391jyv"; + revision = "1"; + editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -219769,6 +220089,27 @@ self: { broken = true; }) {}; + "opencascade-hs" = callPackage + ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKernel, TKFillet + , TKG2d, TKG3d, TKGeomBase, TKMath, TKMesh, TKOffset, TKPrim, TKStd + , TKSTEP, TKSTL, TKTopAlgo, TKV3d + }: + mkDerivation { + pname = "opencascade-hs"; + version = "0.0.0.1"; + sha256 = "1fikr8sx3qbciq2wjbfr53al172h1hw3nxq4sxc3mspqiflwmy2c"; + libraryHaskellDepends = [ base resourcet ]; + librarySystemDepends = [ + TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKMath TKMesh + TKOffset TKPrim TKStd TKSTEP TKSTL TKTopAlgo TKV3d + ]; + description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; + license = lib.licenses.lgpl21Only; + }) {TKBO = null; TKBRep = null; TKFillet = null; TKG2d = null; + TKG3d = null; TKGeomBase = null; TKMath = null; TKMesh = null; + TKOffset = null; TKPrim = null; TKSTEP = null; TKSTL = null; + TKStd = null; TKTopAlgo = null; TKV3d = null; TKernel = null;}; + "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers }: @@ -222276,6 +222617,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "os-string" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, QuickCheck + , random, tasty-bench, template-haskell + }: + mkDerivation { + pname = "os-string"; + version = "2.0.0"; + sha256 = "0mm2mhra424yilg7nww5dn522b5bpriahgdzvbzbv0qf1zbhxv9r"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions template-haskell + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring deepseq random tasty-bench + ]; + description = "Library for manipulating Operating system strings"; + license = lib.licenses.bsd3; + }) {}; + "osc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , data-binary-ieee754, network @@ -223607,8 +223967,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pandoc-types, text }: mkDerivation { pname = "pandoc-builder-monadic"; - version = "1.0.0"; - sha256 = "1ww1fwnsp4xka50jgwlaxzqzzpshglih6n0zi0cmd0bj7jn47jrf"; + version = "1.1.1"; + sha256 = "09rxywpslspva29ngmxnza92vbkbfrf2hb31b545yvij8nvvar7k"; libraryHaskellDepends = [ base dlist mtl pandoc-types text ]; description = "A monadic DSL for building pandoc documents"; license = lib.licenses.bsd3; @@ -224036,8 +224396,8 @@ self: { ({ mkDerivation, base, containers, pandoc-types, relude, text }: mkDerivation { pname = "pandoc-link-context"; - version = "1.4.0.0"; - sha256 = "002q0kdw3686s7yhsk1p8i6srz1wvs42pzvz7ajgnsdqcnyqh93g"; + version = "1.4.1.0"; + sha256 = "01cqbh7vsa02lyfh4kbwb3qmx29qx7q5cy0f7s5wzw8rq11h2yzx"; libraryHaskellDepends = [ base containers pandoc-types relude text ]; @@ -224794,7 +225154,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_9_2" = callPackage + "pantry_0_9_3" = callPackage ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, base , bytestring, Cabal, casa-client, casa-types, companion, conduit , conduit-extra, containers, crypton, crypton-conduit, digest @@ -224809,8 +225169,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.9.2"; - sha256 = "1bn323lpsrjygxp4g0vm4ni8cxrnj2zmhlhqw798b90zv1bz5711"; + version = "0.9.3"; + sha256 = "1ls7cdpbq267cgdq1bj31w3vc35aq2hd3qw8ay0rmri95rwyn7k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227875,6 +228235,22 @@ self: { license = lib.licenses.asl20; }) {}; + "pcubature" = callPackage + ({ mkDerivation, base, containers, delaunayNd, hspray + , numeric-prelude, scubature, vector, vertexenum + }: + mkDerivation { + pname = "pcubature"; + version = "0.1.0.0"; + sha256 = "1jx3av5fz5g9rgn2b4n3520bvk739nvy79pnj4ipazgchasbgccl"; + libraryHaskellDepends = [ + base containers delaunayNd hspray numeric-prelude scubature vector + vertexenum + ]; + description = "Integration over convex polytopes"; + license = lib.licenses.gpl3Only; + }) {}; + "pdc" = callPackage ({ mkDerivation, aeson, base, http-query, text, time }: mkDerivation { @@ -229094,8 +229470,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.6.0.5"; - sha256 = "1jm8270c7805alxa8q8pa5ql9f1ah3ns3p910j86h4bjnvgbvyqa"; + version = "0.6.0.6"; + sha256 = "0pivnycm2f04k5cjg0dplb150n6afvnlp0jhsxkbhsqignxkhimj"; libraryHaskellDepends = [ array base containers dlist names-th product-isomorphic template-haskell th-bang-compat th-constraint-compat th-data-compat @@ -230562,8 +230938,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phladiprelio-general-datatype"; - version = "0.5.1.0"; - sha256 = "10r5wxdqi6ccym7rabha4f1d4y94b2xjih9ib4w6dilqv9f86bi7"; + version = "0.5.2.0"; + sha256 = "0hz2vam7k5vx50qy6h42fzia5ly70b1lc507yq32r6mhgigddss8"; libraryHaskellDepends = [ base ]; description = "Extended functionality of PhLADiPreLiO"; license = lib.licenses.mit; @@ -230594,8 +230970,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.13.0.0"; - sha256 = "020r916dasx5q0ak9caj85dfzh5f1c4affryb39gm2jsf3m25d2n"; + version = "0.14.0.0"; + sha256 = "0r259cqqh9554l8l1d2rvbs8gpxf958qwy0dvk0jisgk3dmx3qkw"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit phladiprelio-general-datatype phladiprelio-general-shared @@ -230659,8 +231035,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.14.0.0"; - sha256 = "0hpn6r8817wrn2ywh2ahi5nf8b7rlczfzfvbw8b9y1b4z3r96nir"; + version = "0.15.0.0"; + sha256 = "0smmzm6xc6rgfi1r2sx6l7qcw9crxgyijafl62hvxrypx2sidgx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232100,8 +232476,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.15"; - sha256 = "11pyl3jj5myav19qky7hdbk39zfavj9gq3q911c4257lmd6480kp"; + version = "0.1.1.0"; + sha256 = "1a2ajm4g3ii4cz6wz6w1rcgpaaznxjv6qwjxy84jsq6s5krczkb0"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -232823,8 +233199,8 @@ self: { pname = "pipes-interleave"; version = "1.1.3"; sha256 = "05g8kl88f55pxb3926fa81qd0a2lc1xdzv36jmm67sc68prr71za"; - revision = "1"; - editedCabalFile = "06vg9vlczmmlpvqnnwn12kyb9c741y50hl8ky0vvdlkwlb90zncq"; + revision = "2"; + editedCabalFile = "0z1nygj9kvmnbbwk6jnnsky5arv1b4vkaz28w2ivw2hbwlininx8"; libraryHaskellDepends = [ base containers heaps pipes ]; description = "Interleave and merge streams of elements"; license = lib.licenses.bsd3; @@ -232915,8 +233291,8 @@ self: { pname = "pipes-lzma"; version = "0.2.0.0"; sha256 = "1b1xnjq1bvp14rl0lvzfxkckvwsihmq0j61wbmx1k0vqjy2b350m"; - revision = "1"; - editedCabalFile = "1i501pqamv0sjrp2ngppvy1wy6gr7xk89hzpfmvnj02ja2m49z41"; + revision = "2"; + editedCabalFile = "0p2bk5dylhlvkqdpz4gadskwfbdnjb8iid5q74s8fxiwzx9f4whw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring exceptions lzma pipes ]; @@ -238184,8 +238560,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "8"; - editedCabalFile = "13j3pfgwsnv4dmnqg36x134zm0mm9r76kg59dc3dmq4pzgpbbw1w"; + revision = "9"; + editedCabalFile = "18gzbm4cvh5cnfxzgq469i96cx8l7172lvmfp7n1pm5dnp9ndsl4"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -241578,8 +241954,8 @@ self: { ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { pname = "product-isomorphic"; - version = "0.0.3.3"; - sha256 = "1fy1a7xvnz47120z7vq5hrdllgard7cd1whkwwmgpwdsmhn3my8y"; + version = "0.0.3.4"; + sha256 = "0hzz90d19cx7vys8cfpglb4h343jnmxwlykfhcylppwbm5blcr6a"; libraryHaskellDepends = [ base template-haskell th-data-compat ]; testHaskellDepends = [ base template-haskell ]; description = "Weaken applicative functor on products"; @@ -242424,8 +242800,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.1"; - sha256 = "0adxa0fkrvp9jgcqv4919g59alc4a6p9lnv3r647hf4mjlywgvkg"; + version = "0.1.2"; + sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -244337,8 +244713,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.12"; - sha256 = "0rsllqg7k7xkgda1j2vk6sfb9k18vp6d16xwkz4bhjsakrl28dqz"; + version = "0.15.13"; + sha256 = "1br28bq8vagkpw7z49b36nzp5i82ibhjci3q1sakxxjaqp98wgnb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245726,10 +246102,8 @@ self: { }: mkDerivation { pname = "quantification"; - version = "0.7.0"; - sha256 = "1aj0pxafcjzgc6akxyh7bbin1jfp66y24afgg546gqqyc2hj45xc"; - revision = "1"; - editedCabalFile = "1sfccf4hgsqkh0wpy1cwkx3lq2grsnr1zbv73k9gj4m66mkijkhh"; + version = "0.7.0.1"; + sha256 = "0cd4qlj069ji5v9b2c594allmmy1qbin7dwlxq1ncz1g8lwd06bc"; libraryHaskellDepends = [ aeson base binary containers hashable path-pieces text unordered-containers vector @@ -246095,8 +246469,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.9"; - sha256 = "0xb6ibssn3r45ab48cj74m8c23ic0gszgfrlm5xaj7nmcixna5i2"; + version = "0.1.12"; + sha256 = "14jk6d0i72ry9x5k1rxy0qgvxw0sp05g03yhjsvyqchh6x9m4kb7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251048,8 +251422,8 @@ self: { pname = "redact"; version = "0.5.0.0"; sha256 = "0f9nfkli9spbcidfwq81z4ryjnlyqf4snj1dmhsngpcp0x2am798"; - revision = "1"; - editedCabalFile = "1sc16ap5mlfhwp903h8jb0xcjrlkmqrn6qzmdykalipy05knfdnf"; + revision = "2"; + editedCabalFile = "16lxlg7wpf7hbvylsfkkxqamhm6k7jf4cfiz7iv78x7s4a6akr1a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; @@ -252436,8 +252810,8 @@ self: { }: mkDerivation { pname = "reflex-test-host"; - version = "0.1.2.2"; - sha256 = "1km340p317yscwjmx20pazraczsilb6mna5ka9mx7al7864jcyk1"; + version = "0.1.2.3"; + sha256 = "0fn4b65r7i8a8b414c1ngygbcb98jgyhi56ihnkzqj36wjk35jbf"; libraryHaskellDepends = [ base dependent-sum lens mtl primitive ref-tf reflex these transformers @@ -253516,8 +253890,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.6.0.0"; - sha256 = "1nspxg5aks9ayk6jzybddr0gb2cs9mbjllvrw8q2v7145bf54b72"; + version = "0.6.1.0"; + sha256 = "0jn8ylnq7vqpdlz01jn8fndczgz02rgpzhi1g7fy1r0pwln6ibgj"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl multimap protolude resourcet semigroupoids semigroups template-haskell text @@ -253569,8 +253943,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.8.0.0"; - sha256 = "1nf06yb4kn04b9cmfc7gs4h4b1p952if6x3wyb7ybbpjnhm2k2jw"; + version = "0.8.1.0"; + sha256 = "10am03sd9xj7a8079z4ikhlm3yf22rv809mk4n9gvhzkycx0dlb9"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -253683,6 +254057,8 @@ self: { pname = "regression-simple"; version = "0.2.1"; sha256 = "1l91wmy29581hgdmn6ds6rp7lib4zphyzmqkjykkp5zi17kv8vmd"; + revision = "1"; + editedCabalFile = "1mrrxvcbkq5k2l53afgr8n0m1wsdkzgh7d0zwb6ikd4d0id8lcx6"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ ad base math-functions splitmix statistics tasty tasty-hunit @@ -253950,18 +254326,18 @@ self: { ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text - , th-constraint-compat, th-reify-compat, time, time-locale-compat - , transformers + , th-constraint-compat, th-data-compat, th-reify-compat, time + , time-locale-compat, transformers }: mkDerivation { pname = "relational-query"; - version = "0.12.3.0"; - sha256 = "1acbz0zy4bb8r7q2nw96jgpi45y8gy4j1qik4fn8ndqw8l3fpzvl"; + version = "0.12.3.1"; + sha256 = "106mjfvjbygjvgdzy3ds4w106mcwxiz45q4pb6q9k56q2v8p0zmf"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text - th-constraint-compat th-reify-compat time time-locale-compat - transformers + th-constraint-compat th-data-compat th-reify-compat time + time-locale-compat transformers ]; testHaskellDepends = [ base bytestring containers product-isomorphic quickcheck-simple @@ -253981,8 +254357,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.2.0"; - sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3"; + version = "0.7.2.1"; + sha256 = "0s0j77hhkrgjglbgwdkj79q5rv0fcf1nipzx1v714n9k7g26y4f7"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -254049,8 +254425,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.6.0.0"; - sha256 = "1f37pzz60zrg5z09vf6sdp9in5f78kyvxag6gbyanapi7iki14k3"; + version = "0.6.0.1"; + sha256 = "0psx15f5kwk2j9mf4pv11w7pshsm7sy0fsmxxbf0a8bdg0jppb7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254072,8 +254448,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.8.0"; - sha256 = "012b3jqxpyv41vwxvrk6nxall7hvbczkxwmld3w3jzg20z0535l4"; + version = "0.1.8.1"; + sha256 = "0nikia6fgzy951iz3aawddnqkmbjbyxvhgcc4flr56rfxcbjnbb2"; libraryHaskellDepends = [ base bytestring containers relational-query sql-words template-haskell time @@ -259334,19 +259710,19 @@ self: { }) {}; "rrb-vector" = callPackage - ({ mkDerivation, base, deepseq, indexed-traversable, nothunks - , primitive, quickcheck-classes-base, tasty, tasty-bench + ({ mkDerivation, base, containers, deepseq, indexed-traversable + , nothunks, primitive, quickcheck-classes-base, tasty, tasty-bench , tasty-quickcheck }: mkDerivation { pname = "rrb-vector"; - version = "0.2.0.1"; - sha256 = "05wg7nz9p3ipn9az37yvaw48gmhchfc9hnqrfbsrbr9jghvm536v"; + version = "0.2.1.0"; + sha256 = "1z5zis6ixqmlanzskkimz9bxdpa5x5bv1xc4f9ny5g4hfly5q1na"; libraryHaskellDepends = [ base deepseq indexed-traversable primitive ]; testHaskellDepends = [ - base deepseq nothunks quickcheck-classes-base tasty + base containers deepseq nothunks quickcheck-classes-base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base tasty-bench ]; @@ -261499,7 +261875,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "sandwich_0_2_0_0" = callPackage + "sandwich_0_2_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, deepseq, directory, exceptions , filepath, free, haskell-src-exts, lifted-async, microlens @@ -261511,8 +261887,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.2.0.0"; - sha256 = "18hr0xyisf9zlfcji63s086mfxgzmhxmpcfhxz41miwlg0780g6f"; + version = "0.2.1.0"; + sha256 = "00wayn1xbhisl3aix61kp7m4xiqrnam5mqal2ncmd2b8cy7h9hn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262044,8 +262420,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.3.1"; - sha256 = "0w4skxbvbmvda2jrvbnnaikka529k5g6qixzc2kz3sqvq784qmks"; + version = "1.2.4.0"; + sha256 = "0hqcpcgzwv4q7vxdhnf3lffhlnrr4ykpz330n1ip0qnys483yz8r"; libraryHaskellDepends = [ base bytestring containers exceptions prettyprinter template-haskell text th-abstraction @@ -263330,6 +263706,8 @@ self: { pname = "scotty"; version = "0.20.1"; sha256 = "1770kj78zdi137pskiyx28id64vilmhylnkgy139pvxa95n8i6kd"; + revision = "1"; + editedCabalFile = "02gz7kgv273scgmig0qkvfynslhqg9pnhmablidr47kw80kqghy6"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive cookie data-default-class exceptions http-types monad-control mtl network @@ -266339,6 +266717,8 @@ self: { pname = "servant"; version = "0.20.1"; sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; + revision = "2"; + editedCabalFile = "137yfr7mxfx2r3pkdfwsxv7xxch5l20yirj82186djyg36q5021z"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -266411,8 +266791,8 @@ self: { pname = "servant-auth"; version = "0.4.1.0"; sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; - revision = "7"; - editedCabalFile = "18ylz2071416hhiqy7n72dvpsfy2cmhsh5j96mmcmgx05fcpkswg"; + revision = "9"; + editedCabalFile = "0vdci6ckk0qq48wpsxqm09azb2fap6av2vnafzkyhfj8knk49jyh"; libraryHaskellDepends = [ aeson base containers jose lens servant text unordered-containers ]; @@ -266431,8 +266811,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.1"; sha256 = "1fs00p15hz2lqspby2xg6h0zxmlljm6wgi0wk73a4gavyg26dgqq"; - revision = "1"; - editedCabalFile = "1ff5hcpc56w7q97myavmfrl5m8sv38mjcw83lgyy0g56d893svhw"; + revision = "4"; + editedCabalFile = "014sbmbvksm4znxxs1h7lvww86ly7sh0zj9w99byxd29s4z4yh8m"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -266511,8 +266891,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.1"; sha256 = "03dnh6x0y34npmv9w2f3hc9r1brlzf2rki6c6ngvwb3dvichhykv"; - revision = "1"; - editedCabalFile = "0l4y7cnbfhad9f3mfv6zzm9qm9gc6g8k4s9vgrvn78jdrpmbbxxr"; + revision = "2"; + editedCabalFile = "09gnjhxdf5kw26c4ah2012lq2z4mg9mdnln8j9xcsg35212mv8c9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs @@ -266576,8 +266956,8 @@ self: { pname = "servant-auth-server"; version = "0.4.8.0"; sha256 = "0drny9m2js619pkxxa1mxji5x4r46kpv3qnmswyrb3kc0ck5c2af"; - revision = "1"; - editedCabalFile = "0dff8ycslxv5zy74wiph27sscd2p3zkq09j043yy8mnaypmpn4xr"; + revision = "4"; + editedCabalFile = "1cib954pc6x4qawyizxlr9qg9838rahyihdiv4qiz09i19m8n6zj"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -266604,8 +266984,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.2"; sha256 = "0f4sn0xlsq8lcnyj0q978bamfav6jmfkkccrg2k5l7rndif4nmwg"; - revision = "1"; - editedCabalFile = "1b4qk84fxs3fn21i8cfcqynl6549rzswyybi613w7raaxgnidqrv"; + revision = "2"; + editedCabalFile = "0gw3pv4jwn5d4gah5l2x4gf9by7wqi40vj9syjv65xgshvcnk8gd"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -266957,8 +267337,8 @@ self: { pname = "servant-client"; version = "0.20"; sha256 = "0xmjqc54yq5akhw5ydbx5k0c1pnrryma8nczwyzvwx4vazrk0pbn"; - revision = "1"; - editedCabalFile = "1bvj0rnnyqw3h70b94k9j21np5h0acxn4cla2gsv9zclhd99f4q6"; + revision = "3"; + editedCabalFile = "0awk9s22228mm4ff3bc165djvykihbkk6vqvfak0mz1m7dypi7fq"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -267013,8 +267393,8 @@ self: { pname = "servant-client-core"; version = "0.20"; sha256 = "012bdf3c44bqzb0ycns4pcxb0zidqqn7lpzz9316kiwy0wb4jx56"; - revision = "1"; - editedCabalFile = "0nkgan32s6v5s3sqk5wdw1m977gszwi8lnap5wrr3m47q7j4003l"; + revision = "3"; + editedCabalFile = "02q7fvmqvc1n5h0bh4q28vaphhnms34lr6ckxbxrmc5wwcz8qkgv"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring constraints containers deepseq exceptions free http-media http-types @@ -267128,6 +267508,8 @@ self: { pname = "servant-conduit"; version = "0.16"; sha256 = "037vqqq5k2jm6s7gg2shb6iyvjfblsr41ifjpryfxmsib669vs9f"; + revision = "1"; + editedCabalFile = "1isnhvhqlzhz37wz19gjbz5i27mmg2qzy6qpma2wlbja22s14ywp"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -267263,6 +267645,8 @@ self: { pname = "servant-docs"; version = "0.13"; sha256 = "0i91my86bcnn0jckf2qlfyx1zfbg8w6959v7iim60s3mdx9yjp67"; + revision = "2"; + editedCabalFile = "1awdlcvi24rqjzx01qff4an4srzqbyrcihxvazha0ypr2w94wz15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267528,8 +267912,8 @@ self: { pname = "servant-foreign"; version = "0.16"; sha256 = "15pir0x7dcyjmw71g4w00qgvcxyvhbkywzc3bvvaaprk5bjb3bmv"; - revision = "1"; - editedCabalFile = "17rnd7dnkj5p8jpbmlgysacrdxxhczd4ll8r5r3bpd56yhj8wm2c"; + revision = "2"; + editedCabalFile = "1mvp8r90kj0hnl95hzwdf5pja69h44vlwjypygzgjxn1j0lmrj2f"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -267758,8 +268142,8 @@ self: { pname = "servant-http-streams"; version = "0.20"; sha256 = "1pakvvw8m7dkwf8zfrh2gan1hs5zp4mgnn4bp0wiy49mc3zzlxwi"; - revision = "1"; - editedCabalFile = "19dficaknm55bgp2sccr9zgxir39cz35h41cgm1w86dxmxv2bzxy"; + revision = "3"; + editedCabalFile = "1liw4vv8agbfyc1nks5qzidp24ia8zm8rj9sz05hapnrsv3q5d74"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -267852,8 +268236,8 @@ self: { pname = "servant-js"; version = "0.9.4.2"; sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; - revision = "4"; - editedCabalFile = "0ayhm01r22qyyxlj4y5y96ny81as16qh75fchsx3wa0fh3qbjvnn"; + revision = "5"; + editedCabalFile = "05iwi5q2hbaqc7n1zhw9zpj4qcw8mg849zjfxfv84c9wwh35nrxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267985,6 +268369,8 @@ self: { pname = "servant-machines"; version = "0.16"; sha256 = "0c2cz96m9lbzr318i4vpy55y37xagh7sf1g0hvxbsvwhnzqa4532"; + revision = "1"; + editedCabalFile = "1fw4ls9s9y6rndr2ky7m50msmssaidq1afmy8gsjksc6px3xk4y9"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -268246,8 +268632,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "5"; - editedCabalFile = "0jy5yp7ag9783mw09dln0jkjgrhy7li4ilgcmydgl4d84izy3zhn"; + revision = "6"; + editedCabalFile = "03sx2hc8kds5yx62zivhc0nj3hd0g0clcrdbccbx1hfnr7bs8ddx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -268349,6 +268735,8 @@ self: { pname = "servant-pipes"; version = "0.16"; sha256 = "00n2rmv4aar49247is2sgy58nal64lv05zci9lhkbgmmmi1hqd10"; + revision = "1"; + editedCabalFile = "0n2l14bsb020ixp8z84m2znjbgma37pdp2yrpq8x64g912qayj63"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -268946,8 +269334,8 @@ self: { pname = "servant-server"; version = "0.20"; sha256 = "1gp8pslk2sspi5vzrl1nimndpif7jhgzlffi2mzf1ap1bdwgxchk"; - revision = "2"; - editedCabalFile = "0x05ngrrgq4jqv5sfwsf35aziipvz64xajzh4a1b5cmh53q7kc8v"; + revision = "4"; + editedCabalFile = "1y1pilkixlm116cr4q7rsawfxkwv7iahq9cqq4nidc4py482ccbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269289,8 +269677,8 @@ self: { pname = "servant-swagger"; version = "1.2"; sha256 = "1dim4vlsd9zcz3ra0qwvb4hlbj0iarxygz78ksw8nbvqgbym3zjh"; - revision = "1"; - editedCabalFile = "1l2459b88hsnz96zqp6iy51kcb0d6pnlf4dwa22vcimhg58vsk89"; + revision = "3"; + editedCabalFile = "1gm7nf0jazlapgg6dvaq4r0nskz23819871rfj84panr9icf8dgj"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -269675,6 +270063,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-xml-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, http-media, servant + , xml-conduit, xml-types + }: + mkDerivation { + pname = "servant-xml-conduit"; + version = "0.1.0.4"; + sha256 = "06br0s9z7ba1kw4ib6dzp2w5f0bm5daywzhpzpliw8b5sgyrvljp"; + libraryHaskellDepends = [ + base bytestring conduit http-media servant xml-conduit xml-types + ]; + description = "Servant XML content-type with support for xml-conduit"; + license = lib.licenses.agpl3Plus; + }) {}; + "servant-xstatic" = callPackage ({ mkDerivation, base, servant, servant-server, xstatic }: mkDerivation { @@ -273216,6 +273619,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cairo" = callPackage + ({ mkDerivation, base, bytestring, c-struct, cairo, cairo-image + , exception-hierarchy, primitive, stm, template-haskell, text + , union-angle, union-color, vector + }: + mkDerivation { + pname = "simple-cairo"; + version = "0.1.0.5"; + sha256 = "1r11gwvx0qssmv99scsblqys450aq8aq1p4vs424s1wv1j59afl3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-struct cairo-image exception-hierarchy primitive + stm template-haskell text union-angle union-color vector + ]; + libraryPkgconfigDepends = [ cairo ]; + testHaskellDepends = [ + base bytestring c-struct cairo-image exception-hierarchy primitive + stm template-haskell text union-angle union-color vector + ]; + description = "Binding to Cairo library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + "simple-cmd" = callPackage ({ mkDerivation, base, directory, extra, filepath, hspec, process , time, unix @@ -273679,6 +274105,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-pango" = callPackage + ({ mkDerivation, array, base, bytestring, c-enum, c-struct + , containers, glib-stopgap, pango, primitive, simple-cairo + , template-haskell, text, union-angle, union-color + }: + mkDerivation { + pname = "simple-pango"; + version = "0.1.0.1"; + sha256 = "1yxl1n9cnqqc0r98h7v57647dkn9bik6h2g5p2dgipi35bx7lmj5"; + libraryHaskellDepends = [ + array base bytestring c-enum c-struct containers glib-stopgap + primitive simple-cairo template-haskell text union-angle + union-color + ]; + libraryPkgconfigDepends = [ pango ]; + testHaskellDepends = [ + array base bytestring c-enum c-struct containers glib-stopgap + primitive simple-cairo template-haskell text union-angle + union-color + ]; + description = "Binding to Pango library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) pango;}; + "simple-parser" = callPackage ({ mkDerivation, base, bytestring, containers, errata, exceptions , mmorph, mtl, nonempty-containers, scientific, tasty, tasty-hunit @@ -274263,13 +274713,19 @@ self: { }) {}; "simplex-method" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, generic-lens, lens, monad-logger + , text, time + }: mkDerivation { pname = "simplex-method"; - version = "0.1.0.0"; - sha256 = "0c1w1b6gxp4kg0jl8shjwz9yd27wlgwfmnxwz3vdwlcgghsdqqbm"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0hmagcxpb0vrg3shd9ab4ykimi717692b2g1pkjkq7nsb5qc3fh0"; + libraryHaskellDepends = [ + base containers generic-lens lens monad-logger text time + ]; + testHaskellDepends = [ + base containers generic-lens lens monad-logger text time + ]; description = "Implementation of the two-phase simplex method in exact rational arithmetic"; license = lib.licenses.bsd3; }) {}; @@ -275238,8 +275694,8 @@ self: { pname = "skew-list"; version = "0.1"; sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; - revision = "1"; - editedCabalFile = "0g54cs64c1bxbs1caihc886hdnlxm6dfz8p3zh454h88aklgz0ax"; + revision = "2"; + editedCabalFile = "1khmbbfd6f531vmlngcqramazayc2sqvm3j9xwmz1zjxscmvwhsg"; libraryHaskellDepends = [ base deepseq hashable indexed-traversable QuickCheck strict ]; @@ -275381,7 +275837,7 @@ self: { mainProgram = "skylighting"; }) {}; - "skylighting_0_14" = callPackage + "skylighting_0_14_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, skylighting-format-ansi , skylighting-format-blaze-html, skylighting-format-context @@ -275389,8 +275845,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.14"; - sha256 = "19vwmrpi4r93a7ic9wrf8nl4bh5pzhgpbr84kg7mklj5ls9wv9pz"; + version = "0.14.1"; + sha256 = "1fyi6hw7mhm12isl9005q16b50z3594f8vb9bdf7llgzszbxa2js"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -275438,7 +275894,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_14" = callPackage + "skylighting-core_0_14_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty @@ -275447,8 +275903,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.14"; - sha256 = "14fbx07h9lrkz9a4z4w4v5b9hi3hpsxqw71pvfcbv39fim8bs8qj"; + version = "0.14.1"; + sha256 = "1i63id4gjvrifzqfagz16h4j395amkd7rc57my48xxgsxs20ag4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276741,6 +277197,8 @@ self: { pname = "smtlib-backends"; version = "0.3"; sha256 = "13pyic8zq0dv7w529pciw0zfpzx63mrf3bq5nillsswbk0czv0qw"; + revision = "1"; + editedCabalFile = "1w7vcgj8x4w9py2b49rqn8gkqybfx3vzz4nyggli2b6vm2bpz5v9"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -276754,6 +277212,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; + revision = "1"; + editedCabalFile = "07g1pwg3ss364yg79xychls0bn145985pscr4vxs5j213zlr7viy"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -276773,6 +277233,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; + revision = "1"; + editedCabalFile = "0imbf9cgp1imqqj5iryg7k2my4690rwixhl4j3s3a6w54n0zs0sd"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -276786,6 +277248,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3"; sha256 = "1dny8jmkx1aclq5sbn4kgnpn0sg1rf34za0j6ppggzmh647aim8l"; + revision = "1"; + editedCabalFile = "094jq4fizsaj5yy3m9z5xv8zm5h110y0a91rkqzyml7f57yzlj5p"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -278971,18 +279435,19 @@ self: { "sockets" = callPackage ({ mkDerivation, async, base, byteslice, bytestring, entropy , error-codes, ip, posix-api, primitive, primitive-addr - , primitive-offset, primitive-unlifted, stm, tasty, tasty-hunit - , text + , primitive-offset, primitive-unlifted, stm, systemd-api, tasty + , tasty-hunit, text }: mkDerivation { pname = "sockets"; - version = "0.6.1.1"; - sha256 = "11d8naqwvsswqs27msir2qsbpgphyvxnq2fdmqc7vnydkgch91jk"; + version = "0.7.0.0"; + sha256 = "0riyn0lp68nydyar6yhx3l428hbf7n7q69mim5h2336hk0mx66aw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base byteslice bytestring error-codes ip posix-api primitive - primitive-addr primitive-offset primitive-unlifted stm text + primitive-addr primitive-offset primitive-unlifted stm systemd-api + text ]; testHaskellDepends = [ async base byteslice bytestring ip primitive primitive-addr @@ -281183,19 +281648,22 @@ self: { }) {}; "spreadsheet" = callPackage - ({ mkDerivation, base, explicit-exception, transformers, utility-ht + ({ mkDerivation, base, doctest-exitcode-stdio, doctest-lib + , explicit-exception, QuickCheck, transformers, utility-ht }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.9"; - sha256 = "10sdywp24c0prvgkdndimc6jnkalzbsbdb1dxw6cv86xxphk65in"; - revision = "2"; - editedCabalFile = "1z25kvb4l37nnpps8xxs4cd1qjjn592002ggw0bx5cn4k3r59wfh"; + version = "0.1.3.10"; + sha256 = "022q6an3jl0s8bnwgma8v03b6m4zq3q0drl6nsrcs0nav8n1z5r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base explicit-exception transformers utility-ht ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib explicit-exception + QuickCheck + ]; description = "Read and write spreadsheets from and to CSV files in a lazy way"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.thielema ]; @@ -281520,8 +281988,8 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.6.4"; - sha256 = "1rd2rkhq56zwv3s1jzxq0vjshjnf5818f70w6ayxbmmg87kiwwy0"; + version = "0.1.6.5"; + sha256 = "1gmza70sibkyf82npnrbh2bwczgji3vn5wkxyzh2lcsybq2xsm6d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; @@ -286107,6 +286575,29 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "streamly_0_10_0" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , directory, exceptions, hashable, heaps, lockfree-queue + , monad-control, mtl, network, streamly-core, template-haskell + , transformers, transformers-base, unicode-data + , unordered-containers + }: + mkDerivation { + pname = "streamly"; + version = "0.10.0"; + sha256 = "0mpgi3pz4xbqrzidsp2gbn4wcqfvi5nhry41sxx1rfjg6lyn9r6g"; + libraryHaskellDepends = [ + atomic-primops base containers deepseq directory exceptions + hashable heaps lockfree-queue monad-control mtl network + streamly-core template-haskell transformers transformers-base + unicode-data unordered-containers + ]; + description = "Streaming, dataflow programming and declarative concurrency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "streamly-archive" = callPackage ({ mkDerivation, archive, base, bytestring, cryptonite, directory , filepath, QuickCheck, streamly, streamly-core, tar, tasty @@ -286215,6 +286706,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamly-core_0_2_0" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, filepath + , fusion-plugin-types, ghc-bignum, ghc-prim, heaps, monad-control + , template-haskell, transformers, unix + }: + mkDerivation { + pname = "streamly-core"; + version = "0.2.0"; + sha256 = "09146gbkg0w0cdb30y498lipqyywjb3r5pmyv4w83cxpfyvq1qlz"; + libraryHaskellDepends = [ + base containers directory exceptions filepath fusion-plugin-types + ghc-bignum ghc-prim heaps monad-control template-haskell + transformers unix + ]; + description = "Streaming, parsers, arrays and more"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streamly-examples" = callPackage ({ mkDerivation, base, containers, directory, exceptions , fusion-plugin, hashable, mtl, network, random, streamly @@ -290814,6 +291324,30 @@ self: { broken = true; }) {}; + "symbolize" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , doctest-parallel, hashable, hedgehog, tasty, tasty-discover + , tasty-golden, tasty-hedgehog, tasty-hunit, text, text-display + , text-short, unordered-containers + }: + mkDerivation { + pname = "symbolize"; + version = "0.1.0.3"; + sha256 = "0nn9ixj0sprg2d7alx3qhjspmz00x4g371pwmg3b0xdjhfr44qzx"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable text text-display + text-short unordered-containers + ]; + testHaskellDepends = [ + async base bytestring containers deepseq doctest-parallel hashable + hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit text + text-display text-short unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "Efficient global Symbol table, with Garbage Collection"; + license = lib.licenses.bsd3; + }) {}; + "symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -291651,6 +292185,8 @@ self: { pname = "system-linux-proc"; version = "0.1.1.1"; sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; + revision = "2"; + editedCabalFile = "0bf4zrx2x3h6wln257k7fjwszvkxg9phjscfkhrl403wiz1kjxqz"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -291816,6 +292352,8 @@ self: { pname = "systemd-api"; version = "0.1.0.0"; sha256 = "1isnzmz32nd55hgrn18gsjz7g5d6cvj1yxgf2z2i1fhjwnkw144y"; + revision = "1"; + editedCabalFile = "03z45qhppl29pab563933mv789724czv35872lcjqzmhf468idd6"; libraryHaskellDepends = [ base byte-order byteslice posix-api primitive text-short ]; @@ -294851,6 +295389,8 @@ self: { pname = "tdigest"; version = "0.3"; sha256 = "02jdi827kxa8bn6gacdncmnggjw5f8wjf2i4idgf88kz564yd9bb"; + revision = "1"; + editedCabalFile = "1pcm1gdn28syhq6gws3ss15dldnvyvy4l2mqbqmp46gv3hzqnw6b"; libraryHaskellDepends = [ base base-compat binary deepseq foldable1-classes-compat reducers transformers vector vector-algorithms @@ -298939,24 +299479,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "th-data-compat_0_1_1_1" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-data-compat"; - version = "0.1.1.1"; - sha256 = "1ry22k1fr50az4gjy6vs3b11a4gp22hkagbbq4r3irqaz059z6dp"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for data definition template of TH"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "th-data-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.2.0"; - sha256 = "1x8znbzzkrmp1vfq6blwnwb5cxyr9gkiwj6c5ab4nds4diy3j3cq"; + version = "0.1.3.0"; + sha256 = "0ll67hmrb0hfdpgyryppp1rplr8fmyj09zka931gwial0kwkhlir"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -299222,8 +299750,8 @@ self: { pname = "th-letrec"; version = "0.1"; sha256 = "0z9j8a7p9m5kp3zzia593zbzfmqc6himrzzjfk7nplv6vfh36yah"; - revision = "1"; - editedCabalFile = "1f6wfk0k6ri8fxld4yz58n6inq8c2qpwkk0b8zd8yrc0584vqxy8"; + revision = "2"; + editedCabalFile = "0f5pzqfh4axv1x09pzp7dpqvbf3cq6yacyfa403klsyizvh6ly6g"; libraryHaskellDepends = [ base containers some template-haskell transformers ]; @@ -301941,20 +302469,20 @@ self: { , dependent-sum-template, extra, filepath, hashable, hspec , hspec-contrib, HUnit, ilist, lens, linear, listsafe, MonadRandom , mtl, patch, pretty-simple, random-shuffle, ref-tf, reflex - , reflex-potatoes, reflex-test-host, relude, semialign - , template-haskell, text, text-icu, these, vector, vty + , reflex-potatoes, reflex-test-host, relude, semialign, text + , text-icu, these, vector, vty }: mkDerivation { pname = "tinytools"; - version = "0.1.0.4"; - sha256 = "0yzwvygjdg8g7w8hqk7x1myab9yl12945i6n7q93yr9w80s04d0a"; + version = "0.1.0.5"; + sha256 = "15f0i636pc09q9wi5dh9wccrfm6widaa3hd80np81qxr1rkx3fxd"; libraryHaskellDepends = [ aeson aeson-pretty base bimap binary bytestring constraints-extras containers data-default data-ordlist deepseq dependent-map dependent-sum dependent-sum-template extra filepath hashable ilist lens linear listsafe MonadRandom mtl patch pretty-simple random-shuffle ref-tf reflex reflex-potatoes reflex-test-host - relude semialign template-haskell text text-icu these vector vty + relude semialign text text-icu these vector vty ]; testHaskellDepends = [ aeson base bimap binary bytestring constraints-extras containers @@ -301962,9 +302490,9 @@ self: { dependent-sum-template extra hashable hspec hspec-contrib HUnit ilist lens linear listsafe MonadRandom mtl patch pretty-simple random-shuffle ref-tf reflex reflex-potatoes reflex-test-host - relude semialign template-haskell text text-icu these vector vty + relude semialign text text-icu these vector vty ]; - description = "tinytools is a mono-space unicode diagram editor"; + description = "tinytools is a monospace unicode diagram editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -303252,8 +303780,8 @@ self: { }: mkDerivation { pname = "toml-parser"; - version = "1.3.0.0"; - sha256 = "162vhazlilpqxvdp8xv4qsnpijr2wz6a1zyknas6f8yy9rxa5mpw"; + version = "1.3.1.0"; + sha256 = "1rqa67cg0rafh4dzbqg46znlk1f9rb59pz078q2w0b67d64lg8fa"; libraryHaskellDepends = [ array base containers prettyprinter text time transformers ]; @@ -303680,8 +304208,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.6.1"; - sha256 = "1ra0inamzcizadggjvzpan979bf6fkrmfwz9qggd34dl6fa203r1"; + version = "1.0.7.0"; + sha256 = "1jrqna3lxjxsiqxb6ybwm7kl59r3948lqhqb8l5xv9v5r38vzr6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -303721,8 +304249,8 @@ self: { pname = "topograph"; version = "1.0.0.2"; sha256 = "08fpwaf6341gaf7niwss08zlfyf8nvfrc4343zlkhscb19l4b7ni"; - revision = "1"; - editedCabalFile = "1myk9hz5nrq2xy8mnw0qr93iqjf9bzdbhpqy5d5288bdba6yqhhv"; + revision = "2"; + editedCabalFile = "1l98l1rky1y9npckf40d3dizy27xh4byqkfz419n1d6ks8fi15w6"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -304695,6 +305223,8 @@ self: { pname = "transformers-either"; version = "0.1.4"; sha256 = "10r542fz3gp2szccqzca9dc5jbs2qs2z5lg0vpl8fzlsy9s0xr11"; + revision = "1"; + editedCabalFile = "0jkkarwy750pkpbhpmvcrh06qhms8b303zy101180ccpz72lwcrx"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Either monad transformer"; license = lib.licenses.bsd3; @@ -304706,6 +305236,8 @@ self: { pname = "transformers-except"; version = "0.1.4"; sha256 = "03g4cxfmlnybvl9rm5f344hnvaf916vz0rafymkal7ibamhhk6bi"; + revision = "1"; + editedCabalFile = "1wgrjvinhx6piwcqvwz84b1ysm3np75wgqyv6pyypgk7xd6zvqrw"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; license = lib.licenses.bsd3; @@ -306375,19 +306907,19 @@ self: { license = lib.licenses.mit; }) {}; - "ttc_1_3_0_0" = callPackage + "ttc_1_4_0_0" = callPackage ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text + , template-haskell, text, text-short }: mkDerivation { pname = "ttc"; - version = "1.3.0.0"; - sha256 = "16px3ws0bzkzpf1hy7il40p7shv8w093fjim0rc1c45y40jp7p09"; - revision = "1"; - editedCabalFile = "1mqxayy3nh39lnmsdr7hsz6xlan95m05s49l0349s4724syflscz"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; + version = "1.4.0.0"; + sha256 = "0kp3kpdv5hf13qri8ms8jb9ydyn3fpviw0wgkqb3g2m4ccyl8ssq"; + libraryHaskellDepends = [ + base bytestring template-haskell text text-short + ]; testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text + base bytestring tasty tasty-hunit template-haskell text text-short ]; description = "Textual Type Classes"; license = lib.licenses.mit; @@ -307952,6 +308484,19 @@ self: { broken = true; }) {}; + "type-flip" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-flip"; + version = "0.1.0.0"; + sha256 = "0wmkhh2csc2fbmpb5wrih8x84djmjspa3fl7dkfis7v34iwkkr36"; + revision = "1"; + editedCabalFile = "0h0nr16w32z7bknr5rml6j6dgn019j40f54dfwbh2q8p62x1m0gp"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + }) {}; + "type-fun" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -308389,6 +308934,18 @@ self: { broken = true; }) {}; + "type-set" = callPackage + ({ mkDerivation, base, random, template-haskell }: + mkDerivation { + pname = "type-set"; + version = "0.1.0.0"; + sha256 = "00y8xwbdfkf2jhhik7agb5cm0q59y85f7ad6c9is0fnfv0wxri8w"; + libraryHaskellDepends = [ base random template-haskell ]; + testHaskellDepends = [ base random template-haskell ]; + description = "Type set"; + license = lib.licenses.bsd3; + }) {}; + "type-sets" = callPackage ({ mkDerivation, base, cmptype }: mkDerivation { @@ -308978,10 +309535,8 @@ self: { ({ mkDerivation, base, dependent-sum }: mkDerivation { pname = "typelits-witnesses"; - version = "0.4.0.0"; - sha256 = "1khy5nacmsl7h4vg7driv4yb9m3zvkhbf8divyhd249i6bdmql70"; - revision = "1"; - editedCabalFile = "11lpv0zymmxlqh2sac324znmr5rhvvfvjipddgyhv6y3l7zy7jhs"; + version = "0.4.0.1"; + sha256 = "1virf6vnzkh91h56k1ni5wkj6mswrnaj86sf1r1a95brqv7w3lbh"; libraryHaskellDepends = [ base dependent-sum ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = lib.licenses.mit; @@ -310616,8 +311171,8 @@ self: { pname = "unicode-data"; version = "0.4.0.1"; sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; - revision = "1"; - editedCabalFile = "1lvsn8r1xh8ip5gyrbwv7pk41yf2ynjimpd6g4am3n7j92djc7h8"; + revision = "2"; + editedCabalFile = "1v7kswa3606k3j8y7y7rigxabgypx23m3wv2hbnqs75s15g7ip2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -311921,14 +312476,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_3_0" = callPackage + "unix_2_8_5_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.3.0"; - sha256 = "1asxibqs77gmgvqxigsf1mch3m4qgznfm1fpqhw0xh9fsil7ip59"; + version = "2.8.5.0"; + sha256 = "0zc5jbdkhnh8m8dxbgvbwx3r1jmgjxdnqq8qc632wzpf8bi822yp"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit tasty-quickcheck @@ -313464,8 +314019,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "11.0.0"; - sha256 = "1qndb850ghicp0iyc4rpw6zz0ms18lj4zsclhzhyrnm60h85jin7"; + version = "11.0.2"; + sha256 = "1xmyckl5kgmgm3kxicc447vmv96v0mhy93v1l0n55skppyc7cvk1"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control monad-control-aligned monad-logger mtl path path-extra resourcet @@ -314125,6 +314680,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "uu-tc-error" = callPackage + ({ mkDerivation, base, uu-tc-error-error }: + mkDerivation { + pname = "uu-tc-error"; + version = "0.2.0.0"; + sha256 = "045xs8jlcqnfbvlbm95a5y9iqqam9gy2nfx4q9r0jdlq9i6fv2rf"; + libraryHaskellDepends = [ base uu-tc-error-error ]; + description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; + license = lib.licenses.bsd3; + }) {}; + + "uu-tc-error-error" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, text + }: + mkDerivation { + pname = "uu-tc-error-error"; + version = "0.1.0.0"; + sha256 = "1xhngmknpvixhdfyljmm3qfmiyn603qwqgqkn05aably7v15iq0x"; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl text + ]; + description = "utilities for parse errors"; + license = lib.licenses.bsd2; + }) {}; + "uuagc" = callPackage ({ mkDerivation, aeson, array, base, bytestring, Cabal, containers , directory, filepath, ghc-prim, haskell-src-exts, mtl, uuagc-cabal @@ -316615,8 +317195,8 @@ self: { }: mkDerivation { pname = "vertexenum"; - version = "0.1.0.0"; - sha256 = "0gqc207lns1by4dz57wrdx3r8jnrl1clwpfi65afgi7x09ircxvw"; + version = "0.1.1.0"; + sha256 = "1b213zl5psrlibcpi27vw7fm9lwj0jgb22k18z13qwk6xykvip8q"; libraryHaskellDepends = [ base containers hmatrix-glpk vector-space ]; @@ -317903,8 +318483,8 @@ self: { }: mkDerivation { pname = "vty-windows"; - version = "0.2.0.0"; - sha256 = "03dha87c7nrfyfscnz5bjys9v971xiw4xs60d5z218daazd2rhfy"; + version = "0.2.0.1"; + sha256 = "0y2ihbhg5xmk1mljn1syrd5iqg0dd0lk6j0kgk6077j0jdm09ar3"; libraryHaskellDepends = [ base blaze-builder bytestring containers deepseq directory filepath microlens microlens-mtl microlens-th mtl parsec stm transformers @@ -320299,6 +320879,8 @@ self: { pname = "warc"; version = "1.0.5"; sha256 = "1s01x0w37gsh4kkv1jq54i0yf7mxk6m6jr6djwql8dz8nqrny8j7"; + revision = "1"; + editedCabalFile = "1kpwclj2017wciw5ivka7l33m779yz1nkmzbcqna0adwfa3gd7bi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -320354,7 +320936,7 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_3_30" = callPackage + "warp_3_3_31" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -320364,8 +320946,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.30"; - sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; + version = "3.3.31"; + sha256 = "13f3gqvwx0n9p80r7zs5q2i0xdql5grncf7nbligwkx45ggwgabw"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -320640,6 +321222,42 @@ self: { broken = true; }) {}; + "waterfall-cad" = callPackage + ({ mkDerivation, base, lattices, lens, linear, opencascade-hs + , resourcet + }: + mkDerivation { + pname = "waterfall-cad"; + version = "0.0.0.1"; + sha256 = "03a7az74sww1s6j1ppghhzszjj34z1v3sv96vh7rngw08bwslsyf"; + libraryHaskellDepends = [ + base lattices lens linear opencascade-hs resourcet + ]; + description = "Declarative CAD/Solid Modeling Library"; + license = lib.licenses.lgpl21Only; + }) {}; + + "waterfall-cad-examples" = callPackage + ({ mkDerivation, base, lens, linear, opencascade-hs + , optparse-applicative, waterfall-cad + }: + mkDerivation { + pname = "waterfall-cad-examples"; + version = "0.0.0.1"; + sha256 = "0ry2gdhppkgcx724lnky3j4am0x5kcxi45a1abp4bpgvqy356yps"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens linear opencascade-hs optparse-applicative waterfall-cad + ]; + executableHaskellDepends = [ + base lens linear opencascade-hs optparse-applicative waterfall-cad + ]; + description = "Examples for Waterfall CAD, a Declarative CAD/Solid Modeling Library"; + license = lib.licenses.lgpl21Only; + mainProgram = "waterfall-cad-examples"; + }) {}; + "wavconvert" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -320678,8 +321296,8 @@ self: { }: mkDerivation { pname = "wavefront"; - version = "0.7.1.4"; - sha256 = "1qmzvlmqxph57nx8h7zkwa9qbmin908w0w91vqwv5n7qgyqwk31n"; + version = "0.7.1.5"; + sha256 = "0kxjhpkfr87fgcl305ng29v4vs9d2pnfr1iwr82gkhk7jbrxzbla"; libraryHaskellDepends = [ attoparsec base dlist filepath mtl text transformers vector ]; @@ -321216,6 +321834,35 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "web-view" = callPackage + ({ mkDerivation, base, bytestring, casing, containers, effectful + , file-embed, http-types, string-interpolate, sydtest + , sydtest-discover, text, wai, warp + }: + mkDerivation { + pname = "web-view"; + version = "0.3.1"; + sha256 = "1c27zmyx4n66gj1nlwnllk2c4vzmcb9xqjgadca12zql1vk69fv8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring casing containers effectful file-embed + string-interpolate text + ]; + executableHaskellDepends = [ + base bytestring casing containers effectful file-embed http-types + string-interpolate text wai warp + ]; + testHaskellDepends = [ + base bytestring casing containers effectful file-embed + string-interpolate sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; + license = lib.licenses.bsd3; + mainProgram = "example"; + }) {}; + "web3" = callPackage ({ mkDerivation, base, web3-ethereum, web3-polkadot, web3-provider }: @@ -324918,8 +325565,8 @@ self: { }: mkDerivation { pname = "ws"; - version = "0.0.5"; - sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6"; + version = "0.0.6"; + sha256 = "03vzgnlwkmv8i3wmp6ww4pkxqbsc3pj4dd0vb877y8l4i4skb37f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -329097,8 +329744,8 @@ self: { pname = "yasi"; version = "0.2.0.1"; sha256 = "0j5g5h40qvz2rinka7mrb8nc7dzhnprdfpjmzc4pdlx1w8fzw8xy"; - revision = "4"; - editedCabalFile = "0hpyi5gypq20127axq2jx2hax6058036san9frm76zmp6c7l3r0f"; + revision = "5"; + editedCabalFile = "0vspxq76ivd49799r9f29kq7xxzjbs6vcvym8ccbs1sd82inzxs2"; libraryHaskellDepends = [ base ghc-hs-meta template-haskell text text-display ]; @@ -330187,8 +330834,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.25.0"; - sha256 = "1n05rs8qn9xpdg9bccxil27zzjzv7gn1x7q8ld3dshwphpr0rpdv"; + version = "1.6.25.1"; + sha256 = "0i8cfwq41f0h4rlapw98ljah4s46wyfsfipxzj0yx98c86km2cdc"; libraryHaskellDepends = [ aeson attoparsec-aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -333452,8 +334099,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "6"; - editedCabalFile = "0sx3cqlky3y1wppccxr4xfkh1f749apr7y6lsip6bipb3z2j0wqf"; + revision = "7"; + editedCabalFile = "192d8y4wh1xaylmfzwcjfck3hcyzbz5726zfp25rkc5jv5mp7p4s"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -334085,8 +334732,8 @@ self: { }: mkDerivation { pname = "zre"; - version = "0.1.5.0"; - sha256 = "12nain4jp6p24z1vxdvayfd26sdksk2vzp1lf438vq1ynvsllfkn"; + version = "0.1.5.1"; + sha256 = "071g9nvl4rbwkkdyi298cvf325xz1fdrp4l237f417yyf9pqybj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 1a1a8d2559b28d99086947934f33c137fd81c816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 4 Dec 2023 19:06:30 +0100 Subject: [PATCH 04/49] maintainers/scripts/merge-and-open-pr: fix error handling Calling `die` in a subshell hides the error message. --- maintainers/scripts/haskell/merge-and-open-pr.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index cdba24f0c207..62565d24d623 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -54,8 +54,8 @@ if ! gh auth status 2>/dev/null ; then fi # Make sure this is configured before we start doing anything -push_remote="$(git config branch.haskell-updates.pushRemote \ - || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote `.')" +push_remote="$(git config branch.haskell-updates.pushRemote)" \ + || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote `.' # Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. echo "Fetching origin..." From 221b8aae16b27da0bde126e4b80bf5be703274af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 4 Dec 2023 23:36:57 +0100 Subject: [PATCH 05/49] haskellPackages: fix eval --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- .../haskell-modules/configuration-ghc-9.4.x.nix | 2 +- .../haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c0f0f0526cbf..fb9a186ac037 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1189,7 +1189,7 @@ self: super: { http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 - pantry = dontCheck hprev.pantry_0_9_2; # needs pantry >= 0.9.2, tests access network + pantry = dontCheck hprev.pantry_0_9_3; # needs pantry >= 0.9.2, tests access network syb = dontCheck hprev.syb; # cyclic dependencies tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 temporary = dontCheck hprev.temporary; # cyclic dependencies @@ -1855,8 +1855,8 @@ self: super: { http-client-tls = self.http-client-tls_0_3_6_3; # pandoc depends on skylighting >= 0.14 - skylighting = self.skylighting_0_14; - skylighting-core = self.skylighting-core_0_14; + skylighting = self.skylighting_0_14_1; + skylighting-core = self.skylighting-core_0_14_1; }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; @@ -2700,7 +2700,7 @@ self: super: { # Both of these need specific versions of ghc-lib-parser, the minor releases # seem to be tied. ghc-syntax-highlighter_0_0_10_0 = super.ghc-syntax-highlighter_0_0_10_0.overrideScope(self: super: { - ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231014; + ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231121; }); ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231009; 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 d13e4cfe9cfc..a219e86504ac 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -115,7 +115,7 @@ in { ( let hls_overlay = lself: lsuper: { - ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231014; + ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231121; ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; Cabal-syntax = lself.Cabal-syntax_3_10_2_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 803e34163f9d..fb6d9bce9f36 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -92,7 +92,7 @@ self: super: { th-extras = doJailbreak super.th-extras; ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231121; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; # Tests fail due to the newly-build fourmolu not being in PATH From aa1ab6c835a0f45d97fe8024b3ab3e6dbf6f4789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 5 Dec 2023 19:18:04 +0100 Subject: [PATCH 06/49] haskellPackages: fix eval some more --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb9a186ac037..ccf7e0f2ac67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2703,7 +2703,7 @@ self: super: { ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231121; }); ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { - ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231009; + ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231121; }); # Needs a matching version of ipython-kernel and a diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index fb6d9bce9f36..fb79b65be137 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -91,7 +91,7 @@ self: super: { # https://github.com/mokus0/th-extras/pull/21 th-extras = doJailbreak super.th-extras; - ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; + ghc-lib = doDistribute self.ghc-lib_9_6_3_20231121; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231121; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; From 88545acef7881913cb4f966b2ed0c768faa7e711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 5 Dec 2023 19:28:36 +0100 Subject: [PATCH 07/49] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 8 +++++--- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 87df614acb81..a98cdfc0b86b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -522,6 +522,7 @@ dont-distribute-packages: - apiary-redis - apiary-session - apiary-websockets + - apigen - apis - apotiki - approx-rand-test @@ -972,7 +973,7 @@ dont-distribute-packages: - couch-simple - couchdb-enumerator - country - - country_0_2_4_0 + - country_0_2_4_1 - cpkg - cprng-aes-effect - cql-io-tinylog @@ -1167,6 +1168,7 @@ dont-distribute-packages: - dobutokO4 - doc-review - doi + - dojang - domaindriven - dormouse-client - dotparse @@ -1486,7 +1488,7 @@ dont-distribute-packages: - ghc-dump-util - ghc-imported-from - ghc-instances - - ghc-lib_9_8_1_20231009 + - ghc-lib_9_8_1_20231121 - ghc-mod - ghc-plugs-out - ghc-session @@ -3459,7 +3461,7 @@ dont-distribute-packages: - samtools-conduit - samtools-enumerator - samtools-iteratee - - sandwich_0_2_0_0 + - sandwich_0_2_1_0 - sarsi - sasha - sasl diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1107caf816ce..8015076b6b93 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37318,6 +37318,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "FFI API generator for several languages"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "apigen"; }) {}; @@ -91192,6 +91193,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A cross-platform dotfiles manager"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "dojang"; }) {}; From 0ae13741a89dc1af46a6915f0c76dddd51645ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 7 Dec 2023 14:04:26 +0100 Subject: [PATCH 08/49] agdaPackages._1lab: unstable-2023-10-11 -> unstable-2023-12-04 --- pkgs/development/libraries/agda/1lab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index b782dfbe0649..c158449aed16 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-10-11"; + version = "unstable-2023-12-04"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - rev = "c6e0c3c714486fd6c89ace31443428ba48871685"; - hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc="; + rev = "47c2a96220b4d14419e5ddb973bc1fa06933e723"; + hash = "sha256-0U6s6sXdynk2IWRBDXBJCf7Gc+gE8AhR1PXZl0DS4yU="; }; # We don't need anything in support; avoid installing LICENSE.agda @@ -16,7 +16,7 @@ mkDerivation rec { rm -rf support ''; - libraryName = "cubical-1lab"; + libraryName = "1lab"; libraryFile = "1lab.agda-lib"; everythingFile = "src/index.lagda.md"; From 0a686c36f166d0cd26994e31b1a451940fe79391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 7 Dec 2023 14:17:44 +0100 Subject: [PATCH 09/49] haskellPackages.hnix: remove obsolete patch and overrides --- .../haskell-modules/configuration-common.nix | 8 +- .../configuration-hackage2nix/main.yaml | 4 +- .../haskell-modules/configuration-nix.nix | 1 - .../haskell-modules/hackage-packages.nix | 35 ++------ .../patches/hnix-compat-for-ghc-9.4.patch | 79 ------------------- 5 files changed, 9 insertions(+), 118 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/hnix-compat-for-ghc-9.4.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2c5fd2aaf396..023eaaa1e2db 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -477,13 +477,9 @@ self: super: { matterhorn = doJailbreak super.matterhorn; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - # 2022-11-24: jailbreak as it has too strict bounds on a bunch of things - # 2023-07-26: Cherry-pick GHC 9.4 changes from hnix master branch - hnix = appendPatches [ - ./patches/hnix-compat-for-ghc-9.4.patch - ] (dontCheck (doJailbreak super.hnix)); + hnix = dontCheck super.hnix; - # Too strict bounds on algebraic-graphs and bytestring + # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core = doJailbreak super.hnix-store-core; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f824cfbf22a8..bfb638bd8b62 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -33,9 +33,7 @@ default-package-overrides: # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 - rope-utf16-splay < 0.4.0.0 - # hnix < 0.17 (unreleased) needs hnix-store-* 0.5.* - - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - hnix-store-core < 0.7 # 2023-12-07: required by hnix-store-remote 0.6 # 2023-04-22: For dhall < 1.42 compatibility - dhall-nixpkgs == 1.0.9 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3f7672fb8e18..e8fc34a009dd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1095,7 +1095,6 @@ self: super: builtins.intersectAttrs super { ''; }) (lib.pipe (super.cachix.override { - hnix-store-core = self.hnix-store-core_0_7_0_0; nix = self.hercules-ci-cnix-store.nixPackage; }) [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6c459a40dcf5..54bdfa337a64 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -151102,26 +151102,25 @@ self: { , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec , lifted-base, memory, monad-control, mtl, nix-derivation, process - , saltine, tasty, tasty-discover, tasty-golden, tasty-hspec + , relude, saltine, tasty, tasty-discover, tasty-golden, tasty-hspec , tasty-hunit, tasty-quickcheck, temporary, text, time, unix , unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.5.0.0"; - sha256 = "1w5qmk7qhasv2qydrhg3g5x9s2pjf5602w084lj1zbman44phzv5"; - revision = "2"; - editedCabalFile = "0iy7h66fqpg3glssywn1ag7a4mcmgnqn9xfhid1jyxnzqhllf20n"; + version = "0.6.1.0"; + sha256 = "1bziw2avcahqn2fpzw40s74kdw9wjvcplp6r2zrg83rbh2k1x73p"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptonite directory filepath hashable lifted-base memory monad-control mtl - nix-derivation saltine text time unix unordered-containers vector + nix-derivation relude saltine text time unix unordered-containers + vector ]; testHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring binary bytestring containers cryptonite directory filepath hspec process - tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck + relude tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary text unix ]; testToolDepends = [ tasty-discover ]; @@ -151169,27 +151168,6 @@ self: { }) {}; "hnix-store-remote" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , cryptonite, hnix-store-core, mtl, network, nix-derivation, text - , time, unordered-containers - }: - mkDerivation { - pname = "hnix-store-remote"; - version = "0.5.0.0"; - sha256 = "0xvqi1l84ic249qf566vz3pxv75qwgc5d2cf3grh3rcxchp12kf9"; - libraryHaskellDepends = [ - attoparsec base binary bytestring containers cryptonite - hnix-store-core mtl network nix-derivation text time - unordered-containers - ]; - description = "Remote hnix store"; - license = lib.licenses.asl20; - maintainers = [ - lib.maintainers.Anton-Latukha lib.maintainers.sorki - ]; - }) {}; - - "hnix-store-remote_0_6_0_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , cryptonite, hnix-store-core, mtl, network, nix-derivation, relude , text, time, unordered-containers @@ -151205,7 +151183,6 @@ self: { ]; description = "Remote hnix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; diff --git a/pkgs/development/haskell-modules/patches/hnix-compat-for-ghc-9.4.patch b/pkgs/development/haskell-modules/patches/hnix-compat-for-ghc-9.4.patch deleted file mode 100644 index c7322dfa3139..000000000000 --- a/pkgs/development/haskell-modules/patches/hnix-compat-for-ghc-9.4.patch +++ /dev/null @@ -1,79 +0,0 @@ -From daae423d339e820e3fe8c720bd568cc49eae3fde Mon Sep 17 00:00:00 2001 -From: Rodney Lorrimar -Date: Tue, 25 Jul 2023 16:46:36 +0800 -Subject: [PATCH] GHC 9.4 compatibility - -This is commit b89eed9 from haskell-nix/hnix master branch, -backported to 0.16. - -The patch should be removed once hnix-0.17 is released. - ---- - src/Nix/Fresh.hs | 2 +- - src/Nix/Lint.hs | 2 +- - src/Nix/Utils.hs | 2 +- - src/Nix/Value.hs | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Nix/Fresh.hs b/src/Nix/Fresh.hs -index fdd20c4a..4b55de4e 100644 ---- a/src/Nix/Fresh.hs -+++ b/src/Nix/Fresh.hs -@@ -14,7 +14,7 @@ import Control.Monad.Catch ( MonadCatch - , MonadMask - , MonadThrow - ) --import Control.Monad.Except ( MonadFix ) -+import Control.Monad.Fix ( MonadFix ) - import Control.Monad.Ref ( MonadAtomicRef(..) - , MonadRef(Ref) - ) -diff --git a/src/Nix/Lint.hs b/src/Nix/Lint.hs -index 2c207c91..3da8c298 100644 ---- a/src/Nix/Lint.hs -+++ b/src/Nix/Lint.hs -@@ -498,7 +498,7 @@ instance MonadThrow (Lint s) where - throwM e = Lint $ ReaderT $ const (throw e) - - instance MonadCatch (Lint s) where -- catch _m _h = Lint $ ReaderT $ const (fail "Cannot catch in 'Lint s'") -+ catch _m _h = Lint $ ReaderT $ const (error "Cannot catch in 'Lint s'") - - runLintM :: Options -> Lint s a -> ST s a - runLintM opts action = -diff --git a/src/Nix/Utils.hs b/src/Nix/Utils.hs -index 8f53b3a7..af370c21 100644 ---- a/src/Nix/Utils.hs -+++ b/src/Nix/Utils.hs -@@ -67,6 +67,7 @@ import Relude hiding ( pass - import Data.Binary ( Binary ) - import Data.Data ( Data ) - import Codec.Serialise ( Serialise ) -+import Control.Monad ( foldM ) - import Control.Monad.Fix ( MonadFix(..) ) - import Control.Monad.Free ( Free(..) ) - import Control.Monad.Trans.Control ( MonadTransControl(..) ) -@@ -84,7 +85,6 @@ import Lens.Family2.Stock ( _1 - , _2 - ) - import qualified System.FilePath as FilePath --import Control.Monad.List (foldM) - - #if ENABLE_TRACING - import qualified Relude.Debug as X -diff --git a/src/Nix/Value.hs b/src/Nix/Value.hs -index aafdc25a..28b9508c 100644 ---- a/src/Nix/Value.hs -+++ b/src/Nix/Value.hs -@@ -554,7 +554,7 @@ liftNValue - => (forall x . u m x -> m x) - -> NValue t f m - -> NValue t f (u m) --liftNValue = (`hoistNValue` lift) -+liftNValue f = hoistNValue f lift - - - -- *** MonadTransUnlift --- -2.40.1 - From b11a691235b7ee401434384bf2dffb9e2afacb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 9 Dec 2023 15:04:20 +0100 Subject: [PATCH 10/49] haskell.packages.ghc810.http-types: disable checks --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) 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 c541c852df36..7d3de2a0aa9f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -175,4 +175,7 @@ self: super: { # Requires GHC < 9.4 ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); + + # No instance for (Show B.Builder) arising from a use of ‘print’ + http-types = dontCheck super.http-types; } From 4e4b31df114b5ffe1a9cc41a54855ec603e5e96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 9 Dec 2023 15:40:30 +0100 Subject: [PATCH 11/49] haskell.packages.ghc90.http-types: disable checks --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++ 1 file changed, 3 insertions(+) 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 de1412f4c0ee..460e7b4fb13e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -173,4 +173,7 @@ self: super: { ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); hspec-megaparsec = super.hspec-megaparsec_2_2_0; + + # No instance for (Show B.Builder) arising from a use of ‘print’ + http-types = dontCheck super.http-types; } From d3fcf59b678b58cb667e17174f91e63701670479 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 9 Dec 2023 23:12:17 +0100 Subject: [PATCH 12/49] haskellPackages.scat: unbreak --- .../haskell-modules/configuration-common.nix | 17 ++++++++++++----- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 1 - 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 023eaaa1e2db..795677ec2d67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1314,12 +1314,19 @@ self: super: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; }) super.beam-postgres; - # Fix for base >= 4.11 scat = overrideCabal (drv: { - patches = [(fetchpatch { - url = "https://github.com/redelmann/scat/pull/6.diff"; - sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; - })]; + patches = [ + # Fix build with base >= 4.11 + (fetchpatch { + url = "https://github.com/redelmann/scat/commit/429f22944b7634b8789cb3805292bcc2b23e3e9f.diff"; + hash = "sha256-FLr1KfBaSYzI6MiZIBY1CkgAb5sThvvgjrSAN8EV0h4="; + }) + # Fix build with vector >= 0.13 + (fetchpatch { + url = "https://github.com/redelmann/scat/commit/e21cc9c17b5b605b5bc0aacad66d44bbe0beb8c4.diff"; + hash = "sha256-MifHb2EKZx8skOcs+2t54CzxAS4PaEC0OTEfq4yVXzk="; + }) + ]; }) super.scat; # Fix build with attr-2.4.48 (see #53716) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 27db7e3c351d..17a1b3c3ee6f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4793,7 +4793,6 @@ broken-packages: - scale # failure in job https://hydra.nixos.org/build/233222189 at 2023-09-02 - scaleimage # failure in job https://hydra.nixos.org/build/233240688 at 2023-09-02 - scalendar # failure in job https://hydra.nixos.org/build/233206581 at 2023-09-02 - - scat # failure in job https://hydra.nixos.org/build/233199202 at 2023-09-02 - scc # failure in job https://hydra.nixos.org/build/233247446 at 2023-09-02 - scgi # failure in job https://hydra.nixos.org/build/233247314 at 2023-09-02 - schedevr # failure in job https://hydra.nixos.org/build/233240124 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 54bdfa337a64..1d5e1858e67d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -262949,7 +262949,6 @@ self: { platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; mainProgram = "scat"; - broken = true; }) {}; "scc" = callPackage From 67bb428465ceb3b32f33363bbfda66effb381cae Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 10 Dec 2023 02:12:33 +0100 Subject: [PATCH 13/49] haskellPackages.selda: unbreak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support for GHC 9.4 and text ≥ 2 has been implemented but still unreleased on Hackage. --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 1 - 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 795677ec2d67..198e4b209ff1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -879,6 +879,26 @@ self: super: { # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; + # Build Selda with the latest git version. + # See https://github.com/valderman/selda/issues/187 + inherit (let + mkSeldaPackage = name: overrideCabal (drv: { + version = "2023-02-05-unstable"; + src = pkgs.fetchFromGitHub { + owner = "valderman"; + repo = "selda"; + rev = "ab9619db13b93867d1a244441bb4de03d3e1dadb"; + hash = "sha256-P0nqAYzbeTyEEgzMij/3mKcs++/p/Wgc7Y6bDudXt2U="; + } + "/${name}"; + }) super.${name}; + in + lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage + ) + selda + selda-sqlite + selda-json + ; + # Build the latest git version instead of the official release. This isn't # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 17a1b3c3ee6f..593a0409b995 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4842,7 +4842,6 @@ broken-packages: - secure-sockets # failure in job https://hydra.nixos.org/build/233254170 at 2023-09-02 - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02 - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02 - - selda # failure in job https://hydra.nixos.org/build/233234757 at 2023-09-02 - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02 - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02 - selinux # failure in job https://hydra.nixos.org/build/233192853 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1d5e1858e67d..a92ecbbc74fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265266,7 +265266,6 @@ self: { description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "selda-json" = callPackage From dc0fd26a1f6cd59a21002fe3c070a252d14d43b7 Mon Sep 17 00:00:00 2001 From: sorki Date: Mon, 11 Dec 2023 08:03:26 +0100 Subject: [PATCH 14/49] haskellPackages.hnix-store-core: move older to extraPackages so hnix-store-core can roll forward and we also have hnix-store-core_0_6_1_0 for hnix-store-remote and hnix. hnix has to use older core as well so it doesn't see two different versions as the older one gets pulled by the hnix-store-remote. --- .../development/haskell-modules/configuration-common.nix | 9 +++++++-- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 +- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 198e4b209ff1..26da8ec13c33 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -477,11 +477,16 @@ self: super: { matterhorn = doJailbreak super.matterhorn; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - hnix = dontCheck super.hnix; + hnix = dontCheck (super.hnix.override { + # 2023-12-11: Needs older core due to remote + hnix-store-core = self.hnix-store-core_0_6_1_0; + }); # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 - hnix-store-core = doJailbreak super.hnix-store-core; + hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; + # 2023-12-11: Needs older core + hnix-store-remote = super.hnix-store-remote.override { hnix-store-core = self.hnix-store-core_0_6_1_0; }; # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bfb638bd8b62..e92c2a1bc0e6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -33,7 +33,6 @@ default-package-overrides: # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 - rope-utf16-splay < 0.4.0.0 - - hnix-store-core < 0.7 # 2023-12-07: required by hnix-store-remote 0.6 # 2023-04-22: For dhall < 1.42 compatibility - dhall-nixpkgs == 1.0.9 @@ -113,6 +112,7 @@ extra-packages: - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 + - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a92ecbbc74fd..147299551e90 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -151097,7 +151097,7 @@ self: { ]; }) {}; - "hnix-store-core" = callPackage + "hnix-store-core_0_6_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -151126,12 +151126,13 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-core_0_7_0_0" = callPackage + "hnix-store-core" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring , case-insensitive, cereal, containers, cryptonite, directory @@ -151161,7 +151162,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; From a042857c78eae9eca028964b68a4b6aa612ccf6c Mon Sep 17 00:00:00 2001 From: sorki Date: Mon, 11 Dec 2023 08:11:22 +0100 Subject: [PATCH 15/49] haskellPackages.scat, haskellPackages.selda: drop hydraPlatforms = lib.platforms.none so it gets built by hydra after unbreak --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 147299551e90..f6521b472fd9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -262947,7 +262947,6 @@ self: { description = "Generates unique passwords for various websites from a single password"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; mainProgram = "scat"; }) {}; @@ -265265,7 +265264,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "selda-json" = callPackage From 9d6713fe82896e1ee83fa0d73d3afd598254ed2a Mon Sep 17 00:00:00 2001 From: sorki Date: Mon, 11 Dec 2023 08:13:06 +0100 Subject: [PATCH 16/49] haskellPackages.cachix_1_3_3: remove Doesn't built anymore due to older semver and can be pulled from older nixpkgs version iff needed. --- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 52 ------------------- 2 files changed, 53 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e92c2a1bc0e6..a19d7f6e7686 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -66,7 +66,6 @@ extra-packages: - Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0 - Cabal-syntax == 3.10.* # newest version required for cabal-install and other packages - - cachix < 1.4 # 2023-04-02: cachix 1.4{,.1} have known on multi-user Nix systems - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f6521b472fd9..3310d6e10376 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -58237,58 +58237,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "cachix_1_3_3" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , cachix-api, concurrent-extra, conduit, conduit-concurrent-map - , conduit-extra, conduit-zstd, containers, cookie, cryptonite - , deepseq, dhall, directory, ed25519, either, extra, filepath - , fsnotify, hercules-ci-cnix-store, here, hnix-store-core, hspec - , hspec-discover, http-client, http-client-tls, http-conduit - , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, network-uri, nix, optparse-applicative - , pretty-terminal, prettyprinter, process, protolude, resourcet - , retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary - , text, time, unix, unordered-containers, uri-bytestring, uuid - , vector, versions, websockets, wuss - }: - mkDerivation { - pname = "cachix"; - version = "1.3.3"; - sha256 = "0gnihq7xnd77m5rg14sw49bb0yr5r9qic2dwvk1w5xxfibh2wrib"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring cachix-api - concurrent-extra conduit conduit-concurrent-map conduit-extra - conduit-zstd containers cookie cryptonite deepseq dhall directory - ed25519 either extra filepath fsnotify hercules-ci-cnix-store here - hnix-store-core http-client http-client-tls http-conduit http-types - inline-c-cpp katip lukko lzma-conduit megaparsec memory mmorph - netrc network-uri optparse-applicative pretty-terminal - prettyprinter process protolude resourcet retry safe-exceptions - servant servant-auth servant-auth-client servant-client - servant-client-core servant-conduit stm stm-chans stm-conduit - systemd temporary text time unix unordered-containers - uri-bytestring uuid vector versions websockets wuss - ]; - libraryPkgconfigDepends = [ nix ]; - executableHaskellDepends = [ - aeson async base cachix-api conduit http-conduit katip protolude - safe-exceptions stm stm-chans stm-conduit time uuid websockets wuss - ]; - executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ - aeson base bytestring cachix-api dhall directory extra here hspec - protolude servant-auth-client servant-client-core temporary - ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.domenkozar ]; - }) {inherit (pkgs) nix;}; - "cachix" = callPackage ({ mkDerivation, aeson, ascii-progress, async, base , base64-bytestring, bytestring, cachix-api, concurrent-extra From 66ea46be076e4ea891d2c647b53701c12dae46ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ll?= Date: Tue, 12 Dec 2023 14:49:44 +0200 Subject: [PATCH 17/49] haskellPackages.rapid: remove broken flag Base dependency bumped to <4.18 in version 0.1.5 Co-authored-by: sternenseemann --- .../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 593a0409b995..0d953ef4cffd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4530,7 +4530,6 @@ broken-packages: - rangemin # failure in job https://hydra.nixos.org/build/233244031 at 2023-09-02 - rank1dynamic # failure in job https://hydra.nixos.org/build/233229881 at 2023-09-02 - rank-product # failure in job https://hydra.nixos.org/build/233239589 at 2023-09-02 - - rapid # failure in job https://hydra.nixos.org/build/233223077 at 2023-09-02 - rapid-term # failure in job https://hydra.nixos.org/build/233251731 at 2023-09-02 - Rasenschach # failure in job https://hydra.nixos.org/build/234445901 at 2023-09-13 - rating-chgk-info # failure in job https://hydra.nixos.org/build/233598034 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3310d6e10376..9cbdea784d1f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -249007,8 +249007,6 @@ self: { ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rapid-term" = callPackage From 38baa1f3af43f967824b1b3ecfadf94717dfe2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 12 Dec 2023 15:02:12 +0100 Subject: [PATCH 18/49] agdaPackages.standard-library: 1.7.3 -> 2.0 https://github.com/agda/agda-stdlib/blob/v2.0/CHANGELOG.md --- .../development/libraries/agda/standard-library/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 10fd1034ebe2..d7b49893b96f 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,18 +2,18 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.3"; + version = "2.0"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg="; + hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; preConfigure = '' - runhaskell GenerateEverything.hs + runhaskell GenerateEverything.hs --include-deprecated # We will only build/consider Everything.agda, in particular we don't want Everything*.agda # do be copied to the store. rm EverythingSafe.agda From 7ac0108ffa944bf9e6ddbb20c5b7929ba0df2baa Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 12 Dec 2023 23:16:59 +0100 Subject: [PATCH 19/49] haskell.packages.ghc98.haskell-language-server: Enable job --- pkgs/top-level/release-haskell.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index f1b5645e52b6..b40a39ac8640 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -497,9 +497,7 @@ let funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 2.3.0.0 - compilerNames.ghc8107 - # Not yet supported - compilerNames.ghc981 + compilerNames.ghc810 ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 From 54fc9f63561a5522161600bdbe392b67a698ce59 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 30 Sep 2023 23:33:08 +0200 Subject: [PATCH 20/49] haskell.packages.ghc9{6,8}: work around aarch64-darwin output cycles This ports our infamous patch for `Cabal` which cheesily prevents an output cycle for derivations that use separate bin outputs where references caused by the `Paths_*` module can't be eliminated by the GHC aarch64-darwin codegen backend. See also - the original issue #140774, - the original patch for GHC 9.2 #216857 - the ported patch for GHC 9.4 https://github.com/NixOS/nixpkgs/pull/240387/commits/f6f780f129f50df536fb301b9dac554f9744ab4b Co-authored-by: sternenseemann --- pkgs/development/compilers/ghc/9.2.4.nix | 2 +- pkgs/development/compilers/ghc/9.2.5.nix | 2 +- pkgs/development/compilers/ghc/9.2.6.nix | 2 +- pkgs/development/compilers/ghc/9.2.7.nix | 2 +- pkgs/development/compilers/ghc/9.2.8.nix | 2 +- pkgs/development/compilers/ghc/9.4.2.nix | 2 +- pkgs/development/compilers/ghc/9.4.3.nix | 2 +- pkgs/development/compilers/ghc/9.4.4.nix | 2 +- pkgs/development/compilers/ghc/9.4.5.nix | 2 +- pkgs/development/compilers/ghc/9.4.6.nix | 2 +- pkgs/development/compilers/ghc/9.4.7.nix | 2 +- pkgs/development/compilers/ghc/9.4.8.nix | 2 +- ...al-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch} | 0 pkgs/development/compilers/ghc/common-hadrian.nix | 9 +++++++++ 14 files changed, 21 insertions(+), 12 deletions(-) rename pkgs/development/compilers/ghc/{Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch => Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch} (100%) diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 97539cd54321..1d39599e3d14 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index a54894bda952..670af5c7ba9a 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 5079578239ea..95c74a33165b 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index 3db132036652..8ae29ac8d6ee 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 499f463e801a..e6c8d34d9c5f 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index 3d7852ec701e..7212513f21dc 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 7dc90444d008..3e3a9b711cb3 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index 7a06d124dfdb..25f79893de19 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 522eab95794f..f03e382738c4 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index affebd95763e..337f7070099a 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix index 705b85fb1159..e1635549d541 100644 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.8.nix b/pkgs/development/compilers/ghc/9.4.8.nix index e915c549dc62..9e46872dc6d2 100644 --- a/pkgs/development/compilers/ghc/9.4.8.nix +++ b/pkgs/development/compilers/ghc/9.4.8.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch b/pkgs/development/compilers/ghc/Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch similarity index 100% rename from pkgs/development/compilers/ghc/Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch rename to pkgs/development/compilers/ghc/Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 8bc9a5835177..7d18699c65fd 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -271,7 +271,16 @@ stdenv.mkDerivation ({ (if lib.versionAtLeast version "9.8" then ./docs-sphinx-7-ghc98.patch else ./docs-sphinx-7.patch ) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; + postPatch = '' patchShebangs --build . ''; From 43b6f6d3c6c058ebc6e07268fc7d830f22d187cf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 14 Dec 2023 19:01:34 +0100 Subject: [PATCH 21/49] haskell.lib.compose.triggerRebuild: don't discard old postUnpack --- pkgs/development/haskell-modules/lib/compose.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index f3a25e293d88..fe1a8ef7a014 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -354,7 +354,12 @@ rec { /* Add a dummy command to trigger a build despite an equivalent earlier build that is present in the store or cache. */ - triggerRebuild = i: overrideCabal (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + triggerRebuild = i: overrideCabal (drv: { + postUnpack = drv.postUnpack or "" + '' + + # trigger rebuild ${toString i} + ''; + }); /* Override the sources for the package and optionally the version. This also takes of removing editedCabalFile. From 727584094927a24d314e782ae3dcee737b35221a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 14 Dec 2023 19:02:20 +0100 Subject: [PATCH 22/49] haskellPackages.cachix: workaround cache corruption on aarch64-linux --- pkgs/development/haskell-modules/configuration-arm.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 54aa44efb488..5a9f923ad00e 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -46,6 +46,9 @@ self: super: { } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # AARCH64-SPECIFIC OVERRIDES + # Corrupted store path https://github.com/NixOS/nixpkgs/pull/272097#issuecomment-1848414265 + cachix = triggerRebuild 1 super.cachix; + # Doctests fail on aarch64 due to a GHCi linking bug # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 # TODO: figure out if needed on aarch32 as well From 69fbd8d01ee124fa0a17cb705372f56d2b7246e6 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 18 Dec 2023 18:11:54 +0100 Subject: [PATCH 23/49] haskell.packages.ghc98: Add system-cxx-std-lib attribute to fix eval --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index cab81349733e..d7a214de0ca0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -39,6 +39,7 @@ self: super: { process = null; rts = null; stm = null; + system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; From 07c30835e14367d32c24ba3c39793fba46aac1d8 Mon Sep 17 00:00:00 2001 From: sorki Date: Tue, 19 Dec 2023 09:18:52 +0100 Subject: [PATCH 24/49] haskellPackages: update dhall and related packages --- .../haskell-modules/configuration-common.nix | 32 +-- .../configuration-hackage2nix/main.yaml | 4 - .../configuration-hackage2nix/stackage.yaml | 4 - .../haskell-modules/hackage-packages.nix | 199 ------------------ 4 files changed, 5 insertions(+), 234 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 26da8ec13c33..6f85f0d6bcfa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1218,34 +1218,12 @@ self: super: { # Generate cli completions for 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 = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] - (overrideCabal (drv: { - patches = [ - # Compatibility with hnix 0.16, waiting for release - # https://github.com/dhall-lang/dhall-haskell/pull/2474 - (pkgs.fetchpatch { - name = "dhall-nix-hnix-0.16.patch"; - url = "https://github.com/dhall-lang/dhall-haskell/commit/49b9b3e3ce1718a89773c2b1bfa3c2af1a6e8752.patch"; - sha256 = "12sh5md81nlhyzzkmf7jrll3w1rvg2j48m57hfyvjn8has9c4gw6"; - stripLen = 1; - includes = [ "dhall-nix.cabal" "src/Dhall/Nix.hs" ]; - }) - ] ++ drv.patches or []; - prePatch = drv.prePatch or "" + '' - ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal - ''; - }) super.dhall-nix); + dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; + # 2023-12-19: jailbreaks due to hnix-0.17 https://github.com/dhall-lang/dhall-haskell/pull/2559 + # until dhall-nix 1.1.26+, dhall-nixpkgs 1.0.10+ + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] (doJailbreak super.dhall-nix); + dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] (doJailbreak super.dhall-nixpkgs); dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] - (overrideCabal (drv: { - # Allow hnix 0.16, needs unreleased bounds change - # https://github.com/dhall-lang/dhall-haskell/pull/2474 - jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true; - }) super.dhall-nixpkgs); crypton-connection = super.crypton-connection.override { # requires tls >= 1.7 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a19d7f6e7686..5a865d254459 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -34,10 +34,6 @@ default-package-overrides: - hasql-dynamic-statements < 0.3.1.2 - rope-utf16-splay < 0.4.0.0 - # 2023-04-22: For dhall < 1.42 compatibility - - dhall-nixpkgs == 1.0.9 - - dhall-nix == 1.1.25 - # 2023-07-06: ghcide-2.0.0.1 explicitly needs implicit-hie < 0.1.3, because some sort of # breaking change was introduced in implicit-hie-0.1.3.0. # https://github.com/haskell/haskell-language-server/blob/feb596592de95f09cf4ee885f3e74178161919f1/ghcide/ghcide.cabal#L107-L111 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index fa9559a1b668..e97e525ba7de 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -561,10 +561,6 @@ default-package-overrides: - deriving-trans ==0.5.2.0 - detour-via-sci ==1.0.0 - df1 ==0.4.2 - - dhall ==1.41.2 - - dhall-bash ==1.0.40 - - dhall-json ==1.7.11 - - dhall-yaml ==1.2.12 - di ==1.3 - diagrams ==1.4.1 - diagrams-cairo ==1.4.2.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9cbdea784d1f..af52d38df034 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -85463,92 +85463,6 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write - , base, base16-bytestring, bytestring, case-insensitive, cborg - , cborg-json, containers, contravariant, cryptohash-sha256 - , data-fix, deepseq, Diff, directory, doctest, dotgen, either - , exceptions, filepath, foldl, gauge, generic-random, half - , hashable, haskeline, http-client, http-client-tls, http-types - , indexed-traversable, lens-family-core, megaparsec, mmorph - , mockery, mtl, network-uri, optparse-applicative - , parser-combinators, parsers, pretty-simple, prettyprinter - , prettyprinter-ansi-terminal, profunctors, QuickCheck - , quickcheck-instances, repline, scientific, serialise - , special-values, spoon, system-filepath, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-silver, template-haskell, temporary, text, text-manipulate - , text-short, th-lift-instances, time, transformers, turtle - , unordered-containers, uri-encode, vector - }: - mkDerivation { - pname = "dhall"; - version = "1.41.2"; - sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; - revision = "5"; - editedCabalFile = "0jhhwzzinlxyb2gxr2jcyr71mbdig7njkw2zi8znns1ik6ix0d4c"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base - base16-bytestring bytestring case-insensitive cborg cborg-json - containers contravariant cryptohash-sha256 data-fix deepseq Diff - directory dotgen either exceptions filepath half hashable haskeline - http-client http-client-tls http-types indexed-traversable - lens-family-core megaparsec mmorph mtl network-uri - optparse-applicative parser-combinators parsers pretty-simple - prettyprinter prettyprinter-ansi-terminal profunctors repline - scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unordered-containers - uri-encode vector - ]; - executableHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base - base16-bytestring bytestring case-insensitive cborg cborg-json - containers contravariant data-fix deepseq Diff directory dotgen - either exceptions filepath half hashable haskeline - indexed-traversable lens-family-core megaparsec mmorph mtl - network-uri optparse-applicative parser-combinators parsers - pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors - repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unordered-containers - uri-encode vector - ]; - testHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base - base16-bytestring bytestring case-insensitive cborg cborg-json - containers contravariant data-fix deepseq Diff directory doctest - dotgen either exceptions filepath foldl generic-random half - hashable haskeline http-client http-client-tls indexed-traversable - lens-family-core megaparsec mmorph mockery mtl network-uri - optparse-applicative parser-combinators parsers pretty-simple - prettyprinter prettyprinter-ansi-terminal profunctors QuickCheck - quickcheck-instances repline scientific serialise special-values - spoon system-filepath tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-silver template-haskell temporary text - text-manipulate text-short th-lift-instances time transformers - turtle unordered-containers uri-encode vector - ]; - benchmarkHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base - base16-bytestring bytestring case-insensitive cborg cborg-json - containers contravariant data-fix deepseq Diff directory dotgen - either exceptions filepath gauge half hashable haskeline - indexed-traversable lens-family-core megaparsec mmorph mtl - network-uri optparse-applicative parser-combinators parsers - pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors - repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unordered-containers - uri-encode vector - ]; - doCheck = false; - description = "A configuration language guaranteed to terminate"; - license = lib.licenses.bsd3; - mainProgram = "dhall"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall_1_42_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg , cborg-json, containers, contravariant, cryptohash-sha256 @@ -85628,37 +85542,11 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall"; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; "dhall-bash" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall - , neat-interpolation, optparse-generic, shell-escape, text - }: - mkDerivation { - pname = "dhall-bash"; - version = "1.0.40"; - sha256 = "0fkzrj4q97cfg96slc6y3sihr9ahcj7lsjpv4kfyrvlw7jxgxld9"; - revision = "1"; - editedCabalFile = "1hpkwk2lwfkvrizwifggm1dv1cmn612axvrbpv7hnxxzz22yf3a1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers dhall neat-interpolation shell-escape - text - ]; - executableHaskellDepends = [ - base bytestring dhall optparse-generic text - ]; - description = "Compile Dhall to Bash"; - license = lib.licenses.bsd3; - mainProgram = "dhall-to-bash"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall-bash_1_0_41" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: @@ -85679,7 +85567,6 @@ self: { ]; description = "Compile Dhall to Bash"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-bash"; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -85804,38 +85691,6 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal - , base, bytestring, containers, dhall, exceptions, filepath - , lens-family-core, optparse-applicative, prettyprinter - , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit - , tasty-silver, text, unordered-containers, vector - }: - mkDerivation { - pname = "dhall-json"; - version = "1.7.11"; - sha256 = "0a7gcnx5xm2b1kvprvxlm7bjk68c30qs8cy3596pyngw7grsrhi6"; - revision = "1"; - editedCabalFile = "0m5sngc1j7jagn95qmjz7gpw2jgqnnafgr6nwd506q8z2jg2a3my"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty aeson-yaml base bytestring containers dhall - exceptions filepath lens-family-core optparse-applicative - prettyprinter scientific text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring dhall exceptions - optparse-applicative prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - aeson base bytestring dhall tasty tasty-hunit tasty-silver text - ]; - description = "Convert between Dhall and JSON or YAML"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall-json_1_7_12" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -85864,7 +85719,6 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -85921,31 +85775,6 @@ self: { }) {}; "dhall-nix" = callPackage - ({ mkDerivation, base, containers, data-fix, dhall, hnix - , lens-family-core, neat-interpolation, optparse-generic, text - }: - mkDerivation { - pname = "dhall-nix"; - version = "1.1.25"; - sha256 = "1541h6hym254dycq6h40rqn82qbk74d071k67hf62aqd9l2g4y6p"; - revision = "1"; - editedCabalFile = "05hcas28mbi1q3x5wpkapj57b7jw1q9npbhx1lyic3df7sqbjrnw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-fix dhall hnix lens-family-core - neat-interpolation text - ]; - executableHaskellDepends = [ - base dhall hnix optparse-generic text - ]; - description = "Dhall to Nix compiler"; - license = lib.licenses.bsd3; - mainProgram = "dhall-to-nix"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall-nix_1_1_26" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: @@ -85964,38 +85793,11 @@ self: { ]; description = "Dhall to Nix compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nix"; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; "dhall-nixpkgs" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, data-fix, dhall, foldl, hnix, lens-family-core - , megaparsec, mmorph, neat-interpolation, network-uri - , optparse-applicative, prettyprinter, text, transformers, turtle - }: - mkDerivation { - pname = "dhall-nixpkgs"; - version = "1.0.9"; - sha256 = "1j0i2qhizmzhz2l46xwklgkki6nqa6imzdqdfm6xy3gkfdlna753"; - revision = "1"; - editedCabalFile = "0140jhwf5mz9i5k1v0mbljhr77rgfvhbs5s3ak9naagnxszy725j"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bytestring data-fix - dhall foldl hnix lens-family-core megaparsec mmorph - neat-interpolation network-uri optparse-applicative prettyprinter - text transformers turtle - ]; - description = "Convert Dhall projects to Nix packages"; - license = lib.licenses.bsd3; - mainProgram = "dhall-to-nixpkgs"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall-nixpkgs_1_0_10" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, data-fix, dhall, foldl, hnix, lens-family-core , megaparsec, mmorph, neat-interpolation, network-uri @@ -86015,7 +85817,6 @@ self: { ]; description = "Convert Dhall projects to Nix packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nixpkgs"; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; From 5a098d2cb6db1815c62f76fdf6a159c121f3225a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 18 Dec 2023 17:12:16 +0200 Subject: [PATCH 25/49] haskellPackages.hopengpg-tools: Unmark broken https://github.com/drduh/YubiKey-Guide/issues/370 https://github.com/drduh/YubiKey-Guide/issues/406 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f85f0d6bcfa..6f9d9f3d57fb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1252,6 +1252,10 @@ self: super: { })) ]; + hopenpgp-tools = super.hopenpgp-tools.override { + optparse-applicative = self.optparse-applicative_0_18_1_0; + }; + # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0d953ef4cffd..f3ed0613763e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2496,7 +2496,6 @@ broken-packages: - hopencc # failure in job https://hydra.nixos.org/build/233192954 at 2023-09-02 - hopencl # failure in job https://hydra.nixos.org/build/233249443 at 2023-09-02 - HOpenCV # failure in job https://hydra.nixos.org/build/233255422 at 2023-09-02 - - hopenpgp-tools # failure in job https://hydra.nixos.org/build/233259304 at 2023-09-02 - hopfield # failure in job https://hydra.nixos.org/build/233598214 at 2023-09-02 - hoppy-generator # failure in job https://hydra.nixos.org/build/233240608 at 2023-09-02 - hops # failure in job https://hydra.nixos.org/build/233207172 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index af52d38df034..23729fcab348 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -152323,7 +152323,6 @@ self: { description = "hOpenPGP-based command-line tools"; license = lib.licenses.agpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hopenssl" = callPackage From 21acd3b7875379b642ae075b8c122f3c0bbe24cf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Dec 2023 10:50:28 +0100 Subject: [PATCH 26/49] haskell.packages.*.{terminfo,xhtml}: allow builds on Hydra for cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have some jobs that hit this case in release-haskell.nix, but they are not actually created, since we forgot to relax hydraPlatforms… --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) 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 c541c852df36..3fa693bebd73 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -39,14 +39,14 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 7cd010e22d9c..7d71328bdc23 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -38,14 +38,14 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; 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 de1412f4c0ee..477fc72395b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -40,14 +40,14 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 99f48333323c..dce4a6f3750b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -43,7 +43,7 @@ self: super: { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else haskellLib.doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; 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 0c1bf8518ea4..7f79e365417f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -40,14 +40,14 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; 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 d13e4cfe9cfc..79bdee986940 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -46,14 +46,14 @@ in { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Jailbreaks & Version Updates diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index bae278f126e4..879f06537353 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -54,7 +54,7 @@ self: super: { system-cxx-std-lib = null; template-haskell = null; # terminfo is not built if GHC is a cross compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index cab81349733e..b0bc3fb86ffc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -41,7 +41,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; From bd16733467dee0b515fc0c0f8a56b9d548fc132c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Dec 2023 10:51:32 +0100 Subject: [PATCH 27/49] release-haskell.nix: add missing ghc948 jobs --- pkgs/top-level/release-haskell.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index f1b5645e52b6..eb72f5b97c10 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -70,6 +70,7 @@ let ghc945 ghc946 ghc947 + ghc948 ghc962 ghc963 ghc981 @@ -567,6 +568,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc947 + compilerNames.ghc948 compilerNames.ghc962 compilerNames.ghc963 ]; From 3d2fdba896fd532fc7d6a4b13e3e5c10873c8af2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Dec 2023 10:57:08 +0100 Subject: [PATCH 28/49] pkgsCross.*.haskell.packages.ghc96.terminfo: fix evaluation --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 879f06537353..9a341fb02dbc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -54,7 +54,7 @@ self: super: { system-cxx-std-lib = null; template-haskell = null; # terminfo is not built if GHC is a cross compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; From 9067af4fb42166ebb2c06ec1cc9f044c83f4ce94 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Dec 2023 12:01:38 +0100 Subject: [PATCH 29/49] haskell.compiler: drop all ghcs without an stackage LTS snapshot https://www.stackage.org/ lists the latest LTS snapshot for any GHC version which, on the flipside, lets us discover which versions don't have a corresponding LTS snapshot. There is really no reason to keep around GHCs that only appeared in some nightly snapshot way back. haskell.compiler.ghc924: remove at 9.2.4 haskell.compiler.ghc942: remove at 9.4.2 haskell.compiler.ghc943: remove at 9.4.3 haskell.compiler.ghc944: remove at 9.4.4 haskell.compiler.ghc962: remove at 9.6.2 --- pkgs/development/compilers/ghc/9.2.4.nix | 392 ---------------------- pkgs/development/compilers/ghc/9.4.2.nix | 398 ----------------------- pkgs/development/compilers/ghc/9.4.3.nix | 398 ----------------------- pkgs/development/compilers/ghc/9.4.4.nix | 398 ----------------------- pkgs/development/compilers/ghc/9.6.2.nix | 4 - pkgs/top-level/haskell-packages.nix | 138 +------- 6 files changed, 2 insertions(+), 1726 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.2.4.nix delete mode 100644 pkgs/development/compilers/ghc/9.4.2.nix delete mode 100644 pkgs/development/compilers/ghc/9.4.3.nix delete mode 100644 pkgs/development/compilers/ghc/9.4.4.nix delete mode 100644 pkgs/development/compilers/ghc/9.6.2.nix diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix deleted file mode 100644 index 1d39599e3d14..000000000000 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ /dev/null @@ -1,392 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, xattr, autoSignDarwinBinariesHook -, bash - -, libiconv ? null, ncurses -, glibcLocales ? null - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc - || stdenv.targetPlatform.isAarch64) -, # LLVM is conceptually a run-time-only dependency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slightly slower native - # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableNativeBignum -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - # Build haddocks for boot packages with hyperlinking - EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump - - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + - # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) - # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. - # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell - lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC -fexternal-dynamic-refs - GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Sometimes we have to dispatch between the bintools wrapper and the unwrapped - # derivation for certain tools depending on the platform. - bintoolsFor = { - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then targetCC.bintools - else targetCC.bintools.bintools; - # Same goes for strip. - strip = - # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin - then targetCC.bintools - else targetCC.bintools.bintools; - }; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableNativeBignum "-native-bignum") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "9.2.4"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - (fetchpatch { - name = "ghc-docs-sphinx-6.0.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; - sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; - }) - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - ./docs-sphinx-7.patch - # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; - sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs - # Can be removed if the Cabal library included with ghc backports the linked fix - (fetchpatch { - url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; - }) - ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" - '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' - export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - echo -n "${buildMK}" > mk/build.mk - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - - # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 - export XATTR=${lib.getBin xattr}/bin/xattr - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - autoSignDarwinBinariesHook - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - # big-parallel allows us to build with more than 2 cores on - # Hydra which already warrants a significant speedup - requiredSystemFeatures = [ "big-parallel" ]; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix deleted file mode 100644 index 7212513f21dc..000000000000 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ /dev/null @@ -1,398 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, xattr, autoSignDarwinBinariesHook -, bash - -, libiconv ? null, ncurses -, glibcLocales ? null - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc - || stdenv.targetPlatform.isAarch64) -, # LLVM is conceptually a run-time-only dependency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slightly slower native - # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableNativeBignum -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - # Build haddocks for boot packages with hyperlinking - EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump - - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + - # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) - # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. - # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell - lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC -fexternal-dynamic-refs - GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Sometimes we have to dispatch between the bintools wrapper and the unwrapped - # derivation for certain tools depending on the platform. - bintoolsFor = { - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then targetCC.bintools - else targetCC.bintools.bintools; - # Same goes for strip. - strip = - # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin - then targetCC.bintools - else targetCC.bintools.bintools; - }; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableNativeBignum "-native-bignum") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "9.4.2"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs - # Can be removed if the Cabal library included with ghc backports the linked fix - (fetchpatch { - url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; - }) - - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - (fetchpatch { - name = "ghc-docs-sphinx-6.0.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; - sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; - }) - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - ./docs-sphinx-7.patch - ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" - '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' - export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - - echo -n "${buildMK}" > mk/build.mk - - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - - # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 - export XATTR=${lib.getBin xattr}/bin/xattr - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - '' - # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have - # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. - + '' - substituteInPlace configure --replace \ - 'MinBootGhcVersion="9.0"' \ - 'MinBootGhcVersion="8.10"' - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - autoSignDarwinBinariesHook - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - # big-parallel allows us to build with more than 2 cores on - # Hydra which already warrants a significant speedup - requiredSystemFeatures = [ "big-parallel" ]; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix deleted file mode 100644 index 3e3a9b711cb3..000000000000 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ /dev/null @@ -1,398 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, xattr, autoSignDarwinBinariesHook -, bash - -, libiconv ? null, ncurses -, glibcLocales ? null - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc - || stdenv.targetPlatform.isAarch64) -, # LLVM is conceptually a run-time-only dependency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slightly slower native - # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableNativeBignum -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - # Build haddocks for boot packages with hyperlinking - EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump - - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + - # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) - # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. - # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell - lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC -fexternal-dynamic-refs - GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Sometimes we have to dispatch between the bintools wrapper and the unwrapped - # derivation for certain tools depending on the platform. - bintoolsFor = { - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then targetCC.bintools - else targetCC.bintools.bintools; - # Same goes for strip. - strip = - # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin - then targetCC.bintools - else targetCC.bintools.bintools; - }; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableNativeBignum "-native-bignum") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "9.4.3"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs - # Can be removed if the Cabal library included with ghc backports the linked fix - (fetchpatch { - url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; - }) - - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - (fetchpatch { - name = "ghc-docs-sphinx-6.0.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; - sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; - }) - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - ./docs-sphinx-7.patch - ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" - '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' - export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - - echo -n "${buildMK}" > mk/build.mk - - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - - # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 - export XATTR=${lib.getBin xattr}/bin/xattr - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - '' - # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have - # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. - + '' - substituteInPlace configure --replace \ - 'MinBootGhcVersion="9.0"' \ - 'MinBootGhcVersion="8.10"' - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - autoSignDarwinBinariesHook - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - # big-parallel allows us to build with more than 2 cores on - # Hydra which already warrants a significant speedup - requiredSystemFeatures = [ "big-parallel" ]; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix deleted file mode 100644 index 25f79893de19..000000000000 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ /dev/null @@ -1,398 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, xattr, autoSignDarwinBinariesHook -, bash - -, libiconv ? null, ncurses -, glibcLocales ? null - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc - || stdenv.targetPlatform.isAarch64) -, # LLVM is conceptually a run-time-only dependency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slightly slower native - # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableNativeBignum -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - # Build haddocks for boot packages with hyperlinking - EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump - - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + - # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) - # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. - # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell - lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC -fexternal-dynamic-refs - GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Sometimes we have to dispatch between the bintools wrapper and the unwrapped - # derivation for certain tools depending on the platform. - bintoolsFor = { - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then targetCC.bintools - else targetCC.bintools.bintools; - # Same goes for strip. - strip = - # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin - then targetCC.bintools - else targetCC.bintools.bintools; - }; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableNativeBignum "-native-bignum") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "9.4.4"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "e8cef25a6ded1531cda7a90488d0cfb6d780657d16636daa59430be030cd67e2"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs - # Can be removed if the Cabal library included with ghc backports the linked fix - (fetchpatch { - url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; - }) - - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - (fetchpatch { - name = "ghc-docs-sphinx-6.0.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; - sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; - }) - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - ./docs-sphinx-7.patch - ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC needs the locale configured during the Haddock phase. - LANG = "en_US.UTF-8"; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" - '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' - export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - - echo -n "${buildMK}" > mk/build.mk - - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - - # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 - export XATTR=${lib.getBin xattr}/bin/xattr - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - '' - # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have - # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. - + '' - substituteInPlace configure --replace \ - 'MinBootGhcVersion="9.0"' \ - 'MinBootGhcVersion="8.10"' - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - autoSignDarwinBinariesHook - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - # big-parallel allows us to build with more than 2 cores on - # Hydra which already warrants a significant speedup - requiredSystemFeatures = [ "big-parallel" ]; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/9.6.2.nix b/pkgs/development/compilers/ghc/9.6.2.nix deleted file mode 100644 index a0f764d016b5..000000000000 --- a/pkgs/development/compilers/ghc/9.6.2.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix rec { - version = "9.6.2"; - sha256 = "1b510c5f8753c3ba24851702c6c9da7d81dc5e47fe3ecb7af39c7c2613abf170"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44ff6a6dd59e..7bf0431130fb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -13,21 +13,16 @@ let "ghc90" "ghc902" "ghc92" - "ghc924" "ghc925" "ghc926" "ghc927" "ghc928" "ghc94" - "ghc942" - "ghc943" - "ghc944" "ghc945" "ghc946" "ghc947" "ghc948" "ghc96" - "ghc962" "ghc963" "ghc98" "ghc981" @@ -111,20 +106,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc90 = compiler.ghc902; - ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { - bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 - else - packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { bootPkgs = if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -182,78 +163,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc92 = compiler.ghc928; - ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then - # TODO(@sternenseemann): package bindist - packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 - else - packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; - ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then - # TODO(@sternenseemann): package bindist - packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 - else - packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; - ghc944 = callPackage ../development/compilers/ghc/9.4.4.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then - # TODO(@sternenseemann): package bindist - packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 - else - packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc945 = callPackage ../development/compilers/ghc/9.4.5.nix { bootPkgs = # Building with 9.2 is broken due to @@ -351,31 +260,13 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc94 = compiler.ghc948; - ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc924 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 - else - packages.ghc924Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. if stdenv.hostPlatform.isAarch32 then - packages.ghc924 + packages.ghc928 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 + packages.ghc928 else packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; @@ -483,11 +374,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; ghc90 = packages.ghc902; - ghc924 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc924; - ghc = bh.compiler.ghc924; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; - }; ghc925 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc925; ghc = bh.compiler.ghc925; @@ -509,21 +395,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = packages.ghc928; - ghc942 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc942; - ghc = bh.compiler.ghc942; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; - ghc943 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc943; - ghc = bh.compiler.ghc943; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; - ghc944 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc944; - ghc = bh.compiler.ghc944; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; ghc945 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc945; ghc = bh.compiler.ghc945; @@ -545,11 +416,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghc94 = packages.ghc948; - ghc962 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc962; - ghc = bh.compiler.ghc962; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc963 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc963; ghc = bh.compiler.ghc963; From 7998143a43ae0ab51eed75e92851446daddc7966 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Dec 2023 11:54:22 +0100 Subject: [PATCH 30/49] haskell.compiler: also build manual for cross-compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The reasoning given for disabling it is flawed: In most cases, sphinx and its dependencies are already in the binary cache, since we only need them as build tools—sphinx for the build platform is just the normal pkgs.sphinx, since it doesn't care about targetPlatform. We just need to disable it when the buildPlatform is also musl, so we avoid pulling in sphinx in pkgsMusl. --- pkgs/development/compilers/ghc/8.10.7.nix | 9 +++------ pkgs/development/compilers/ghc/9.0.2.nix | 9 +++------ pkgs/development/compilers/ghc/9.2.4.nix | 9 +++------ pkgs/development/compilers/ghc/9.2.5.nix | 9 +++------ pkgs/development/compilers/ghc/9.2.6.nix | 9 +++------ pkgs/development/compilers/ghc/9.2.7.nix | 9 +++------ pkgs/development/compilers/ghc/9.2.8.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.2.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.3.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.4.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.5.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.6.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.7.nix | 9 +++------ pkgs/development/compilers/ghc/9.4.8.nix | 9 +++------ pkgs/development/compilers/ghc/common-hadrian.nix | 10 ++++------ 15 files changed, 46 insertions(+), 90 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 6eedcb6374be..c49c274c67d4 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -44,12 +44,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 92ed154a02ba..bdfff2b795a4 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pullls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 97539cd54321..d3824de3cefc 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index a54894bda952..a2980712ee24 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 5079578239ea..57c827010359 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index 3db132036652..2f5604d3641b 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 499f463e801a..df1b226ade99 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -46,12 +46,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index 3d7852ec701e..84208a5fb673 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 7dc90444d008..0037b2def836 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index 7a06d124dfdb..037da42a164d 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 522eab95794f..75503d0bb218 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index affebd95763e..dee464d48844 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix index 705b85fb1159..dda817015d48 100644 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/9.4.8.nix b/pkgs/development/compilers/ghc/9.4.8.nix index e915c549dc62..84e482566114 100644 --- a/pkgs/development/compilers/ghc/9.4.8.nix +++ b/pkgs/development/compilers/ghc/9.4.8.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 8bc9a5835177..2d1ba01d8e34 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -162,13 +162,11 @@ } , # Whether to build sphinx documentation. + # TODO(@sternenseemann): Hadrian ignores the --docs flag if finalStage = Stage1 enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , # Whether to disable the large address space allocator From a6e59fff33ebb2556633db4ef17150f848dfdbbd Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 22 Dec 2023 16:34:17 +0800 Subject: [PATCH 31/49] haskellPackages.warp: enable tests and fix eval error --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 --- pkgs/development/haskell-modules/configuration-nix.nix | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 79f19bd2411d..0f77e21634e3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -265,9 +265,6 @@ self: super: { })]; }) super.ConfigFile; - # The curl executable is required for withApplication tests. - warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29; - # The NCG backend for aarch64 generates invalid jumps in some situations, # the workaround on 9.6 is to revert to the LLVM backend (which is used # for these sorts of situations even on 9.2 and 9.4). diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b3fd585843a1..03f065d632e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -394,7 +394,6 @@ self: super: builtins.intersectAttrs super { socket = dontCheck super.socket; stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw - warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw @@ -414,6 +413,9 @@ self: super: builtins.intersectAttrs super { mustache = dontCheck super.mustache; arch-web = dontCheck super.arch-web; + # The curl executable is required for withApplication tests. + warp = addTestToolDepend pkgs.curl super.warp; + # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements; From 04a4f1f8a5e1fb3040912f1b3c6e05020d2542c7 Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 22 Dec 2023 11:12:13 +0100 Subject: [PATCH 32/49] git-annex: bump hash --- 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 6f9d9f3d57fb..97ece05b508b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -328,7 +328,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 = "14x7avdvf0fjqncwxydlrv32lbyfiqrm346nvypzg27gq46fvkcg"; + sha256 = "sha256-DFdfRh4ST4hZl9AOsp0/Y4N+bT2Y1NoLdwi5sxVnCaw="; # 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 4c395aa8e3a01333b7250ddf1b02bcaed05388bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 23 Dec 2023 21:52:05 +0100 Subject: [PATCH 33/49] agdaPackages.functional-linear-algebra: 0.4.1 -> 0.5.0 https://github.com/ryanorendorff/functional-linear-algebra/releases/tag/v0.5.0 --- .../libraries/agda/functional-linear-algebra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index c32c301dd3b3..c91896993ce5 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.4.1"; + version = "0.5.0"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,7 +10,7 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "GrTeMEHEXb0t2RgHWiGfvvofNYl8YYaaoCE18JrG6Q4="; + sha256 = "sha256-3nme/eH4pY6bD0DkhL4Dj/Vp/WnZqkQtZTNk+n1oAyY="; }; preConfigure = '' From 5692c3bc501ffe00c1e9a4ef92ad7b014f351fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 27 Dec 2023 01:13:31 +0100 Subject: [PATCH 34/49] agdaPackages.agda-categories: 0.1.7.2 -> 0.2.0 https://github.com/agda/agda-categories/releases/tag/v0.2.0 --- .../libraries/agda/agda-categories/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 2b26a9562965..11c129badd64 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.2"; + version = "0.2.0"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c="; + sha256 = "sha256-GQuQxzYSQxAIVSJ1vf0blRC0juoxAqD1AHW66H/6NSk="; }; postPatch = '' @@ -26,6 +26,10 @@ mkDerivation rec { find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ''; + # agda: Heap exhausted; + # agda: Current maximum heap size is 4294967296 bytes (4096 MB). + GHCRTS = "-M5G"; + buildInputs = [ standard-library ]; meta = with lib; { From 9a00eb12503d9e5eac895c2eae16006f8f0b625f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 27 Dec 2023 09:23:06 +0900 Subject: [PATCH 35/49] haskellPackages.gi-vte: fix by adding missing gi-cairo dep --- .../haskell-modules/configuration-common.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 97ece05b508b..7c3e26c96528 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2186,6 +2186,22 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + # Missing dependency on gi-cairo + # https://github.com/haskell-gi/haskell-gi/pull/420 + gi-vte = + overrideCabal + (oldAttrs: { + # This is implemented as a sed expression instead of pulling a patch + # from upstream because the gi-vte repo doesn't actually contain a + # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata + # in the repo. + postPatch = (oldAttrs.postPatch or "") + '' + sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal + ''; + buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo]; + }) + super.gi-vte; + # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { From ca89b111a551efb722f3906a4ebb55bf15caa6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 27 Dec 2023 12:17:49 +0100 Subject: [PATCH 36/49] agdaPackages.agdarsec: mark as broken --- pkgs/development/libraries/agda/agdarsec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/agdarsec/default.nix b/pkgs/development/libraries/agda/agdarsec/default.nix index ccdf65f96570..34730ae17f4e 100644 --- a/pkgs/development/libraries/agda/agdarsec/default.nix +++ b/pkgs/development/libraries/agda/agdarsec/default.nix @@ -24,5 +24,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ turion ]; + broken = true; }; } From b629581dc93787c611962c0b2580e8295b2991ac Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 13:41:29 +0100 Subject: [PATCH 37/49] release-haskell: Correctly disable hls jobs on ghc 8.10.7 --- pkgs/top-level/release-haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index b40a39ac8640..2e4a440a28f8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -497,7 +497,7 @@ let funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 2.3.0.0 - compilerNames.ghc810 + compilerNames.ghc8107 ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 From 258151d138300f381bf1d94ddd4228045ceec901 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 14:00:07 +0100 Subject: [PATCH 38/49] haskellPackages.update-nix-fetchgit: Fix build --- .../haskell-modules/configuration-common.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7c3e26c96528..e9e2dcc86fb2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -482,6 +482,7 @@ self: super: { hnix-store-core = self.hnix-store-core_0_6_1_0; }); + # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; @@ -1690,16 +1691,27 @@ self: super: { # - Patch can be removed on next package set bump (for v0.2.11) # 2023-06-26: Test failure: https://hydra.nixos.org/build/225081865 - update-nix-fetchgit = dontCheck (let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; - in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal - (drv: { - buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; - postInstall = drv.postInstall or "" + '' - wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ - lib.makeBinPath deps - }" - ''; - }) (addTestToolDepends deps super.update-nix-fetchgit))); + update-nix-fetchgit = let + deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; + in lib.pipe super.update-nix-fetchgit [ + dontCheck + (self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ]) + (overrideCabal (drv: { + buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; + postInstall = drv.postInstall or "" + '' + wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ + lib.makeBinPath deps + }" + ''; + })) + (addTestToolDepends deps) + # Patch for hnix compat. + (appendPatch (fetchpatch { + url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/dfa34f9823e282aa8c5a1b8bc95ad8def0e8d455.patch"; + sha256 = "sha256-yBjn1gVihVTlLewKgJc2I9gEj8ViNBAmw0bcsb5rh1A="; + excludes = [ "cabal.project" ]; + })) + ]; # Raise version bounds: https://github.com/idontgetoutmuch/binary-low-level/pull/16 binary-strict = appendPatches [ From aa84d903e16ebfe60fecac34133c091045a8f29a Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 15:11:40 +0100 Subject: [PATCH 39/49] haskellPackages.compact: Unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e412bac785e4..476e9438c6cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -829,7 +829,6 @@ broken-packages: - commodities # failure in job https://hydra.nixos.org/build/233239851 at 2023-09-02 - Compactable # failure in job https://hydra.nixos.org/build/233227285 at 2023-09-02 - compactable # failure in job https://hydra.nixos.org/build/233228106 at 2023-09-02 - - compact # failure in job https://hydra.nixos.org/build/233203421 at 2023-09-02 - compact-list # failure in job https://hydra.nixos.org/build/233241961 at 2023-09-02 - compact-map # failure in job https://hydra.nixos.org/build/233201665 at 2023-09-02 - compact-sequences # failure in job https://hydra.nixos.org/build/233208553 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7ea609822b74..3d5848cce34f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -69057,8 +69057,6 @@ self: { testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compact-list" = callPackage @@ -152322,7 +152320,6 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = lib.licenses.agpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "hopenssl" = callPackage From 15257e4500f260e7cbfb3783db2d8aabd17e4114 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 17:44:42 +0100 Subject: [PATCH 40/49] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 9 --------- pkgs/development/haskell-modules/hackage-packages.nix | 9 --------- 2 files changed, 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b8928b58efe1..e720f9b046b5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -235,7 +235,6 @@ dont-distribute-packages: - IORefCAS - IndexedList - InfixApplicative - - InternedData - JSON-Combinator - JSON-Combinator-Examples - Javasf @@ -293,7 +292,6 @@ dont-distribute-packages: - NTRU - NXT - NaperianNetCDF - - NaturalLanguageAlphabets - NearContextAlgebra - Ninjas - NoSlow @@ -662,7 +660,6 @@ dont-distribute-packages: - bip32 - birch-beer - bird - - bisc - biscuit-servant - bishbosh - bit-array @@ -913,8 +910,6 @@ dont-distribute-packages: - comonad-random - compaREST - compact-mutable - - compact-mutable-vector - - compact-socket - complexity - comprehensions-ghc - computational-algebra @@ -3509,9 +3504,6 @@ dont-distribute-packages: - secrm - sednaDBXML - seitz-symbol - - selda-json - - selda-postgresql - - selda-sqlite - selenium-server - semantic-source - semantic-version @@ -3842,7 +3834,6 @@ dont-distribute-packages: - tagged-list - tagged-th - tagsoup-navigate - - tagstew - tahoe-directory - tahoe-great-black-swamp - tahoe-ssk diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3d5848cce34f..b11171c0d1ab 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11883,7 +11883,6 @@ self: { ]; description = "Data interning (with compact regions where possible)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Interpolation" = callPackage @@ -15103,7 +15102,6 @@ self: { ]; description = "Simple scoring schemes for word alignments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "NaturalSort" = callPackage @@ -49443,7 +49441,6 @@ self: { ]; description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "bisc"; }) {}; @@ -69119,7 +69116,6 @@ self: { testHaskellDepends = [ base compact hspec ]; description = "Mutable vector with different GC characteristics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compact-sequences" = callPackage @@ -69152,7 +69148,6 @@ self: { ]; description = "Socket functions for compact normal form"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compact-string" = callPackage @@ -265016,7 +265011,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "selda-postgresql" = callPackage @@ -265033,7 +265027,6 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "selda-sqlite" = callPackage @@ -265050,7 +265043,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "select" = callPackage @@ -292905,7 +292897,6 @@ self: { ]; description = "Black magic tagsoup"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "tagstew"; }) {}; From 2684e3ea4ba048d751f1b60cd45554fa7fa3ea1d Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 17:55:27 +0100 Subject: [PATCH 41/49] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1803300](https://hydra.nixos.org/eval/1803300) of nixpkgs commit [f963570](https://github.com/NixOS/nixpkgs/commits/f9635700240b469009cc9350d5ca0f652454c29c) as of 2024-01-01 16:49 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 15 ++++++++ .../transitive-broken.yaml | 8 ++++ .../haskell-modules/hackage-packages.nix | 37 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 476e9438c6cf..3f9b51b943fe 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -613,6 +613,7 @@ broken-packages: - cacophony # failure in job https://hydra.nixos.org/build/233239380 at 2023-09-02 - cafeteria-prelude # failure in job https://hydra.nixos.org/build/233254881 at 2023-09-02 - cairo-core # failure in job https://hydra.nixos.org/build/233248151 at 2023-09-02 + - cairo-image # failure in job https://hydra.nixos.org/build/243813080 at 2024-01-01 - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02 - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02 - calamity # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238601583 at 2023-10-21 @@ -846,6 +847,7 @@ broken-packages: - composite-aeson-path # failure in job https://hydra.nixos.org/build/233203114 at 2023-09-02 - composite-aeson-refined # failure in job https://hydra.nixos.org/build/233241450 at 2023-09-02 - composite-cassava # failure in job https://hydra.nixos.org/build/233241110 at 2023-09-02 + - composite-dhall # failure in job https://hydra.nixos.org/build/244399630 at 2024-01-01 - composite-ekg # failure in job https://hydra.nixos.org/build/233235858 at 2023-09-02 - composite-opaleye # failure in job https://hydra.nixos.org/build/233256318 at 2023-09-02 - composite-swagger # failure in job https://hydra.nixos.org/build/233258006 at 2023-09-02 @@ -944,6 +946,7 @@ broken-packages: - CoreErlang # failure in job https://hydra.nixos.org/build/233199110 at 2023-09-02 - core # failure in job https://hydra.nixos.org/build/233253971 at 2023-09-02 - core-haskell # failure in job https://hydra.nixos.org/build/233222588 at 2023-09-02 + - corenlp-types # failure in job https://hydra.nixos.org/build/243808366 at 2024-01-01 - core-warn # failure in job https://hydra.nixos.org/build/233204404 at 2023-09-02 - Coroutine # failure in job https://hydra.nixos.org/build/233211213 at 2023-09-02 - coroutine-object # failure in job https://hydra.nixos.org/build/233220413 at 2023-09-02 @@ -1186,6 +1189,7 @@ broken-packages: - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02 - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02 - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02 + - dhall-text-shell # failure in job https://hydra.nixos.org/build/244399613 at 2024-01-01 - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 - dhcp-lease-parser # failure in job https://hydra.nixos.org/build/233229124 at 2023-09-02 - dhrun # failure in job https://hydra.nixos.org/build/233227529 at 2023-09-02 @@ -2502,6 +2506,7 @@ broken-packages: - ho-rewriting # failure in job https://hydra.nixos.org/build/233253726 at 2023-09-02 - horizon # failure in job https://hydra.nixos.org/build/233215473 at 2023-09-02 - horizon-gen-nix # failure in job https://hydra.nixos.org/build/233663130 at 2023-09-02 + - horizon-spec # failure in job https://hydra.nixos.org/build/244399500 at 2024-01-01 - horizon-spec-lens # failure in job https://hydra.nixos.org/build/233221337 at 2023-09-02 - horizon-spec-pretty # failure in job https://hydra.nixos.org/build/233227612 at 2023-09-02 - horname # failure in job https://hydra.nixos.org/build/233198123 at 2023-09-02 @@ -3205,6 +3210,7 @@ broken-packages: - libpq # failure in job https://hydra.nixos.org/build/233192542 at 2023-09-02 - librandomorg # failure in job https://hydra.nixos.org/build/233232749 at 2023-09-02 - libsecp256k1 # failure in job https://hydra.nixos.org/build/234441559 at 2023-09-13 + - libsodium # failure in job https://hydra.nixos.org/build/243816565 at 2024-01-01 - libsystemd-daemon # failure in job https://hydra.nixos.org/build/233207090 at 2023-09-02 - libtagc # failure in job https://hydra.nixos.org/build/233223631 at 2023-09-02 - libtelnet # failure in job https://hydra.nixos.org/build/233209594 at 2023-09-02 @@ -3813,6 +3819,7 @@ broken-packages: - notzero # failure in job https://hydra.nixos.org/build/233216133 at 2023-09-02 - np-linear # failure in job https://hydra.nixos.org/build/233257696 at 2023-09-02 - nptools # failure in job https://hydra.nixos.org/build/233234905 at 2023-09-02 + - nqe # failure in job https://hydra.nixos.org/build/243814217 at 2024-01-01 - ntp-control # failure in job https://hydra.nixos.org/build/233231061 at 2023-09-02 - ntrip-client # failure in job https://hydra.nixos.org/build/233230605 at 2023-09-02 - n-tuple # failure in job https://hydra.nixos.org/build/233225021 at 2023-09-02 @@ -3865,6 +3872,7 @@ broken-packages: - om-http-logging # failure in job https://hydra.nixos.org/build/233218069 at 2023-09-02 - om-logging # failure in job https://hydra.nixos.org/build/233222909 at 2023-09-02 - omnifmt # failure in job https://hydra.nixos.org/build/233219763 at 2023-09-02 + - om-plugin-imports # failure in job https://hydra.nixos.org/build/243826382 at 2024-01-01 - om-socket # failure in job https://hydra.nixos.org/build/233235423 at 2023-09-02 - on-a-horse # failure in job https://hydra.nixos.org/build/233199193 at 2023-09-02 - onama # failure in job https://hydra.nixos.org/build/233241430 at 2023-09-02 @@ -3884,6 +3892,7 @@ broken-packages: - openapi3 # failure in job https://hydra.nixos.org/build/233208815 at 2023-09-02 - openapi-petstore # failure in job https://hydra.nixos.org/build/233221722 at 2023-09-02 - openapi-typed # failure in job https://hydra.nixos.org/build/233226830 at 2023-09-02 + - opencascade-hs # failure in job https://hydra.nixos.org/build/243821447 at 2024-01-01 - opencc # failure in job https://hydra.nixos.org/build/233211902 at 2023-09-02 - opench-meteo # failure in job https://hydra.nixos.org/build/233212476 at 2023-09-02 - OpenCL # failure in job https://hydra.nixos.org/build/233216571 at 2023-09-02 @@ -4527,6 +4536,7 @@ broken-packages: - rangemin # failure in job https://hydra.nixos.org/build/233244031 at 2023-09-02 - rank1dynamic # failure in job https://hydra.nixos.org/build/233229881 at 2023-09-02 - rank-product # failure in job https://hydra.nixos.org/build/233239589 at 2023-09-02 + - rapid # failure in job https://hydra.nixos.org/build/244061259 at 2024-01-01 - rapid-term # failure in job https://hydra.nixos.org/build/233251731 at 2023-09-02 - Rasenschach # failure in job https://hydra.nixos.org/build/234445901 at 2023-09-13 - rating-chgk-info # failure in job https://hydra.nixos.org/build/233598034 at 2023-09-02 @@ -4824,6 +4834,7 @@ broken-packages: - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 + - sdr # failure in job https://hydra.nixos.org/build/243807383 at 2024-01-01 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 - seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02 - secdh # failure in job https://hydra.nixos.org/build/233244391 at 2023-09-02 @@ -4909,6 +4920,7 @@ broken-packages: - servant-streamly # failure in job https://hydra.nixos.org/build/233231404 at 2023-09-02 - servant-tracing # failure in job https://hydra.nixos.org/build/233229308 at 2023-09-02 - servant-wasm # failure in job https://hydra.nixos.org/build/233191644 at 2023-09-02 + - servant-xml-conduit # failure in job https://hydra.nixos.org/build/243828707 at 2024-01-01 - servant-yaml # failure in job https://hydra.nixos.org/build/233260010 at 2023-09-02 - servant-zeppelin # failure in job https://hydra.nixos.org/build/233230172 at 2023-09-02 - server-generic # failure in job https://hydra.nixos.org/build/233194042 at 2023-09-02 @@ -5429,6 +5441,7 @@ broken-packages: - template-yj # failure in job https://hydra.nixos.org/build/233236245 at 2023-09-02 - templatise # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237235933 at 2023-10-21 - tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02 + - temporal-csound # failure in job https://hydra.nixos.org/build/243818090 at 2024-01-01 - tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02 - ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02 - tensor # failure in job https://hydra.nixos.org/build/233233707 at 2023-09-02 @@ -5783,6 +5796,7 @@ broken-packages: - unused # failure in job https://hydra.nixos.org/build/233243602 at 2023-09-02 - uom-plugin # failure in job https://hydra.nixos.org/build/233228019 at 2023-09-02 - Updater # failure in job https://hydra.nixos.org/build/233215373 at 2023-09-02 + - updo # failure in job https://hydra.nixos.org/build/244399557 at 2024-01-01 - uploadcare # failure in job https://hydra.nixos.org/build/233197403 at 2023-09-02 - upskirt # failure in job https://hydra.nixos.org/build/233226983 at 2023-09-02 - urbit-hob # failure in job https://hydra.nixos.org/build/233209231 at 2023-09-02 @@ -5983,6 +5997,7 @@ broken-packages: - web-routes-quasi # failure in job https://hydra.nixos.org/build/233222454 at 2023-09-02 - web-routes-transformers # failure in job https://hydra.nixos.org/build/233256428 at 2023-09-02 - webshow # failure in job https://hydra.nixos.org/build/233243842 at 2023-09-02 + - web-view # failure in job https://hydra.nixos.org/build/244678837 at 2024-01-01 - webwire # failure in job https://hydra.nixos.org/build/233233892 at 2023-09-02 - WEditor # failure in job https://hydra.nixos.org/build/233215233 at 2023-09-02 - weighted-regexp # failure in job https://hydra.nixos.org/build/233243077 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e720f9b046b5..033f1a63b5c8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -291,6 +291,7 @@ dont-distribute-packages: - NGLess - NTRU - NXT + - NaCl - NaperianNetCDF - NearContextAlgebra - Ninjas @@ -994,6 +995,7 @@ dont-distribute-packages: - crypto-classical - crypto-conduit - crypto-pubkey + - crypto-sodium - cryptocipher - cryptoids - cryptoids-class @@ -1928,6 +1930,8 @@ dont-distribute-packages: - hasklepias - haskoin-bitcoind - haskoin-crypto + - haskoin-node + - haskoin-node_1_0_1 - haskoin-protocol - haskoin-script - haskoon @@ -3593,10 +3597,12 @@ dont-distribute-packages: - silvi - simgi - simple-c-value + - simple-cairo - simple-firewire - simple-log-syslog - simple-logging - simple-nix + - simple-pango - simple-pascal - simple-postgresql-orm - simpleirc-lens @@ -4133,6 +4139,8 @@ dont-distribute-packages: - warp-grpc - warp-quic - warped + - waterfall-cad + - waterfall-cad-examples - wavesurfer - wavy - weatherhs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b11171c0d1ab..c738c0fa1d82 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14989,6 +14989,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "NameGenerator" = callPackage @@ -58477,6 +58478,8 @@ self: { testHaskellDepends = [ base c-enum primitive template-haskell ]; description = "Image for Cairo"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo;}; "cake" = callPackage @@ -69805,6 +69808,8 @@ self: { ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -74500,6 +74505,8 @@ self: { ]; description = "Types for interaction with CoreNLP"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cornea" = callPackage @@ -76740,6 +76747,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "crypto-token" = callPackage @@ -85930,7 +85938,9 @@ self: { ]; description = "Render dhall text with shell commands as function arguments"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "dhall-text-shell"; + broken = true; }) {}; "dhall-to-cabal" = callPackage @@ -138800,6 +138810,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "P2P library for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskoin-node_1_0_1" = callPackage @@ -152590,6 +152601,8 @@ self: { ]; description = "Horizon Stable Package Set Type Definitions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "horizon-spec-lens" = callPackage @@ -187012,6 +187025,8 @@ self: { testToolDepends = [ c2hs ]; description = "Low-level bindings to the libsodium C library"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libsodium;}; "libsodium-bindings" = callPackage @@ -216143,6 +216158,8 @@ self: { ]; description = "Concurrency library in the style of Erlang/OTP"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nri-env-parser" = callPackage @@ -218815,6 +218832,8 @@ self: { libraryHaskellDepends = [ base containers ghc safe ]; description = "Plugin-based import warnings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "om-show" = callPackage @@ -219814,6 +219833,8 @@ self: { ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {TKBO = null; TKBRep = null; TKFillet = null; TKG2d = null; TKG3d = null; TKGeomBase = null; TKMath = null; TKMesh = null; TKOffset = null; TKPrim = null; TKSTEP = null; TKSTL = null; @@ -248797,6 +248818,8 @@ self: { ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rapid-term" = callPackage @@ -264519,6 +264542,8 @@ self: { license = lib.licenses.bsd3; platforms = lib.platforms.x86_64; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "seacat" = callPackage @@ -269776,6 +269801,8 @@ self: { ]; description = "Servant XML content-type with support for xml-conduit"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-xstatic" = callPackage @@ -273340,6 +273367,7 @@ self: { ]; description = "Binding to Cairo library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo;}; "simple-cmd" = callPackage @@ -273827,6 +273855,7 @@ self: { ]; description = "Binding to Pango library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) pango;}; "simple-parser" = callPackage @@ -295975,6 +296004,8 @@ self: { ]; description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "temporal-media" = callPackage @@ -313205,6 +313236,8 @@ self: { ]; description = "A style of maintaining and upgrading Haskell projects"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "uploadcare" = callPackage @@ -320933,6 +320966,7 @@ self: { ]; description = "Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {}; "waterfall-cad-examples" = callPackage @@ -320953,6 +320987,7 @@ self: { ]; description = "Examples for Waterfall CAD, a Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; mainProgram = "waterfall-cad-examples"; }) {}; @@ -321558,7 +321593,9 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "web3" = callPackage From dffa76ad6e59a366e08a30e6d81fb4a320e0452e Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 18:04:53 +0100 Subject: [PATCH 42/49] release-haskell.nix: Cleanup missing compiler names --- pkgs/top-level/release-haskell.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 73e3e9d32993..83d881aa9459 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -62,7 +62,6 @@ let released = with compilerNames; [ ghc8107 ghc902 - ghc924 ghc925 ghc926 ghc927 @@ -71,7 +70,6 @@ let ghc946 ghc947 ghc948 - ghc962 ghc963 ghc981 ]; @@ -510,12 +508,10 @@ let compilerNames.ghc8107 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc962 compilerNames.ghc963 compilerNames.ghc981 ] released; hlint = lib.subtractLists [ - compilerNames.ghc962 compilerNames.ghc963 compilerNames.ghc981 ] released; @@ -567,7 +563,6 @@ let weeder = [ compilerNames.ghc8107 compilerNames.ghc902 - compilerNames.ghc924 compilerNames.ghc925 compilerNames.ghc926 compilerNames.ghc927 @@ -576,7 +571,6 @@ let compilerNames.ghc946 compilerNames.ghc947 compilerNames.ghc948 - compilerNames.ghc962 compilerNames.ghc963 ]; }) @@ -653,7 +647,6 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc924 jobs.pkgsMusl.haskell.compiler.ghc925 jobs.pkgsMusl.haskell.compiler.ghc926 jobs.pkgsMusl.haskell.compiler.ghc927 From 7b4156eddac0142fc02dba8f88c958f71e9d0baa Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 18:28:31 +0100 Subject: [PATCH 43/49] haskellPackages: Fix eval errors --- pkgs/test/haskell/incremental/default.nix | 2 +- pkgs/top-level/release-haskell.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix index 4509939ba4f4..59bd5e491e95 100644 --- a/pkgs/test/haskell/incremental/default.nix +++ b/pkgs/test/haskell/incremental/default.nix @@ -9,7 +9,7 @@ let inherit (haskell.lib.compose) overrideCabal; # Incremental builds work with GHC >=9.4. - temporary = haskell.packages.ghc944.temporary; + temporary = haskell.haskellPackages.temporary; # This will do a full build of `temporary`, while writing the intermediate build products # (compiled modules, etc.) to the `intermediates` output. diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 83d881aa9459..376aa60cd14c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -654,7 +654,6 @@ let jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc926 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc927 From 5518af0a558dde9ce869098799be461bc74485ab Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 1 Jan 2024 19:16:21 +0100 Subject: [PATCH 44/49] haskellPackages: Fix eval errors --- pkgs/test/haskell/incremental/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix index 59bd5e491e95..c7bd43b11af6 100644 --- a/pkgs/test/haskell/incremental/default.nix +++ b/pkgs/test/haskell/incremental/default.nix @@ -3,13 +3,13 @@ # See: https://www.haskellforall.com/2022/12/nixpkgs-support-for-incremental-haskell.html # See: https://felixspringer.xyz/homepage/blog/incrementalHaskellBuildsWithNix -{ haskell, lib }: +{ haskell, haskellPackages, lib }: let inherit (haskell.lib.compose) overrideCabal; # Incremental builds work with GHC >=9.4. - temporary = haskell.haskellPackages.temporary; + temporary = haskellPackages.temporary; # This will do a full build of `temporary`, while writing the intermediate build products # (compiled modules, etc.) to the `intermediates` output. From 36f775a9bcc6be3195ddceb304183c647478afab Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 20 Dec 2023 11:26:36 +0100 Subject: [PATCH 45/49] haskellPackages.postgrest: 10.1.1 -> 11.2.2 and fix build --- .../haskell-modules/configuration-common.nix | 31 ++++++++++++------- .../configuration-hackage2nix/broken.yaml | 2 -- .../configuration-hackage2nix/main.yaml | 1 + .../transitive-broken.yaml | 1 - .../haskell-modules/configuration-nix.nix | 10 ++++++ .../haskell-modules/hackage-packages.nix | 25 ++++++++++++--- 6 files changed, 51 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ea510b7da68..f9d7324c4695 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2714,19 +2714,24 @@ self: super: { co-log-polysemy = doJailbreak super.co-log-polysemy; co-log-polysemy-formatting = doJailbreak super.co-log-polysemy-formatting; - # 2022-12-02: Needs newer postgrest package + # 2023-12-20: Needs newer postgrest package and extra dependencies # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 - # 2022-12-02: Tests require running postresql server - postgrest = dontCheck (doJailbreak (overrideSrc rec { - version = "10.1.1"; - src = pkgs.fetchFromGitHub { - owner = "PostgREST"; - repo = "postgrest"; - rev = "v${version}"; - sha256 = "sha256-ceSPBH+lzGU1OwjolcaE1BCpkKCJrvMU5G8TPeaJesM="; - }; - } super.postgrest)); + postgrest = lib.pipe (super.postgrest.overrideScope (lself: lsuper: { + hasql-pool = lself.hasql-pool_0_10; + })) [ + (addBuildDepends [ self.extra self.fuzzyset_0_2_4 ]) + doJailbreak + (overrideSrc rec { + version = "11.2.2"; + src = pkgs.fetchFromGitHub { + owner = "PostgREST"; + repo = "postgrest"; + rev = "v${version}"; + hash = "sha256-6Nv0NSAiNUSg2T/cmWs7zGSInLSmF0WDA3E/KxlA7O8="; + }; + }) + ]; html-charset = dontCheck super.html-charset; @@ -2820,4 +2825,8 @@ self: super: { ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0; }); + # 2024-01-01: Too strict bounds on megaparsec + # Fixed in 0.2.8: https://github.com/PostgREST/configurator-pg/pull/20 + configurator-pg = doJailbreak super.configurator-pg; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3f9b51b943fe..1625bdc608d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -889,7 +889,6 @@ broken-packages: - config-parser # failure in job https://hydra.nixos.org/build/233206136 at 2023-09-02 - Configurable # failure in job https://hydra.nixos.org/build/233200781 at 2023-09-02 - configuration # failure in job https://hydra.nixos.org/build/233195399 at 2023-09-02 - - configurator-pg # failure in job https://hydra.nixos.org/build/233219556 at 2023-09-02 - config-value-getopt # failure in job https://hydra.nixos.org/build/233204566 at 2023-09-02 - confsolve # failure in job https://hydra.nixos.org/build/233194913 at 2023-09-02 - congruence-relation # failure in job https://hydra.nixos.org/build/233222125 at 2023-09-02 @@ -1749,7 +1748,6 @@ broken-packages: - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02 - futures # failure in job https://hydra.nixos.org/build/233230206 at 2023-09-02 - fuzzyfind # failure in job https://hydra.nixos.org/build/233206269 at 2023-09-02 - - fuzzyset # failure in job https://hydra.nixos.org/build/233231726 at 2023-09-02 - fuzzy-timings # failure in job https://hydra.nixos.org/build/233235765 at 2023-09-02 - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13 - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5a865d254459..47ac2ef1e56d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -147,6 +147,7 @@ extra-packages: - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* - unix-compat < 0.7 # 2023-07-04: Need System.PosixCompat.User for git-annex - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 + - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 033f1a63b5c8..cc084eb63cfd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3114,7 +3114,6 @@ dont-distribute-packages: - postgresql-tx-query - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple - - postgrest - postmark - potoki - potoki-cereal diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 03f065d632e9..cecd27e023da 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -422,8 +422,18 @@ self: super: builtins.intersectAttrs super { hasql-interpolate = dontCheck super.hasql-interpolate; hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; + hasql-pool_0_10 = dontCheck super.hasql-pool_0_10; hasql-transaction = dontCheck super.hasql-transaction; + # Test suite requires a running postgresql server, + # avoid compiling twice by providing executable as a separate output (with small closure size), + # generate shell completion + postgrest = lib.pipe super.postgrest [ + dontCheck + enableSeparateBinOutput + (self.generateOptparseApplicativeCompletions [ "postgrest" ]) + ]; + # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c738c0fa1d82..741b54668bc0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -72116,8 +72116,6 @@ self: { ]; description = "Reduced parser for configurator-ng config files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conformance" = callPackage @@ -112734,6 +112732,26 @@ self: { broken = true; }) {}; + "fuzzyset_0_2_4" = callPackage + ({ mkDerivation, base, data-default, hspec, ieee754, text + , text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.2.4"; + sha256 = "0rj6d5z2cy954w3xzq4dfn0i3dg2idb8y2lcf2f10ar42r58zhxn"; + libraryHaskellDepends = [ + base data-default text text-metrics unordered-containers vector + ]; + testHaskellDepends = [ + base data-default hspec ieee754 text text-metrics + unordered-containers vector + ]; + description = "Fuzzy set for approximate string matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fuzzyset" = callPackage ({ mkDerivation, base, hspec, ieee754, mtl, text, text-metrics , transformers, unordered-containers, vector @@ -112751,8 +112769,6 @@ self: { ]; description = "Fuzzy set data structure for approximate string matching"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fuzzytime" = callPackage @@ -238549,7 +238565,6 @@ self: { ]; description = "REST API for any Postgres database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "postgrest"; }) {}; From d9e1745681105a35cf50bc4ddb1052edaa622c7e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 20 Dec 2023 12:31:54 +0100 Subject: [PATCH 46/49] postgrest: add top-level package --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4778d42ec69..44a7830c24ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27128,6 +27128,8 @@ with pkgs; postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { }; + postgrest = haskellPackages.postgrest.bin; + redshift_jdbc = callPackage ../development/java-modules/redshift_jdbc { }; liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { }; From 677d868ca34ccf131ec0c1b3a18e5fa5ee79af00 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 23 Dec 2023 12:32:01 +0800 Subject: [PATCH 47/49] haskellPackages.postgrest: 11.2.2 -> 12.0.2 https://github.com/PostgREST/postgrest/releases/tag/v12.0.2 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f9d7324c4695..c4e4910201a9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2723,12 +2723,12 @@ self: super: { (addBuildDepends [ self.extra self.fuzzyset_0_2_4 ]) doJailbreak (overrideSrc rec { - version = "11.2.2"; + version = "12.0.2"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-6Nv0NSAiNUSg2T/cmWs7zGSInLSmF0WDA3E/KxlA7O8="; + hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to="; }; }) ]; From 111c8d73a479f707e920307564c0a16285d1d41a Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 23 Dec 2023 12:37:40 +0800 Subject: [PATCH 48/49] haskellPackages.postgrest: Add more build-depends for 12.0.2 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4e4910201a9..850529f06bdf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2714,14 +2714,14 @@ self: super: { co-log-polysemy = doJailbreak super.co-log-polysemy; co-log-polysemy-formatting = doJailbreak super.co-log-polysemy-formatting; - # 2023-12-20: Needs newer postgrest package and extra dependencies - # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 - # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 + # 2023-12-20: Needs newer hasql-pool package and extra dependencies postgrest = lib.pipe (super.postgrest.overrideScope (lself: lsuper: { hasql-pool = lself.hasql-pool_0_10; })) [ - (addBuildDepends [ self.extra self.fuzzyset_0_2_4 ]) + (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ]) + # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 doJailbreak + # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { version = "12.0.2"; src = pkgs.fetchFromGitHub { From 18a01f3fd956de7fc6d32e5e241e949671e7e8bf Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 2 Jan 2024 02:22:09 +0100 Subject: [PATCH 49/49] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1803308](https://hydra.nixos.org/eval/1803308) of nixpkgs commit [eb6169a](https://github.com/NixOS/nixpkgs/commits/eb6169a4a75a164c9ecd72cf6a629f5bbc7ff67c) as of 2024-01-02 01:20 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 4 ++++ pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1625bdc608d9..71364c6a7476 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -832,7 +832,9 @@ broken-packages: - compactable # failure in job https://hydra.nixos.org/build/233228106 at 2023-09-02 - compact-list # failure in job https://hydra.nixos.org/build/233241961 at 2023-09-02 - compact-map # failure in job https://hydra.nixos.org/build/233201665 at 2023-09-02 + - compact-mutable-vector # failure in job https://hydra.nixos.org/build/245539335 at 2024-01-02 - compact-sequences # failure in job https://hydra.nixos.org/build/233208553 at 2023-09-02 + - compact-socket # failure in job https://hydra.nixos.org/build/245539349 at 2024-01-02 - compact-string # failure in job https://hydra.nixos.org/build/233204162 at 2023-09-02 - compact-string-fix # failure in job https://hydra.nixos.org/build/233238513 at 2023-09-02 - comparse # failure in job https://hydra.nixos.org/build/233220012 at 2023-09-02 @@ -3710,6 +3712,7 @@ broken-packages: - nats-client # failure in job https://hydra.nixos.org/build/233241313 at 2023-09-02 - nat-sized-numbers # failure in job https://hydra.nixos.org/build/233244238 at 2023-09-02 - natural # failure in job https://hydra.nixos.org/build/233232490 at 2023-09-02 + - NaturalLanguageAlphabets # failure in job https://hydra.nixos.org/build/245539294 at 2024-01-02 - NaturalSort # failure in job https://hydra.nixos.org/build/233213239 at 2023-09-02 - naver-translate # failure in job https://hydra.nixos.org/build/233225934 at 2023-09-02 - nbt # failure in job https://hydra.nixos.org/build/233253509 at 2023-09-02 @@ -4847,6 +4850,7 @@ broken-packages: - secure-sockets # failure in job https://hydra.nixos.org/build/233254170 at 2023-09-02 - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02 - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02 + - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02 - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02 - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02 - selinux # failure in job https://hydra.nixos.org/build/233192853 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 741b54668bc0..18a751666ddf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15103,6 +15103,8 @@ self: { ]; description = "Simple scoring schemes for word alignments"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "NaturalSort" = callPackage @@ -69119,6 +69121,8 @@ self: { testHaskellDepends = [ base compact hspec ]; description = "Mutable vector with different GC characteristics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "compact-sequences" = callPackage @@ -69151,6 +69155,8 @@ self: { ]; description = "Socket functions for compact normal form"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "compact-string" = callPackage @@ -265067,6 +265073,8 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "selda-sqlite" = callPackage