From 1dc7345389a2baced186589cab9824cec3dc0281 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 25 Jan 2024 14:41:37 +0100 Subject: [PATCH 01/29] =?UTF-8?q?haskell.compiler.ghc981:=20build=20stage?= =?UTF-8?q?=202=20compiler=20for=20=E2=80=9Cnative=20cross=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we are building compiler for a platform we can execute ourselves, we can build a proper stage2 compiler which unlocks some features that are interesting for e.g. pkgsStatic. The resulting compiler is technically a native compiler that's prefixed. --- pkgs/development/compilers/ghc/common-hadrian.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 079bbefbae4c..522bcb10222b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -116,8 +116,11 @@ -- no way to set this via the command line finalStage :: Stage finalStage = ${ - if stdenv.hostPlatform == stdenv.targetPlatform - then "Stage2" # native compiler + # Always build the stage 2 compiler if possible. Note we can currently + # assume hostPlatform == buildPlatform. + # TODO(@sternenseemann): improve this condition when we can cross-compile GHC + if stdenv.hostPlatform.canExecute stdenv.targetPlatform + then "Stage2" # native compiler or “native” cross e.g. pkgsStatic else "Stage1" # cross compiler } From 490114a2e13eced195b9027b44d4e0d9d85a6a20 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 14:01:22 +0200 Subject: [PATCH 02/29] haskellPackages.ghc: 9.6.4 -> 9.6.5 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3a5481f45a90..ec050d743178 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -308,7 +308,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc964; + ghc96 = compiler.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -513,7 +513,7 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc964; + ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; From 1cda30090accdc5888fac6319d92599b1da8330d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 20:08:29 +0200 Subject: [PATCH 03/29] all-cabal-hashes: 2024-04-09T20:48:09Z -> 2024-04-16T17:36:35Z 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 ede51924e027..38730d8ade56 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "5bae847bf7e96ce10e824377f4cb7f02c51b7245", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5bae847bf7e96ce10e824377f4cb7f02c51b7245.tar.gz", - "sha256": "1p45mapjca2d7r8ky27s0pn3sflp61iippcabsb85s49fi9sqlv2", - "msg": "Update from Hackage at 2024-04-09T20:48:09Z" + "commit": "4eb9a5fde06b5d7343665582243debaf1d77e0a9", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4eb9a5fde06b5d7343665582243debaf1d77e0a9.tar.gz", + "sha256": "0dzyfr1gv79riy2vh840b5hqly8rs10zhj01zi9nfn7jd9pzql28", + "msg": "Update from Hackage at 2024-04-16T17:36:35Z" } From 8767abc31ef3cd2d2fdabab85414ff2e980e211e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 20:08:51 +0200 Subject: [PATCH 04/29] haskellPackages: stackage LTS 22.16 -> LTS 22.17 --- .../configuration-hackage2nix/main.yaml | 3 -- .../configuration-hackage2nix/stackage.yaml | 36 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4799e9c3bc1c..221062282a98 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,9 +28,6 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - # Needs to be pinned to match jsaddle from Stackage LTS (9.8.*) - - jsaddle-dom < 0.9.9.0 - - jsaddle-webkit2gtk < 0.9.9.0 extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 17ce50df0fc3..6b9818daebe1 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 22.16 +# Stackage LTS 22.17 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -564,7 +564,7 @@ default-package-overrides: - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.12 - bytestring-trie ==0.2.7.2 - - bz2 ==1.0.1.1 + - bz2 ==1.0.1.2 - bzip2-clib ==1.0.8 - bzlib ==0.5.2.0 - bzlib-conduit ==0.3.0.3 @@ -661,7 +661,7 @@ default-package-overrides: - code-page ==0.2.1 - coinor-clp ==0.0.0.2 - cointracking-imports ==0.1.0.2 - - collect-errors ==0.1.5.0 + - collect-errors ==0.1.6.0 - co-log ==0.6.1.0 - co-log-concurrent ==0.5.1.0 - co-log-core ==0.3.2.1 @@ -1050,7 +1050,7 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.6 + - faktory ==1.1.2.7 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - fast-logger ==3.2.2 @@ -1351,7 +1351,7 @@ default-package-overrides: - hasql-interpolate ==0.2.1.0 - hasql-listen-notify ==0.1.0.1 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.1.0 + - hasql-notifications ==0.2.1.1 - hasql-optparse-applicative ==0.7.1.3 - hasql-pool ==0.10.1 - hasql-th ==0.4.0.19 @@ -1490,7 +1490,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - - hspec-golden ==0.2.1.0 + - hspec-golden ==0.2.2.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.1.1.0 - hspec-junit-formatter ==1.1.0.2 @@ -1667,7 +1667,7 @@ default-package-overrides: - jose ==0.11 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.6 - - jsaddle ==0.9.8.3 + - jsaddle ==0.9.9.0 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1953,7 +1953,7 @@ default-package-overrides: - monoidal-containers ==0.6.4.0 - monoidal-functors ==0.2.3.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.4.1 + - monoid-subclasses ==1.2.5 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - mono-traversable ==1.0.17.0 @@ -2089,7 +2089,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.2.3 + - opaleye ==0.10.3.0 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2318,10 +2318,10 @@ default-package-overrides: - protobuf-simple ==0.1.1.1 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.1.4 - - proto-lens-arbitrary ==0.1.2.12 - - proto-lens-optparse ==0.1.1.11 - - proto-lens-runtime ==0.7.0.5 + - proto-lens ==0.7.1.5 + - proto-lens-arbitrary ==0.1.2.13 + - proto-lens-optparse ==0.1.1.12 + - proto-lens-runtime ==0.7.0.6 - protolude ==0.3.4 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 @@ -2354,7 +2354,7 @@ default-package-overrides: - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.1 + - quickcheck-monoid-subclasses ==0.3.0.2 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.8.0 @@ -2921,7 +2921,7 @@ default-package-overrides: - these-optics ==1.0.1.2 - these-skinny ==0.7.5 - th-expand-syns ==0.4.11.0 - - th-extras ==0.0.0.7 + - th-extras ==0.0.0.8 - th-lego ==0.3.0.3 - th-lift ==0.8.4 - th-lift-instances ==0.1.20 @@ -3253,11 +3253,11 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.7 + - Yampa ==0.14.8 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - - yesod-auth ==1.6.11.2 + - yesod-auth ==1.6.11.3 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.2.0 @@ -3293,7 +3293,7 @@ default-package-overrides: - zigzag ==0.0.1.0 - zim-parser ==0.2.1.0 - zip ==2.0.0 - - zip-archive ==0.4.3.1 + - zip-archive ==0.4.3.2 - zippers ==0.3.2 - zip-stream ==0.2.2.0 - zlib ==0.6.3.0 From 9ce35fc0a8e2672cca605254d5d143a06331236b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 22:43:25 +0200 Subject: [PATCH 05/29] 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 | 879 ++++++++++-------- 1 file changed, 507 insertions(+), 372 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f66a166c2ce3..f3f238ca7295 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9453,8 +9453,8 @@ self: { ({ mkDerivation, base, bcm2835, bytestring }: mkDerivation { pname = "HPi"; - version = "0.10.0"; - sha256 = "1b3lwa1j2w9vwqxpccyg4mcy338q4byyqpysxd2ciljq3wcf5nkw"; + version = "0.11.0"; + sha256 = "1m2sa97883dvw1m10a1rb19dc7a1wc5cgs89zsrw2mlkl3877946"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bcm2835 ]; description = "GPIO, I2C, SPI, and PWM functions for the Raspberry Pi"; @@ -9947,8 +9947,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; - revision = "3"; - editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf"; + revision = "4"; + editedCabalFile = "18ywxacq8p51p84haqgm8h19jnsja4dgx32sxl9ncgvh2xwyj35r"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -14327,8 +14327,8 @@ self: { pname = "MissingH"; version = "1.6.0.1"; sha256 = "0f5d7ws2vqm1vpwjab9cp691jn5j3dxycfn4w5p1rb4aim504aa9"; - revision = "2"; - editedCabalFile = "1qvdaa5im36x6j7z060n084q62gp35sp7sa6cgcbdjva5bqgi2iy"; + revision = "3"; + editedCabalFile = "00cx3sszr8f6adkl5w09mk7yg6pl38mym2mcl2nicdpz9vyvjb2f"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -23235,24 +23235,6 @@ self: { }) {}; "Yampa" = callPackage - ({ mkDerivation, base, criterion, deepseq, filepath, random - , simple-affine-space, time - }: - mkDerivation { - pname = "Yampa"; - version = "0.14.7"; - sha256 = "0y9aagh532xdp2qq5xfk8qzf326pjs5x3lvrfby2d2qbbh724nav"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq random simple-affine-space - ]; - benchmarkHaskellDepends = [ base criterion filepath time ]; - description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; - license = lib.licenses.bsd3; - }) {}; - - "Yampa_0_14_8" = callPackage ({ mkDerivation, base, criterion, deepseq, filepath, random , simple-affine-space, time }: @@ -23268,7 +23250,6 @@ self: { benchmarkHaskellDepends = [ base criterion filepath time ]; description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Yampa-core" = callPackage @@ -35466,15 +35447,16 @@ self: { "amqp-streamly" = callPackage ({ mkDerivation, amqp, base, bytestring, hspec, process, streamly - , testcontainers, text + , streamly-core, testcontainers, text }: mkDerivation { pname = "amqp-streamly"; - version = "0.2.1"; - sha256 = "17qh1f05byyysmmyyz6lsqgkkn3bhxw6jpg4pm53ii1m6myfnqw9"; - libraryHaskellDepends = [ amqp base streamly text ]; + version = "0.3.0"; + sha256 = "1095f9da87y1h47a2sskliyx71iy6xv00wzzjv7va8rqdlfzch5b"; + libraryHaskellDepends = [ amqp base streamly streamly-core text ]; testHaskellDepends = [ - amqp base bytestring hspec process streamly testcontainers text + amqp base bytestring hspec process streamly streamly-core + testcontainers text ]; description = "A simple streamly wrapper for amqp"; license = lib.licenses.bsd3; @@ -37898,6 +37880,27 @@ self: { broken = true; }) {}; + "apply-merge" = callPackage + ({ mkDerivation, base, containers, falsify, pqueue, tasty + , tasty-bench, tasty-expected-failure, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "apply-merge"; + version = "0.1.0.0"; + sha256 = "1wkm96jhy9z0k3nyzba6x33r9nv69chsyd44srwpp3qryzm3884k"; + libraryHaskellDepends = [ base containers pqueue ]; + testHaskellDepends = [ + base containers falsify pqueue tasty tasty-expected-failure + tasty-hunit transformers vector + ]; + benchmarkHaskellDepends = [ + base containers pqueue tasty-bench transformers vector + ]; + description = "Lift a binary, non-decreasing function onto ordered lists and order the output"; + license = lib.licenses.bsd3; + }) {}; + "apply-refact_0_9_3_0" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -39224,12 +39227,12 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_6_0" = callPackage + "array_0_5_7_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.6.0"; - sha256 = "0bhiw4zwnlapy4fznck7kna5f59dv33pk34x6r0liw0n81s22pm8"; + version = "0.5.7.0"; + sha256 = "155ka0ax0z0niwgy68cnrh3zd75a5xw1i6wvaaqk0sszgxqr6myh"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -40611,6 +40614,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; + revision = "1"; + editedCabalFile = "1y1cd3dkllrwbqj9ca8rr4vv2v751vrvia0kkq4qv5ajbxh9wpcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -41137,6 +41142,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_6" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.6"; + sha256 = "1cas7m0v94fkd1s7hqpl5vf270z5yjd4rnq0glkcz4gy44h06jyl"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -46811,10 +46828,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.12"; - sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "8"; - editedCabalFile = "1xsvw5mid9f4gildrw4hdxp77hqx33vkp6x015ig0rm8b2cpp0r7"; + version = "1.0.13"; + sha256 = "0v2sfblzwjb0y8dnjpl9jxsiz14lqdnpa1vccbnm2y73b5pkj30p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47706,7 +47721,7 @@ self: { mainProgram = "binance-exports"; }) {}; - "binary_0_8_9_1" = callPackage + "binary_0_8_9_2" = callPackage ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring , Cabal, cereal, containers, criterion, deepseq, directory , filepath, generic-deriving, HUnit, mtl, QuickCheck, random @@ -47715,8 +47730,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.9.1"; - sha256 = "1h7bmrzipfkglh627dmwm7vqf7akkilmfz5qr85rpz1d8miwl8dc"; + version = "0.8.9.2"; + sha256 = "0k7pkc6rkxfq6xz5hai5y31rhi8d3hrn5nxsp4ya3nyc9rmi2dw4"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base base-orphans bytestring Cabal containers directory @@ -49226,31 +49241,36 @@ self: { }) {}; "binrep" = callPackage - ({ mkDerivation, base, bytestring, bytezap, deepseq, flatparse - , gauge, generic-data-asserts, generic-data-functions - , generic-random, hspec, hspec-discover, parser-combinators - , QuickCheck, quickcheck-instances, refined1, strongweak, text - , text-icu + ({ mkDerivation, base, bytestring, bytezap, deepseq, defun-core + , flatparse, gauge, generic-data-functions, generic-random + , generic-type-asserts, generic-type-functions, hspec + , hspec-discover, parser-combinators, QuickCheck + , quickcheck-instances, refined1, strongweak, text, text-icu + , type-level-bytestrings }: mkDerivation { pname = "binrep"; - version = "0.6.0"; - sha256 = "1rd27h3i39zibz7dvwk53akqkrfhwln2igfczxdwflhav372ah18"; + version = "0.8.0"; + sha256 = "1bsncrkxixp28ffmm2dgfpai3nv8cq0db3fdy11y6gi7rri7g8cj"; libraryHaskellDepends = [ - base bytestring bytezap deepseq flatparse generic-data-asserts - generic-data-functions parser-combinators refined1 strongweak text - text-icu + base bytestring bytezap deepseq defun-core flatparse + generic-data-functions generic-type-asserts generic-type-functions + parser-combinators refined1 strongweak text text-icu + type-level-bytestrings ]; testHaskellDepends = [ - base bytestring bytezap deepseq flatparse generic-data-asserts - generic-data-functions generic-random hspec parser-combinators - QuickCheck quickcheck-instances refined1 strongweak text text-icu + base bytestring bytezap deepseq defun-core flatparse + generic-data-functions generic-random generic-type-asserts + generic-type-functions hspec parser-combinators QuickCheck + quickcheck-instances refined1 strongweak text text-icu + type-level-bytestrings ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring bytezap deepseq flatparse gauge - generic-data-asserts generic-data-functions parser-combinators - refined1 strongweak text text-icu + base bytestring bytezap deepseq defun-core flatparse gauge + generic-data-functions generic-type-asserts generic-type-functions + parser-combinators refined1 strongweak text text-icu + type-level-bytestrings ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; @@ -56484,27 +56504,32 @@ self: { }) {}; "bytezap" = callPackage - ({ mkDerivation, base, bytestring, primitive, text }: + ({ mkDerivation, base, bytestring, defun-core + , generic-type-functions, primitive, text, type-level-bytestrings + }: mkDerivation { pname = "bytezap"; - version = "1.1.0"; - sha256 = "08nr0iyj80bc19fj8dgfzyyb1dws93lclpmgxq2m0jcaxxzid1kj"; - libraryHaskellDepends = [ base bytestring primitive text ]; + version = "1.3.0"; + sha256 = "0ichvvl1f76m520q3pq0m90wi4f0gzmhbsxkk5xnh72kdbaj164h"; + libraryHaskellDepends = [ + base bytestring defun-core generic-type-functions primitive text + type-level-bytestrings + ]; description = "Bytestring builder with zero intermediate allocation"; license = lib.licenses.mit; }) {}; "bz2" = callPackage - ({ mkDerivation, base, bytestring, bzip2-clib, bzlib, c2hs, cpphs - , criterion, deepseq, directory, filepath, tasty, tasty-golden - , tasty-hunit, temporary + ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion + , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "bz2"; - version = "1.0.1.1"; - sha256 = "1pa7qswh3sl9d0pbil14c8w8dvqs4va97ich2fck0gw25y4dwphn"; + version = "1.0.1.2"; + sha256 = "0pjcpp365lnfmmp0x9yi71h9nvvmglpc4pvkb7qcvpygx35vxzb1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring bzip2-clib ]; + libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring deepseq directory filepath tasty tasty-golden @@ -61496,6 +61521,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; + revision = "1"; + editedCabalFile = "0bgr0m1p4r2snp8d1irsyql2a9kcpp09lkajjfsyqq8riaf75a2v"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring cborg scientific text unordered-containers vector @@ -62099,8 +62126,8 @@ self: { }: mkDerivation { pname = "cfg"; - version = "0.0.2.1"; - sha256 = "0fy21jxpr3720r4l6xnsbg2xasyrq94ljjnnk6639q4w8waqqrb2"; + version = "0.0.2.2"; + sha256 = "1v0k3gkwwifps4msd2888slaf4wdw5ppfpp0a0rzgmp14fbxz2sw"; libraryHaskellDepends = [ base bytestring containers errors free megaparsec mtl pretty-simple text vector @@ -65160,6 +65187,8 @@ self: { pname = "clash-shake"; version = "0.3.2"; sha256 = "0bgnl1q1xm1yhwspqlfr02p37iy8vka727r4awr2lihg12x83bjx"; + revision = "1"; + editedCabalFile = "1gqzayyqdrhfd11as965bmi06ahnx72sr5ghxczrlfxsihdrbcgl"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -65230,8 +65259,8 @@ self: { }: mkDerivation { pname = "clashilator"; - version = "0.1.2.1"; - sha256 = "1sldbsx1w3qpa9djilrfc9ag9bja64pk2qw4bi8gn9d3zqybyn92"; + version = "0.1.3"; + sha256 = "00w9jm0pq2sxd1pv3fgxflbv7gwawiqicmf8q5jx7l3lwccha718"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68460,8 +68489,8 @@ self: { ({ mkDerivation, base, containers, deepseq, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.5.0"; - sha256 = "1hljcnmwpk47rivlds9901129hgkm7j8h3yhz2j1j2pga5w43ck9"; + version = "0.1.6.0"; + sha256 = "0afyd8qyih6aqkavgk2dc4a6dsnc1yk5xqq1vi54lgmjdhrh6xbg"; libraryHaskellDepends = [ base containers deepseq QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; @@ -69538,6 +69567,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "commutative-semigroups_0_2" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "commutative-semigroups"; + version = "0.2"; + sha256 = "0jkqfslrvyh17p9llf1ga249fcnhfjlp1rb3nvj0078a19c0xcd8"; + libraryHaskellDepends = [ base containers ]; + description = "Commutative semigroups"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "comonad" = callPackage ({ mkDerivation, base, containers, distributive , indexed-traversable, tagged, transformers, transformers-compat @@ -88752,14 +88793,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "directory_1_3_8_3" = callPackage + "directory_1_3_8_4" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.3"; - sha256 = "1hzn11nairaj1n20znhgnsg43cxl2l1cqb55gixq0bkkkj2ygl6b"; - revision = "1"; - editedCabalFile = "0jx9x76xg38ibfnhrrghnx2vqnrk3myl33ncrhml8jyn32dsqbx0"; + version = "1.3.8.4"; + sha256 = "0r10g7a68r5asjgs5r0zpjzq0qiqf5i8h5bmaylpm6ikwnj9irx4"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -91469,6 +91508,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_1_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.1.1"; + sha256 = "1xpk020024vsqh27sp225hx50i1hn5fkhxiyww6wqnhrkxypjkwa"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -92277,8 +92343,8 @@ self: { ({ mkDerivation, base, Cabal-syntax, text }: mkDerivation { pname = "double-x-encoding"; - version = "1.1.1"; - sha256 = "1y9grxp9xbjx4ldx6idmzy275wkr2jgajf6dki96janiwcjwmnym"; + version = "1.2.1"; + sha256 = "0sg8sh9a1krzfhdwxcd3ja56kzr6hif11s4iqicrdqz3qgi905ia"; libraryHaskellDepends = [ base Cabal-syntax text ]; testHaskellDepends = [ base Cabal-syntax text ]; description = "Encoding scheme to encode any Unicode string with only [0-9a-zA-Z_]"; @@ -98655,18 +98721,18 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, Cabal, directory, file-embed, filepath - , generic-lens, happy, hspec, hspec-discover, lens, mtl - , optparse-applicative, process, QuickCheck, scientific + , blaze-markup, BNFC, Cabal, directory, doctest-parallel + , file-embed, filepath, generic-lens, happy, hspec, hspec-discover + , lens, mtl, optparse-applicative, process, QuickCheck, scientific , string-interpolate, template-haskell, text, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.3.0"; - sha256 = "00shchphrpr8gasd5vypwk512mdpk1ff4a10jlk63mc3lz7c553c"; + version = "0.3.1"; + sha256 = "0ap9p8ls5k692ldhkpiasnkdq0a33py8kc3i150yjcbqv5falhc3"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; + setupHaskellDepends = [ base Cabal process string-interpolate ]; libraryHaskellDepends = [ aeson array base blaze-html blaze-markup directory file-embed filepath generic-lens lens mtl scientific string-interpolate @@ -98680,9 +98746,9 @@ self: { ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base blaze-html blaze-markup directory file-embed - filepath generic-lens hspec hspec-discover lens mtl QuickCheck - scientific string-interpolate template-haskell text yaml + aeson array base blaze-html blaze-markup directory doctest-parallel + file-embed filepath generic-lens hspec hspec-discover lens mtl + QuickCheck scientific string-interpolate template-haskell text yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; @@ -103547,8 +103613,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.1.2.6"; - sha256 = "1ddzq4pxx6blvqa2s6y7jmx6s49g9ckywiidi2hvq7r0dympsz03"; + version = "1.1.2.7"; + sha256 = "057rrfrfxa5xsv9pqy3jsx5gzrg0lwcx50w0hlwvkgpzlxnfch30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105170,20 +105236,20 @@ self: { "feedback" = callPackage ({ mkDerivation, autodocodec, autodocodec-yaml, base, bytestring , conduit, containers, envparse, fsnotify, optparse-applicative - , path, path-io, pretty-show, safe-coloured-text + , path, path-io, pretty-show, process, safe-coloured-text , safe-coloured-text-layout, safe-coloured-text-terminfo, text , time, typed-process, unix, unliftio, yaml }: mkDerivation { pname = "feedback"; - version = "0.1.0.4"; - sha256 = "0x7c8jr2mrvkfjxw919fkwngkxzbwly1xi1c1z4i0finkzfz8x6w"; + version = "0.1.0.5"; + sha256 = "0g15yinnxh8x0dknhfjpy88z5bzary8midj5qskrbkyqbvkni20l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ autodocodec autodocodec-yaml base bytestring conduit containers envparse fsnotify optparse-applicative path path-io pretty-show - safe-coloured-text safe-coloured-text-layout + process safe-coloured-text safe-coloured-text-layout safe-coloured-text-terminfo text time typed-process unix unliftio yaml ]; @@ -112269,6 +112335,8 @@ self: { pname = "ftp-client"; version = "0.5.1.5"; sha256 = "08sxbk4s3prh22b1c19cv571fgdc5k9347i17jqmvfwjl3lkv5w7"; + revision = "1"; + editedCabalFile = "09ri1dqkmy1hipssy3shy15lb0gyswc2r6ji71mbvy3lv71n4wjh"; libraryHaskellDepends = [ attoparsec base bytestring containers crypton-connection exceptions network transformers @@ -115287,8 +115355,8 @@ self: { ({ mkDerivation, base, contravariant, text }: mkDerivation { pname = "generic-data-functions"; - version = "0.5.0"; - sha256 = "0qjbwn0b59i5lrq26v36ai7z8xckid3gjz33w6l0kq1cvpfvzrnx"; + version = "0.5.1"; + sha256 = "1yw9v9s9nsz492d6v4sfi0s9nm3mq2kvxn4q9y01s7fwabdijpk1"; libraryHaskellDepends = [ base contravariant text ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; @@ -115759,6 +115827,29 @@ self: { broken = true; }) {}; + "generic-type-asserts" = callPackage + ({ mkDerivation, base, type-spec }: + mkDerivation { + pname = "generic-type-asserts"; + version = "0.3.0"; + sha256 = "1xsr6syv85rwzrfyqgjhv751fc2njbmq0a36wnil19p08nrzbrmr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base type-spec ]; + description = "Structural assertions on generic type representations"; + license = lib.licenses.mit; + }) {}; + + "generic-type-functions" = callPackage + ({ mkDerivation, base, defun-core }: + mkDerivation { + pname = "generic-type-functions"; + version = "0.1.0"; + sha256 = "0li28kwaidcpn0n8j40jp6i9yyb473w68c31vqlf8xrzgc7lmjls"; + libraryHaskellDepends = [ base defun-core ]; + description = "Familiar functions lifted to type-level functions on generic types"; + license = lib.licenses.mit; + }) {}; + "generic-xml" = callPackage ({ mkDerivation, base, HaXml, mtl, syb-with-class, template-haskell }: @@ -117618,21 +117709,23 @@ self: { }) {}; "ghc-debug-brick" = callPackage - ({ mkDerivation, base, brick, containers, contra-tracer, deepseq - , directory, exceptions, filepath, ghc-debug-client - , ghc-debug-common, ghc-debug-convention, microlens - , microlens-platform, text, time, unordered-containers, vty + ({ mkDerivation, base, brick, bytestring, byteunits, containers + , contra-tracer, deepseq, directory, exceptions, filepath + , ghc-debug-client, ghc-debug-common, ghc-debug-convention + , microlens, microlens-platform, text, time, unordered-containers + , vty, vty-crossplatform }: mkDerivation { pname = "ghc-debug-brick"; - version = "0.5.0.0"; - sha256 = "1k5gl9paz5z8w9h49ilpjxk0k73qyk2rwncnfhx11b64y2n74w2m"; + version = "0.6.0.0"; + sha256 = "0mmy484sj89g5y69j7lgcczipmmhlra7kmv230kg3380mh3r1ndv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick containers contra-tracer deepseq directory exceptions - filepath ghc-debug-client ghc-debug-common ghc-debug-convention - microlens microlens-platform text time unordered-containers vty + base brick bytestring byteunits containers contra-tracer deepseq + directory exceptions filepath ghc-debug-client ghc-debug-common + ghc-debug-convention microlens microlens-platform text time + unordered-containers vty vty-crossplatform ]; description = "A simple TUI using ghc-debug"; license = lib.licenses.bsd3; @@ -117645,17 +117738,17 @@ self: { , containers, contra-tracer, directory, dom-lt, filepath , ghc-debug-common, ghc-debug-convention, ghc-prim, hashable , language-dot, monoidal-containers, mtl, network, process - , psqueues, stm, text, unordered-containers + , psqueues, stm, text, unordered-containers, vector }: mkDerivation { pname = "ghc-debug-client"; - version = "0.5.0.0"; - sha256 = "0djv1y0fxg0vzr0baxml023i3a9di2zy0xhyxqg8wb0j9k5pszh0"; + version = "0.6.0.0"; + sha256 = "0002w48g4fw053vwzdi5l1qaglr6035jnmxajd8i9c1ppz09q8kn"; libraryHaskellDepends = [ async base binary bitwise bytestring containers contra-tracer directory dom-lt filepath ghc-debug-common ghc-debug-convention ghc-prim hashable language-dot monoidal-containers mtl network - process psqueues stm text unordered-containers + process psqueues stm text unordered-containers vector ]; description = "Useful functions for writing heap analysis tools which use ghc-debug"; license = lib.licenses.bsd3; @@ -117664,15 +117757,15 @@ self: { "ghc-debug-common" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, cpu , deepseq, directory, dom-lt, filepath, ghc-debug-convention - , ghc-heap, hashable, transformers, unordered-containers + , hashable, transformers, unordered-containers }: mkDerivation { pname = "ghc-debug-common"; - version = "0.5.0.0"; - sha256 = "0x2phkcnbfybkfy94g6jyc1s4wcls1r8ws4b5wnjl58pf8q09ni2"; + version = "0.6.0.0"; + sha256 = "1i2212qd7qvighvrb8x7hb6fisg3fb6vr49xgdcv66wrclj9n0hd"; libraryHaskellDepends = [ array base binary bytestring containers cpu deepseq directory - dom-lt filepath ghc-debug-convention ghc-heap hashable transformers + dom-lt filepath ghc-debug-convention hashable transformers unordered-containers ]; description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program"; @@ -117683,8 +117776,8 @@ self: { ({ mkDerivation, base, directory, filepath }: mkDerivation { pname = "ghc-debug-convention"; - version = "0.5.0.0"; - sha256 = "1hg2b3g7nqba5y4s1imaikx9y8vm4i6cb47nbnp07zwqg9zjlq3k"; + version = "0.6.0.0"; + sha256 = "0iwjfqxl0q6kja2zzrv3ypcc39vyc9cfaab83854jd1qi9vffkm9"; libraryHaskellDepends = [ base directory filepath ]; description = "Definitions needed by ghc-debug-stub and ghc-debug-common"; license = lib.licenses.bsd3; @@ -117696,8 +117789,8 @@ self: { }: mkDerivation { pname = "ghc-debug-stub"; - version = "0.5.0.0"; - sha256 = "1ykwfp841wbnqgsvvspixr95ars1np2khjlzycmb3q7cxv2xn2lw"; + version = "0.6.0.0"; + sha256 = "0cajxbz0lfin2vm9cs4ap7h2s4wxynrp606aqbnlj4m5x1yp6fp0"; libraryHaskellDepends = [ base directory filepath ghc-debug-convention ghc-prim ]; @@ -130875,8 +130968,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.1.1.0"; - sha256 = "1jbdrgdvzap5i67509qdmy669cijf94wa5a96cnc2626yvjirycc"; + version = "5.1.3.0"; + sha256 = "11m93r38i9ncb036rpm56qd03hcyfvgx6a1h0lynlbg8mfd4hg19"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130962,6 +131055,25 @@ self: { broken = true; }) {}; + "h3spec" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-core, http-types + , http3, network, quic, tls, unliftio + }: + mkDerivation { + pname = "h3spec"; + version = "0.1.10"; + sha256 = "0cqqhskk4rip3j903ynml1dcbm2v8si15c2kfwy2l42rj2fj0s1g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hspec hspec-core http-types http3 network quic tls + unliftio + ]; + description = "QUIC"; + license = lib.licenses.bsd3; + mainProgram = "h3spec"; + }) {}; + "hArduino" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, serialport , time @@ -132150,20 +132262,18 @@ self: { "hackage-repo-tool" = callPackage ({ mkDerivation, base, bytestring, Cabal, Cabal-syntax, directory , filepath, hackage-security, microlens, network, network-uri - , old-time, optparse-applicative, tar, time, unix, zlib + , optparse-applicative, tar, time, unix, zlib }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1.3"; - sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "6"; - editedCabalFile = "0a3ylq1r8zsvh34cjg2vqdx7r8ykla4myzjhv5vnc1bpq34bw5y8"; + version = "0.1.1.4"; + sha256 = "1nqm6rri8rkhrqvppyzy04s3875c4wjcay8gny4ygbr65c6iw81v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal Cabal-syntax directory filepath - hackage-security microlens network network-uri old-time - optparse-applicative tar time unix zlib + hackage-security microlens network network-uri optparse-applicative + tar time unix zlib ]; description = "Manage secure file-based package repositories"; license = lib.licenses.bsd3; @@ -132213,6 +132323,8 @@ self: { pname = "hackage-security"; version = "0.6.2.6"; sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif"; + revision = "1"; + editedCabalFile = "05jbc1wv5njv4jdqfiq12y1cni7fa1qis1g5z03dg6jg64j0bxwg"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -132235,10 +132347,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.1.1"; - sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "8"; - editedCabalFile = "14y8lj2gbm19swc3z3wi0slc2ax61gnzgpyzmrxay4zjqsv6qfvc"; + version = "0.1.1.2"; + sha256 = "0nsnn0lnnpvvfwgl480vhbmf4pfc11h128y252lslnlhzj1c66l3"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -133603,8 +133713,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "1.2.1"; - sha256 = "08vbkjf3nnl7dwz5r4vzgbylpql0b3xgnw7ivhxmc2k2sqzgs2rp"; + version = "1.2.2"; + sha256 = "10pn4hk9gzlz92jxln6zj2i5vg42n369njzlrhbxf50dlgy4x05q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -141325,8 +141435,8 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.1.0"; - sha256 = "0f415g6y13sndyn66ssj0hfrqm6l5p1r48v2lix0cvi1gkrv9wm2"; + version = "0.2.1.1"; + sha256 = "0pw9m72b2rxg9yiirz48260ypgqzn8icarq0rj3sdzs7b255s6m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158614,6 +158724,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "hslogger_1_3_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , network, network-bsd, old-locale, time, unix + }: + mkDerivation { + pname = "hslogger"; + version = "1.3.1.1"; + sha256 = "0k8imyj2531j6k3c2bn0bavr175km2vwjlwg89vjvl00gdb107c4"; + libraryHaskellDepends = [ + base bytestring containers deepseq network network-bsd old-locale + time unix + ]; + testHaskellDepends = [ base HUnit ]; + description = "Versatile logging framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslogger-reader" = callPackage ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative , text, text-icu, time @@ -159778,17 +159906,19 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, filepath, hspec, hspec-core - , hspec-discover, optparse-applicative, silently + ({ mkDerivation, ansi-terminal, base, directory, filepath, hspec + , hspec-core, hspec-discover, optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.2.1.0"; - sha256 = "07bfwj10n75l5zskwx4yzi86xxp5b4f692bjjkqs5b970h6gw33y"; + version = "0.2.2.0"; + sha256 = "1wpn9ll8x3gr0y86f5s9266x94jlc6hh778vc0npdynabipirwbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath hspec-core ]; - executableHaskellDepends = [ base directory optparse-applicative ]; + executableHaskellDepends = [ + ansi-terminal base directory optparse-applicative + ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; testToolDepends = [ hspec-discover ]; description = "Golden tests for hspec"; @@ -160432,8 +160562,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.2.5.0"; - sha256 = "00md7i8g7sqxac7lplgdxy6csabaz35bm2lnb6c290fn261mvlx1"; + version = "0.2.6.0"; + sha256 = "1g9qm69bwf8cz5ly9jy1yflqya8nabkgbm64irdvl99vs4ry59vc"; libraryHaskellDepends = [ base containers hashable matrix numeric-prelude text unordered-containers @@ -160891,20 +161021,20 @@ self: { "hstar" = callPackage ({ mkDerivation, base, brotli, bytestring, bz2, composition-prelude - , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma, lzo + , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma-static, lzo , optparse-applicative, process, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.5"; - sha256 = "1cp7g4c38psfb9nlq8481dqazl7shy8zswli7058mgyf2xbalw0y"; + version = "0.1.0.6"; + sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base brotli bytestring bz2 composition-prelude dir-traverse - libarchive lz4-hs lzlib lzma lzo optparse-applicative process zlib - zstd + libarchive lz4-hs lzlib lzma-static lzo optparse-applicative + process zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -163414,6 +163544,8 @@ self: { pname = "http2-client"; version = "0.10.0.1"; sha256 = "1051qcnnigxyq20067r26gm3wp61p4ipga2pzjymd2wvnndx56hg"; + revision = "1"; + editedCabalFile = "1kh14m7r59lssxjrjdasrxbw6fh5ngbq0amn41863vsfff3rh1sq"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 lifted-async lifted-base mtl network stm time tls transformers-base @@ -163550,8 +163682,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.9"; - sha256 = "0y6fvkjn5lxh4r8qnnjqkq9r38ziw10smcgrws408wfpm948j3kd"; + version = "0.0.10"; + sha256 = "0azhvf92wxxx9rlj2l8xc77ch7n52jpd7yjilzjfd55v06v9k2hz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166381,8 +166513,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.4"; sha256 = "02sxx9263b9z4q9xh8d2mhg3g6mihydhzn7rjvpi3gp4bld2hg9m"; - revision = "1"; - editedCabalFile = "023f8i8110nm051wi372b9m21lpkxmdp0zp37fmimama9yv8rmxl"; + revision = "2"; + editedCabalFile = "1dijgrfidzjq2sddfb2a7dsyr956rx2g479vsyisdf067mszxq4j"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -172601,8 +172733,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "3"; - editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c"; + revision = "4"; + editedCabalFile = "12xc9y7ynxrw9gbqgr6kxslcdssbgkb361qiw3bgvimngjspjqzj"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -174812,8 +174944,8 @@ self: { }: mkDerivation { pname = "jackpolynomials"; - version = "1.2.0.0"; - sha256 = "159hipi5xqshxlys5rsv1v116njnbbhgfkxhn9s4m4rjd2ng149g"; + version = "1.2.1.0"; + sha256 = "1iwzsld7xxrlzsx5vs84lgbgdjrds316fryf1y40l6pb57cli582"; libraryHaskellDepends = [ array base combinat containers hspray ilist lens numeric-prelude ]; @@ -176300,27 +176432,6 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, containers, deepseq, exceptions - , filepath, ghc-prim, http-types, lens, primitive, process, random - , ref-tf, scientific, stm, text, time, transformers, unliftio-core - , unordered-containers, vector - }: - mkDerivation { - pname = "jsaddle"; - version = "0.9.8.3"; - sha256 = "03d89cyhkwcvk3xjac3hgp7nfg8bq6lkig7y98yyha0chda1206w"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers deepseq exceptions filepath ghc-prim http-types lens - primitive process random ref-tf scientific stm text time - transformers unliftio-core unordered-containers vector - ]; - description = "Interface for JavaScript that works with GHCJS and GHC"; - license = lib.licenses.mit; - }) {}; - - "jsaddle_0_9_9_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, containers, deepseq, exceptions , filepath, ghc-prim, http-types, lens, primitive, process, random @@ -176339,7 +176450,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -176360,22 +176470,6 @@ self: { }) {}; "jsaddle-dom" = callPackage - ({ mkDerivation, base, base-compat, Cabal, exceptions, jsaddle - , lens, text, transformers - }: - mkDerivation { - pname = "jsaddle-dom"; - version = "0.9.5.0"; - sha256 = "1abl7rwh8yc7852vphv5g5k3jv6454cdrqd2dzmhxxhxqkgxv88p"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base base-compat exceptions jsaddle lens text transformers - ]; - description = "DOM library that uses jsaddle to support both GHCJS and GHC"; - license = lib.licenses.mit; - }) {}; - - "jsaddle-dom_0_9_9_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, jsaddle, lens, text , transformers }: @@ -176388,7 +176482,6 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -176437,26 +176530,6 @@ self: { }) {}; "jsaddle-webkit2gtk" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, gi-gio - , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base - , haskell-gi-overloading, jsaddle, text, unix - , webkit2gtk3-javascriptcore - }: - mkDerivation { - pname = "jsaddle-webkit2gtk"; - version = "0.9.8.4"; - sha256 = "1aky8lczbvhm11s6hhn5vnmssq8sdhd3nx93dihhsvlma1gg8gs3"; - libraryHaskellDepends = [ - aeson base bytestring directory gi-gio gi-glib gi-gtk - gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading - jsaddle text unix webkit2gtk3-javascriptcore - ]; - description = "Interface for JavaScript that works with GHCJS and GHC"; - license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; - }) {}; - - "jsaddle-webkit2gtk_0_9_9_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base , haskell-gi-overloading, jsaddle, text, unix @@ -176474,7 +176547,6 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-webkitgtk" = callPackage @@ -181026,10 +181098,8 @@ self: { }: mkDerivation { pname = "knead"; - version = "1.0.1"; - sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; - revision = "1"; - editedCabalFile = "1h7w7y5s5mx7pxgmff45pfhh7cnxg9w2bv8787s80cfnnypwv3as"; + version = "1.0.1.1"; + sha256 = "1sd391wpnyzcyp2d7w4xfmmafsxkhcn7wfhpwdglvxzpv0sbixrd"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -182302,6 +182372,8 @@ self: { pname = "lambdabot-core"; version = "5.3.1.2"; sha256 = "14my72cw39hfc0i7fzhgxv5xjrdfr4pz2ccrixaclngypfd08g28"; + revision = "1"; + editedCabalFile = "1g26gs4dj86vhr4ic8g38pxszlik47zd1c0hm62zj9lkl8qcfyxc"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance exceptions filepath @@ -182327,6 +182399,8 @@ self: { pname = "lambdabot-haskell-plugins"; version = "5.3.1.2"; sha256 = "0pbhwhcxn4fqvn7ynhc19285r75fiksfd9yfjz6d8iq7wmp1frp8"; + revision = "1"; + editedCabalFile = "080a4iv2md1p9qa34ikqc6bliwlgmjsrlf7ys44lh3zj1ldshxfh"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -182348,6 +182422,8 @@ self: { pname = "lambdabot-irc-plugins"; version = "5.3.1.2"; sha256 = "00s27136i4xadm09clncrkm5annvnahrvcy04m5llrxa9ja09ixb"; + revision = "1"; + editedCabalFile = "15b4r4m2sqw4pa1yk90q9rg7cpk2davpib79sah13m8xf1lrf2ci"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -182367,6 +182443,8 @@ self: { pname = "lambdabot-misc-plugins"; version = "5.3.1.2"; sha256 = "0hkia5zziwabm847bl1f2pap47iyrvjwzdsygcvywving467302d"; + revision = "1"; + editedCabalFile = "09d3bngay0xai4sngp0ddly38qdpdzdaa4p5yp4qvrgg8b0nlv2w"; libraryHaskellDepends = [ base bytestring containers filepath lambdabot-core lifted-base mtl network network-uri parsec process regex-tdfa SafeSemaphore split @@ -182404,6 +182482,8 @@ self: { pname = "lambdabot-reference-plugins"; version = "5.3.1.2"; sha256 = "086ac4j85x2s156xzwmlldk7sll6jq3gq4mp2vjsa8w9q0p6yw0y"; + revision = "1"; + editedCabalFile = "1sglhkprhbdn3mv4iw1wrn8yfsc9rh1la2h2vqqx5jv7wdy3v9nd"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -188182,13 +188262,13 @@ self: { "libsecp256k1" = callPackage ({ mkDerivation, base, bytestring, deepseq, either, entropy - , hashable, hedgehog, hspec, HUnit, memory, monad-par, secp256k1 - , transformers + , hashable, hedgehog, hspec, hspec-api, HUnit, memory, monad-par + , secp256k1, transformers }: mkDerivation { pname = "libsecp256k1"; - version = "0.1.4"; - sha256 = "14y8r7f70jga8c3f2iwi8jfgbj0fd85nwz40qv8fm094yhw08hd3"; + version = "0.1.5"; + sha256 = "1x9f9ym6ssxbk404argf2y455bv2qxrcyy7brkql1fpqphl6g1dp"; libraryHaskellDepends = [ base bytestring deepseq entropy hashable hedgehog memory transformers @@ -188196,7 +188276,7 @@ self: { libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base bytestring deepseq either entropy hashable hedgehog hspec - HUnit memory monad-par transformers + hspec-api HUnit memory monad-par transformers ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; @@ -189288,6 +189368,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_23" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, QuickCheck, random + , reflection, semigroupoids, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "linear"; + version = "1.23"; + sha256 = "13w6j1wnq40821nwrly7zl4qdsnih19f3p9fnmka42mblmin2lld"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit QuickCheck reflection + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -194117,6 +194226,21 @@ self: { mainProgram = "generator"; }) {}; + "lsql-csv" = callPackage + ({ mkDerivation, base, containers, Glob, parsec, text }: + mkDerivation { + pname = "lsql-csv"; + version = "0.1.0.2"; + sha256 = "1ja2xbjl11i1cc77qszgphy9v859rzxc87z6l6kp8cz58095qb4v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers Glob parsec text ]; + executableHaskellDepends = [ base ]; + description = "A tool for CSV files data querying from the shell with short queries"; + license = lib.licenses.gpl3Only; + mainProgram = "lsql-csv"; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -199483,8 +199607,8 @@ self: { }: mkDerivation { pname = "melf"; - version = "1.3.0"; - sha256 = "1fk439y6ykdfn36vk1b09x7abp2pin7iw0a73dqxgafagqxp8sqx"; + version = "1.3.1"; + sha256 = "0ivfzsw36qy0m93h353r3963vmhirzg3a5mirqn1hfbsk24xf1dx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -201987,8 +202111,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.3.0.0"; - sha256 = "0qahnq95nxqgl5lj51j06hpmzi3fypm7flywibzyb5xad5hqp4db"; + version = "1.3.0.1"; + sha256 = "1f17mf4v2dv19wv1kzff3kql6yhn452vpjk8i1sd91rkznq28yr0"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -206301,8 +206425,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.4.1"; - sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; + version = "1.2.5"; + sha256 = "17i07i5z4jhk7w35123hkikrl81v7vnp4qd8plci90vfix53z5aa"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -206379,8 +206503,8 @@ self: { }: mkDerivation { pname = "monoidmap"; - version = "0.0.1.1"; - sha256 = "0dp0gc0jqfr8rzlvg0zgyk21xizwhx0mr5r29xkkxc9n5mxsl0l7"; + version = "0.0.1.2"; + sha256 = "1gva15h7jkll43529c6q7w4z27cbx8rpddda1gg27w6i7i9rv4dh"; libraryHaskellDepends = [ base containers deepseq groups monoid-subclasses nonempty-containers nothunks @@ -213789,6 +213913,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "network_3_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, QuickCheck, temporary + }: + mkDerivation { + pname = "network"; + version = "3.2.0.0"; + sha256 = "1jmrkjxjypm3j0d3rzm3xm87nnwnd7c3s6l7aqxdjdy49ms9cmn4"; + libraryHaskellDepends = [ base bytestring deepseq directory ]; + testHaskellDepends = [ + base bytestring directory hspec HUnit QuickCheck temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -214505,6 +214647,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-run_0_2_8" = callPackage + ({ mkDerivation, base, bytestring, network, time-manager }: + mkDerivation { + pname = "network-run"; + version = "0.2.8"; + sha256 = "1yqqvb9l17n2r4giigppj12xdpvx0m13yyhlx5ss3r4qkdj2b962"; + libraryHaskellDepends = [ base bytestring network time-manager ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-server" = callPackage ({ mkDerivation, base, network, unix }: mkDerivation { @@ -215530,8 +215684,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.3.0"; - sha256 = "1dfjvzw65q6fjzdwisr6rbwfwcp4d36k56pn3vp7i86z9vn2syqx"; + version = "0.5.4.0"; + sha256 = "0w7pvv44l4kllfgvsmszxja8wzimiskkqa1nna21cfhfkfc78h03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -216518,6 +216672,19 @@ self: { license = lib.licenses.asl20; }) {}; + "no-recursion" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, ghc }: + mkDerivation { + pname = "no-recursion"; + version = "0.1.1.0"; + sha256 = "1696872aswsh00br5wwr5ccc77ab52qvznhbjkng26vcn08mdf0w"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base doctest ]; + description = "A GHC plugin to remove support for recursion"; + license = lib.licenses.agpl3Plus; + }) {}; + "no-role-annots" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -220592,21 +220759,32 @@ self: { }) {}; "one-time-password" = callPackage - ({ mkDerivation, base, bytestring, cereal, cryptonite, memory - , tasty, tasty-hunit, time + ({ mkDerivation, base, base16, base32, bytestring, cereal, chronos + , cryptohash-sha1, cryptonite, network-uri, optparse-applicative + , sel, tasty, tasty-hunit, tasty-quickcheck, text, text-display + , torsor }: mkDerivation { pname = "one-time-password"; - version = "2.0.0"; - sha256 = "18pr5cmkm89zhwi38gb87vgzagga9qggr03vysz0q1v7cdabld8a"; + version = "3.0.0.0"; + sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal cryptonite memory time + base bytestring cereal chronos cryptohash-sha1 network-uri sel text + text-display + ]; + executableHaskellDepends = [ + base bytestring chronos optparse-applicative sel text text-display + torsor ]; testHaskellDepends = [ - base bytestring cryptonite tasty tasty-hunit time + base base16 base32 bytestring chronos cryptonite sel tasty + tasty-hunit tasty-quickcheck text text-display torsor ]; description = "HMAC-Based and Time-Based One-Time Passwords"; license = lib.licenses.mit; + mainProgram = "one-time-password"; }) {}; "oneOfN" = callPackage @@ -220807,8 +220985,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.2.3"; - sha256 = "1cbd6d5gp438bi3w2ml7lba6rjjykyxpc5dp5ph0n67pbvbzd66d"; + version = "0.10.3.0"; + sha256 = "1zq2d8rb1zwrvg0civh2a6r01nv1v2ini9rykf63px00srs98p67"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -232130,8 +232308,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.20.0.1"; - sha256 = "0rc7di62zcbssl21pa109k9klxkc44ihz12sdlzwq3hg3hrmnrsv"; + version = "0.20.0.2"; + sha256 = "016rb0x25584d7qxrqw4pgqlp0d6fyannhwjdy4677hlp5yi2812"; libraryHaskellDepends = [ async base cli-arguments deepseq directory halfsplit minmax phladiprelio-general-datatype phladiprelio-general-shared @@ -232196,8 +232374,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.20.2.1"; - sha256 = "1jlx3dffra7cs263bg1mgvbi1kzw15dy98jiysxb906ivwd5vnfd"; + version = "0.20.2.2"; + sha256 = "0fy9559zbza3jpiz502pqya00da67bvh2m0hca756lrh8agqmfjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240478,8 +240656,8 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.0.3.0"; - sha256 = "0rm3cnvjs8825x7czdc948whjfjynzz9apbp2qbmyv3lihi4mib5"; + version = "0.0.4.0"; + sha256 = "0d5bfci30ck6kx9pspv0d68lxgs700xv6y6067ki9yvlnrimrff2"; libraryHaskellDepends = [ aeson base constraints containers lens template-haskell text ]; @@ -242671,16 +242849,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_18_0" = callPackage + "process_1_6_19_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.18.0"; - sha256 = "0zm3v2m95a7bsnndl1pvdj9a7gd4v84pb34rmgsqjkwpwi7lqpxa"; - revision = "2"; - editedCabalFile = "0ksri04db6g38n9h3qi0qwiq0gh0hy20irj90121mxp494kwwjwb"; + version = "1.6.19.0"; + sha256 = "15nbbn7zcs1pwicqdhzg5s6wrym1l29mbvbin5z56rk9nid3as5l"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -244177,27 +244353,6 @@ self: { }) {ribosome-menu = null;}; "proto-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , lens-family, parsec, pretty, primitive, profunctors, QuickCheck - , tagged, tasty, tasty-quickcheck, text, transformers, vector - }: - mkDerivation { - pname = "proto-lens"; - version = "0.7.1.4"; - sha256 = "0nb1klrhms82mkjzr2zxdcj5ny6skjgqi6md05bmm99s0hg0ql15"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim lens-family parsec - pretty primitive profunctors tagged text transformers vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck vector - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens_0_7_1_5" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, tasty, tasty-quickcheck, text, transformers, vector @@ -244216,27 +244371,9 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.12"; - sha256 = "1hx3yifczzvl5h14c8yjqdq3q8g37hawqkbc6c25pcs8i40sagv7"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - description = "Arbitrary instances for proto-lens"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "proto-lens-arbitrary_0_1_2_13" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: @@ -244310,19 +244447,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.11"; - sha256 = "19iszwk1i8h9n7ryxmvf1rc102n6yn9d22rdnslw9s2vycb1645j"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_12" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -244333,7 +244457,6 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage @@ -244377,22 +244500,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, proto-lens, text, vector - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.7.0.5"; - sha256 = "17c0ip6s3sca23mwmzl2ky8b220iiaasqmbv19ixfq82hl9sjvl1"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family proto-lens - text vector - ]; - doHaddock = false; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_7_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -244406,7 +244513,6 @@ self: { ]; doHaddock = false; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -247688,8 +247794,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.19"; - sha256 = "0kxdiah415lsj06pdi14bcs3i7gqyyx9x093rxss8l48w1820zwr"; + version = "0.1.20"; + sha256 = "0zzpdb07xrgx3bcvnfmn778yamk6q86lqmj1ir1h3g82gcknzfxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248021,8 +248127,8 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.1"; - sha256 = "0fi2ixgd4cpc5q6ybbmgbf14dszpr3454bbwpzr74rnalj5qj7ym"; + version = "0.3.0.2"; + sha256 = "1baxylj4kh1vx5vfy8dcschzr9bfaby7y3m6m1kjpb4qdj8vlbk3"; libraryHaskellDepends = [ base containers monoid-subclasses pretty-show QuickCheck quickcheck-classes quickcheck-instances semigroupoids @@ -248099,8 +248205,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.1"; - sha256 = "1nqc5ggm50pw7vzjxdc8kv3iz40lpkisrs35jmzx892b4iy361dz"; + version = "0.0.1.2"; + sha256 = "1chdbkd1as9ln6cgcv62w3vqw821ybmyh500k80a3c244ipwf8ny"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -254660,8 +254766,8 @@ self: { pname = "regex-tdfa"; version = "1.3.2.2"; sha256 = "1dvmplkhma32y68v4vvpbwmjbg3hzd7qhsyq6pim1fs68b2xaglk"; - revision = "2"; - editedCabalFile = "165gd2gr0x9d3yvdzp8hdiapwz3cgdfbai15zbqdy0cq312d3bwj"; + revision = "3"; + editedCabalFile = "0y3l8ipsxyf47vpgg94p7mrn4f1b82y891vrmqzwcqlci6r1bsp5"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -257826,6 +257932,8 @@ self: { pname = "retroclash-lib"; version = "0.1.2.2"; sha256 = "18jkrbg3fhz64n6adxa674jng6ajrq89ib53rhjvm053qsafrllh"; + revision = "1"; + editedCabalFile = "0f2l2xvz704yhwb1qwk70z29j3gf1afxvszc6f1sk3cdkkxnxpsd"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -257847,6 +257955,8 @@ self: { pname = "retroclash-sim"; version = "0.1.1"; sha256 = "147i7nbxyxgsvyj2wiaiipi0s8sp14y1av33yba4s148k38zsiw3"; + revision = "1"; + editedCabalFile = "10s1p7j3i37ykwaaf58n1cl3ha128mbl3b6jp9lhvxgxj3f7j06d"; libraryHaskellDepends = [ array arrows base clash-ghc clash-lib clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -267724,8 +267834,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "1"; - editedCabalFile = "1y1x0jrc5k7z8r54jk1p1iw18f2psky4ksxd0f8aqfvy1hamzra8"; + revision = "2"; + editedCabalFile = "1y21m10vx4k75x0im5448pl5mhl772hz1hfk47ryb3whz1l6d9vf"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -278578,8 +278688,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "3"; - editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8"; + revision = "4"; + editedCabalFile = "11rgmi28yhdpmzc72zxql70q6zrxnihkrv5lvabggyc9008dhyj8"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -279753,10 +279863,8 @@ self: { }: mkDerivation { pname = "snappy-c"; - version = "0.1.0"; - sha256 = "02q3bikni0ajwiiah3w6bay24wc9ip6jgnb2nidnwshk4s7i84y7"; - revision = "1"; - editedCabalFile = "057h4hmb035562s5zqgc23r6kyzlqmna3s0bf5qw8bama3dk75yp"; + version = "0.1.1"; + sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285987,12 +286095,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_3_0" = callPackage + "stm_2_5_3_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.3.0"; - sha256 = "1xy3sj69wcb92fg0y5lp0qxcsi3pyvvrrrn4fpi2snji4j3k47hv"; + version = "2.5.3.1"; + sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -292832,6 +292940,42 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {}; + "synthesizer-core_0_8_4" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, semigroups, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "synthesizer-core"; + version = "0.8.4"; + sha256 = "11m5zvnwzrsd5ylyc6xd4k56ypmmwzyhixvzc55hgjfpsx9snks9"; + revision = "1"; + editedCabalFile = "1q274hspisb2qi45dj01dcm2sxfcqib0i96jkc2jzlvaynnnqhlr"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq event-list + explicit-exception filepath non-empty non-negative numeric-prelude + numeric-quest process QuickCheck random sample-frame-np semigroups + sox storable-record storable-tuple storablevector transformers + utility-ht + ]; + testHaskellDepends = [ + base containers event-list non-empty non-negative numeric-prelude + QuickCheck random storable-tuple storablevector transformers + utility-ht + ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; + description = "Audio signal processing coded in Haskell: Low level part"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; + }) {}; + "synthesizer-dimensional" = callPackage ({ mkDerivation, base, bytestring, event-list, non-negative , numeric-prelude, random, semigroups, sox, storable-record @@ -300647,8 +300791,10 @@ self: { }: mkDerivation { pname = "th-extras"; - version = "0.0.0.7"; - sha256 = "0zxbqmdzrljjcj5dh2yi0hgjjd6a3wyg2r989vvcsdfxfcb0dl46"; + version = "0.0.0.8"; + sha256 = "1hvpvb02j2zyg4mpdqzs3w4s7wva78npdlrnpsii7nps2fpvcmrs"; + revision = "1"; + editedCabalFile = "065l0xfzdq529d64qnh2s13zvswhjzv9ndyf7m7hzzbg8y83flbc"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -302099,6 +302245,8 @@ self: { pname = "tidal"; version = "1.9.5"; sha256 = "1skm8x9gh60c0i1rr0a18jxi6y4mpi83fvzjcadlziwjna5x6a3w"; + revision = "1"; + editedCabalFile = "1hp0r7mav7m6ga6lxjvw7lkhnw240a7pzc65s97k4kcax2ibvq96"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -309680,6 +309828,18 @@ self: { broken = true; }) {}; + "type-level-bytestrings" = callPackage + ({ mkDerivation, base, type-spec }: + mkDerivation { + pname = "type-level-bytestrings"; + version = "0.1.0"; + sha256 = "06iw0plkkwl514w4nx5188v35x22abxmqfg1alnlqr1ihssmgf63"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base type-spec ]; + description = "Tools for manipulating type-level bytes and bytestrings"; + license = lib.licenses.mit; + }) {}; + "type-level-integers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -327650,8 +327810,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.13.0"; - sha256 = "0qdfj4d83b1fjmlysqncgi65ldf3qnrsj4lync95mgbaq2kzxj2r"; + version = "0.14.0"; + sha256 = "184ap6lpd29bx4b3dxpcpzc3za9m4gz2fwf7565mxlxlwjbyamhv"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -331640,8 +331800,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11.2"; - sha256 = "0yqyggdvfi0kg4qa0is3lqifz40kgyjll445yxcpv6m8vcd2r1a1"; + version = "1.6.11.3"; + sha256 = "1qfzg4khdzrhzq78323648780divjllqrxn9hhzpnis61f0fwni8"; libraryHaskellDepends = [ aeson attoparsec-aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup @@ -335665,30 +335825,6 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, pretty, process - , temporary, text, time, unix, which, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.4.3.1"; - sha256 = "0f9z0p2vmqahk9fzxwp5914f3ls4wsacd9bf5p5nnd5vdp1navyf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit process temporary time - unix - ]; - testToolDepends = [ which ]; - description = "Library for creating and modifying zip archives"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) which;}; - - "zip-archive_0_4_3_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process , temporary, text, time, unix, which, zlib @@ -335710,7 +335846,6 @@ self: { testToolDepends = [ which ]; description = "Library for creating and modifying zip archives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) which;}; "zip-cmd" = callPackage From bf2a10e15b8ec74cc21c6ba8e3463e75452831eb Mon Sep 17 00:00:00 2001 From: Alex Tunstall Date: Fri, 21 Jul 2023 19:43:22 +0100 Subject: [PATCH 06/29] haskell.compiler.ghc8107: support {LD,AR}_STAGE0 --- pkgs/development/compilers/ghc/8.10.7.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 4a770d993a67..cc819ff8dcbf 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, autoreconfHook, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx , xattr, autoSignDarwinBinariesHook , bash @@ -223,6 +223,12 @@ stdenv.mkDerivation (rec { stripLen = 3; extraPrefix = "libraries/Cabal/Cabal/"; }) + + # We need to be able to set AR_STAGE0 and LD_STAGE0 when cross-compiling + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; + hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; + }) ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { @@ -334,7 +340,7 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 + perl autoreconfHook autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook From ad321e0602a6eb9cc5bc6fa4676371053d8183c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 23:48:22 +0200 Subject: [PATCH 07/29] release-haskell.nix/mergeable: include darwin again Unfortunately, some of these packages block the NixOS/nixpkgs channels so they also need to work on darwin. I'd say for the future we can be liberal in moving packages (that don't block the channel) out of mergeable, but stuff like cachix needs to work everywhere. --- pkgs/top-level/release-haskell.nix | 64 +++++++++++++----------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ed1d3240d1cf..4f922ab67ac3 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -594,42 +594,34 @@ let maintainers = lib.teams.haskell.members; }; constituents = - let - # Filter out all Darwin derivations. We don't want flakey Darwin - # derivations and flakey Hydra Darwin builders to block the - # mergeable job from successfully building. - filterInLinux = - lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); - in - filterInLinux - (accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]); + accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages"; From 40bc356bc601d0441e235c447634ff5551ee78e1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 16 Apr 2024 23:51:18 +0200 Subject: [PATCH 08/29] release-haskell.nix/mergeable: include shellcheck pkgs.shellcheck is (indirectly via nix-info-tested) a channel blocker. --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4f922ab67ac3..40e27ab7810e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -610,6 +610,7 @@ let jobs.pandoc jobs.stack jobs.stylish-haskell + jobs.shellcheck # important haskell (library) packages jobs.haskellPackages.cabal-plan jobs.haskellPackages.distribution-nixpkgs From 9b818bcc11ad88409cc1b6c84cc53c4b82e06327 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 19 Apr 2024 15:16:35 +0200 Subject: [PATCH 09/29] haskell.packages.*.cabal-install: reflect process 1.6.18 -> 1.6.19 --- 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 00dcc3b7a5d8..79a8beec01b1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -24,7 +24,7 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_18_0; + process = self.process_1_6_19_0; })); # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -48,7 +48,7 @@ self: super: { # cabal-install, but we need to recompile process even if the correct # version is available to prevent inconsistent dependencies: # process depends on directory. - process = cself.process_1_6_18_0; + process = cself.process_1_6_19_0; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. From 9070ffe650b44dbee6dd56aeba503846ee188066 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Thu, 18 Apr 2024 16:32:02 +0200 Subject: [PATCH 10/29] mkjson: init at 0.4.0 --- pkgs/by-name/mk/mkjson/generated.nix | 46 ++++++++++++++++++++++++++++ pkgs/by-name/mk/mkjson/package.nix | 1 + pkgs/top-level/release-haskell.nix | 1 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/by-name/mk/mkjson/generated.nix create mode 100644 pkgs/by-name/mk/mkjson/package.nix diff --git a/pkgs/by-name/mk/mkjson/generated.nix b/pkgs/by-name/mk/mkjson/generated.nix new file mode 100644 index 000000000000..a89306f5b427 --- /dev/null +++ b/pkgs/by-name/mk/mkjson/generated.nix @@ -0,0 +1,46 @@ +{ mkDerivation, lib, fetchFromGitHub +, aeson, base, bytestring, containers, criterion +, doctest, Glob, mersenne-random-pure64, mtl +, optparse-applicative, parsec, random, regex-tdfa, scientific +, text, time, unordered-containers, uuid, vector +}: + +mkDerivation rec { + pname = "mkjson"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "mkjson"; + rev = "${version}"; + hash = "sha256-+NDLFtsWWxHv/6XC9hJOAHPU6YED5oHqS/j5BPwNsqA="; + }; + + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers mersenne-random-pure64 mtl + optparse-applicative parsec random regex-tdfa scientific text time + unordered-containers uuid vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers mersenne-random-pure64 mtl + optparse-applicative parsec random regex-tdfa scientific text time + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doctest Glob + mersenne-random-pure64 mtl optparse-applicative parsec random + regex-tdfa scientific text time unordered-containers uuid vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion mersenne-random-pure64 + mtl optparse-applicative parsec random regex-tdfa scientific text + time unordered-containers uuid vector + ]; + + description = "A commandline tool to generate static or random JSON records"; + homepage = "https://github.com/mfussenegger/mkjson"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ athas ]; + mainProgram = "mkjson"; +} diff --git a/pkgs/by-name/mk/mkjson/package.nix b/pkgs/by-name/mk/mkjson/package.nix new file mode 100644 index 000000000000..dfa170a5303d --- /dev/null +++ b/pkgs/by-name/mk/mkjson/package.nix @@ -0,0 +1 @@ +{ haskell, haskellPackages }: haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { }) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ed1d3240d1cf..1c06b9e49596 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -319,6 +319,7 @@ let madlang mailctl matterhorn + mkjson mueval naproche niv From d4f78fde662a67fb2115f79627500ccc3426190a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 21 Apr 2024 18:21:44 +0200 Subject: [PATCH 11/29] mueval: broken on aarch64 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 221062282a98..5d9e21dc0937 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -645,6 +645,7 @@ unsupported-platforms: monomer: [ platforms.darwin ] # depends on mesa monomer-hagrid: [ platforms.darwin ] # depends on mesa mptcp-pm: [ platforms.darwin ] + mueval: [ aarch64-linux ] # https://hydra.nixos.org/build/257076117/nixlog/2 https://gitlab.haskell.org/ghc/ghc/-/issues/24432 nanovg: [ platforms.darwin ] # depends on mesa netlink: [ platforms.darwin ] notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu From 1d5354ec4db51a5cb71f283055e3c4b4b9e5c617 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 17:08:16 +0200 Subject: [PATCH 12/29] fffuu: allow building with split-0.2.5 --- pkgs/tools/misc/fffuu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 2463ee5a6e99..ed34fc42d64b 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -14,7 +14,8 @@ mkDerivation { postPatch = '' substituteInPlace haskell_tool/fffuu.cabal \ --replace "containers >=0.5 && <0.6" "containers >= 0.6" \ - --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" + --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" \ + --replace "split >= 0.2.3 && <= 0.2.4" "split >= 0.2.3" ''; preCompileBuildDriver = '' From bce71e97a07bc342d89ce85480fb3b134e1395d8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 20:43:55 +0200 Subject: [PATCH 13/29] haskellPackages.cabal2nix-unstable: 2024-02-05 -> 2024-04-21 This removes (some of) the special casing for git-annex which we need to replicate using overrides. As a first step, we recreate an equivalent set of overrides to the former gitAnnexHook, the only difference being that we use the default installPhase over a custom implementation. A big flaw of the current expression (which was shared by the previous iteration) is that they ignore the testFlags argument. Unfortunately, we can't do that without changing the generic builder implementation. --- .../haskell-modules/cabal2nix-unstable.nix | 6 +- .../haskell-modules/configuration-nix.nix | 59 ++++++++++++++++++- .../haskell-modules/hackage-packages.nix | 54 ++++++----------- 3 files changed, 80 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8e7396a3fb48..b16a9abfe8a2 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-02-05"; + version = "unstable-2024-04-21"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/173e8a5fa70dc95a1aeb0bd877bf5fee6d5e6b4a.tar.gz"; - sha256 = "1pld7jfsjmw486ch6li1fqci1jj5p2nvfq7nrkxrmf5p2ja5528g"; + url = "https://github.com/NixOS/cabal2nix/archive/f8e6bf749a158a5ed866c57deee907b5f16c38e5.tar.gz"; + sha256 = "0c73mvza65iy46fv8c8cadsy7klk4jzmimm1mfdavvm8i2cr5476"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 72cc9c4c85a9..a3739ad96210 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -719,7 +719,28 @@ self: super: builtins.intersectAttrs super { }) (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark); - git-annex = overrideCabal (drv: { + git-annex = let + # Executables git-annex needs at runtime. git-annex detects these at configure + # time and expects to be able to execute them. This means that cross-compiling + # git-annex is not possible and strictDeps must be false (runtimeExecDeps go + # into executableSystemDepends/buildInputs). + runtimeExecDeps = [ + pkgs.bup + pkgs.curl + pkgs.git + pkgs.gnupg + pkgs.lsof + pkgs.openssh + pkgs.perl + pkgs.rsync + pkgs.wget + pkgs.which + ]; + in + overrideCabal (drv: { + executableSystemDepends = runtimeExecDeps; + enableSharedExecutables = false; + # This is an instance of https://github.com/NixOS/nix/pull/1085 # Fails with: # gpg: can't connect to the agent: File name too long @@ -728,6 +749,42 @@ self: super: builtins.intersectAttrs super { --replace ', testCase "crypto" test_crypto' "" '' + (drv.postPatch or ""); + preConfigure = drv.preConfigure or "" + '' + export HOME=$TEMPDIR + patchShebangs . + ''; + + # git-annex ships its test suite as part of the final executable instead of + # using a Cabal test suite. + checkPhase = '' + runHook preCheck + + # Setup PATH for the actual tests + ln -sf dist/build/git-annex/git-annex git-annex + ln -sf git-annex git-annex-shell + PATH+=":$PWD" + + echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} + + # Doesn't use Cabal's test mechanism + git-annex test $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} + + runHook postCheck + ''; + + # Use default installPhase of pkgs/stdenv/generic/setup.sh. We need to set + # the environment variables it uses via the preInstall hook since the Haskell + # generic builder doesn't accept them as arguments. + preInstall = drv.preInstall or "" + '' + installTargets="install install-completions" + installFlagsArray+=( + "BUILDER=:" + "PREFIX=" + "DESTDIR=$out" + ) + ''; + installPhase = null; + # Ensure git-annex uses the exact same coreutils it saw at build-time. # This is especially important on Darwin but also in Linux environments # where non-GNU coreutils are used by default. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3f238ca7295..f8a6812cb9b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -121898,34 +121898,32 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, aws, base - , blaze-builder, bloomfilter, bup, byteable, bytestring, Cabal + , blaze-builder, bloomfilter, byteable, bytestring, Cabal , case-insensitive, clientsession, concurrent-output, conduit - , containers, crypto-api, crypton, curl, data-default, DAV, dbus - , deepseq, directory, disk-free-space, dlist, edit-distance - , exceptions, fdo-notify, feed, filepath, filepath-bytestring, free - , git, git-lfs, gnupg, hinotify, http-client - , http-client-restricted, http-client-tls, http-conduit, http-types - , IfElse, lsof, magic, memory, microlens, monad-control - , monad-logger, mountpoints, mtl, network, network-bsd - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent + , containers, crypto-api, crypton, data-default, DAV, dbus, deepseq + , directory, disk-free-space, dlist, edit-distance, exceptions + , fdo-notify, feed, filepath, filepath-bytestring, free, git-lfs + , hinotify, http-client, http-client-restricted, http-client-tls + , http-conduit, http-types, IfElse, magic, memory, microlens + , monad-control, monad-logger, mountpoints, mtl, network + , network-bsd, network-info, network-multicast, network-uri + , old-locale, optparse-applicative, path-pieces, persistent , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unliftio-core, unordered-containers, utf8-string - , uuid, vector, wai, wai-extra, warp, warp-tls, wget, which, yesod - , yesod-core, yesod-form, yesod-static + , random, regex-tdfa, resourcet, SafeSemaphore, sandi, securemem + , shakespeare, socks, split, stm, stm-chans, tagsoup, tasty + , tasty-hunit, tasty-quickcheck, tasty-rerun, template-haskell + , text, time, torrent, transformers, unix, unix-compat + , unliftio-core, unordered-containers, utf8-string, uuid, vector + , wai, wai-extra, warp, warp-tls, yesod, yesod-core, yesod-form + , yesod-static }: mkDerivation { pname = "git-annex"; version = "10.20240227"; sha256 = "07py6xfss8jpw5yhvj203g4yd7qqx600j20hz0kqk80dpn7i3nqq"; configureFlags = [ - "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" - "-fwebapp" "-fwebdav" + "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" + "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" ]; isLibrary = false; isExecutable = true; @@ -121952,25 +121950,11 @@ self: { utf8-string uuid vector wai wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = '' - ln -sf dist/build/git-annex/git-annex git-annex - ln -sf git-annex git-annex-shell - ''; - installPhase = "make PREFIX=$out BUILDER=: install install-completions"; - checkPhase = ''PATH+=":$PWD" git-annex test''; - enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = lib.licenses.agpl3Only; mainProgram = "git-annex"; maintainers = [ lib.maintainers.peti lib.maintainers.roosemberth ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; + }) {}; "git-brunch" = callPackage ({ mkDerivation, base, brick, extra, hspec, microlens From fd8ab54324450671c5de41177e776045b732b7ec Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 21:02:16 +0200 Subject: [PATCH 14/29] git-annex: don't use redundant installation targets `make install` also implies install-mans and install-completions. --- pkgs/development/haskell-modules/configuration-nix.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a3739ad96210..660bf2d123c6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -776,7 +776,7 @@ self: super: builtins.intersectAttrs super { # the environment variables it uses via the preInstall hook since the Haskell # generic builder doesn't accept them as arguments. preInstall = drv.preInstall or "" + '' - installTargets="install install-completions" + installTargets="install" installFlagsArray+=( "BUILDER=:" "PREFIX=" @@ -801,13 +801,6 @@ self: super: builtins.intersectAttrs super { # `git-annex-shell` by making `shell = haskellPackages.git-annex`. # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; - - # Install man pages which is no longer done by Setup.hs - # TODO(@sternenseemann): figure out why install-desktops wants to create /usr - # and run that, too. - postInstall = drv.postInstall or "" + '' - make install-mans "DESTDIR=$out" PREFIX= - ''; }) (super.git-annex.override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; From cdedb410393cacc4756422d7d64b5144b816ff28 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 21:35:08 +0200 Subject: [PATCH 15/29] git-annex: fix installation location of .desktop files and icons --- .../haskell-modules/configuration-common.nix | 7 +++++++ .../patches/git-annex-no-usr-prefix.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79a8beec01b1..777cbef33597 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -411,6 +411,13 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; + + patches = drv.patches or [ ] ++ [ + # Prevent .desktop files from being installed to $out/usr/share. + # TODO(@sternenseemann): submit upstreamable patch resolving this + # (this should be possible by also taking PREFIX into account). + ./patches/git-annex-no-usr-prefix.patch + ]; }) super.git-annex; # Too strict bounds on servant diff --git a/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch b/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch new file mode 100644 index 000000000000..03c9368d52fb --- /dev/null +++ b/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs +index 896b89b991..6cbb4f90ae 100644 +--- a/Utility/FreeDesktop.hs ++++ b/Utility/FreeDesktop.hs +@@ -112,7 +112,7 @@ desktopfile f = f ++ ".desktop" + + {- Directory used for installation of system wide data files.. -} + systemDataDir :: FilePath +-systemDataDir = "/usr/share" ++systemDataDir = "/share" + + {- Directory used for installation of system wide config files. -} + systemConfigDir :: FilePath From 69e0d2cb42847a5a977fa5c62713e38480699ce7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 23:37:32 +0200 Subject: [PATCH 16/29] git-annex: crypto test no longer fails on darwin --- pkgs/development/haskell-modules/configuration-nix.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 660bf2d123c6..fb4afdde5bba 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -741,14 +741,6 @@ self: super: builtins.intersectAttrs super { executableSystemDepends = runtimeExecDeps; enableSharedExecutables = false; - # This is an instance of https://github.com/NixOS/nix/pull/1085 - # Fails with: - # gpg: can't connect to the agent: File name too long - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace Test.hs \ - --replace ', testCase "crypto" test_crypto' "" - '' + (drv.postPatch or ""); - preConfigure = drv.preConfigure or "" + '' export HOME=$TEMPDIR patchShebangs . From 4a1299190e087eead9ef5bc288e6015564fbe146 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 23:48:32 +0200 Subject: [PATCH 17/29] git-annex: skip test requiring unavailable tool on darwin --- .../haskell-modules/configuration-darwin.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 480059de14c0..3e7bf1f89f7c 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -82,6 +82,17 @@ self: super: ({ # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = dontCheck super.system-fileio; + git-annex = overrideCabal (drv: { + # We can't use testFlags since git-annex side steps the Cabal test mechanism + preCheck = drv.preCheck or "" + '' + checkFlagsArray+=( + # The addurl test cases require security(1) to be in PATH which we can't + # provide from nixpkgs to my (@sternenseemann) knowledge. + "-p" "!/addurl/" + ) + ''; + }) super.git-annex; + # Prevents needing to add `security_tool` as a run-time dependency for # everything using x509-system to give access to the `security` executable. # From e102133fa1067d0d6acfdf9253eb8e0c1a7c9934 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Apr 2024 11:12:09 +0200 Subject: [PATCH 18/29] release-haskell.nix: include new nixfmt-* attributes --- 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 c6ac739f027e..a28c4e8a84ec 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -331,6 +331,8 @@ let nix-script nix-tree nixfmt + nixfmt-classic + nixfmt-rfc-style nota nvfetcher ormolu From 78667e9c1b40c35c8c8eea32efa6811160699783 Mon Sep 17 00:00:00 2001 From: Slava Gorbunov Date: Mon, 22 Apr 2024 12:58:46 +0200 Subject: [PATCH 19/29] haskellPackages.mkDerivation: fix logic error Co-authored-by: sternenseemann --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index cda49e0f8752..25480044c9ed 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -40,7 +40,7 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) +, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; From 718851b229754c86bb20507404a50ec07719d057 Mon Sep 17 00:00:00 2001 From: Slava Gorbunov Date: Fri, 12 Apr 2024 17:50:59 +0300 Subject: [PATCH 20/29] haskellPackages.mkDerivation: use emcc as C compiler for ghcjs We need to set up EM_CACHE correctly so that it works, of course. Note that the solution relies on the assumption that this should only happen when we cross compile, i.e. the extra logic to account for the cc-less stdenv in pkgsCross.ghcjs is only present in crossCabalFlags. Co-authored-by: sternenseemann --- .../haskell-modules/generic-builder.nix | 30 ++++++++++++++----- pkgs/top-level/release-haskell.nix | 10 +++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 25480044c9ed..f9acdd0f4a27 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,13 +1,24 @@ { lib, stdenv, buildPackages, buildHaskellPackages, ghc -, jailbreak-cabal, hscolour, cpphs, nodejs +, jailbreak-cabal, hscolour, cpphs , ghcWithHoogle, ghcWithPackages +, nodejs }: let isCross = stdenv.buildPlatform != stdenv.hostPlatform; + + # Pass the "wrong" C compiler rather than none at all so packages that just + # use the C preproccessor still work, see + # https://github.com/haskell/cabal/issues/6466 for details. + cc = + if stdenv.hasCC then "$CC" + else if stdenv.hostPlatform.isGhcjs then "${emscripten}/bin/emcc" + else "$CC_FOR_BUILD"; + inherit (buildPackages) fetchurl removeReferencesTo - pkg-config coreutils gnugrep glibcLocales; + pkg-config coreutils gnugrep glibcLocales + emscripten; in { pname @@ -40,7 +51,8 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm) +# Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 +, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isGhcjs) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; @@ -188,10 +200,7 @@ let crossCabalFlags = [ "--with-ghc=${ghcCommand}" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" - # Pass the "wrong" C compiler rather than none at all so packages that just - # use the C preproccessor still work, see - # https://github.com/haskell/cabal/issues/6466 for details. - "--with-gcc=${if stdenv.hasCC then "$CC" else "$CC_FOR_BUILD"}" + "--with-gcc=${cc}" ] ++ optionals stdenv.hasCC [ "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" @@ -315,7 +324,7 @@ let optionals doBenchmark benchmarkToolDepends; nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) (assert pkg-config != null; pkg-config) ++ - setupHaskellDepends ++ collectedToolDepends; + setupHaskellDepends ++ collectedToolDepends ++ optional stdenv.hostPlatform.isGhcjs nodejs; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputsHaskell = optionals doCheck (testDepends ++ testHaskellDepends) ++ @@ -442,6 +451,11 @@ stdenv.mkDerivation ({ '' + '' done '' + + (optionalString stdenv.hostPlatform.isGhcjs '' + export EM_CACHE="$(realpath "$(mktemp -d emcache.XXXXXXXXXX)")" + cp -Lr ${emscripten}/share/emscripten/cache/* "$EM_CACHE/" + chmod u+rwX -R "$EM_CACHE" + '') # only use the links hack if we're actually building dylibs. otherwise, the # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes # "ln -s $out/lib/links", which tries to recreate the links dir and fails diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a28c4e8a84ec..5ebc1c78a89f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -473,6 +473,15 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) ghc hello + microlens + ; + }; + + haskell.packages.ghc98 = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) + ghc + hello + microlens ; }; @@ -480,6 +489,7 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) ghc hello + microlens ; }; }; From eff1cb2ba7b3193c1b1d1846724c20e0f75f5ba4 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 22 Apr 2024 23:50:26 +0200 Subject: [PATCH 21/29] haskellPackages: change maintainerships by maralorn This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/main.yaml | 10 ++++++---- .../transitive-broken.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 15 ++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5d9e21dc0937..ddbadf71d7f7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -249,22 +249,22 @@ package-maintainers: libjared: - sensei maralorn: + - bluefin - cabal-fmt - - clay - eventlog2html + - falsify - generic-optics - ghc-debug-brick - ghc-debug-stub - ghcid - graphql-client - haskell-language-server - - hedgehog - hledger - hledger-ui - hledger-web - hlint - - hmatrix - hspec-discover + - jsaddle-warp - matrix-client - optics - pandoc @@ -273,9 +273,9 @@ package-maintainers: - postgresql-simple - purebred-email - reflex-dom - - releaser - replace-megaparsec - req + - say - shake-bench - shh - shh-extras @@ -283,7 +283,9 @@ package-maintainers: - stm-containers - streamly - streamly-bytestring + - string-interpolate - taskwarrior + - tasty - threadscope - tz - weeder diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index dcaa495f6b69..a6cefd5e6932 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1834,6 +1834,7 @@ dont-distribute-packages: - gtkrsync - guarded-rewriting - guess-combinator + - h3spec - hArduino - hOff-display - hPDB @@ -3000,6 +3001,7 @@ dont-distribute-packages: - olwrapper - om-kubernetes - om-legion + - one-time-password - online-csv - oops-examples - opc-xml-da-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f8a6812cb9b4..952974491081 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -51906,6 +51906,7 @@ self: { libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "bluefin-internal" = callPackage @@ -65525,7 +65526,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "clay_0_15_0" = callPackage @@ -65540,7 +65540,6 @@ self: { description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "clckwrks" = callPackage @@ -103708,6 +103707,7 @@ self: { ]; description = "Property-based testing with internal integrated shrinking"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "familiar-reflection" = callPackage @@ -131055,6 +131055,7 @@ self: { ]; description = "QUIC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "h3spec"; }) {}; @@ -144154,7 +144155,6 @@ self: { ]; description = "Release with confidence"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "hedgehog-checkers" = callPackage @@ -151284,7 +151284,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -176510,6 +176509,7 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; broken = true; }) {}; @@ -209339,6 +209339,7 @@ self: { ]; description = "Safely evaluate pure Haskell expressions"; license = lib.licenses.bsd3; + badPlatforms = [ "aarch64-linux" ]; mainProgram = "mueval"; }) {}; @@ -220768,6 +220769,7 @@ self: { ]; description = "HMAC-Based and Time-Based One-Time Passwords"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "one-time-password"; }) {}; @@ -255753,7 +255755,6 @@ self: { description = "Automation of Haskell package release process"; license = lib.licenses.asl20; mainProgram = "releaser"; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "relevant-time" = callPackage @@ -263670,6 +263671,7 @@ self: { ]; description = "Send textual messages to a Handle in a thread-friendly way"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "say-my-name" = callPackage @@ -288500,6 +288502,7 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "string-interpreter" = callPackage @@ -295278,6 +295281,7 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "tasty_1_5" = callPackage @@ -295297,6 +295301,7 @@ self: { description = "Modern and extensible testing framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "tasty-ant-xml" = callPackage From c4192037f7febee4b23b6aefc7a81f9f35189cb9 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 23 Apr 2024 00:24:08 +0200 Subject: [PATCH 22/29] haskellPackages.jsaddle-dom: Fix build --- .../development/haskell-modules/configuration-common.nix | 1 + .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 7 ------- pkgs/development/haskell-modules/hackage-packages.nix | 9 --------- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 777cbef33597..f629e35bc9a5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1594,6 +1594,7 @@ self: super: { jsaddle-dom = overrideCabal (old: { postPatch = old.postPatch or "" + '' sed -i 's/lens.*4.20/lens/' jsaddle-dom.cabal + rm Setup.hs ''; }) (doJailbreak super.jsaddle-dom); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7885fa5f21d7..0b24e9ef79eb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3207,7 +3207,6 @@ broken-packages: - joy-rewrite # failure in job https://hydra.nixos.org/build/233201002 at 2023-09-02 - jpeg # failure in job https://hydra.nixos.org/build/233204056 at 2023-09-02 - jsaddle-clib # failure in job https://hydra.nixos.org/build/233203899 at 2023-09-02 - - jsaddle-warp # failure in job https://hydra.nixos.org/build/233252373 at 2023-09-02 - jsaddle-wkwebview # failure in job https://hydra.nixos.org/build/233242986 at 2023-09-02 - js-good-parts # failure in job https://hydra.nixos.org/build/233198958 at 2023-09-02 - json2 # failure in job https://hydra.nixos.org/build/233242447 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 a6cefd5e6932..50d793c10fb9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -357,17 +357,13 @@ dont-distribute-packages: - Shellac-haskeline - Shellac-readline - ShortestPathProblems - - Shpadoinkle - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-static - Shpadoinkle-developer-tools - Shpadoinkle-disembodied - Shpadoinkle-examples - Shpadoinkle-html - - Shpadoinkle-lens - Shpadoinkle-router - - Shpadoinkle-streaming - Shpadoinkle-template - Shpadoinkle-widgets - SimpleGL @@ -1528,7 +1524,6 @@ dont-distribute-packages: - ghc-plugs-out - ghc-session - ghci-pretty - - ghcjs-dom-hello - ghcjs-dom-webkit - ghcjs-hplay - ghcup @@ -2420,7 +2415,6 @@ dont-distribute-packages: - jordan-servant-openapi - jordan-servant-server - jot - - jsaddle-hello - jsc - jsmw - json-ast-json-encoder @@ -3349,7 +3343,6 @@ dont-distribute-packages: - rc - rdf4h-vocab-activitystreams - rdioh - - react - react-flux-servant - reactive - reactive-banana-sdl diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 952974491081..e76427766810 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19477,7 +19477,6 @@ self: { ]; description = "A programming model for declarative, high performance user interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-backend-pardiff" = callPackage @@ -19514,7 +19513,6 @@ self: { ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-backend-static" = callPackage @@ -19686,7 +19684,6 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-router" = callPackage @@ -19722,7 +19719,6 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-template" = callPackage @@ -119721,7 +119717,6 @@ self: { description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-dom-javascript" = callPackage @@ -176485,7 +176480,6 @@ self: { description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-warp" = callPackage @@ -176508,9 +176502,7 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; - broken = true; }) {}; "jsaddle-webkit2gtk" = callPackage @@ -251282,7 +251274,6 @@ self: { ]; description = "Create React components in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "react-flux" = callPackage From 1c8747bc8c51518ce0467a80212c04ee0b6406f6 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 23 Apr 2024 00:28:01 +0200 Subject: [PATCH 23/29] haskellPackages.ghc-debug-brick: Fix build --- .../haskell-modules/configuration-common.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f629e35bc9a5..6fdbda02c4d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -270,20 +270,7 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # 2024-03-10: Compatibility fixes have been applied upstream, but are unreleased. - ghc-debug-brick = appendPatches [ - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/4f195b98a8d3159bd4586af49ea8e269214a848e.patch"; - sha256 = "sha256-ZMxDkkI365w/qtRc21k9UTcIiTjoOd/BGJgt/6C6P6A="; - relative = "ghc-debug-brick"; - includes = ["ghc-debug-brick.cabal"]; - }) - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/5b8f848b82ea4c5a1867b9965a973e73e5d58dad.patch"; - sha256 = "sha256-XydmqScUuXyxqvW1HeKlKiiGFQi/MkM81RMPxmADrhw="; - relative = "ghc-debug-brick"; - }) - ] super.ghc-debug-brick; + ghc-debug-client = doJailbreak super.ghc-debug-client; # Test failure. Tests also disabled in Stackage: # https://github.com/jtdaugherty/brick/issues/499 From 4f6ebb60e63f3ccd1024eb2f31e653d2fe03fa66 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 22 Apr 2024 21:36:24 +0100 Subject: [PATCH 24/29] haskell.packages.ghc98.ghc-lib: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change eval fails as: $ nix build --no-link -f. haskell.packages.ghc98.ghc-lib error: … in the left operand of the update (//) operator at pkgs/development/haskell-modules/lib/compose.nix:40:7: 39| mkDerivation = drv: (args.mkDerivation drv).override f; 40| })) // { | ^ 41| overrideScope = scope: overrideCabal f (drv.overrideScope scope); error: attribute 'ghc-lib_9_8_1_20231121' missing at pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix:58:26: 57| ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; 58| ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; | ^ 59| megaparsec = doDistribute self.megaparsec_9_6_1; --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf197f9fb3f5..624b767f47c9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -55,7 +55,7 @@ self: super: { th-abstraction = doDistribute self.th-abstraction_0_7_0_0; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; + ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; # TODO: remove when aeson updates or launches a revision # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 From a5b5d65b5b1c038eb121720772a70a250f46499d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 27 Apr 2024 10:28:45 +0200 Subject: [PATCH 25/29] haskell.compiler.ghcjs: provide required ansi-wl-pprint < 0.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately the outdated version of optparse-applicative we need to use hasn't survived the ansi-wl-pprint deprecation… --- .../compilers/ghcjs/8.10/common-overrides.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix index 8b54ee2e3531..8f791b73abff 100644 --- a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix @@ -15,5 +15,6 @@ in self: super: { }) (super.ghcjs.overrideScope (self: super: { # Allow transformers-compat >= 0.7 optparse-applicative = doJailbreak self.optparse-applicative_0_15_1_0; + ansi-wl-pprint = self.ansi-wl-pprint_0_6_9; })); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ddbadf71d7f7..e03097739a82 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -66,6 +66,7 @@ extra-packages: - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs - 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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e76427766810..d538dd990695 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36221,6 +36221,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ansi-wl-pprint_0_6_9" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.9"; + sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + revision = "4"; + editedCabalFile = "04ljsk64bzwsczh0zc5w3r98qr1zlzbwwm2xb6nk9vradv4pnwzv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter-compat-ansi-wl-pprint }: mkDerivation { From 8c3a95b3c51e69b13024f335aa74d464b5d03c88 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 27 Apr 2024 11:15:42 +0200 Subject: [PATCH 26/29] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1805927](https://hydra.nixos.org/eval/1805927) of nixpkgs commit [cce32cc](https://github.com/NixOS/nixpkgs/commits/cce32cc804ff793aa153aa3ff3caab9deb1b1d09) as of 2024-04-27 08:42 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 9 +++++++++ 3 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0b24e9ef79eb..584197463269 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -605,6 +605,7 @@ broken-packages: - cabal2json # failure in job https://hydra.nixos.org/build/233196099 at 2023-09-02 - cabal-audit # failure in job https://hydra.nixos.org/build/233193414 at 2023-09-02 - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 + - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 - cabal-bundle-clib # failure in job https://hydra.nixos.org/build/233199225 at 2023-09-02 - cabal-constraints # failure in job https://hydra.nixos.org/build/233214316 at 2023-09-02 - cabal-db # failure in job https://hydra.nixos.org/build/233197235 at 2023-09-02 @@ -738,6 +739,7 @@ broken-packages: - changelog-d # failure in job https://hydra.nixos.org/build/252716175 at 2024-03-16 - changelog-d # failure in job https://hydra.nixos.org/build/253689337 at 2024-03-31 - changelog-d # failure in job https://hydra.nixos.org/build/255671571 at 2024-04-16 + - changelog-d # failure in job https://hydra.nixos.org/build/257082502 at 2024-04-27 - changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02 - character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02 - charter # failure in job https://hydra.nixos.org/build/233237264 at 2023-09-02 @@ -4909,6 +4911,7 @@ broken-packages: - rclient # failure in job https://hydra.nixos.org/build/233239290 at 2023-09-02 - rdf4h # failure in job https://hydra.nixos.org/build/233234057 at 2023-09-02 - rds-data-codecs # failure in job https://hydra.nixos.org/build/253696582 at 2024-03-31 + - react # failure in job https://hydra.nixos.org/build/257372364 at 2024-04-27 - react-flux # failure in job https://hydra.nixos.org/build/233246819 at 2023-09-02 - react-haskell # failure in job https://hydra.nixos.org/build/233242976 at 2023-09-02 - reaction-logic # failure in job https://hydra.nixos.org/build/233216789 at 2023-09-02 @@ -5388,6 +5391,7 @@ broken-packages: - show-type # failure in job https://hydra.nixos.org/build/233225756 at 2023-09-02 - Shpadoinkle-console # failure in job https://hydra.nixos.org/build/233228559 at 2023-09-02 - Shpadoinkle-debug # failure in job https://hydra.nixos.org/build/233194479 at 2023-09-02 + - Shpadoinkle # failure in job https://hydra.nixos.org/build/257372361 at 2024-04-27 - Shpadoinkle-isreal # failure in job https://hydra.nixos.org/build/233200051 at 2023-09-02 - shwifty # failure in job https://hydra.nixos.org/build/233249022 at 2023-09-02 - sifflet # failure in job https://hydra.nixos.org/build/233210515 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 50d793c10fb9..b58da3ac10b6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -358,12 +358,15 @@ dont-distribute-packages: - Shellac-readline - ShortestPathProblems - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-static - Shpadoinkle-developer-tools - Shpadoinkle-disembodied - Shpadoinkle-examples - Shpadoinkle-html + - Shpadoinkle-lens - Shpadoinkle-router + - Shpadoinkle-streaming - Shpadoinkle-template - Shpadoinkle-widgets - SimpleGL diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d538dd990695..66ebf73ce793 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19477,6 +19477,8 @@ self: { ]; description = "A programming model for declarative, high performance user interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-backend-pardiff" = callPackage @@ -19513,6 +19515,7 @@ self: { ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-backend-static" = callPackage @@ -19684,6 +19687,7 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-router" = callPackage @@ -19719,6 +19723,7 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-template" = callPackage @@ -57056,6 +57061,8 @@ self: { libraryHaskellDepends = [ base Cabal ]; description = "Adds executable dependencies to the Cabal build"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cabal-bundle-clib" = callPackage @@ -251290,6 +251297,8 @@ self: { ]; description = "Create React components in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "react-flux" = callPackage From 2b3f8cc207fe9ebcb6219849a5f89a606646ccd8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 27 Apr 2024 11:16:59 +0200 Subject: [PATCH 27/29] haskellPackages.lsql-csv: lift overly strict upper bounds Should be resolved in the next version released to hackage though! --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6fdbda02c4d1..fd0fcc446475 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1585,6 +1585,9 @@ self: super: { ''; }) (doJailbreak super.jsaddle-dom); + # Too strict upper bounds on text + lsql-csv = doJailbreak super.lsql-csv; + reflex-dom = lib.pipe super.reflex-dom [ (appendPatch (fetchpatch { From e62270e35f308cdf18404aa080b71110070dc41d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 27 Apr 2024 11:17:32 +0200 Subject: [PATCH 28/29] haskellPackages.jsaddle-hello: lift overly strict bounds --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fd0fcc446475..8c85687e9b38 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1584,6 +1584,7 @@ self: super: { rm Setup.hs ''; }) (doJailbreak super.jsaddle-dom); + jsaddle-hello = doJailbreak super.jsaddle-hello; # Too strict upper bounds on text lsql-csv = doJailbreak super.lsql-csv; From 6de4b5739e54e85eb40c58c49bb5d21c2e464cf2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 27 Apr 2024 11:18:17 +0200 Subject: [PATCH 29/29] haskellPackages.ghcjs-dom-hello: lift overly strict bounds --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c85687e9b38..a0ab31525888 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1585,6 +1585,7 @@ self: super: { ''; }) (doJailbreak super.jsaddle-dom); jsaddle-hello = doJailbreak super.jsaddle-hello; + ghcjs-dom-hello = doJailbreak super.ghcjs-dom-hello; # Too strict upper bounds on text lsql-csv = doJailbreak super.lsql-csv;