From 519d3392a1403ed9e629f7bedb66992a9db94dde Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 21:48:03 -0400 Subject: [PATCH 01/61] python3Packages.cachecontrol: Fix sandboxed build on Darwin --- pkgs/development/python-modules/cachecontrol/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 529975f1080b..c5c7128f7223 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "ionrock"; repo = pname; From e92783ffeaa79988ffadae32f5efb6868d86e810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 17:20:29 +0000 Subject: [PATCH 02/61] limesctl: 3.1.1 -> 3.1.3 --- pkgs/applications/misc/limesctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 5ac3e9938fc3..a40b253d4ba0 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg="; + sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI="; }; - vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo="; + vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts="; subPackages = [ "." ]; From c18d193adc1fbcdb8bb1d221e5f1c51e79cdc4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Dec 2022 05:01:53 +0100 Subject: [PATCH 03/61] trufflehog: 2.2.1 -> 3.21.0 --- pkgs/tools/security/trufflehog/default.nix | 59 +++++++++------------- 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 27574241576a..9e2b2e44f33a 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,43 +1,32 @@ { lib -, python3Packages +, fetchFromGitHub +, buildGoModule }: -let - truffleHogRegexes = python3Packages.buildPythonPackage rec { - pname = "truffleHogRegexes"; - version = "0.0.7"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; - }; +buildGoModule rec { + pname = "trufflehog"; + version = "3.21.0"; + + src = fetchFromGitHub { + owner = "trufflesecurity"; + repo = "trufflehog"; + rev = "v${version}"; + sha256 = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA="; }; -in - python3Packages.buildPythonApplication rec { - pname = "truffleHog"; - version = "2.2.1"; - src = python3Packages.fetchPypi { - inherit pname version; - hash = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ="; - }; + vendorSha256 = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; - # Relax overly restricted version constraint - postPatch = '' - substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " - ''; + # Test cases run git clone and require network access + doCheck = false; - propagatedBuildInputs = [ - python3Packages.gitpython - truffleHogRegexes - ]; + postInstall = '' + rm $out/bin/{generate,snifftest} + ''; - # Test cases run git clone and require network access - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/dxa4481/truffleHog"; - description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history"; - license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ bhipple ]; - }; - } + meta = with lib; { + description = "Find credentials all over the place"; + homepage = "https://github.com/trufflesecurity/trufflehog"; + license = with licenses; [ agpl3 ]; + maintainers = with maintainers; [ ]; + }; +} From e5cbb7ab5ef8208f3350689444cad8949ba4ef26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Dec 2022 22:01:21 +0000 Subject: [PATCH 04/61] gcsfuse: 0.41.9 -> 0.41.10 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 225048f0e3a8..f58bd415c413 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.9"; + version = "0.41.10"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-hfdQa0e1S1cIF4V2XPFBl4jzzTWlIxZIJ99PRxCP55s="; + sha256 = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; }; vendorSha256 = null; From aa55adff674fe8b6e3c81ccde28ce220e8c4776a Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 30 Dec 2022 23:51:51 +0100 Subject: [PATCH 05/61] haskellPackages: stackage LTS 20.4 -> LTS 20.5 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 123 +++++++++--------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 1d1d297cf588..99e542eed090 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 20.4 +# Stackage LTS 20.5 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -15,7 +15,7 @@ default-package-overrides: - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - - advent-of-code-api ==0.2.8.2 + - advent-of-code-api ==0.2.8.4 - aern2-mp ==0.2.11.0 - aern2-real ==0.2.11.0 - aeson ==2.0.3.0 @@ -61,7 +61,7 @@ default-package-overrides: - annotated-exception ==0.2.0.4 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11.4 - - ansi-terminal-game ==1.8.0.1 + - ansi-terminal-game ==1.8.1.0 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - aos-signature ==0.1.1 @@ -86,11 +86,11 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.2.3.0 - - ascii-case ==1.0.0.11 - - ascii-char ==1.0.0.15 + - ascii ==1.2.4.0 + - ascii-case ==1.0.1.1 + - ascii-char ==1.0.0.16 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.13 + - ascii-group ==1.0.0.14 - ascii-numbers ==1.1.0.0 - ascii-predicates ==1.0.1.0 - ascii-progress ==0.3.3.0 @@ -136,7 +136,7 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.8 - - barbies ==2.0.3.1 + - barbies ==2.0.4.0 - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 - base32 ==0.2.2.0 @@ -171,7 +171,7 @@ default-package-overrides: - bench-show ==0.3.2 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 - - benri-hspec ==0.1.0.0 + - benri-hspec ==0.1.0.1 - between ==0.11.0.0 - bhoogle ==0.1.4.2 - bibtex ==0.1.0.6 @@ -221,14 +221,14 @@ default-package-overrides: - bm ==0.1.0.2 - bmp ==1.2.6.3 - bnb-staking-csvs ==0.2.1.0 - - BNFC ==2.9.4 + - BNFC ==2.9.4.1 - BNFC-meta ==0.6.1 - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - bookkeeping ==0.4.0.1 - Boolean ==0.2.4 - boolsimplifier ==0.1.8 - - boomerang ==1.4.8 + - boomerang ==1.4.8.1 - boots ==0.2.0.1 - bordacount ==0.1.0.0 - boring ==0.2 @@ -267,7 +267,7 @@ default-package-overrides: - bytes ==0.17.2 - byteset ==0.1.1.0 - byteslice ==0.2.7.0 - - bytesmith ==0.3.9.0 + - bytesmith ==0.3.9.1 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 - bytestring-lexing ==0.5.0.9 @@ -341,7 +341,7 @@ default-package-overrides: - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0 - - chimera ==0.3.2.0 + - chimera ==0.3.3.0 - choice ==0.2.2 - chronologique ==0.3.1.3 - chunked-data ==0.3.1 @@ -372,6 +372,7 @@ default-package-overrides: - code-page ==0.2.1 - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 + - co-log-core ==0.3.2.0 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -394,9 +395,9 @@ default-package-overrides: - componentm ==0.0.0.2 - componentm-devel ==0.0.0.2 - composable-associations ==0.1.0.0 - - composite-base ==0.8.2.0 - - composite-binary ==0.8.2.0 - - composite-ekg ==0.8.2.0 + - composite-base ==0.8.2.1 + - composite-binary ==0.8.2.1 + - composite-ekg ==0.8.2.1 - composite-tuple ==0.1.2.0 - composite-xstep ==0.1.0.0 - composition ==1.0.2.2 @@ -529,7 +530,7 @@ default-package-overrides: - data-dword ==0.3.2.1 - data-endian ==0.1.1 - data-fix ==0.3.2 - - data-forest ==0.1.0.9 + - data-forest ==0.1.0.10 - data-functor-logistic ==0.0 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 @@ -567,7 +568,7 @@ default-package-overrides: - dejafu ==2.4.0.4 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 - - dependent-sum ==0.7.1.0 + - dependent-sum ==0.7.2.0 - dependent-sum-template ==0.1.1.1 - depq ==0.4.2 - deque ==0.4.4 @@ -597,7 +598,7 @@ default-package-overrides: - dictionary-sharing ==0.1.0.0 - di-df1 ==1.2.1 - Diff ==0.4.1 - - digest ==0.0.1.3 + - digest ==0.0.1.4 - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 @@ -616,7 +617,7 @@ default-package-overrides: - dl-fedora ==0.9.3 - dlist ==1.0 - dlist-instances ==0.1.1.1 - - dlist-nonempty ==0.1.1 + - dlist-nonempty ==0.1.2 - dns ==4.1.0 - docker ==0.7.0.1 - dockerfile ==0.2.0 @@ -624,10 +625,10 @@ default-package-overrides: - doctemplates ==0.10.0.2 - doctest ==0.20.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.5 + - doctest-driver-gen ==0.3.0.6 - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - - doctest-parallel ==0.2.5 + - doctest-parallel ==0.2.6 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.4 @@ -637,10 +638,9 @@ default-package-overrides: - domain-optics ==0.1.0.3 - do-notation ==0.1.0.2 - dot ==0.3 - - dotenv ==0.9.0.3 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.4.1 + - double-conversion ==2.0.4.2 - download ==0.3.2.7 - download-curl ==0.1.4 - DPutils ==0.1.1.0 @@ -651,7 +651,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.1 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.9.1 + - dunai ==0.9.2 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -714,18 +714,18 @@ default-package-overrides: - errors-ext ==0.4.2 - ersatz ==0.4.13 - esqueleto ==3.5.8.1 - - essence-of-live-coding ==0.2.6 - - essence-of-live-coding-gloss ==0.2.6 - - essence-of-live-coding-pulse ==0.2.6 - - essence-of-live-coding-quickcheck ==0.2.6 - - essence-of-live-coding-warp ==0.2.6 + - essence-of-live-coding ==0.2.7 + - essence-of-live-coding-gloss ==0.2.7 + - essence-of-live-coding-pulse ==0.2.7 + - essence-of-live-coding-quickcheck ==0.2.7 + - essence-of-live-coding-warp ==0.2.7 - event-list ==0.1.2 - eventstore ==1.4.2 - every ==0.0.1 - evm-opcodes ==0.1.2 - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.2 - - exception-hierarchy ==0.1.0.7 + - exception-hierarchy ==0.1.0.8 - exception-mtl ==0.4.0.1 - exception-transformers ==0.4.0.11 - executable-hash ==0.2.0.4 @@ -789,9 +789,9 @@ default-package-overrides: - fitspec ==0.4.10 - fixed ==0.3 - fixed-length ==0.2.3.1 - - fixed-vector ==1.2.1.0 + - fixed-vector ==1.2.2.1 - fixed-vector-hetero ==0.6.1.1 - - fix-whitespace ==0.0.10 + - fix-whitespace ==0.0.11 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 @@ -1031,7 +1031,7 @@ default-package-overrides: - haskell-gi ==0.26.2 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.1 + - haskell-lexer ==1.1.1 - HaskellNet ==0.6.0.1 - HaskellNet-SSL ==0.3.4.4 - haskell-src ==1.0.4 @@ -1069,7 +1069,7 @@ default-package-overrides: - heatshrink ==0.1.0.0 - hebrew-time ==0.1.2 - hedgehog ==1.1.2 - - hedgehog-classes ==0.2.5.3 + - hedgehog-classes ==0.2.5.4 - hedgehog-corpus ==0.2.0 - hedgehog-fakedata ==0.0.1.5 - hedgehog-fn ==1.0 @@ -1131,7 +1131,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10 - - hpack ==0.35.0 + - hpack ==0.35.1 - hpack-dhall ==0.5.7 - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.1.0 @@ -1169,7 +1169,7 @@ default-package-overrides: - hslua-packaging ==2.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.2 + - HsOpenSSL ==0.11.7.4 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.9.7 @@ -1258,7 +1258,7 @@ default-package-overrides: - hw-int ==0.0.2.0 - hw-ip ==2.4.2.1 - hw-json ==1.3.2.3 - - hw-json-simd ==0.1.1.1 + - hw-json-simd ==0.1.1.2 - hw-json-simple-cursor ==0.1.1.1 - hw-json-standard-cursor ==0.2.3.2 - hwk ==0.6 @@ -1270,7 +1270,7 @@ default-package-overrides: - hw-prim ==0.6.3.2 - hw-rankselect ==0.13.4.1 - hw-rankselect-base ==0.3.4.1 - - hw-simd ==0.1.2.1 + - hw-simd ==0.1.2.2 - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.5 - hw-succinct ==0.1.0.1 @@ -1531,7 +1531,7 @@ default-package-overrides: - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - mason ==0.2.5 - - massiv ==1.0.2.0 + - massiv ==1.0.3.0 - massiv-io ==1.0.0.1 - massiv-persist ==1.0.0.3 - massiv-serialise ==1.0.0.2 @@ -1571,12 +1571,12 @@ default-package-overrides: - microaeson ==0.1.0.1 - microlens ==0.4.12.0 - microlens-aeson ==2.5.0 - - microlens-contra ==0.1.0.2 + - microlens-contra ==0.1.0.3 - microlens-ghc ==0.4.13.2 - - microlens-mtl ==0.2.0.2 + - microlens-mtl ==0.2.0.3 - microlens-platform ==0.4.2.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.10 + - microlens-th ==0.4.3.11 - microspec ==0.2.1.3 - microstache ==1.0.2.2 - midair ==0.2.0.1 @@ -1644,7 +1644,7 @@ default-package-overrides: - monad-time ==0.3.1.0 - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.3.0 - - monoid-extras ==0.6.1 + - monoid-extras ==0.6.2 - monoid-subclasses ==1.1.3 - monoid-transformer ==0.0.4 - monomer ==1.5.0.0 @@ -1726,7 +1726,7 @@ default-package-overrides: - network-simple ==0.4.5 - network-simple-tls ==0.4 - network-transport ==0.5.6 - - network-uri ==2.6.4.1 + - network-uri ==2.6.4.2 - network-wait ==0.2.0.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 @@ -1762,9 +1762,9 @@ default-package-overrides: - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 - - nvim-hs ==2.3.1.0 + - nvim-hs ==2.3.2.0 - nvim-hs-contrib ==2.0.0.1 - - nvim-hs-ghcid ==2.0.0.0 + - nvim-hs-ghcid ==2.0.1.0 - oauthenticated ==0.3.0.0 - ObjectName ==1.1.0.2 - oblivious-transfer ==0.1.0 @@ -1781,7 +1781,7 @@ default-package-overrides: - oo-prototypes ==0.1.0.0 - opaleye ==0.9.6.1 - OpenAL ==1.7.0.5 - - openapi3 ==3.2.2 + - openapi3 ==3.2.3 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -1939,7 +1939,7 @@ default-package-overrides: - polysemy-fs ==0.1.0.0 - polysemy-kvstore ==0.1.3.0 - polysemy-methodology ==0.2.2.0 - - polysemy-plugin ==0.4.3.1 + - polysemy-plugin ==0.4.4.0 - polysemy-several ==0.1.1.0 - polysemy-webserver ==0.2.1.1 - polysemy-zoo ==0.8.1.0 @@ -2098,7 +2098,7 @@ default-package-overrides: - record-dot-preprocessor ==0.2.15 - record-hasfield ==1.0 - rec-smallarray ==0.1.0.0 - - recursion-schemes ==5.2.2.2 + - recursion-schemes ==5.2.2.3 - recv ==0.0.0 - redact ==0.4.0.0 - reddit-scrape ==0.0.1 @@ -2279,7 +2279,7 @@ default-package-overrides: - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-multipart-client ==0.12.1 - - servant-openapi3 ==2.0.1.5 + - servant-openapi3 ==2.0.1.6 - servant-pipes ==0.15.3 - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 @@ -2352,10 +2352,11 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.13.1.2 - - skylighting-core ==0.13.1.2 + - skylighting ==0.13.2 + - skylighting-core ==0.13.2 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1 + - skylighting-format-context ==0.1.0.1 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.2 @@ -2366,7 +2367,7 @@ default-package-overrides: - socket ==0.8.3.0 - socks ==0.6.1 - solana-staking-csvs ==0.1.2.0 - - some ==1.0.3 + - some ==1.0.4.1 - some-dict-of ==0.1.0.2 - sop-core ==0.5.0.2 - sort ==1.0.0.0 @@ -2459,7 +2460,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.2 + - string-interpolate ==0.3.2.0 - stringprep ==1.0.0 - string-qq ==0.0.4 - string-random ==0.1.4.3 @@ -2526,7 +2527,7 @@ default-package-overrides: - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.4.0 - - tasty ==1.4.2.3 + - tasty ==1.4.3 - tasty-ant-xml ==1.1.8 - tasty-autocollect ==0.3.2.0 - tasty-bench ==0.3.2 @@ -2559,7 +2560,7 @@ default-package-overrides: - tcp-streams ==1.0.1.1 - tdigest ==0.2.1.1 - teardown ==0.5.0.1 - - telegram-bot-simple ==0.6 + - telegram-bot-simple ==0.6.1 - template ==0.2.0.10 - template-haskell-compat-v0208 ==0.1.9.1 - temporary ==1.3 @@ -2587,7 +2588,7 @@ default-package-overrides: - text-ansi ==0.2.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 - - text-builder-dev ==0.3.3 + - text-builder-dev ==0.3.3.2 - text-conversions ==0.3.1.1 - text-icu ==0.8.0.2 - text-latin1 ==0.3.1 @@ -2601,7 +2602,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10 - - text-show-instances ==3.9.2 + - text-show-instances ==3.9.3 - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 @@ -2822,7 +2823,7 @@ default-package-overrides: - vector-builder ==0.3.8.4 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.4 - - vector-extras ==0.2.7.1 + - vector-extras ==0.2.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.1 @@ -2895,7 +2896,7 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - weigh ==0.0.16 - - wide-word ==0.1.3.0 + - wide-word ==0.1.4.0 - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 From b45571856bb502bc16be4101a8e8baf10c98d346 Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 30 Dec 2022 23:52:08 +0100 Subject: [PATCH 06/61] all-cabal-hashes: 2022-12-28T16:35:05Z -> 2022-12-30T22:03:31Z 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 4da998f3f3c8..e18e844a17bb 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6.tar.gz", - "sha256": "19pgh69fj3p1glqyjikpsvn5j4bax6yw5qxf9qaaap19hksgn85p", - "msg": "Update from Hackage at 2022-12-28T16:35:05Z" + "commit": "78541d36393ac3dd0ffa32b4a9af15fecdefb5d1", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78541d36393ac3dd0ffa32b4a9af15fecdefb5d1.tar.gz", + "sha256": "1qwjkjlz9sw1jnsarin6803vj68bfm3iyysfwxaifga5w4dsrqcs", + "msg": "Update from Hackage at 2022-12-30T22:03:31Z" } From fcfc9171794b4306e14dd31664900f6bd8bc55ca Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 30 Dec 2022 23:54:49 +0100 Subject: [PATCH 07/61] 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 | 1671 ++++------------- 1 file changed, 333 insertions(+), 1338 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index abe79ed19883..ee76845c6870 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1305,35 +1305,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.4"; - sha256 = "1gy7ggrf2zikyfi8anlj2zavs5b99z7rzs1lmyflrjd82a31bmzp"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - mainProgram = "bnfc"; - }) {}; - - "BNFC_2_9_4_1" = callPackage ({ mkDerivation, alex, array, base, containers, deepseq, directory , filepath, happy, hspec, hspec-discover, HUnit, mtl, pretty , process, QuickCheck, string-qq, temporary, time, transformers @@ -1357,7 +1328,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bnfc"; }) {}; @@ -2997,8 +2967,8 @@ self: { pname = "Cabal-syntax"; version = "3.8.1.0"; sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; - revision = "1"; - editedCabalFile = "0rmrcjpm169acfranqq04ach5g3jv7v6g45yzpwcp3ksk9g7cdj9"; + revision = "2"; + editedCabalFile = "1bzwjxj5mrsxxcgrfgisamx3f3ymz5bz085k6p83s7djh39ayaxx"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -9641,8 +9611,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "3"; - editedCabalFile = "0316jr5npssxxxj85x74vasvm2ib09mjv2jy7abwjs7cfqbpnr8w"; + revision = "4"; + editedCabalFile = "0sj82pzq2hcx3yjsljwgbr1kcdgwpgfmq0n0dhz3am8ckwir0slz"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -11125,22 +11095,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7.2"; - sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5"; - revision = "3"; - editedCabalFile = "0nsqxym87s48029laqba4nzwpk7nrk35x7wmpjqfnbrj82ddcshd"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -11152,7 +11106,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -15344,6 +15297,22 @@ self: { broken = true; }) {}; + "OGDF" = callPackage + ({ mkDerivation, base, COIN, fficxx, fficxx-runtime, OGDF, stdcxx + , template-haskell + }: + mkDerivation { + pname = "OGDF"; + version = "1.0.0.0"; + sha256 = "0sn5xyn2yqh7aywadzxvaxcyqj2clivvizqdbnjkljib7960w44z"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime stdcxx template-haskell + ]; + librarySystemDepends = [ COIN OGDF ]; + description = "Haskell binding to OGDF"; + license = lib.licenses.bsd2; + }) {COIN = null; OGDF = null;}; + "OGL" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -25197,28 +25166,6 @@ self: { }) {}; "advent-of-code-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, filepath, finite-typelits, http-api-data, http-client - , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors - , servant, servant-client, servant-client-core, stm, tagsoup, text - , time, time-compat - }: - mkDerivation { - pname = "advent-of-code-api"; - version = "0.2.8.2"; - sha256 = "1z4y8bssmaappc7hamdzynjxd1mamn7vzyc0nymldxb8ly7fvpwy"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - finite-typelits http-api-data http-client http-client-tls - http-media megaparsec mtl profunctors servant servant-client - servant-client-core stm tagsoup text time time-compat - ]; - testHaskellDepends = [ base directory filepath HUnit text ]; - description = "Advent of Code REST API bindings and servant API"; - license = lib.licenses.bsd3; - }) {}; - - "advent-of-code-api_0_2_8_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, filepath, finite-typelits, http-api-data, http-client , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors @@ -25238,7 +25185,6 @@ self: { testHaskellDepends = [ base directory filepath HUnit text ]; description = "Advent of Code REST API bindings and servant API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "advent-of-code-ocr" = callPackage @@ -31781,33 +31727,6 @@ self: { }) {}; "ansi-terminal-game" = callPackage - ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, containers, exceptions, hspec, hspec-discover, linebreak - , mintty, mtl, QuickCheck, random, split, terminal-size - , timers-tick, unidecode - }: - mkDerivation { - pname = "ansi-terminal-game"; - version = "1.8.0.1"; - sha256 = "1fic8wjkbpfd076shfrq8pxlnpsrm59yilbhiinynlgr4vhjncz5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock containers - exceptions linebreak mintty mtl QuickCheck random split - terminal-size timers-tick unidecode - ]; - testHaskellDepends = [ - ansi-terminal array base bytestring cereal clock containers - exceptions hspec linebreak mintty mtl QuickCheck random split - terminal-size timers-tick unidecode - ]; - testToolDepends = [ hspec-discover ]; - description = "sdl-like functions for terminal applications, based on ansi-terminal"; - license = lib.licenses.gpl3Only; - }) {}; - - "ansi-terminal-game_1_8_1_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, colour, containers, exceptions, hspec, hspec-discover , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size @@ -31832,7 +31751,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "ansi-wl-pprint" = callPackage @@ -35121,26 +35039,6 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers - , ascii-predicates, ascii-superset, ascii-th, base, bytestring - , hedgehog, text - }: - mkDerivation { - pname = "ascii"; - version = "1.2.3.0"; - sha256 = "0s6w1wv6hjx1abz038cw7fyl8ilbs3cxmcs989c3hh9659l82p2j"; - revision = "2"; - editedCabalFile = "16b1dmjl0p2zdn05h2iwm1ymhrvgr19c1gzankrn0i7jj89nf979"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-group ascii-numbers ascii-predicates - ascii-superset ascii-th base bytestring text - ]; - testHaskellDepends = [ base hedgehog text ]; - description = "The ASCII character set and encoding"; - license = lib.licenses.asl20; - }) {}; - - "ascii_1_2_4_0" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers , ascii-predicates, ascii-superset, ascii-th, base, bytestring , hedgehog, text @@ -35156,7 +35054,6 @@ self: { testHaskellDepends = [ base hedgehog text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -35176,20 +35073,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.11"; - sha256 = "03rhq303igzvx9yil5qli2ga9iz47psrlnbb494785w9whwayxq1"; - revision = "1"; - editedCabalFile = "0a4nz34a5034lkq42q2l7xqdkjpakcy44syqy0gvx8p6h83ccrb1"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_1_1" = callPackage ({ mkDerivation, ascii-char, base, hashable, hspec }: mkDerivation { pname = "ascii-case"; @@ -35199,7 +35082,6 @@ self: { testHaskellDepends = [ ascii-char base hspec ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-caseless" = callPackage @@ -35217,20 +35099,6 @@ self: { }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.15"; - sha256 = "10vvhpl7y1gpw7gw2hpcckl0pmx7rkn35zy6yl6c9mx0hib0745a"; - revision = "1"; - editedCabalFile = "0b73pm9z5k3xbpn49fz4m8jwzw3r4z0l2v4alinf5l7n6vx4wvj0"; - libraryHaskellDepends = [ base hashable ]; - testHaskellDepends = [ base ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_16" = callPackage ({ mkDerivation, base, hashable, hspec }: mkDerivation { pname = "ascii-char"; @@ -35240,6 +35108,18 @@ self: { testHaskellDepends = [ base hspec ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; + }) {}; + + "ascii-char_1_0_0_17" = callPackage + ({ mkDerivation, base, hashable, hspec }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.17"; + sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base hspec ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -35273,30 +35153,17 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable, hedgehog }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.13"; - sha256 = "1xynfvrr8lwmrxqww2c2bwp6r3162mqgmx7hljwmbvdmnc0na30d"; - revision = "1"; - editedCabalFile = "0snp4qfj20jjchhhf7v8lyssjydv57sd2wy88fbc0aaba4c5lq7y"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base hedgehog ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_14" = callPackage ({ mkDerivation, ascii-char, base, hashable, hedgehog }: mkDerivation { pname = "ascii-group"; version = "1.0.0.14"; sha256 = "0rk3lvs4b6d4cfzb5zc87f42wdmziprpfd4fww5r68ry3ccyn1ps"; + revision = "1"; + editedCabalFile = "0iwf48cq67qzgw4ih6532yxl03bpnzrhz68y0yfk87r1y3hsdxfx"; libraryHaskellDepends = [ ascii-char base hashable ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -35336,6 +35203,26 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-numbers_1_1_0_1" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base + , bytestring, hashable, hedgehog, invert, text + }: + mkDerivation { + pname = "ascii-numbers"; + version = "1.1.0.1"; + sha256 = "1zb37db0vpcnh63izq9m62p2an1w496ljh7d196k0i1w76j2jhiy"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable text + ]; + testHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable + hedgehog invert text + ]; + description = "ASCII representations of numbers"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-predicates" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { @@ -35350,6 +35237,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-predicates_1_0_1_1" = callPackage + ({ mkDerivation, ascii-char, base, hedgehog }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.1.1"; + sha256 = "1r8kd5p17jd46298wp7b1rvfg86g752k2x45ppqikrbkqv9vkvmc"; + libraryHaskellDepends = [ ascii-char base ]; + testHaskellDepends = [ ascii-char base hedgehog ]; + description = "Various categorizations of ASCII characters"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -35412,6 +35312,23 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-superset_1_0_1_14" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, hedgehog + , text + }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.1.14"; + sha256 = "1zggxgxwdc8cd224dgmrq0bijgi0adv233ysnpaw97sa9m6mgmb6"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + testHaskellDepends = [ ascii-char base hedgehog text ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -35449,6 +35366,25 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_12" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, bytestring + , hedgehog, template-haskell, text + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.12"; + sha256 = "1kdqkd7sq8kb8ymy4p45w39ndr7z2jcjy9c5ws227hrhglam9pcy"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + testHaskellDepends = [ + ascii-char ascii-superset base bytestring hedgehog text + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -36591,6 +36527,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "atomic-counter" = callPackage + ({ mkDerivation, async, base, primitive, QuickCheck, stm, tasty + , tasty-bench, tasty-quickcheck + }: + mkDerivation { + pname = "atomic-counter"; + version = "0.1"; + sha256 = "1vrggycr9jbnrx2gz71rfqrldmf6417kx5sp2w5g238iv6a3m9p1"; + libraryHaskellDepends = [ async base QuickCheck ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base primitive QuickCheck stm tasty tasty-bench tasty-quickcheck + ]; + doHaddock = false; + description = "Mutable counters that can be modified with atomic operatinos"; + license = lib.licenses.asl20; + }) {}; + "atomic-file-ops" = callPackage ({ mkDerivation, base, directory, filelock, filepath , io-string-like @@ -39993,22 +39947,6 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers - }: - mkDerivation { - pname = "barbies"; - version = "2.0.3.1"; - sha256 = "0gfzb52k3py1qnr2b6gshdg7c9aj1j9y2xsdhz86n01ybv81yg51"; - libraryHaskellDepends = [ base distributive transformers ]; - testHaskellDepends = [ - base distributive QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Classes for working with types that can change clothes"; - license = lib.licenses.bsd3; - }) {}; - - "barbies_2_0_4_0" = callPackage ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers }: @@ -40022,7 +39960,6 @@ self: { ]; description = "Classes for working with types that can change clothes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "barbies-layered" = callPackage @@ -42100,17 +42037,6 @@ self: { }) {}; "benri-hspec" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "benri-hspec"; - version = "0.1.0.0"; - sha256 = "0vvc7fw52c9flmdjmgrc9cca9yrl4r7yvh2l5ixc23gvvmlhdycy"; - libraryHaskellDepends = [ base hspec ]; - description = "Simplify tests where Either or Maybe types are returned from monadic code"; - license = lib.licenses.bsd3; - }) {}; - - "benri-hspec_0_1_0_1" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "benri-hspec"; @@ -42119,7 +42045,6 @@ self: { libraryHaskellDepends = [ base hspec ]; description = "Simplify tests where Either or Maybe types are returned from monadic code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bento" = callPackage @@ -47651,21 +47576,6 @@ self: { }) {}; "boomerang" = callPackage - ({ mkDerivation, base, mtl, semigroups, template-haskell, text - , th-abstraction - }: - mkDerivation { - pname = "boomerang"; - version = "1.4.8"; - sha256 = "141rs9q8i89118ldplm90zqzkjff3jwqhsdld4vp4ipc26f9gjdl"; - libraryHaskellDepends = [ - base mtl semigroups template-haskell text th-abstraction - ]; - description = "Library for invertible parsing and printing"; - license = lib.licenses.bsd3; - }) {}; - - "boomerang_1_4_8_1" = callPackage ({ mkDerivation, base, mtl, semigroups, template-haskell, text , th-abstraction }: @@ -47678,7 +47588,6 @@ self: { ]; description = "Library for invertible parsing and printing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boomslang" = callPackage @@ -50708,32 +50617,6 @@ self: { }) {}; "bytesmith" = callPackage - ({ mkDerivation, base, byte-order, byteslice, bytestring - , contiguous, gauge, primitive, run-st, tasty, tasty-hunit - , tasty-quickcheck, text-short, wide-word - }: - mkDerivation { - pname = "bytesmith"; - version = "0.3.9.0"; - sha256 = "0jmx4flf3j5a4gyrw79cxiybp6f7y0rm9ifmrxypxpwrwc220zjg"; - revision = "1"; - editedCabalFile = "0ly247yj2ay0fpj5v3dqp0hava1wrllqhphf7k3hcifpi5zfr8i0"; - libraryHaskellDepends = [ - base byteslice bytestring contiguous primitive run-st text-short - wide-word - ]; - testHaskellDepends = [ - base byte-order byteslice primitive tasty tasty-hunit - tasty-quickcheck text-short wide-word - ]; - benchmarkHaskellDepends = [ - base byteslice bytestring gauge primitive - ]; - description = "Nonresumable byte parser"; - license = lib.licenses.bsd3; - }) {}; - - "bytesmith_0_3_9_1" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, primitive, run-st, tasty, tasty-hunit , tasty-quickcheck, text-short, wide-word @@ -50755,7 +50638,6 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_3_1" = callPackage @@ -51834,8 +51716,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.5.4"; - sha256 = "15jg140ly7rska7v8ihvd383q9lj4i5c18rzjad4yi8f78jjciqb"; + version = "1.0.5.5"; + sha256 = "0474z8cw2wikqg3bnsxqj4rxy13n5l8p06fq72l4klh01s8i1qfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57905,22 +57787,22 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, adjunctions, base, distributive, mtl, QuickCheck - , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, vector + ({ mkDerivation, adjunctions, base, distributive, mtl, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, transformers, vector }: mkDerivation { pname = "chimera"; - version = "0.3.2.0"; - sha256 = "1p8in1a37hrb0qwvabwi4a9ahzydkd8j3v402cn2i3xmkzcr0kh9"; + version = "0.3.3.0"; + sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; libraryHaskellDepends = [ - adjunctions base distributive mtl vector + adjunctions base distributive mtl primitive transformers vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck vector ]; - benchmarkHaskellDepends = [ base mtl random tasty-bench ]; + benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; description = "Lazy infinite streams with O(1) indexing and applications for memoization"; license = lib.licenses.bsd3; }) {}; @@ -59498,6 +59380,8 @@ self: { pname = "clash-prelude"; version = "1.6.4"; sha256 = "12ic8jcgz3jr4zrgrx06dzd6whlypyyxilrgbja27dcdv02fs6yr"; + revision = "1"; + editedCabalFile = "09ra3gbhghrqlzaanjlvm0qpj05v3ilps62lblzy44n7sxmc5db7"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -64499,29 +64383,6 @@ self: { }) {}; "composite-base" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hspec, lens - , monad-control, mtl, profunctors, QuickCheck, template-haskell - , text, transformers, transformers-base, unliftio-core, vinyl - }: - mkDerivation { - pname = "composite-base"; - version = "0.8.2.0"; - sha256 = "0niw6rc9sscq73vja8pzds4r87yvckh0h5138i86wv18m34ksniw"; - libraryHaskellDepends = [ - base deepseq exceptions lens monad-control mtl profunctors - template-haskell text transformers transformers-base unliftio-core - vinyl - ]; - testHaskellDepends = [ - base deepseq exceptions hspec lens monad-control mtl profunctors - QuickCheck template-haskell text transformers transformers-base - unliftio-core vinyl - ]; - description = "Shared utilities for composite-* packages"; - license = lib.licenses.bsd3; - }) {}; - - "composite-base_0_8_2_1" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, lens , monad-control, mtl, profunctors, QuickCheck, template-haskell , text, transformers, transformers-base, unliftio-core, vinyl @@ -64542,21 +64403,9 @@ self: { ]; description = "Shared utilities for composite-* packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-binary" = callPackage - ({ mkDerivation, base, binary, composite-base }: - mkDerivation { - pname = "composite-binary"; - version = "0.8.2.0"; - sha256 = "1ijlrwyji9179hc5wcmdzzf3g79xkz6k1kjxq0l7iqyvfjh2zrkh"; - libraryHaskellDepends = [ base binary composite-base ]; - description = "Orphan binary instances"; - license = lib.licenses.bsd3; - }) {}; - - "composite-binary_0_8_2_1" = callPackage ({ mkDerivation, base, binary, composite-base }: mkDerivation { pname = "composite-binary"; @@ -64565,7 +64414,6 @@ self: { libraryHaskellDepends = [ base binary composite-base ]; description = "Orphan binary instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-cassava" = callPackage @@ -64606,20 +64454,6 @@ self: { }) {}; "composite-ekg" = callPackage - ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl - }: - mkDerivation { - pname = "composite-ekg"; - version = "0.8.2.0"; - sha256 = "0kcyscjs8qsydhj7labm8v62xcm9vc39rcw13xlvwmxz3lwi5jl3"; - libraryHaskellDepends = [ - base composite-base ekg-core lens text vinyl - ]; - description = "EKG Metrics for Vinyl records"; - license = lib.licenses.bsd3; - }) {}; - - "composite-ekg_0_8_2_1" = callPackage ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: mkDerivation { @@ -64631,7 +64465,6 @@ self: { ]; description = "EKG Metrics for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-hashable" = callPackage @@ -74748,10 +74581,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-forest"; - version = "0.1.0.9"; - sha256 = "1l16hg1pfzrbi2ih6najcam18p2b5lvmmkl6fxvk7izynvcc79jc"; - revision = "1"; - editedCabalFile = "0m0fp8fx21257z5k1g575wjcmavd29qav4cgjcwg5nxkxwrfldg8"; + version = "0.1.0.10"; + sha256 = "0wfw87vb00lgc1pf6cmqmlzfqskhy42kyzfj5nyfw1lch8s6sbvm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A simple multi-way tree data structure"; @@ -78335,19 +78166,6 @@ self: { }) {}; "dependent-sum" = callPackage - ({ mkDerivation, base, constraints-extras, some }: - mkDerivation { - pname = "dependent-sum"; - version = "0.7.1.0"; - sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; - revision = "2"; - editedCabalFile = "0d7wb1ag60mcm56axcrx9pd6hgrsxmqynyplbcfl01ms2i60fhr9"; - libraryHaskellDepends = [ base constraints-extras some ]; - description = "Dependent sum type"; - license = lib.licenses.publicDomain; - }) {}; - - "dependent-sum_0_7_2_0" = callPackage ({ mkDerivation, base, constraints-extras, some }: mkDerivation { pname = "dependent-sum"; @@ -78356,7 +78174,6 @@ self: { libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "dependent-sum-aeson-orphans" = callPackage @@ -81249,18 +81066,6 @@ self: { }) {}; "digest" = callPackage - ({ mkDerivation, base, bytestring, zlib }: - mkDerivation { - pname = "digest"; - version = "0.0.1.3"; - sha256 = "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) zlib;}; - - "digest_0_0_1_4" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; @@ -81270,7 +81075,6 @@ self: { libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) zlib;}; "digest-pure" = callPackage @@ -83599,30 +83403,6 @@ self: { }) {}; "dlist-nonempty" = callPackage - ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq - , dlist, dlist-instances, QuickCheck, quickcheck-instances - , semigroupoids - }: - mkDerivation { - pname = "dlist-nonempty"; - version = "0.1.1"; - sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "13"; - editedCabalFile = "1hbd0j8yw81y4rnxqxxnvhy33ccgl5c7qcr9shzqy97fwi2vkikm"; - libraryHaskellDepends = [ - base base-compat deepseq dlist semigroupoids - ]; - testHaskellDepends = [ - base Cabal QuickCheck quickcheck-instances - ]; - benchmarkHaskellDepends = [ - base base-compat criterion dlist dlist-instances - ]; - description = "Non-empty difference lists"; - license = lib.licenses.bsd3; - }) {}; - - "dlist-nonempty_0_1_2" = callPackage ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq , dlist, dlist-instances, QuickCheck, quickcheck-instances , semigroupoids @@ -83640,7 +83420,6 @@ self: { ]; description = "Non-empty difference lists"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dmc" = callPackage @@ -84556,22 +84335,6 @@ self: { }) {}; "doctest-driver-gen" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.3.0.5"; - sha256 = "08zv5c1cfklknpbw974sw4rb6jiijd3q28cpjw1cncc06n2jy85b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = lib.licenses.bsd3; - mainProgram = "doctest-driver-gen"; - }) {}; - - "doctest-driver-gen_0_3_0_6" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; @@ -84584,7 +84347,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "doctest-driver-gen"; }) {}; @@ -84640,36 +84402,6 @@ self: { }) {}; "doctest-parallel" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths - , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty - , process, QuickCheck, random, setenv, silently, stringbuilder, syb - , template-haskell, transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; - version = "0.2.5"; - sha256 = "075y4yllpgfq0dlfd6y9nqhsdkxzb9s3jgb0v194l216kg5zsqzc"; - revision = "1"; - editedCabalFile = "1q81qjz9af9a57xyxz6kci28shl4r9y3lrl3rckknhqwcy1ahqz4"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions extra filepath ghc ghc-paths Glob pretty 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 hspec-discover HUnit - mockery process QuickCheck setenv silently stringbuilder syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - }) {}; - - "doctest-parallel_0_2_6" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty @@ -84695,7 +84427,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -85209,35 +84940,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec - , optparse-applicative, process, shellwords, text - }: - mkDerivation { - pname = "dotenv"; - version = "0.9.0.3"; - sha256 = "163w2japbcdjzmhr7afq2rss7sp7gz2j8mylcc716x63gm3ws20h"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - shellwords text - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process shellwords text - ]; - testToolDepends = [ hspec-discover ]; - description = "Loads environment variables from dotenv files"; - license = lib.licenses.mit; - mainProgram = "dotenv"; - }) {}; - - "dotenv_0_10_0_0" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec , optparse-applicative, process, shellwords, text @@ -85263,7 +84965,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Loads environment variables from dotenv files"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dotenv"; }) {}; @@ -85346,25 +85047,6 @@ self: { }) {}; "double-conversion" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "double-conversion"; - version = "2.0.4.1"; - sha256 = "1hrpqh8lbw0kkryqsya95mfnnnj0pj7zswxrn6kvfy4rf7z8v2d4"; - revision = "2"; - editedCabalFile = "0qya075j3kz4jq1kx4951qvi9blh6hcqfd7vpcx8l8ql143ajvqs"; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - description = "Fast conversion between single and double precision floating point and text"; - license = lib.licenses.bsd3; - }) {}; - - "double-conversion_2_0_4_2" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework , test-framework-hunit, test-framework-quickcheck2, text }: @@ -85381,7 +85063,6 @@ self: { ]; description = "Fast conversion between single and double precision floating point and text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "double-extra" = callPackage @@ -86706,23 +86387,6 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty - , tasty-hunit, transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; - version = "0.9.1"; - sha256 = "0krgbs9xqar78815xrgqbj63678jm0mjbsvnqdayh0c2awf9i8bj"; - libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base - ]; - testHaskellDepends = [ base tasty tasty-hunit transformers ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "dunai_0_9_2" = callPackage ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty , tasty-hunit, transformers, transformers-base }: @@ -86736,7 +86400,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -92572,33 +92235,6 @@ self: { }) {}; "essence-of-live-coding" = callPackage - ({ mkDerivation, base, containers, foreign-store, HUnit, mmorph - , mtl, QuickCheck, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, vector-sized - }: - mkDerivation { - pname = "essence-of-live-coding"; - version = "0.2.6"; - sha256 = "0bmcy6j0zw9v7z4sr0m300ckr1mdh3wxj975wbgbl8qlkwsfwv9l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers foreign-store mmorph syb time transformers - vector-sized - ]; - executableHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers HUnit mtl QuickCheck syb test-framework - test-framework-hunit test-framework-quickcheck2 transformers - ]; - description = "General purpose live coding framework"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - broken = true; - }) {}; - - "essence-of-live-coding_0_2_7" = callPackage ({ mkDerivation, base, containers, foreign-store, HUnit, mmorph , mtl, QuickCheck, syb, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers, vector-sized @@ -92643,23 +92279,6 @@ self: { }) {}; "essence-of-live-coding-gloss" = callPackage - ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss - , syb, transformers - }: - mkDerivation { - pname = "essence-of-live-coding-gloss"; - version = "0.2.6"; - sha256 = "02jdi5ijkhf9jc9r5jyqvlk6idmgbjbv3x4yw6ich2m95yhf8hrl"; - libraryHaskellDepends = [ - base essence-of-live-coding foreign-store gloss syb transformers - ]; - description = "General purpose live coding framework - Gloss backend"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "essence-of-live-coding-gloss_0_2_7" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: @@ -92697,23 +92316,6 @@ self: { }) {}; "essence-of-live-coding-pulse" = callPackage - ({ mkDerivation, base, essence-of-live-coding, foreign-store - , pulse-simple, transformers - }: - mkDerivation { - pname = "essence-of-live-coding-pulse"; - version = "0.2.6"; - sha256 = "16fipxz90vlsy9hgksiw7m7r7wzrqrjdhb6fg11m6jlrk1f5bkka"; - libraryHaskellDepends = [ - base essence-of-live-coding foreign-store pulse-simple transformers - ]; - description = "General purpose live coding framework - pulse backend"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "essence-of-live-coding-pulse_0_2_7" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: @@ -92751,24 +92353,6 @@ self: { }) {}; "essence-of-live-coding-quickcheck" = callPackage - ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding - , QuickCheck, syb, transformers - }: - mkDerivation { - pname = "essence-of-live-coding-quickcheck"; - version = "0.2.6"; - sha256 = "1hkzp0q0xk3wa892vnjimi7m9gq56m5wx1m2i72ssl6x2jgy52hl"; - libraryHaskellDepends = [ - base boltzmann-samplers essence-of-live-coding QuickCheck syb - transformers - ]; - description = "General purpose live coding framework - QuickCheck integration"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "essence-of-live-coding-quickcheck_0_2_7" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: @@ -92799,26 +92383,6 @@ self: { }) {}; "essence-of-live-coding-warp" = callPackage - ({ mkDerivation, base, bytestring, essence-of-live-coding - , http-client, http-types, wai, warp - }: - mkDerivation { - pname = "essence-of-live-coding-warp"; - version = "0.2.6"; - sha256 = "0x18jxw0xwqvbwdalbrz4lp2lq9pyl4a5r9vnky5hc5wcwqm2f4m"; - libraryHaskellDepends = [ - base essence-of-live-coding http-types wai warp - ]; - testHaskellDepends = [ - base bytestring essence-of-live-coding http-client - ]; - description = "General purpose live coding framework"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "essence-of-live-coding-warp_0_2_7" = callPackage ({ mkDerivation, base, bytestring, essence-of-live-coding , http-client, http-types, wai, warp }: @@ -94154,17 +93718,6 @@ self: { }) {}; "exception-hierarchy" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "exception-hierarchy"; - version = "0.1.0.7"; - sha256 = "14kk0rync05rq2adx5lk59y56h97s0yv7mqfn2grhhwqb10maqj0"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Exception type hierarchy with TemplateHaskell"; - license = lib.licenses.bsd3; - }) {}; - - "exception-hierarchy_0_1_0_8" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-hierarchy"; @@ -94173,7 +93726,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exception-mailer" = callPackage @@ -94831,15 +94383,15 @@ self: { "exon" = callPackage ({ mkDerivation, base, criterion, flatparse, generics-sop , ghc-hs-meta, hedgehog, incipit-base, tasty, tasty-hedgehog - , template-haskell, type-errors-pretty + , template-haskell }: mkDerivation { pname = "exon"; - version = "1.2.0.0"; - sha256 = "1cayih5rp386cn1ig5g7flxjfh47451h095zx4av4i0c72j6q7s1"; + version = "1.3.0.0"; + sha256 = "1w93x0yfqm1yp82lh2q1wibb88xn7rh4vh16pq1pzs8vdhgbapc2"; libraryHaskellDepends = [ base flatparse generics-sop ghc-hs-meta incipit-base - template-haskell type-errors-pretty + template-haskell ]; testHaskellDepends = [ base hedgehog incipit-base tasty tasty-hedgehog template-haskell @@ -99729,24 +99281,6 @@ self: { }) {}; "fix-whitespace" = callPackage - ({ mkDerivation, base, directory, extra, filepath, filepattern - , text, yaml - }: - mkDerivation { - pname = "fix-whitespace"; - version = "0.0.10"; - sha256 = "1jlkx0ygl315yik0f2fh4ml77c4080y0czs2mlnc84pkhximj58l"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory extra filepath filepattern text yaml - ]; - description = "Fixes whitespace issues"; - license = "unknown"; - mainProgram = "fix-whitespace"; - }) {}; - - "fix-whitespace_0_0_11" = callPackage ({ mkDerivation, base, directory, extra, filepath, filepattern , text, yaml }: @@ -99761,7 +99295,6 @@ self: { ]; description = "Fixes whitespace issues"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "fix-whitespace"; }) {}; @@ -99886,27 +99419,14 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "1.2.1.0"; - sha256 = "05x3qivymg02n17wik17fmz2bqbbhj4b0w5iz7vnjz3szhwjizdf"; + version = "1.2.2.1"; + sha256 = "0kp747v67x1ija33nyqmyh6g178pqn2c7glynrpzcv733lalp00z"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = lib.licenses.bsd3; }) {}; - "fixed-vector_1_2_1_1" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "1.2.1.1"; - sha256 = "1gf3gpdl92yb7s68d39wmj7h9ivm925ix3yb7l5x0ljdw5xjldki"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -123632,8 +123152,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "3"; - editedCabalFile = "14cypbxm6njhxwxps9ac80nf1j00vgh9bwcyxx9h74z5hi7wdld2"; + revision = "4"; + editedCabalFile = "09hs3iidjlwdppm5q1vq58p70js11whhcl5nr73kv8zj1yh0ir3h"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -126771,8 +126291,8 @@ self: { ({ mkDerivation, base, Chart, Chart-diagrams }: mkDerivation { pname = "happy-hour"; - version = "0.0.0.3"; - sha256 = "0icdx6lw9bbcchhwcr7q4yaprz9crhlq6gycb430100c2irlfnkw"; + version = "0.0.0.4"; + sha256 = "07cqp51hq9andw9pw5nbpqkcmk4q6a9xlspayfh964pvz7p0vsbv"; libraryHaskellDepends = [ base Chart Chart-diagrams ]; description = "Generate simple okay-looking bar plots without much effort"; license = lib.licenses.mit; @@ -128995,17 +128515,6 @@ self: { }) {}; "haskell-lexer" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "haskell-lexer"; - version = "1.1"; - sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii"; - libraryHaskellDepends = [ base ]; - description = "A fully compliant Haskell 98 lexer"; - license = lib.licenses.bsd3; - }) {}; - - "haskell-lexer_1_1_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "haskell-lexer"; @@ -129014,7 +128523,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-lsp" = callPackage @@ -135125,28 +134633,6 @@ self: { }) {}; "hedgehog-classes" = callPackage - ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog - , pretty-show, primitive, semirings, silently, transformers, vector - , wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog-classes"; - version = "0.2.5.3"; - sha256 = "1qanfnvciykm5hmiqyf0icn4xn16v6zvlfal98lphhcmym26m9x1"; - revision = "3"; - editedCabalFile = "09khb9px24zj24ahb51w1a6glgmcnhk2xn89gn1qwzhs3xn4vlj5"; - libraryHaskellDepends = [ - aeson base binary comonad containers hedgehog pretty-show primitive - semirings silently transformers vector wl-pprint-annotated - ]; - testHaskellDepends = [ - aeson base binary comonad containers hedgehog vector - ]; - description = "Hedgehog will eat your typeclass bugs"; - license = lib.licenses.bsd3; - }) {}; - - "hedgehog-classes_0_2_5_4" = callPackage ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog , pretty-show, primitive, semirings, silently, transformers, vector , wl-pprint-annotated @@ -135164,7 +134650,6 @@ self: { ]; description = "Hedgehog will eat your typeclass bugs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedgehog-corpus" = callPackage @@ -136226,8 +135711,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.9"; - sha256 = "1havsghzsbicixb8cya0v1694l7r9n2frnmy297ar3chblfj8hgl"; + version = "0.9.10"; + sha256 = "1sbp3jjn54z6hwkfgb83g0zgn1dm8qi9254g2yc8r4msm6n3nzww"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136280,8 +135765,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api"; - version = "0.7.2.0"; - sha256 = "0z3j96il0rvzplxih4vq5dghp18plbk5k55ymwm7dxp51d0jg902"; + version = "0.7.2.1"; + sha256 = "1nkmiyfmidrfqvlfy9k75y4asrrbrs2511kdzhrpb3zlrlaw4zb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136313,8 +135798,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.6.0"; - sha256 = "0bdmz7c4ln2bbss5wa4q8k9wha47knnp9d9n3w9kj8p7wzhc2kly"; + version = "0.4.6.1"; + sha256 = "07gvmcag36ai945j7bxnvy2x8fsx9apkabcikp6x1a2anvkgws24"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -136362,17 +135847,17 @@ self: { , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core , hercules-ci-cnix-expr, hercules-ci-cnix-store , hercules-ci-optparse-applicative, hostname, hspec, http-client - , http-client-tls, http-types, katip, lens, lens-aeson, lifted-base - , monad-control, network-uri, process, protolude, QuickCheck, retry - , rio, safe-exceptions, servant, servant-auth-client - , servant-client, servant-client-core, servant-conduit, temporary - , text, transformers, transformers-base, unix, unliftio - , unliftio-core, unordered-containers, uuid + , http-client-tls, http-types, inline-c-cpp, katip, lens + , lens-aeson, lifted-base, monad-control, network-uri, process + , protolude, QuickCheck, retry, rio, safe-exceptions, servant + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, temporary, text, transformers, transformers-base + , unix, unliftio, unliftio-core, unordered-containers, uuid }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.4"; - sha256 = "1n79ka1bn99vqa8i14f94zs4b78vl2pidx0h8nrdvg1xclqa5fka"; + version = "0.3.5"; + sha256 = "0mk6q6ccgpdpjfc7mdms28dbhh1bawy4jnnqcfcb6vxg4cj83f44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136381,8 +135866,8 @@ self: { hercules-ci-agent hercules-ci-api hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store hercules-ci-optparse-applicative hostname http-client - http-client-tls http-types katip lens lens-aeson lifted-base - monad-control network-uri process protolude retry rio + http-client-tls http-types inline-c-cpp katip lens lens-aeson + lifted-base monad-control network-uri process protolude retry rio safe-exceptions servant servant-auth-client servant-client servant-client-core servant-conduit temporary text transformers transformers-base unix unliftio unliftio-core unordered-containers @@ -136411,8 +135896,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.4.0"; - sha256 = "1mszhnd2z0qy58x13w5nbw3ymqvd8vf0d4kh3bprrjlbll0rxmgn"; + version = "0.3.5.0"; + sha256 = "0r70kjn8a1wiw1zndahrg2gc88k52dscm4yjmms2caf22pkh562a"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -136441,8 +135926,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.2"; - sha256 = "11z6k9r8z2bvf0wly6b0fr0s3svbrf1rgz0v2in33jq6739lci92"; + version = "0.3.3.3"; + sha256 = "1w4azya8phkk3gmkifcv2pc6jh8zanwk9m2vwqsdgk7kr8zkkzws"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -136876,9 +136361,9 @@ self: { ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, array, async , base, base16-bytestring, binary, brick, bytestring, cereal , containers, cryptonite, data-dword, Decimal, deepseq, directory - , fgl, filepath, free, haskeline, here, HUnit, lens, lens-aeson - , libff, megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, parsec, process, QuickCheck + , fgl, filemanip, filepath, free, haskeline, here, HUnit, lens + , lens-aeson, libff, megaparsec, memory, monad-par, mtl, multiset + , operational, optparse-generic, parsec, process, QuickCheck , quickcheck-instances, quickcheck-text, regex, regex-tdfa , restless-git, rosezipper, s-cargot, scientific, secp256k1 , semver-range, smt2-parser, spool, tasty, tasty-expected-failure @@ -136888,22 +136373,21 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.50.0"; - sha256 = "0wdp7vl1aq79k8sw7n4mf6wv184as0pmprdffzklzkcskvs9yjmb"; + version = "0.50.1"; + sha256 = "07s6p22j8cagwyni8f362c0z9cmd7l0xhh6cm0xv1g7kphnla2qp"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint array async base base16-bytestring binary brick bytestring cereal containers - cryptonite data-dword Decimal deepseq directory fgl filepath free - haskeline here HUnit lens lens-aeson megaparsec memory monad-par - mtl multiset operational optparse-generic parsec process QuickCheck - quickcheck-instances quickcheck-text regex regex-tdfa restless-git - rosezipper s-cargot scientific semver-range smt2-parser spool tasty - tasty-expected-failure tasty-hunit tasty-quickcheck temporary text - time transformers tree-view tuple unordered-containers vector vty - witherable word-wrap wreq + cryptonite data-dword Decimal deepseq directory fgl filemanip + filepath free haskeline here HUnit lens lens-aeson megaparsec + memory monad-par mtl multiset operational optparse-generic parsec + process QuickCheck quickcheck-instances quickcheck-text regex + regex-tdfa restless-git rosezipper s-cargot scientific semver-range + smt2-parser spool tasty tasty-expected-failure tasty-hunit + tasty-quickcheck temporary text time transformers tree-view tuple + unordered-containers vector vty witherable word-wrap wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ @@ -136914,11 +136398,11 @@ self: { temporary text unordered-containers vector vty ]; testHaskellDepends = [ - array base base16-bytestring binary bytestring containers - data-dword directory here HUnit lens mtl process QuickCheck - quickcheck-instances regex regex-tdfa smt2-parser tasty + aeson array base base16-bytestring binary bytestring containers + data-dword directory filemanip filepath here HUnit lens mtl process + QuickCheck quickcheck-instances regex regex-tdfa smt2-parser tasty tasty-expected-failure tasty-hunit tasty-quickcheck temporary text - time vector + time vector witherable ]; testSystemDepends = [ secp256k1 ]; doHaddock = false; @@ -144406,8 +143890,8 @@ self: { }: mkDerivation { pname = "horizon-gen-nix"; - version = "0.3.1.0"; - sha256 = "1by0813yzhnzl188b7sdcy682arprhgahnivpqxkm1pfk2im92i9"; + version = "0.4.0"; + sha256 = "0s0macrn45wh1y7nflw9y73wxsynvym7n12f9n0yhxi8w3j7wzn2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144841,7 +144325,7 @@ self: { mainProgram = "hp2pretty"; }) {}; - "hpack" = callPackage + "hpack_0_35_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -144879,10 +144363,11 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; }) {}; - "hpack_0_35_1" = callPackage + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -144918,7 +144403,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; }) {}; @@ -155408,33 +154892,6 @@ self: { }) {}; "hw-json-simd" = callPackage - ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover - , hw-prim, lens, optparse-applicative, transformers, vector - }: - mkDerivation { - pname = "hw-json-simd"; - version = "0.1.1.1"; - sha256 = "0nn6fyvw0j2csn8anqpgjzdzdasiwa99g1v2qrcyym1wi86biqqb"; - revision = "1"; - editedCabalFile = "0cavymml55m8f1zyh8pby44xq67ckdqdy0wgib8i0xjq00hrp07m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring hw-prim lens optparse-applicative vector - ]; - testHaskellDepends = [ - base bytestring doctest doctest-discover hw-prim lens transformers - vector - ]; - testToolDepends = [ doctest-discover ]; - description = "SIMD-based JSON semi-indexer"; - license = lib.licenses.bsd3; - mainProgram = "hw-json-simd"; - }) {}; - - "hw-json-simd_0_1_1_2" = callPackage ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover , hw-prim, lens, optparse-applicative, transformers, vector }: @@ -155456,7 +154913,6 @@ self: { testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hw-json-simd"; }) {}; @@ -155874,40 +155330,6 @@ self: { }) {}; "hw-simd" = callPackage - ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava - , containers, criterion, deepseq, directory, doctest - , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, text, transformers, vector - }: - mkDerivation { - pname = "hw-simd"; - version = "0.1.2.1"; - sha256 = "051dbwi4kvv04dnglcx9666g097fy9rw8kmgbcw5y9cs06mbw9cr"; - revision = "2"; - editedCabalFile = "10ns52d5xzry7bkaaggv5sgry44fxl9jpyx48iafyfpcn3h8439k"; - libraryHaskellDepends = [ - base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect - hw-rankselect-base transformers vector - ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bits-extra bytestring deepseq directory doctest - doctest-discover hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base lens - text vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bits-extra bytestring cassava containers criterion deepseq - directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap - transformers vector - ]; - description = "SIMD library"; - license = lib.licenses.bsd3; - }) {}; - - "hw-simd_0_1_2_2" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava , containers, criterion, deepseq, directory, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits @@ -155937,7 +155359,6 @@ self: { ]; description = "SIMD library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hw-simd-cli" = callPackage @@ -159791,8 +159212,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.5.0.0"; - sha256 = "137i92xfpchyvnrckb8876cxw514zxf53hbzqyyj6f4mipiq319j"; + version = "0.7.0.0"; + sha256 = "00ymmb2d5hlskc2zc88kibgx1c5mxp4bdfymahzhqg1qhyw3q9ci"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -159808,8 +159229,8 @@ self: { }: mkDerivation { pname = "incipit-base"; - version = "0.4.0.0"; - sha256 = "08r934qii1hc7hb3xmk7mpw0srh82h2djxkh55gskm7wbaby15qi"; + version = "0.5.0.0"; + sha256 = "1h3mmabxb0c29cy349xkk87df4x0dxakfaryyr8r43wj2l39yhj0"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -159821,8 +159242,8 @@ self: { ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.4.0.0"; - sha256 = "0nh1ivn74fcciwmvnqdr1h1vdhxxy3xjf2bzsdm1dpyylglcaspr"; + version = "0.5.0.0"; + sha256 = "17fbdp2v22fni36ijfm9hb9hkcarg4jy3xksngnhlzxqz77adcyj"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -184065,10 +183486,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5.4"; - sha256 = "0ql96kb7hg50d1flk36999p5p05bqs7rp7a59ys4q02423mq1z7b"; - revision = "2"; - editedCabalFile = "0dvqqjihfzkcqaahicga0cnimcwh197dpj8spqrk9mmicmqs5gcr"; + version = "5.2.5.5"; + sha256 = "1qq0lzyfpnjdl9mh8qrr5lhhby8gxzgi1a8wiwpf3vkrziz5hh23"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -186383,23 +185802,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , primitive, random, scheduler, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "1.0.2.0"; - sha256 = "15ckrsavsrkgm4c9al2jlk1r4nm2mdjshw1ksbkh8m65l3l5kcrr"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions primitive random scheduler - unliftio-core vector - ]; - testHaskellDepends = [ base doctest ]; - description = "Massiv (Массив) is an Array Library"; - license = lib.licenses.bsd3; - }) {}; - - "massiv_1_0_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions , primitive, random, scheduler, unliftio-core, vector , vector-stream @@ -186415,7 +185817,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -189791,17 +189192,6 @@ self: { }) {}; "microlens-contra" = callPackage - ({ mkDerivation, base, microlens }: - mkDerivation { - pname = "microlens-contra"; - version = "0.1.0.2"; - sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; - libraryHaskellDepends = [ base microlens ]; - description = "True folds and getters for microlens"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-contra_0_1_0_3" = callPackage ({ mkDerivation, base, microlens }: mkDerivation { pname = "microlens-contra"; @@ -189810,7 +189200,6 @@ self: { libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-each" = callPackage @@ -189858,21 +189247,6 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.2.0.2"; - sha256 = "0y1jli9379l8sgv5a4xl8v3qkz9fkp4qlfsywzdpywbnydl1d5v6"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - description = "microlens support for Reader/Writer/State from mtl"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-mtl_0_2_0_3" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -189885,7 +189259,6 @@ self: { ]; description = "microlens support for Reader/Writer/State from mtl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-platform" = callPackage @@ -189939,25 +189312,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, tagged - , template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.10"; - sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; - revision = "1"; - editedCabalFile = "142wksvc854qmd665qd6mwzik8g02yzfpjk1fpxw4mlcns06y4m2"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens tagged ]; - description = "Automatic generation of record lenses for microlens"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_11" = callPackage ({ mkDerivation, base, containers, microlens, tagged , template-haskell, th-abstraction, transformers }: @@ -189972,7 +189326,6 @@ self: { testHaskellDepends = [ base microlens tagged ]; description = "Automatic generation of record lenses for microlens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "micrologger" = callPackage @@ -194584,21 +193937,6 @@ self: { }) {}; "monoid-extras" = callPackage - ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups - }: - mkDerivation { - pname = "monoid-extras"; - version = "0.6.1"; - sha256 = "1nj5rfax9lmr1pprvgdgq90am9mknx9iv7s84smv6qaw050356jf"; - revision = "2"; - editedCabalFile = "04zbzq7dbv0ddpc1dxrxn9jfyg1xj8sar6ngzhc0cji72cail503"; - libraryHaskellDepends = [ base groups semigroupoids ]; - benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "Various extra monoid-related definitions and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-extras_0_6_2" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -194609,7 +193947,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-map" = callPackage @@ -194840,8 +194177,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.2.0.0"; - sha256 = "160d4acqrrxhlbx85749vm02c01sz7lxp8gxnykv1f0f00bb8w67"; + version = "0.2.0.1"; + sha256 = "0vic013zr80wlm1gf33y8vlkpmrv6z52975dpa3ciypayd36hy2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197610,6 +196947,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "multicurryable" = callPackage + ({ mkDerivation, base, sop-core }: + mkDerivation { + pname = "multicurryable"; + version = "0.1.0.0"; + sha256 = "0p0wlz44scvkxzdhd059ivrhz4bsgbml26a8fm7jsav80cwbdfc4"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ base sop-core ]; + description = "Uncurry functions with multiple arguments"; + license = lib.licenses.bsd3; + }) {}; + "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative , pretty, process, transformers @@ -199873,15 +199222,21 @@ self: { }) {}; "named-text" = callPackage - ({ mkDerivation, base, deepseq, hashable, prettyprinter, sayable - , text + ({ mkDerivation, aeson, base, bytestring, deepseq, hashable, hspec + , parameterized-utils, prettyprinter, sayable, tasty, tasty-ant-xml + , tasty-checklist, tasty-hspec, text, unordered-containers }: mkDerivation { pname = "named-text"; - version = "1.0.1.0"; - sha256 = "05v79ry6rlrpfvf36nkzf6l4xm2kzgpdrvaivg878nxcrni1gr78"; + version = "1.1.1.0"; + sha256 = "1g3xb3pr6sxn3sk9h2jbqlj30vh4nxcc14d06dawmqfva8b1gfp5"; libraryHaskellDepends = [ - base deepseq hashable prettyprinter sayable text + aeson base deepseq hashable prettyprinter sayable text + ]; + testHaskellDepends = [ + aeson base bytestring hspec parameterized-utils prettyprinter + sayable tasty tasty-ant-xml tasty-checklist tasty-hspec text + unordered-containers ]; description = "A parameterized named text type and associated functionality"; license = lib.licenses.isc; @@ -202714,26 +202069,6 @@ self: { }) {}; "network-uri" = callPackage - ({ mkDerivation, base, criterion, deepseq, HUnit, parsec - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-compat - }: - mkDerivation { - pname = "network-uri"; - version = "2.6.4.1"; - sha256 = "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap"; - libraryHaskellDepends = [ - base deepseq parsec template-haskell th-compat - ]; - testHaskellDepends = [ - base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq HUnit ]; - description = "URI manipulation"; - license = lib.licenses.bsd3; - }) {}; - - "network-uri_2_6_4_2" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck , template-haskell, th-compat @@ -202751,7 +202086,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq HUnit ]; description = "URI manipulation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "network-uri-flag" = callPackage @@ -206406,45 +205740,6 @@ self: { }) {}; "nvim-hs" = callPackage - ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit - , containers, data-default, deepseq, foreign-store, hslogger, hspec - , hspec-discover, HUnit, megaparsec, messagepack, mtl, network - , optparse-applicative, path, path-io, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm - , streaming-commons, template-haskell - , template-haskell-compat-v0208, text, time, time-locale-compat - , transformers, transformers-base, typed-process, unliftio - , unliftio-core, utf8-string, vector, void - }: - mkDerivation { - pname = "nvim-hs"; - version = "2.3.1.0"; - sha256 = "1vgdvcvjyl7dxmvmcljb130gwp806769hks00fj1sqfi953lm9bf"; - libraryHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default deepseq foreign-store hslogger megaparsec messagepack - mtl network optparse-applicative path path-io prettyprinter - prettyprinter-ansi-terminal resourcet stm streaming-commons - template-haskell template-haskell-compat-v0208 text time - time-locale-compat transformers transformers-base typed-process - unliftio unliftio-core utf8-string vector void - ]; - testHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default foreign-store hslogger hspec hspec-discover HUnit - megaparsec messagepack mtl network optparse-applicative path - path-io prettyprinter prettyprinter-ansi-terminal QuickCheck - resourcet stm streaming-commons template-haskell - template-haskell-compat-v0208 text time time-locale-compat - transformers transformers-base typed-process unliftio unliftio-core - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell plugin backend for neovim"; - license = lib.licenses.asl20; - }) {}; - - "nvim-hs_2_3_2_0" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec , hspec-discover, HUnit, megaparsec, messagepack, mtl, network @@ -206481,7 +205776,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage @@ -206508,31 +205802,6 @@ self: { }) {}; "nvim-hs-ghcid" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers - , unliftio, yaml - }: - mkDerivation { - pname = "nvim-hs-ghcid"; - version = "2.0.0.0"; - sha256 = "0i9wc6mgxxzymw1smjvin70i4ynqsn2k3ig36pxmbb6qd0ci0hwg"; - revision = "1"; - editedCabalFile = "0na6lv57jdrpq1zkp3dhlpzh0wrr9632h7izw7jf8622x51qlh4r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath ghcid nvim-hs - nvim-hs-contrib resourcet transformers unliftio yaml - ]; - executableHaskellDepends = [ base nvim-hs ]; - description = "Neovim plugin that runs ghcid to update the quickfix list"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "nvim-hs-ghcid"; - broken = true; - }) {}; - - "nvim-hs-ghcid_2_0_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers , unliftio, yaml @@ -208811,44 +208080,6 @@ self: { }) {}; "openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "openapi3"; - version = "3.2.2"; - sha256 = "0d31ilv2ivwswzbpfibqwnld8697vk63wyr6yl80brjx60g4jp9j"; - revision = "2"; - editedCabalFile = "1yc3wlc8j84glav3hzx1l4yq33k05bll252a8yl6ld275jjswn8p"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - executableHaskellDepends = [ aeson base lens text ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "OpenAPI 3.0 data model"; - license = lib.licenses.bsd3; - mainProgram = "example"; - }) {}; - - "openapi3_3_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -208881,7 +208112,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "OpenAPI 3.0 data model"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -212910,17 +212140,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, bytestring, containers, extra, pandoc - , pandoc-types, text + ({ mkDerivation, base, bytestring, containers, pandoc, pandoc-types + , text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.3.0"; - sha256 = "1145flz4jkn5knqkc5cppc1412m6hfzd13124k2kfm8dmw196k31"; + version = "0.2.4.0"; + sha256 = "0j25frcafcr0jvk3dfrmxan2q95920wy6jm0fahwf20f4jbanzfc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers extra pandoc pandoc-types text + base bytestring containers pandoc pandoc-types text ]; description = "Pandoc filter to customize links, images and paragraphs"; license = lib.licenses.bsd3; @@ -215022,10 +214252,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.12"; - sha256 = "0razhgznrrzp23zdpl1z8056n2dp2azl42cnha2g0b5h04nipg4q"; - revision = "1"; - editedCabalFile = "13ba819c67d1j6a5rr5w2lss1drb3znjdkfv2y0fd5givda2ds5v"; + version = "0.6.0.13"; + sha256 = "117k12wgaypj7lkj9lqi7xhli9f33hsd455p87g9xxcwx32m0r53"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -223610,7 +222838,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "polysemy_1_8_0_0" = callPackage + "polysemy_1_9_0_0" = callPackage ({ mkDerivation, async, base, Cabal, cabal-doctest, containers , doctest, first-class-families, hspec, hspec-discover , inspection-testing, mtl, stm, syb, template-haskell @@ -223618,8 +222846,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.8.0.0"; - sha256 = "1fyysldfnirhk8nfgiji248rc35c97r0hm4hk6j1n12ynhxcaiwb"; + version = "1.9.0.0"; + sha256 = "00qmsn0mr88y29my389ln6c5imcac73p7hisd102w4qlwikwj9ir"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -223708,8 +222936,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.11.1.0"; - sha256 = "0kwfvwv4hzbm51sk78k1ka9i3f23jp9r8d0acs4gjnbbjfvv78wk"; + version = "0.12.1.0"; + sha256 = "0js5hl84nfmb2i5si67wrf9d0i69piaj44v3sbia6yncq85fj7vn"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix @@ -223777,8 +223005,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.9.0.0"; - sha256 = "13d5ydyaq6jjinq8h8slxj0iw6bfpg7cdv0lj0kl8kpvikr6livg"; + version = "0.10.0.0"; + sha256 = "1j0a0gmlr1cd6mwa8y4f6dq3zf4asmgj4v4cdriiw0k1cxi81l9c"; libraryHaskellDepends = [ aeson base case-insensitive exon http-client http-client-tls http-types polysemy polysemy-plugin prelate time @@ -223853,8 +223081,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.8.0.0"; - sha256 = "0zvlx1y852c1jyaw3lcxps8yb6qk56i8drnfbqvdpss3hb6jhii7"; + version = "0.9.0.0"; + sha256 = "1sgmgbh7gkyhp7rmdx2rj6dibwhi6z2qzg4cbnjsx8asz6xa188h"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -223878,8 +223106,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.8.0.0"; - sha256 = "09r4aqkwfjnwnlym97mfasghb3c9jq9vlmqlycz0kgsid8hdjh52"; + version = "0.9.0.0"; + sha256 = "18z75dbbqf18ff3dc641svm93fvrdaxzplbaicdy7y3dz3y7apmv"; libraryHaskellDepends = [ base co-log co-log-concurrent co-log-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -223900,8 +223128,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.8.0.0"; - sha256 = "1gmwrmnw4675y8hzywazjcafd0hkfal7rxpcycz4dpvzsqznrcrz"; + version = "0.9.0.0"; + sha256 = "0zwcv6b0m5phwiy0c1z3wfnbw0976qg744dpb6k66wdr3yvpl05f"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -223993,8 +223221,8 @@ self: { }: mkDerivation { pname = "polysemy-mocks"; - version = "0.3.0.0"; - sha256 = "03yq5pyrg2rhykyhvp3f8b816r9j035xr5d9d1cls73zh9pbbh7z"; + version = "0.3.1.0"; + sha256 = "08dsx682fvx7ywiixxjaa5b05r3s97anl893nlfc3vy6qynaqkns"; libraryHaskellDepends = [ base polysemy template-haskell ]; testHaskellDepends = [ base hspec polysemy ]; testToolDepends = [ hspec-discover ]; @@ -224031,29 +223259,6 @@ self: { }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , ghc, ghc-tcplugins-extra, hspec, hspec-discover - , inspection-testing, polysemy, should-not-typecheck, syb - , transformers - }: - mkDerivation { - pname = "polysemy-plugin"; - version = "0.4.3.1"; - sha256 = "02s9hb0y4fgvmlkg7izwq24hrgb92h1jd7v0gjzayjn6la8xmf6r"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra polysemy syb transformers - ]; - testHaskellDepends = [ - base containers doctest ghc ghc-tcplugins-extra hspec - inspection-testing polysemy should-not-typecheck syb transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Disambiguate obvious uses of effects"; - license = lib.licenses.bsd3; - }) {}; - - "polysemy-plugin_0_4_4_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , ghc, ghc-tcplugins-extra, hspec, hspec-discover , inspection-testing, polysemy, should-not-typecheck, syb @@ -224075,7 +223280,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-process" = callPackage @@ -224086,8 +223290,8 @@ self: { }: mkDerivation { pname = "polysemy-process"; - version = "0.11.1.0"; - sha256 = "09bzjdnj15bv0fnvs99f6x71yqmy0lbsnxbr4w3mxn4yp73sppc1"; + version = "0.12.1.0"; + sha256 = "0009h21pwfkwfyb5qk6v9gw5gh2ksap3xbcbny2icn88dhqs42k6"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans @@ -224150,8 +223354,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.6.0.0"; - sha256 = "1m6rw8h1glvzic2zhnksiag377zqyf771ypqks59yksmw11hvsyv"; + version = "0.7.0.0"; + sha256 = "0f2hlccg7qpx9dd1k73ni59yl447m3v2s6r8h9n2k1klxc21jr07"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -227367,8 +226571,8 @@ self: { }: mkDerivation { pname = "prelate"; - version = "0.3.0.0"; - sha256 = "13qrk305k5mgpkhjhk92zs0rp3y68k7rhj5d3cqj785bvyvpz3wh"; + version = "0.4.0.0"; + sha256 = "0bil1d1daw6a37zi0fddf3mja3ab12rcsldi879qcipbjc7bh4bz"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process @@ -234216,6 +233420,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-monoid-subclasses" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, hspec, hspec-discover, monoid-subclasses, pretty-show + , QuickCheck, quickcheck-classes, quickcheck-instances + , semigroupoids, text, vector + }: + mkDerivation { + pname = "quickcheck-monoid-subclasses"; + version = "0.0.0.1"; + sha256 = "1x1jza5s1v89ik0h5m3kla5qwgh05j5dbd7f2m2miwyy1b75bqly"; + libraryHaskellDepends = [ + base containers monoid-subclasses pretty-show QuickCheck + quickcheck-classes quickcheck-instances semigroupoids + ]; + testHaskellDepends = [ + base bytestring commutative-semigroups containers hspec + monoid-subclasses QuickCheck quickcheck-classes + quickcheck-instances text vector + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Testing monoid subclass instances with QuickCheck"; + license = lib.licenses.asl20; + }) {}; + "quickcheck-poly" = callPackage ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl , QuickCheck, regex-compat, regex-tdfa @@ -238485,25 +237714,6 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, data-fix - , free, HUnit, template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.2.2.2"; - sha256 = "018l7j9pk8izi817vqyrakrkjsxr332jh24d6j0yl35i5wm4khv6"; - revision = "1"; - editedCabalFile = "1l6wbzx8804pb6p8gvk45hal6sz8r1gvyxb8aa9ih6j8pqv4q04c"; - libraryHaskellDepends = [ - base base-orphans comonad containers data-fix free template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = lib.licenses.bsd2; - }) {}; - - "recursion-schemes_5_2_2_3" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, data-fix , free, HUnit, template-haskell, th-abstraction, transformers }: @@ -238518,7 +237728,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -245763,6 +244972,26 @@ self: { broken = true; }) {}; + "roc-id_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text + , vector-sized + }: + mkDerivation { + pname = "roc-id"; + version = "0.2.0.0"; + sha256 = "1gng9rw9z9zmrkk68q8zf95w3d05yaglk2hp17jvnaw8qxfs3mvp"; + libraryHaskellDepends = [ + base MonadRandom Only text vector-sized + ]; + testHaskellDepends = [ + base hspec MonadRandom Only QuickCheck text vector-sized + ]; + description = "Implementation of the ROC (Taiwan) National ID standard"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "rock" = callPackage ({ mkDerivation, base, constraints, constraints-extras , dependent-hashmap, dependent-sum, deriving-compat, hashable @@ -255192,36 +254421,6 @@ self: { }) {}; "servant-openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , lens-aeson, openapi3, QuickCheck, servant, singleton-bool - , template-haskell, text, time, unordered-containers, utf8-string - , vector - }: - mkDerivation { - pname = "servant-openapi3"; - version = "2.0.1.5"; - sha256 = "0zcyqga4hbdyk34368108vv9vavzdhv26xphas7yppada2sshfay"; - revision = "3"; - editedCabalFile = "0xvs5a9zsg32iziznvvjhfji577xmza419xk0cy1hwamw17f43mi"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens openapi3 QuickCheck servant - singleton-bool text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - lens-aeson openapi3 QuickCheck servant template-haskell text time - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; - license = lib.licenses.bsd3; - }) {}; - - "servant-openapi3_2_0_1_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -255247,7 +254446,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-options" = callPackage @@ -261978,30 +261176,6 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, skylighting-format-ansi - , skylighting-format-blaze-html, skylighting-format-latex, text - }: - mkDerivation { - pname = "skylighting"; - version = "0.13.1.2"; - sha256 = "05m11hd6xr4kh6jgdj4mgwa7nbrj29jzca76pjpm0mjiqv3ah3av"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core skylighting-format-ansi - skylighting-format-blaze-html skylighting-format-latex - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - mainProgram = "skylighting"; - }) {}; - - "skylighting_0_13_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, skylighting-format-ansi , skylighting-format-blaze-html, skylighting-format-context @@ -262024,41 +261198,10 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "skylighting"; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , bytestring, case-insensitive, colour, containers, criterion, Diff - , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, transformers - , utf8-string, xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.13.1.2"; - sha256 = "0081zihpiq4w99x4s5bhf0r2j627dzmlnmpca5rq16mqvhz22mmz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring binary bytestring - case-insensitive colour containers directory filepath mtl safe text - transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_13_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty @@ -262086,7 +261229,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -265873,20 +265015,6 @@ self: { }) {}; "some" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "some"; - version = "1.0.3"; - sha256 = "0w3syapwz9v916zf1i4f8vxymdfg7syc2cpxgnqr018pbswzxrk2"; - revision = "2"; - editedCabalFile = "1w3snkgqhrgi2x2bdny9i7a9ybmal3asrh6g6kg8v86kq1gyr34k"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base ]; - description = "Existential type: Some"; - license = lib.licenses.bsd3; - }) {}; - - "some_1_0_4_1" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; @@ -265896,7 +265024,6 @@ self: { testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "some-dict-of" = callPackage @@ -271694,6 +270821,8 @@ self: { pname = "store-core"; version = "0.4.4.4"; sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; + revision = "1"; + editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -273325,36 +272454,6 @@ self: { }) {}; "string-interpolate" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, formatting - , haskell-src-exts, haskell-src-meta, hspec, hspec-core - , interpolate, neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, split, template-haskell - , text, text-conversions, unordered-containers, utf8-string - }: - mkDerivation { - pname = "string-interpolate"; - version = "0.3.1.2"; - sha256 = "0gmph9mikqq8hch9wjyyx6dxfxwhmdfrwsrxkvbk7i24lvi19hhp"; - revision = "1"; - editedCabalFile = "1nrpng7r59a25z4qns8vy26rvp1wgn5f4bs8ism40q66ags8f2ad"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta split - template-haskell text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec hspec-core QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode template-haskell text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq formatting interpolate - neat-interpolation QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = lib.licenses.bsd3; - }) {}; - - "string-interpolate_0_3_2_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, formatting , haskell-src-exts, haskell-src-meta, hspec, hspec-core , interpolate, neat-interpolation, QuickCheck, quickcheck-instances @@ -273380,7 +272479,6 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "string-interpreter" = callPackage @@ -279680,23 +278778,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers - , optparse-applicative, stm, tagged, transformers, unbounded-delays - , unix, wcwidth - }: - mkDerivation { - pname = "tasty"; - version = "1.4.2.3"; - sha256 = "1inhrayiqhd3k14b9cnjcv5kdxb95sgk8b0ibbf37z4dlalsf569"; - libraryHaskellDepends = [ - ansi-terminal base clock containers optparse-applicative stm tagged - transformers unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = lib.licenses.mit; - }) {}; - - "tasty_1_4_3" = callPackage ({ mkDerivation, ansi-terminal, base, containers , optparse-applicative, stm, tagged, transformers, unix }: @@ -279710,7 +278791,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -281300,32 +280380,6 @@ self: { }) {}; "telegram-bot-simple" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron - , filepath, hashable, http-api-data, http-client, http-client-tls - , monad-control, mtl, pretty-show, profunctors, servant - , servant-client, servant-multipart-api, servant-multipart-client - , servant-server, split, stm, template-haskell, text, time - , transformers, unordered-containers, warp, warp-tls - }: - mkDerivation { - pname = "telegram-bot-simple"; - version = "0.6"; - sha256 = "1f4nfh32v5l60p2bqifg5dl311p86lis51na7hri074w0p3kg6ki"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring cron filepath hashable - http-api-data http-client http-client-tls monad-control mtl - pretty-show profunctors servant servant-client - servant-multipart-api servant-multipart-client servant-server split - stm template-haskell text time transformers unordered-containers - warp warp-tls - ]; - description = "Easy to use library for building Telegram bots"; - license = lib.licenses.bsd3; - }) {}; - - "telegram-bot-simple_0_6_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -281349,7 +280403,6 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "telegram-raw-api" = callPackage @@ -283582,28 +282635,6 @@ self: { }) {}; "text-builder-dev" = callPackage - ({ mkDerivation, base, bytestring, criterion, deferred-folds - , isomorphism-class, QuickCheck, quickcheck-instances, rerebase - , split, tasty, tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "text-builder-dev"; - version = "0.3.3"; - sha256 = "0h88yxj0w7ycpmzxyxnxkrz05dmi902dv9v8mxlx7nrr8idxss74"; - libraryHaskellDepends = [ - base bytestring deferred-folds isomorphism-class split text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Edge of developments for \"text-builder\""; - license = lib.licenses.mit; - }) {}; - - "text-builder-dev_0_3_3_2" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , isomorphism-class, QuickCheck, quickcheck-instances, rerebase , split, tasty, tasty-hunit, tasty-quickcheck, text, transformers @@ -283623,7 +282654,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Edge of developments for \"text-builder\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "text-builder-linear" = callPackage @@ -284282,39 +283312,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.9.2"; - sha256 = "1j1mcmw9l7hfmvhmv083bssc2w6zbvibaq3w4c7g7a2vxxcqwh3y"; - libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml - ]; - testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_9_3" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -284345,6 +283342,39 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = lib.licenses.bsd3; + }) {}; + + "text-show-instances_3_9_4" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, scientific + , semigroups, tagged, template-haskell, terminfo, text, text-short + , text-show, th-orphans, time, transformers, transformers-compat + , unix, unordered-containers, uuid-types, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.9.4"; + sha256 = "154smhpc3l2h1iacdsywzirkv19w493yajhsiqg9pqmmiii7kwr5"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + ghc-boot-th haskeline hpc old-locale old-time pretty random + scientific semigroups tagged template-haskell terminfo text + text-short text-show time transformers unix unordered-containers + uuid-types vector xhtml + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + scientific tagged template-haskell terminfo text-short text-show + th-orphans time transformers transformers-compat unix + unordered-containers uuid-types vector xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -300298,8 +299328,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "var-monad"; - version = "0.2.0.0"; - sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji"; + version = "0.2.0.1"; + sha256 = "1k1v503ww56chlxy9a9vh3w5rh047l3q97si1bi3x1575b1sppm2"; libraryHaskellDepends = [ base stm ]; description = "The VarMonad typeclass, generalizing types of references"; license = lib.licenses.asl20; @@ -301113,22 +300143,6 @@ self: { }) {}; "vector-extras" = callPackage - ({ mkDerivation, base, containers, deferred-folds, foldl, hashable - , unordered-containers, vector - }: - mkDerivation { - pname = "vector-extras"; - version = "0.2.7.1"; - sha256 = "1a8aak9v68qmrx719w782ww7accn7bk11gnca3d2lvbzw793dl4q"; - libraryHaskellDepends = [ - base containers deferred-folds foldl hashable unordered-containers - vector - ]; - description = "Utilities for the \"vector\" library"; - license = lib.licenses.mit; - }) {}; - - "vector-extras_0_2_8" = callPackage ({ mkDerivation, base, containers, deferred-folds, foldl, hashable , unordered-containers, vector }: @@ -301142,7 +300156,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-fft" = callPackage @@ -301332,6 +300345,8 @@ self: { pname = "vector-sized"; version = "1.5.0"; sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; + revision = "1"; + editedCabalFile = "0y088b8fdhjrghi203n11ip4x2j4632c8rz6a5hx8azmdz2giiph"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -302905,6 +301920,8 @@ self: { pname = "vty"; version = "5.35.1"; sha256 = "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k"; + revision = "1"; + editedCabalFile = "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307780,27 +306797,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable - , hedgehog, primitive, QuickCheck, quickcheck-classes, semirings - }: - mkDerivation { - pname = "wide-word"; - version = "0.1.3.0"; - sha256 = "03g0v5zp3ra2z31vyjkhgd23s2dyaks640y2imkv649fcvvz33xj"; - revision = "1"; - editedCabalFile = "1y1w3ih92dni6bzp4w1hcwn96ahdrk34lmqrgkri2dcdkykwyqwb"; - libraryHaskellDepends = [ - base deepseq ghc-prim hashable primitive - ]; - testHaskellDepends = [ - base bytestring ghc-prim hedgehog primitive QuickCheck - quickcheck-classes semirings - ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = lib.licenses.bsd2; - }) {}; - - "wide-word_0_1_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable , hedgehog, primitive, QuickCheck, quickcheck-classes, semirings }: @@ -307817,7 +306813,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "wide-word-instances" = callPackage From c558d50b4566f907ab7360eee1a8916c480e3e65 Mon Sep 17 00:00:00 2001 From: Benedikt Broich Date: Fri, 30 Dec 2022 18:09:01 +0100 Subject: [PATCH 08/61] blueprint-compiler: refactor Some improvements discussed [here](https://github.com/NixOS/nixpkgs/pull/208157) after the first merge. --- .../compilers/blueprint/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 7ac0a68be05b..425ea5766f9c 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -1,14 +1,13 @@ -{ gtk4 -, python3 -, stdenv -, fetchFromGitLab +{ fetchFromGitLab , gobject-introspection +, gtk4 , lib , meson , ninja +, python3 +, stdenv , testers }: - stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; version = "0.6.0"; @@ -21,31 +20,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja ]; buildInputs = [ - python3 - gtk4 - ] ++ (with python3.pkgs; [ - pygobject3 - wrapPython - ]); + (python3.withPackages (ps: with ps; [ + pygobject3 + ])) + ]; propagatedBuildInputs = [ + # For setup hook, so that the compiler can find typelib files gobject-introspection ]; - postFixup = '' - makeWrapperArgs="\ - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ - --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3})\"" - wrapPythonPrograms - ''; + doCheck = true; + + checkInputs = [ + gtk4 + ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; From c30e3bc5d00fbb59e8b37a5694c90c56c4529060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 03:58:34 +0000 Subject: [PATCH 09/61] nfdump: 1.7.0.1 -> 1.7.1 --- pkgs/tools/networking/nfdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 3a24794f419b..59a10a314fcb 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, bison }: -let version = "1.7.0.1"; in +let version = "1.7.1"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "sha256-yD/NFGw38ishqQmKhlnHYodXmJuezI09hxNsyObZ1QE="; + sha256 = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ="; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; From b80c4e945d7dd4d82ea56fdd3df6343d5cc11215 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Sat, 31 Dec 2022 12:18:26 +0100 Subject: [PATCH 10/61] haskellPackages: unbreak hevm --- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-nix.nix | 6 +- .../haskell-modules/hackage-packages.nix | 2 - .../patches/hevm-update-deps.patch | 129 ------------------ 4 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/hevm-update-deps.patch diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7ecd847ddf64..d8edd9c64599 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2217,7 +2217,6 @@ broken-packages: - heterogeneous-list-literals - hetris - heukarya - - hevm - HExcel - hexchat - hexif diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 06b0644b7012..75725a2bf359 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -723,10 +723,8 @@ self: super: builtins.intersectAttrs super { ''; }) super.haskell-language-server; - # NOTE: this patch updates the hevm code to work with the latest packages that broke the build - # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1 - # tests depend on a specific version of solc - hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm); + # there are three very heavy test suites that need external repos, one requires network access + hevm = dontCheck super.hevm; # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ee76845c6870..36fd34b57c0f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -136408,10 +136408,8 @@ self: { doHaddock = false; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; - broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage diff --git a/pkgs/development/haskell-modules/patches/hevm-update-deps.patch b/pkgs/development/haskell-modules/patches/hevm-update-deps.patch deleted file mode 100644 index e4a37fc0f4c2..000000000000 --- a/pkgs/development/haskell-modules/patches/hevm-update-deps.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/hevm.cabal b/hevm.cabal -index cf36961e..3b31f595 100644 ---- a/hevm.cabal -+++ b/hevm.cabal -@@ -71,6 +71,10 @@ library - -Wall -Wno-deprecations - extra-libraries: - secp256k1, ff -+ if os(darwin) -+ extra-libraries: c++ -+ else -+ extra-libraries: stdc++ - c-sources: - ethjet/tinykeccak.c, ethjet/ethjet.c - cxx-sources: -@@ -88,7 +92,7 @@ library - transformers >= 0.5.6 && < 0.6, - tree-view >= 0.5 && < 0.6, - abstract-par >= 0.3.3 && < 0.4, -- aeson >= 1.5.6 && < 1.6, -+ aeson >= 2.0 && < 2.1, - bytestring >= 0.10.8 && < 0.11, - scientific >= 0.3.6 && < 0.4, - binary >= 0.8.6 && < 0.9, -@@ -97,7 +101,7 @@ library - vector >= 0.12.1 && < 0.13, - ansi-wl-pprint >= 0.6.9 && < 0.7, - base16-bytestring >= 1.0.0 && < 2.0, -- brick >= 0.58 && < 0.63, -+ brick >= 0.58 && < 0.69, - megaparsec >= 9.0.0 && < 10.0, - mtl >= 2.2.2 && < 2.3, - directory >= 1.3.3 && < 1.4, -@@ -105,13 +109,13 @@ library - vty >= 5.25.1 && < 5.34, - cereal >= 0.5.8 && < 0.6, - cryptonite >= 0.27 && <= 0.29, -- memory >= 0.14.18 && < 0.16, -+ memory >= 0.14.18 && < 0.20, - data-dword >= 0.3.1 && < 0.4, - fgl >= 5.7.0 && < 5.8, - free >= 5.1.3 && < 5.2, - haskeline >= 0.8.0 && < 0.9, - process >= 1.6.5 && < 1.7, -- lens >= 4.17.1 && < 4.20, -+ lens >= 4.17.1 && < 5.1, - lens-aeson >= 1.0.2 && < 1.2, - monad-par >= 0.3.5 && < 0.4, - multiset >= 0.3.4 && < 0.4, -@@ -124,7 +128,6 @@ library - sbv >= 8.9, - semver-range >= 0.2.7 && < 0.3, - temporary >= 1.3 && < 1.4, -- text-format >= 0.3.2 && < 0.4, - witherable >= 0.3.5 && < 0.5, - wreq >= 0.5.3 && < 0.6, - regex-tdfa >= 1.2.3 && < 1.4, -@@ -190,7 +193,6 @@ executable hevm - sbv, - temporary, - text, -- text-format, - unordered-containers, - vector, - vty -diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs -index b7d0f36b..4e9d6892 100644 ---- a/src/EVM/Solidity.hs -+++ b/src/EVM/Solidity.hs -@@ -70,6 +70,7 @@ import Control.Monad - import Control.Lens hiding (Indexed, (.=)) - import qualified Data.String.Here as Here - import Data.Aeson hiding (json) -+import qualified Data.Aeson.KeyMap as KeyMap - import Data.Aeson.Types - import Data.Aeson.Lens - import Data.Scientific -@@ -714,8 +715,8 @@ astIdMap = foldMap f - f :: Value -> Map Int Value - f (Array x) = foldMap f x - f v@(Object x) = -- let t = foldMap f (HMap.elems x) -- in case HMap.lookup "id" x of -+ let t = foldMap f (KeyMap.elems x) -+ in case KeyMap.lookup "id" x of - Nothing -> t - Just (Number i) -> t <> Map.singleton (round i) v - Just _ -> t -diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs -index 5bbf1c03..b828098e 100644 ---- a/src/EVM/SymExec.hs -+++ b/src/EVM/SymExec.hs -@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM () - - -- | Convenience functions for generating large symbolic byte strings - sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8]) --sbytes32 = toBytes <$> freshVar_ @ (WordN 256) --sbytes128 = toBytes <$> freshVar_ @ (WordN 1024) -+sbytes32 = toBytes <$> freshVar_ @(WordN 256) -+sbytes128 = toBytes <$> freshVar_ @(WordN 1024) - sbytes256 = liftA2 (++) sbytes128 sbytes128 - sbytes512 = liftA2 (++) sbytes256 sbytes256 - sbytes1024 = liftA2 (++) sbytes512 sbytes512 -diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs -index fdd2368d..1dc29e83 100644 ---- a/src/EVM/Types.hs -+++ b/src/EVM/Types.hs -@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer) - readNull :: Read a => a -> String -> a - readNull x = fromMaybe x . Text.Read.readMaybe - --wordField :: JSON.Object -> Text -> JSON.Parser W256 -+wordField :: JSON.Object -> Key -> JSON.Parser W256 - wordField x f = ((readNull 0) . Text.unpack) - <$> (x .: f) - --addrField :: JSON.Object -> Text -> JSON.Parser Addr -+addrField :: JSON.Object -> Key -> JSON.Parser Addr - addrField x f = (read . Text.unpack) <$> (x .: f) - --addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr) -+addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr) - addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f) - --dataField :: JSON.Object -> Text -> JSON.Parser ByteString -+dataField :: JSON.Object -> Key -> JSON.Parser ByteString - dataField x f = hexText <$> (x .: f) - - toWord512 :: W256 -> Word512 From 314dc9e822810e03d7514f94bea1ea2a9d222ed9 Mon Sep 17 00:00:00 2001 From: jackkav Date: Sat, 31 Dec 2022 14:57:53 +0000 Subject: [PATCH 11/61] add package: keet --- .../instant-messengers/keet/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/keet/default.nix diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix new file mode 100644 index 000000000000..557078cd8b50 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -0,0 +1,32 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "keet"; + version = "1.2.1"; + + src = fetchurl { + url = "https://keet.io/downloads/${version}/Keet.AppImage"; + sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit src pname version; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Peer-to-Peer Chat"; + homepage = "https://keet.io"; + license = licenses.unfree; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d37566466fef..a2cdaad3487b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30081,6 +30081,8 @@ with pkgs; kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; + keet = callPackage ../applications/networking/instant-messengers/keet { }; + kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; From 2776b31558428169b7f03dc0377bbc90b67765a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 03:14:00 +0000 Subject: [PATCH 12/61] python310Packages.ansible-lint: 6.10.0 -> 6.10.1 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 691a4f1146cf..7883d9ae8bc6 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.10.0"; + version = "6.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9ezsWOvntr/El2vn1uQAQRqK8FsOGhnxXyX1nzQBNIw="; + sha256 = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q="; }; postPatch = '' From 7789eab44f0ba31c46064fda14e21096f88221c6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 1 Jan 2023 23:52:01 +0100 Subject: [PATCH 13/61] libbluray: 1.3.2 -> 1.3.4 Signed-off-by: Felix Singer --- .../libraries/libbluray/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index f987e7c6497f..bc10d06b846c 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -11,27 +11,13 @@ stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-RWgU258Hwe7N736ED8uyCXbvgU34dUKL+4Hs9FhR8XA="; + hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; }; - patches = [ - ./BDJ-JARFILE-path.patch - (fetchpatch { - name = "Initial-support-for-Java-18.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch"; - hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo="; - }) - (fetchpatch { - name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch"; - hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ lib.optionals withJava [ ant ]; From 2d3c98f2a3c2de92c88191458ee875069081c876 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Fri, 30 Dec 2022 11:37:11 -0700 Subject: [PATCH 14/61] haskellPackages.true-name: Add a patch to allow building with current template-haskell. This updates the `true-name` package to include changes up to version 0.1.0.4, as well as compilation failures when building with template-haskell version 2.16 and higher. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa0538289992..fa599029392a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2370,4 +2370,16 @@ self: super: { } super.postgrest)); html-charset = dontCheck super.html-charset; + + # true-name-0.1.0.4 has been tagged, but has not been released to Hackage. + # Also, beyond 0.1.0.4 an additional patch is required to make true-name + # compatible with current versions of template-haskell + # https://github.com/liyang/true-name/pull/4 + true-name = appendPatch (fetchpatch { + url = "https://github.com/liyang/true-name/compare/0.1.0.3...nuttycom:true-name:update_template_haskell.patch"; + hash = "sha256-ZMBXGGc2X5AKXYbqgkLXkg5BhEwyj022E37sUEWahtc="; + }) (overrideCabal (drv: { + revision = null; + editedCabalFile = null; + }) super.true-name); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 69a10689fb70..33e8627195f2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5416,7 +5416,6 @@ broken-packages: - trivia - tropical - tropical-geometry - - true-name - tsession - tslib - tsparse From 8adc6631f2031f848ae6b5bd8649ec7ffffdbe11 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 2 Jan 2023 15:55:12 +0900 Subject: [PATCH 15/61] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 36fd34b57c0f..da3d47efd98a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -290608,8 +290608,6 @@ self: { testHaskellDepends = [ base containers template-haskell time ]; description = "Template Haskell hack to violate module abstractions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "truelevel" = callPackage From efca7bec1910135e0456772daa0a4eeb08fc03fd Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sat, 31 Dec 2022 15:05:03 +0000 Subject: [PATCH 16/61] vaultenv: 0.14 -> 0.15.1. --- .../haskell-modules/configuration-common.nix | 6 ------ pkgs/development/tools/haskell/vaultenv/default.nix | 10 ++++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fbcd31680a67..f70503a81afe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2142,12 +2142,6 @@ self: super: { # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; - # Doesn't support aeson >= 2.0 - # https://github.com/channable/vaultenv/issues/118 - vaultenv = super.vaultenv.overrideScope (self: super: { - aeson = self.aeson_1_5_6_0; - }); - # Support network >= 3.1.2 # https://github.com/erebe/wstunnel/pull/107 wstunnel = appendPatch (fetchpatch { diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index b0810d33b50a..bde2dce30eeb 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -19,6 +19,7 @@ , parser-combinators , retry , lib +, quickcheck-instances , text , unix , unordered-containers @@ -28,13 +29,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; + sha256 = "sha256-yoYkAypH+HQSVTvd/qKNFkL5krbB5mZw3ec9ojvy+Pw="; }; buildTools = [ hpack ]; @@ -86,6 +87,7 @@ mkDerivation rec { optparse-applicative parser-combinators retry + quickcheck-instances text unix unordered-containers @@ -96,8 +98,4 @@ mkDerivation rec { description = "Runs processes with secrets from HashiCorp Vault"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lnl7 manveru ]; - - # Does not compile on ghc92 - hydraPlatforms = lib.platforms.none; - broken = true; } From b43cb178aa79a7f60e55c364cfbffafd61a48ece Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 04:47:50 +0100 Subject: [PATCH 17/61] home-assistant: 2022.12.8 -> 2022.12.9 https://github.com/home-assistant/core/releases/tag/2022.12.9 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b72fa929a7db..8dcda90018b8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.12.8"; + version = "2022.12.9"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 24d59402d281..c09ecc6fb49d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -190,7 +190,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.12.8"; + hassVersion = "2022.12.9"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -208,7 +208,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-oJwA0YELlgMbnf1XiLDGlMLrvFaLP7WMv9/0KOI4XDI="; + hash = "sha256-tf2H4+79CGTmbKZtJpzYOzAgi90RpSy89hoDNS24m0Q="; }; # leave this in, so users don't have to constantly update their downstream patch handling From e76246283bdd209e9559f6bbec38ef85ef857df3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 3 Jan 2023 04:20:00 +0000 Subject: [PATCH 18/61] python310Packages.tubeup: 0.0.34 -> 0.0.35 https://github.com/bibanon/tubeup/releases/tag/0.00.35 --- pkgs/development/python-modules/tubeup/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 045780219d42..6dc5dcdb3a0f 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,18 +9,20 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.34"; + version = "0.0.35"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ae1e606b243fd70742f8b5871c497628d258ee9f416caa46544aca9a5fbfbca0"; + sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1"; }; postPatch = '' substituteInPlace setup.py \ + --replace "internetarchive==3.0.2" "internetarchive" \ + --replace "urllib3==1.26.13" "urllib3" \ --replace "docopt==0.6.2" "docopt" ''; From d24b2e9d5df498893380a454b4ae62d3b796c911 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 13:22:14 +0100 Subject: [PATCH 19/61] haskellPackages.hashing: drop stale override --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f70503a81afe..65e11196ff2a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -216,10 +216,6 @@ self: super: { # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core = doJailbreak super.hnix-store-core; - # Too strict upper bound on bytestring - # https://github.com/wangbj/hashing/issues/3 - hashing = doJailbreak super.hashing; - # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; search = dontCheck super.search; From 5df77ad6ee332547670da30e1f9ba868356318b3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 13:22:27 +0100 Subject: [PATCH 20/61] haskellPackages.xmlbf: drop stale override --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 65e11196ff2a..c9609bd7b848 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1999,12 +1999,6 @@ self: super: { "--skip" "/toJsonSerializer/should generate valid JSON/" ] ++ drv.testFlags or []; }) super.hschema-aeson; - # https://gitlab.com/k0001/xmlbf/-/issues/32 - xmlbf = overrideCabal (drv: { - testFlags = [ - "-p" "!/xml: <\\/x>/&&!/xml: <\\/x>/" - ] ++ drv.testFlags or []; - }) super.xmlbf; # https://github.com/ssadler/aeson-quick/issues/3 aeson-quick = overrideCabal (drv: { testFlags = [ From 3665c429d349fbda46b0651e554cca8434452748 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 19 Dec 2022 12:19:45 +0100 Subject: [PATCH 21/61] haskell.compiler.ghcHEAD: 9.5.20220921 -> 9.7.20221224 Finally building a cross compiler using hadrian is possible, but there are some outstanding issues regarding external libraries in the package db which causes issues with ghc-bignum. --- pkgs/development/compilers/ghc/common-hadrian.nix | 6 ------ pkgs/development/compilers/ghc/head.nix | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 1ca3c9efde94..c54e6a4baf86 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -156,12 +156,6 @@ assert !enableNativeBignum -> gmp != null; -assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' - hadrian doesn't support building an installable GHC cross-compiler at the moment. - Consider using GHC 9.4 or lower which support this via the make build system. - See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 -''; - let src = (if rev != null then fetchgit else fetchurl) ({ inherit url sha256; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6158be43d810..19739ecbd14f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.5.20220921"; - rev = "2463df2fe21b5b37ecada3df8c6726c534d24590"; - sha256 = "1k2h4myqbs31fdzw5n4iw0qn44mp7d33kjwrr15ix4r54r8yskzs"; + version = "9.7.20221224"; + rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19"; + sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi"; } From 413c75fa1a6d40385af396eb0755ad688b85a6a2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 3 Jan 2023 19:22:31 +0100 Subject: [PATCH 22/61] hercules-ci-agent: Remove released patch --- .../haskell-modules/configuration-common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c9609bd7b848..d95864a76617 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1456,16 +1456,6 @@ self: super: { servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; hercules-ci-agent = lib.pipe super.hercules-ci-agent [ - (appendPatches [ - # haskell-updates branch, will be merged in 0.9.10 - (fetchpatch2 { - name = "hercules-ci-agent-cachix-1.1"; - url = "https://github.com/hercules-ci/hercules-ci-agent/commit/b76d888548da37a96ae47f1be871de6605d38edd.patch"; - sha256 = "sha256-kqEkDHbatcYS8LuQlGV/1j/6LXWviQoDQAHDr6DBbDU="; - stripLen = 1; - includes = [ "*.hs" ]; - }) - ]) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; From 28accf43182b59f974673c55dd9ad32d3fbc9c86 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 3 Jan 2023 13:35:17 -0500 Subject: [PATCH 23/61] iwgtk: 0.8 -> 0.9 Diff: https://github.com/j-lentz/iwgtk/compare/v0.8...v0.9 Changelog: https://github.com/j-lentz/iwgtk/blob/v0.9/CHANGELOG --- pkgs/tools/networking/iwgtk/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/tools/networking/iwgtk/default.nix index c2781fbaf797..0c72c41ce626 100644 --- a/pkgs/tools/networking/iwgtk/default.nix +++ b/pkgs/tools/networking/iwgtk/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "iwgtk"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "j-lentz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-89rzDxalZtQkwAKS6hKPVY87kOWPySwDeZrPs2rGs/k="; + sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs="; }; # patch systemd service to pass necessary environments and use absolute paths @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 qrencode ]; postInstall = '' - mv $out/share/lib/systemd $out/share - rmdir $out/share/lib - substituteInPlace $out/share/systemd/user/iwgtk.service --subst-var out + substituteInPlace $out/lib/systemd/user/iwgtk.service --subst-var out ''; meta = with lib; { From 1ee0f4c2aa2f6f70dca68c0d9bc51663a923bf2b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 22:19:59 +0100 Subject: [PATCH 24/61] systemd: fix evaluation in pkgsCross.ghcjs.buildPackages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GHC's js backend depends on systemd via emscripten via closure compiler via jdk via cups. Before it fails to evaluate, though, since llvmPackages looks into `targetPackages.stdenv.cc` to determine which C++ library to use (something that should be rectified in the future). [Unfortunately], for `pkgsCross.ghcjs`, `stdenv.cc` throws which blows up evaluating `pkgsCross.buildPackages.llvmPackages.clang`. This is in principle unnecessary. We want to build `pkgsCross.ghcjs.buildPackages.haskell.compiler.native-bignum.ghcHEAD` which depends on `pkgsCross.ghcjs.buildPackages.systemd` which needs clang and friends only in `nativeBuildInputs`, so `pkgsCross.ghcjs.buildPackages.buildPackages.llvmPackages.clang`. Unfortunately, due to the nature of splicing, we first evaluate the “adjacent” derivation before we can access the spliced derivation we are actually interested in. If the former fails (`pkgsCross.ghcjs.buildPackages.llvmPackages.clang`), we can't do the latter. The solution is to just not rely on splicing in this case and take `buildPackages.llvmPackages.clang` directly (relative to `buildPackages.systemd` in this case!) which avoids the whole problem. [Unfortunately]: https://github.com/NixOS/nixpkgs/commit/c739c420db5b9d56c335414be1696c57f2dbbb6a#diff-3209527bd27cbc775f579b1e295b0264c850859c7245d526965cec456b8c70a4R61 --- pkgs/os-specific/linux/systemd/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 91746b9f1090..4e3f3762370d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -70,9 +70,16 @@ # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time. # Only libbpf should be a runtime dependency. + # Note: llvmPackages is explicitly taken from buildPackages instead of relying + # on splicing. Splicing will evaluate the adjacent (pkgsHostTarget) llvmPackages + # which is sometimes problematic: llvmPackages.clang looks at targetPackages.stdenv.cc + # which, in the unfortunate case of pkgsCross.ghcjs, `throw`s. If we explicitly + # take buildPackages.llvmPackages, this is no problem because + # `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to us. Working + # around this is important, because systemd is in the dependency closure of + # GHC via emscripten and jdk. , bpftools , libbpf -, llvmPackages , withAnalyze ? true , withApparmor ? true @@ -86,7 +93,7 @@ , withHostnamed ? true , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl -, withLibBPF ? lib.versionAtLeast llvmPackages.clang.version "10.0" +, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" , withLocaled ? true , withLogind ? true , withMachined ? true @@ -368,8 +375,8 @@ stdenv.mkDerivation { ] ++ lib.optionals withLibBPF [ bpftools - llvmPackages.clang - llvmPackages.libllvm + buildPackages.llvmPackages.clang + buildPackages.llvmPackages.libllvm ] ; From a05354790bb2474249eca45b0156f518626999c7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 22:42:57 +0100 Subject: [PATCH 25/61] haskell.compiler.ghcHEAD: use LLVM 14 This will be required for the JavaScript backend to work. --- pkgs/top-level/haskell-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 35281cf5f086..b4beafcfd3c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -277,9 +277,9 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2022-08-04: Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; + # 2022-08-04: Support range >= 10 && < 15 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; + llvmPackages = pkgs.llvmPackages_14; }; ghcjs = compiler.ghcjs810; From 12af3ee5c596b0a6798b299c97336fa3f5f063ed Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 22:45:05 +0100 Subject: [PATCH 26/61] emscripten: fake cc-wrapper-esque passthru attrs for GHC For the GHC JavaScript backend, we'll use emscripten in place of targetCC. To avoid having too much special logic for this, we'll make the emscripten derivation look like the result of wrapCC as far as GHC is concerned, i.e. we need targetPrefix and bintools. For bintools, we'll just reexpose emscripten, as it has emar, the only relevant bintools. That the other ones are missing doesn't matter in practice, as the GHC build system won't attempt to use them. targetPrefix can immediately be (ab)used to make sure GHC will correctly call emcc etc. instead of plain cc. --- pkgs/development/compilers/emscripten/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 44ba33247b40..eca67f832102 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,6 +3,7 @@ , llvmPackages , symlinkJoin, makeWrapper, substituteAll , mkYarnModules +, emscripten }: stdenv.mkDerivation rec { @@ -116,6 +117,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + # HACK: Make emscripten look more like a cc-wrapper to GHC + # when building the javascript backend. + targetPrefix = "em"; + bintools = emscripten; + }; + meta = with lib; { homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; From de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 22:58:25 +0100 Subject: [PATCH 27/61] haskell.compiler: also check targetPlatform for gmp compat gmp is part of buildInputs _and_ depsTargetTarget, so we need to check the host and target platform to be correct. In practice this doesn't change much though, as gmp.meta.platforms is _quite_ liberal. --- pkgs/development/compilers/ghc/8.10.7.nix | 4 +++- pkgs/development/compilers/ghc/8.8.4.nix | 4 +++- pkgs/development/compilers/ghc/9.0.2.nix | 3 ++- pkgs/development/compilers/ghc/9.2.4.nix | 3 ++- pkgs/development/compilers/ghc/9.2.5.nix | 3 ++- pkgs/development/compilers/ghc/9.4.2.nix | 3 ++- pkgs/development/compilers/ghc/9.4.3.nix | 3 ++- pkgs/development/compilers/ghc/9.4.4.nix | 3 ++- pkgs/development/compilers/ghc/common-hadrian.nix | 3 ++- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index b7f027440de1..afc06e09edb0 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -21,7 +21,9 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 40dabc6c9837..be4ca5edb823 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -20,7 +20,9 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 0881b58ff717..f69e52701a93 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 68657c9178a0..6b8efae06e5b 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index 12511c761391..e7c75fcaccf9 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index a3eb18e15687..d3702f4e849d 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 2b0f206a6fb0..fea2d4c4c8c9 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index fafa24808489..b9897b0f4d82 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index c54e6a4baf86..00f08c9a8023 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -48,7 +48,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. From b711b52d159d9c18e0cc3a839f21a1061ddc5b3e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 23:20:45 +0100 Subject: [PATCH 28/61] jre, temurin-bin: fix eval in pkgsCross.ghcjs.buildPackages Since #200337 gobject-introspection propagates itself via depsTargetTargetPropagated, so one doesn't have to add it to every derivation twice. The problem is that gobject-introspection still is in a lot of buildInputs and will thus propagate itself again for target, breaking evaluation unnecessarily if gobject-introspection doesn't evaluate on whatever the target platform turns out to be. temurin-bin and openjdk19 caused such a situation via gtk3 which GHC's JavaScript backend depends on. To fix evaluation of those packages in pkgsCross.ghcjs.buildPackages, we'll just disable the features pulling in gtk3 until this is fixed properly. --- pkgs/development/compilers/openjdk/19.nix | 4 +++- pkgs/development/compilers/temurin-bin/jdk-linux-base.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 87c978ec8305..fb4a273aed4f 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -4,7 +4,9 @@ , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap , ensureNewerSourcesForZipFilesHook , setJavaClassPath -, headless ? false +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index a7ed81ca8acb..c601ca63b7cd 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -20,7 +20,9 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? true +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, gtkSupport ? !stdenv.targetPlatform.isGhcjs , cairo , glib , gtk3 From 6392c21c1fefd50d9dda8bec70bcbbf01622f769 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 3 Jan 2023 23:38:37 +0100 Subject: [PATCH 29/61] haskell.compiler.ghcHEAD: allow building the JavaScript backend This is now possible by building a cross compiler for js-unknown-ghjs using `pkgsCross.ghcjs.buildPackages.haskell.compiler.ghcHEAD`. To allow this, the following things needed to be done: * Disable dependencies that wouldn't work: - Don't pull in ncurses for terminfo - Don't pull in libffi - Don't pull in libiconv - Don't enable the LLVM backend - Enable gmp-less native-bignum backend * Use emscripten instead of a C compiler. The way this works is inspired by emscriptenPackages, but avoids the following flaws: - Instead of using a custom configurePhase, just set `configureScript = "emconfigure ./configure";` which is much simpler. - Create writable EM_CACHE before configuring, as configure scripts want to compile test programs. Additionally, we need to disable the targetCC check, as it is not applicable with emscripten which never appears as part of stdenv. * Use generic $configureScript in installPhase to be able to work with our emconfigure trick. Note that the corresponding Haskell package set does not work yet. Cabal doesn't seem to like GHC 9.7 yet and the generic-builder is clueless about the JS backend. --- .../compilers/ghc/common-hadrian.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 00f08c9a8023..15073bfec107 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -39,7 +39,8 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) + || stdenv.targetPlatform.isGhcjs) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -50,6 +51,7 @@ # bignum backend instead of the faster but GPLed gmp backend. enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp && lib.meta.availableOn stdenv.targetPlatform gmp) + || stdenv.targetPlatform.isGhcjs , gmp , # If enabled, use -fPIC when compiling static libs. @@ -63,7 +65,8 @@ enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + || stdenv.targetPlatform.isGhcjs) , # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04 enableDwarf ? (stdenv.targetPlatform.isx86 || @@ -196,17 +199,19 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] + ++ lib.optionals (!targetPlatform.isGhcjs) [libffi] # Bindist configure script fails w/o elfutils in linker search path # https://gitlab.haskell.org/ghc/ghc/-/issues/22081 ++ lib.optional enableDwarf elfutils ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows && !targetPlatform.isGhcjs) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? # GHC doesn't seem to have {LLC,OPT}_HOST toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc + (if targetPlatform.isGhcjs + then pkgsBuildTarget.emscripten + else pkgsBuildTarget.targetPackages.stdenv.cc) ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -246,7 +251,7 @@ in # C compiler, bintools and LLVM are used at build time, but will also leak into # the resulting GHC's settings file and used at runtime. This means that we are # currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert !targetPlatform.isGhcjs -> targetCC == pkgsHostTarget.targetPackages.stdenv.cc; assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; @@ -329,6 +334,13 @@ stdenv.mkDerivation ({ '*-android*|*-gnueabi*|*-musleabi*)' done '' + # Need to make writable EM_CACHE for emscripten + # https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available + + lib.optionalString targetPlatform.isGhcjs '' + export EM_CACHE="$(mktemp -d emcache.XXXXXXXXXX)" + cp -Lr ${targetCC /* == emscripten */}/share/emscripten/cache/* "$EM_CACHE/" + chmod u+rwX -R "$EM_CACHE" + '' # Create bash array hadrianFlagsArray for use in buildPhase. Do it in # preConfigure, so overrideAttrs can be used to modify it effectively. # hadrianSettings are passed via the command line so they are more visible @@ -340,6 +352,8 @@ stdenv.mkDerivation ({ ) ''; + ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure"; + # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; @@ -348,7 +362,7 @@ stdenv.mkDerivation ({ configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" @@ -387,6 +401,9 @@ stdenv.mkDerivation ({ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx + ] ++ lib.optionals targetPlatform.isGhcjs [ + # emscripten itself is added via depBuildTarget / targetCC + python3 ]; # For building runtime libs @@ -445,7 +462,7 @@ stdenv.mkDerivation ({ preInstall = '' pushd _build/bindist/* - ./configure $configureFlags "''${configureFlagsArray[@]}" + $configureScript $configureFlags "''${configureFlagsArray[@]}" ''; postInstall = '' From 91e05c47f82bb122f16576e0f2c631349b2efb1c Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 4 Jan 2023 02:23:24 +0100 Subject: [PATCH 30/61] haskellPackages.recursion-schemes: Remove obsolete patch --- .../haskell-modules/configuration-common.nix | 12 ---------- .../patches/recursion-schemes-128.patch | 24 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/recursion-schemes-128.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d95864a76617..6cbc88547bc3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1899,18 +1899,6 @@ self: super: { # 2022-12-30: Restrictive upper bound on optparse-applicative retrie = doJailbreak super.retrie; - # Fixes https://github.com/NixOS/nixpkgs/issues/140613 - # https://github.com/recursion-schemes/recursion-schemes/issues/128 - recursion-schemes = overrideCabal (drv: { - patches = drv.patches or [] ++ [ - ./patches/recursion-schemes-128.patch - ]; - # make sure line endings don't break the patch - prePatch = drv.prePatch or "" + '' - "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal - ''; - }) super.recursion-schemes; - # 2022-08-30 Too strict bounds on finite-typelits # https://github.com/jumper149/blucontrol/issues/1 blucontrol = doJailbreak super.blucontrol; diff --git a/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch b/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch deleted file mode 100644 index a40efc6f6334..000000000000 --- a/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal -index c35f2c6..e692ade 100644 ---- a/recursion-schemes.cabal -+++ b/recursion-schemes.cabal -@@ -93,6 +93,7 @@ library - Paths_recursion_schemes - - ghc-options: -Wall -+ ghc-prof-options: -DPROFILING_ENABLED - if impl(ghc >= 8.6) - ghc-options: -Wno-star-is-type - default-language: Haskell2010 -diff --git a/src/Data/Functor/Foldable/TH.hs b/src/Data/Functor/Foldable/TH.hs -index b3d5ac8..d4ef0e4 100644 ---- a/src/Data/Functor/Foldable/TH.hs -+++ b/src/Data/Functor/Foldable/TH.hs -@@ -1,4 +1,7 @@ - {-# LANGUAGE CPP, PatternGuards, Rank2Types #-} -+#if defined(PROFILING_ENABLED) -+{-# OPTIONS_GHC -O0 #-} -+#endif - module Data.Functor.Foldable.TH - ( MakeBaseFunctor(..) - , BaseRules From d73083e05966ba8da1efea752a5272d2794a072f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 08:31:49 +0100 Subject: [PATCH 31/61] python310Packages.tubeup: add changelog to meta - update disabled --- .../python-modules/tubeup/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 6dc5dcdb3a0f..abb5e6c1fc0f 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -4,7 +4,8 @@ , fetchPypi , yt-dlp , docopt -, isPy27 +, pythonOlder +, urllib3 }: buildPythonPackage rec { @@ -12,7 +13,7 @@ buildPythonPackage rec { version = "0.0.35"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -26,9 +27,16 @@ buildPythonPackage rec { --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; + propagatedBuildInputs = [ + internetarchive + docopt + urllib3 + yt-dlp + ]; - pythonImportsCheck = [ "tubeup" ]; + pythonImportsCheck = [ + "tubeup" + ]; # Tests failing upstream doCheck = false; @@ -36,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Youtube (and other video site) to Internet Archive Uploader"; homepage = "https://github.com/bibanon/tubeup"; + changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From 1586fdfda1baa96032fa8f958615dd8d538c5ca4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 08:44:55 +0100 Subject: [PATCH 32/61] python310Packages.ansible-lint: add changelog to meta --- pkgs/development/python-modules/ansible-lint/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 7883d9ae8bc6..b567c10e8d92 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -24,11 +24,12 @@ buildPythonPackage rec { pname = "ansible-lint"; version = "6.10.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q="; + hash = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q="; }; postPatch = '' @@ -91,15 +92,15 @@ buildPythonPackage rec { "test_run_inside_role_dir" "test_run_multiple_role_path_no_trailing_slash" "test_runner_exclude_globs" - "test_discover_lintables_umlaut" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ]; meta = with lib; { - homepage = "https://github.com/ansible/ansible-lint"; description = "Best practices checker for Ansible"; + homepage = "https://github.com/ansible/ansible-lint"; + changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sengaya ]; }; From 0f1e65656d43369ec2f477f33122f4039c2d9922 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 08:57:29 +0100 Subject: [PATCH 33/61] gcsfuse: add changelog to meta --- pkgs/tools/filesystems/gcsfuse/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index f58bd415c413..f45d4cd95b69 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gcsfuse"; @@ -7,15 +10,22 @@ buildGoModule rec { src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "v${version}"; - sha256 = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; + rev = "refs/tags/${version}"; + hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; }; vendorSha256 = null; - subPackages = [ "." "tools/mount_gcsfuse" ]; + subPackages = [ + "." + "tools/mount_gcsfuse" + ]; - ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.gcsfuseVersion=${version}" + ]; preCheck = let skippedTests = [ @@ -35,6 +45,7 @@ buildGoModule rec { meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; + changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; From de21dd1cd0f494813490849c91b7ab18b5c6fde2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 09:31:13 +0100 Subject: [PATCH 34/61] trufflehog: add changelog to meta --- pkgs/tools/security/trufflehog/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 9e2b2e44f33a..76ccda498b47 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -10,11 +10,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; - rev = "v${version}"; - sha256 = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA="; + rev = "refs/tags/v${version}"; + hash = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA="; }; - vendorSha256 = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; + vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; # Test cases run git clone and require network access doCheck = false; @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; + changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}"; license = with licenses; [ agpl3 ]; maintainers = with maintainers; [ ]; }; From 3fdc7bc916ebc6b08c6855314bc8e1ebef37f26f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 09:37:58 +0100 Subject: [PATCH 35/61] mitmproxy2swagger: 0.7.1 -> 0.7.2 Changelog: https://github.com/alufers/mitmproxy2swagger/releases/tag/0.7.2 --- pkgs/tools/security/mitmproxy2swagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 560e9a175da0..3378e0d332c7 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-morBtuRZZ/d3ye8aB+m2dSwWoaF3JJ92c+CgF71MqH4="; + hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA="; }; nativeBuildInputs = with python3.pkgs; [ From db03610a3e6702b6eb676320d32bd26281e82b1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 14:44:00 +0100 Subject: [PATCH 36/61] python310Packages.python-ipmi: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/python-ipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index cbd68f387656..08c23dfb5d3a 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; + sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY="; }; propagatedBuildInputs = [ From 10c8aeeb4e08fbb3e71935a03488fdc49cdedfe9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 14:45:45 +0100 Subject: [PATCH 37/61] python310Packages.roonapi: 0.1.2 -> 0.1.3 Changelog: https://github.com/pavoni/pyroon/releases/tag/0.1.3 --- pkgs/development/python-modules/roonapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index 282e5b684f65..ae3116de9ae5 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - hash = "sha256-HcHs9UhRbSKTxW5qEvmMrQ+kWIBAqVpyldapx635uNM="; + hash = "sha256-QOFBNTz8g3f6C8Vjkblrd3QFCRrA1WqOCv6xS4GbFC4="; }; nativeBuildInputs = [ From 28afc5f35a59b9bfb73ed958e4e306b731b14e49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 14:47:13 +0100 Subject: [PATCH 38/61] python310Packages.skodaconnect: 1.2.5 -> 1.3.0 Changelog: https://github.com/lendy007/skodaconnect/releases/tag/1.3.0 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index a3354718c3aa..6ea921c9f58a 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.2.5"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Re6ECMaDmg007XHw9Kpa46+oEs+01CzOZzszKzKS4WA="; + hash = "sha256-1x1TQNhKL3RgoeYSB8l607mHt0VrHwOU1CFemoaTCt8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 83ac77245983706ad845f86f5efa3b9475de59f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 14:49:57 +0100 Subject: [PATCH 39/61] python310Packages.socialscan: add changelog to meta --- pkgs/development/python-modules/socialscan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index 9e51ccd81d37..073d6a58bbfc 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iojw"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "rT+/j6UqDOzuNBdN3I74YIxS6qkhd7BjHCGX+gGjprc="; }; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and CLI for accurately querying username and email usage on online platforms"; homepage = "https://github.com/iojw/socialscan"; + changelog = "https://github.com/iojw/socialscan/releases/tag/v${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ fab ]; }; From 6c3cc7358e217246419a9bdb7a2334c4b6462581 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 14:50:37 +0100 Subject: [PATCH 40/61] python310Packages.socialscan: 1.4.2 -> 2.0.0 Changelog: https://github.com/iojw/socialscan/releases/tag/v2.0.0 --- pkgs/development/python-modules/socialscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index 073d6a58bbfc..5e25e3c16bec 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socialscan"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "iojw"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "rT+/j6UqDOzuNBdN3I74YIxS6qkhd7BjHCGX+gGjprc="; + sha256 = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; }; propagatedBuildInputs = [ From e79e069e1579cb76da7a812d45edcefed25e48f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 15:13:59 +0100 Subject: [PATCH 41/61] python310Packages.python-fsutil: 0.8.0 -> 0.9.1 Changelog: https://github.com/fabiocaccamo/python-fsutil/blob/0.9.1/CHANGELOG.md --- pkgs/development/python-modules/python-fsutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 1f04a3a14b2d..6ebb1485d203 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.8.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA="; + hash = "sha256-rMQjsGqdiXe8zS18hZQAro3UWyHPjNJYyQ/NAoxbE7k="; }; propagatedBuildInputs = [ From 13433d2f4dd9fd4dd162036d1412417c40ab148c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 15:17:29 +0100 Subject: [PATCH 42/61] python310Packages.pypck: add changelog to meta --- pkgs/development/python-modules/pypck/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 13519664b52b..3e82a86aa63b 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alengwenus"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "LCN-PCK library written in Python"; homepage = "https://github.com/alengwenus/pypck"; + changelog = "https://github.com/alengwenus/pypck/releases/tag/${version}"; license = with licenses; [ epl20 ]; maintainers = with maintainers; [ fab ]; }; From d9e1cee0e939caabf5c95b2e27defec5447a12a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 15:18:23 +0100 Subject: [PATCH 43/61] python310Packages.pypck: 0.7.15 -> 0.7.16 Changelog: https://github.com/alengwenus/pypck/releases/tag/0.7.16 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 3e82a86aa63b..26292d3a8312 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.15"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g="; + hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40="; }; checkInputs = [ From 564566885ccf2acaaba6d592f780a91dbf7ba9a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 15:22:43 +0100 Subject: [PATCH 44/61] python310Packages.meross-iot: 0.4.5.2 -> 0.4.5.3 Changelog: https://github.com/albertogeniola/MerossIot/releases/tag/0.4.5.3 --- pkgs/development/python-modules/meross-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 7b707e25afdf..3cd35f44c09a 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.5.2"; + version = "0.4.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-gT4HxdmyX7oOQFBo1frkmmoXrNfGOcqL0hPZ40kRZeo="; + hash = "sha256-auOL/3rxLkSvRsu+Kb1VgPIAS0YalSFjP6x5fo8yd8U="; }; propagatedBuildInputs = [ From a26efdfa2f563d473f7453cc843fd671b18f3d83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 15:23:09 +0100 Subject: [PATCH 45/61] python310Packages.meross-iot: 0.4.5.3 -> 0.4.5.4 Changelog: https://github.com/albertogeniola/MerossIot/releases/tag/0.4.5.4 --- pkgs/development/python-modules/meross-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 3cd35f44c09a..e7507bcee171 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.5.3"; + version = "0.4.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-auOL/3rxLkSvRsu+Kb1VgPIAS0YalSFjP6x5fo8yd8U="; + hash = "sha256-HPA3oeanFHx+g0nt/nsTzG3RTCdsjNSvDCXILR271P4="; }; propagatedBuildInputs = [ From 394d2ac3924c7a808d50b6f7ffe0c39200b43d07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 17:11:40 +0100 Subject: [PATCH 46/61] python310Packages.ghrepo-stats: 0.4.0 -> 0.5.0 Changelog: https://github.com/mrbean-bremen/ghrepo-stats/blob/v0.5.0/CHANGES.md --- .../python-modules/ghrepo-stats/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index 154700e89af2..71e640cce795 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -1,4 +1,5 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub , matplotlib @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,10 +18,17 @@ buildPythonPackage rec { owner = "mrbean-bremen"; repo = pname; rev = "v${version}"; - hash = "sha256-KFjqHrN0prcqu3wEPZpa7rLfuD0X/DN7BMo4zcHNmYo="; + hash = "sha256-rTW6wADpkP9GglNmQNVecHfA2yJZuzYhJfsLfucbcgY="; }; + postPatch = '' + # https://github.com/mrbean-bremen/ghrepo-stats/pull/1 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" + ''; + propagatedBuildInputs = [ + beautifulsoup4 matplotlib PyGithub ]; From cbaf3173f126857c590450c87c0ece3e53d0dc3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 17:21:08 +0100 Subject: [PATCH 47/61] nfdump: add changelog to meta --- pkgs/tools/networking/nfdump/default.nix | 43 +++++++++++++++++------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 59a10a314fcb..713bf400f4b1 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,22 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, automake, libtool, pkg-config -, bzip2, libpcap, flex, bison }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, bzip2 +, libpcap +, flex +, bison +}: -let version = "1.7.1"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nfdump"; - inherit version; + version = "1.7.1"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; - rev = "v${version}"; - sha256 = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ="; }; - nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; - buildInputs = [ bzip2 libpcap ]; + nativeBuildInputs = [ + autoconf + automake + flex + libtool + pkg-config + bison + ]; + + buildInputs = [ + bzip2 + libpcap + ]; preConfigure = '' # The script defaults to glibtoolize on darwin, so we pass the correct @@ -37,8 +55,9 @@ stdenv.mkDerivation { nfdump is a set of tools for working with netflow data. ''; homepage = "https://github.com/phaag/nfdump"; + changelog = "https://github.com/phaag/nfdump/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.takikawa ]; + maintainers = with maintainers; [ takikawa ]; platforms = platforms.unix; }; } From 733bc1fb0a6868c8b0b2c0231e1ec6bef6671882 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 4 Jan 2023 18:35:41 +0100 Subject: [PATCH 48/61] haskell.packages.ghc944.blaze-textual: Remove obsolete override --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 192c3cf7872c..2b704463d62e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -60,8 +60,6 @@ in { # consequences of doctest breakage follow: - double-conversion = markBroken super.double-conversion; - blaze-textual = checkAgainAfter super.double-conversion "2.0.4.1" "double-conversion fails to build; required for testsuite" (dontCheck super.blaze-textual); ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen); lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; From 120269fe5c10e95d590cf97d62561228f049f0dd Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 31 Oct 2022 19:08:02 -0400 Subject: [PATCH 49/61] pkgsStatic.tup: fix build Patch build system to use prefixed versions of "gcc", "ar" and "pkg-config". --- .../development/tools/build-managers/tup/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 0763f2e9359c..3d0b68b12d84 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -21,7 +21,17 @@ in stdenv.mkDerivation rec { configurePhase = '' substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' - substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' + + for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do + substituteInPlace "$f" \ + --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \ + --replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre" + done + + cat << EOF > tup.config + CONFIG_CC=${stdenv.cc.targetPrefix}cc + CONFIG_AR=${stdenv.cc.targetPrefix}ar + EOF ''; # Regular tup builds require fusermount to have suid, which nix cannot From 040bf815ef15ed5a7a5b34ee2d8a05a624ccb05a Mon Sep 17 00:00:00 2001 From: Woze Parrot Date: Mon, 22 Aug 2022 10:51:37 -0400 Subject: [PATCH 50/61] seaweedfs: 3.34 -> 3.38 --- pkgs/applications/networking/seaweedfs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index cf23d2208739..3757d57df816 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.34"; + version = "3.38"; src = fetchFromGitHub { - owner = "chrislusf"; + owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; + hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM="; }; - vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; + vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI="; subPackages = [ "weed" ]; @@ -49,7 +49,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ azahi cmacrae ]; + maintainers = with maintainers; [ azahi cmacrae wozeparrot ]; mainProgram = "weed"; license = licenses.asl20; }; From 2f2e7f8842770c3bf82fb285c14e82a2642f0337 Mon Sep 17 00:00:00 2001 From: "\"The Hedgehog\"" <"me@thehedgehog.me"> Date: Wed, 27 Jul 2022 11:37:25 -0400 Subject: [PATCH 51/61] vimPlugins.mason-nvim: init at 2022-07-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 263c0428ff14..8de72284fc2f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4665,6 +4665,18 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-nvim = buildVimPluginFrom2Nix { + pname = "mason.nvim"; + version = "2022-07-27"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason.nvim"; + rev = "269ee222f76e705619da2c0130c0a06e76419b88"; + sha256 = "1bngr68gfv33p989dqhz6xmhips7i2yjni96qgnqwhdjczfw865v"; + }; + meta.homepage = "https://github.com/williamboman/mason.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f729c240f5df..a9ddfea76515 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -391,6 +391,7 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, From 72a4c545f098e96647ed5e9ebba771d7e27e10e9 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 31 Oct 2022 19:17:33 -0400 Subject: [PATCH 52/61] tup: avoid vendoring sqlite3 --- pkgs/development/tools/build-managers/tup/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 3d0b68b12d84..e53acd4e9e60 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }: let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse pcre sqlite ]; patches = [ ./fusermount-setuid.patch ]; @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { cat << EOF > tup.config CONFIG_CC=${stdenv.cc.targetPrefix}cc CONFIG_AR=${stdenv.cc.targetPrefix}ar + CONFIG_TUP_USE_SYSTEM_SQLITE=y EOF ''; From 39e738746b9b13b61dcc7237f524efad63ee075e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 4 Jan 2023 13:01:19 -0500 Subject: [PATCH 53/61] terraform: 1.3.6 -> 1.3.7 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index fe105fa3b71a..4865ca4901cb 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.6"; - sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU="; + version = "1.3.7"; + sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 9e2070e1e59972e43990a992b7d31622ce9684a0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 Jan 2023 21:34:09 +0100 Subject: [PATCH 54/61] chromiumBeta: 109.0.5414.61 -> 109.0.5414.74 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 74942ffd03f3..daf40e3aadfd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "109.0.5414.61", - "sha256": "1dk832ishjhba0rnf57w7vqrr8dyqga6zsgw9945i7zz997fpjyi", - "sha256bin64": "1s1d7h9ygzpa5b39pdivn5vvpm7fpnhw5p3lz8blrgn61m8h6jg6", + "version": "109.0.5414.74", + "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", + "sha256bin64": "1ihjjf8x5080p9bizhqrrr0rcjf0l1nps9xq9naa2f48y5zfshkd", "deps": { "gn": { "version": "2022-11-10", From 295c552dc92ac63ff9d0a979f723c8dfa058fb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 29 Dec 2022 13:39:01 +0100 Subject: [PATCH 55/61] nixos/apcupsd: wrap CLI with "-f ${configFile}" This ensures that the CLI is in sync with the service configuration. (I tried building apcupsd with --sysconfdir=/etc instead, but it wants to install stuff there at build time, so I backed out.) Fixes https://github.com/NixOS/nixpkgs/issues/208204. --- nixos/modules/services/monitoring/apcupsd.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index d4216b44cdc8..666479c78a84 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -62,6 +62,21 @@ let ); + # Ensure the CLI uses our generated configFile + wrappedBinaries = pkgs.runCommandLocal "apcupsd-wrapped-binaries" + { nativeBuildInputs = [ pkgs.makeWrapper ]; } + '' + for p in "${lib.getBin pkgs.apcupsd}/bin/"*; do + bname=$(basename "$p") + makeWrapper "$p" "$out/bin/$bname" --add-flags "-f ${configFile}" + done + ''; + + apcupsdWrapped = pkgs.symlinkJoin { + name = "apcupsd-wrapped"; + # Put wrappers first so they "win" + paths = [ wrappedBinaries pkgs.apcupsd ]; + }; in { @@ -138,7 +153,7 @@ in } ]; # Give users access to the "apcaccess" tool - environment.systemPackages = [ pkgs.apcupsd ]; + environment.systemPackages = [ apcupsdWrapped ]; # NOTE 1: apcupsd runs as root because it needs permission to run # "shutdown" From 1b80fc420475319a7f518a130a649fb37146e22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 29 Dec 2022 13:43:50 +0100 Subject: [PATCH 56/61] nixos/tests/apcupsd.nix: init This verifies that https://github.com/NixOS/nixpkgs/issues/208204 ("apcupsd: apcaccess does not respect config from services.apcupsd") is fixed. --- nixos/tests/all-tests.nix | 1 + nixos/tests/apcupsd.nix | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 nixos/tests/apcupsd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e9b58c7c4f77..83ad7c48a089 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -78,6 +78,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + apcupsd = handleTest ./apcupsd.nix {}; apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; diff --git a/nixos/tests/apcupsd.nix b/nixos/tests/apcupsd.nix new file mode 100644 index 000000000000..287140f039d8 --- /dev/null +++ b/nixos/tests/apcupsd.nix @@ -0,0 +1,41 @@ +let + # arbitrary address + ipAddr = "192.168.42.42"; +in +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "apcupsd"; + meta.maintainers = with lib.maintainers; [ bjornfor ]; + + nodes = { + machine = { + services.apcupsd = { + enable = true; + configText = '' + UPSTYPE usb + BATTERYLEVEL 42 + # Configure NISIP so that the only way apcaccess can work is to read + # this config. + NISIP ${ipAddr} + ''; + }; + networking.interfaces.eth1 = { + ipv4.addresses = [{ + address = ipAddr; + prefixLength = 24; + }]; + }; + }; + }; + + # Check that the service starts, that the CLI (apcaccess) works and that it + # uses the config (ipAddr) defined in the service config. + testScript = '' + start_all() + machine.wait_for_unit("apcupsd.service") + machine.wait_for_open_port(3551, "${ipAddr}") + res = machine.succeed("apcaccess") + expect_line="MBATTCHG : 42 Percent" + assert "MBATTCHG : 42 Percent" in res, f"expected apcaccess output to contain '{expect_line}' but got '{res}'" + machine.shutdown() + ''; +}) From e320029847a89320aa7600b57c29c1c8985717bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 30 Dec 2022 00:09:44 +0100 Subject: [PATCH 57/61] apcupsd: add nixosTests.apcupsd to passthru.tests --- pkgs/servers/apcupsd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 9e5e81457e90..aff8bba91a7f 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, systemd, util-linux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd +, nixosTests }: assert enableCgiScripts -> gd != null; @@ -52,6 +53,8 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.smoke = nixosTests.apcupsd; + meta = with lib; { description = "Daemon for controlling APC UPSes"; homepage = "http://www.apcupsd.com/"; From 8ea667c3f1a5a3a82b60ced067353b0d34593502 Mon Sep 17 00:00:00 2001 From: The Hedgehog Date: Wed, 27 Jul 2022 11:51:08 -0400 Subject: [PATCH 58/61] vimPlugins.mason-tool-installer-nvim: init at 2022-07-26 vimPlugins.mason-lspconfig-nvim: init at 2022-07-25 --- .../editors/vim/plugins/generated.nix | 25 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 2 ++ 2 files changed, 27 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8de72284fc2f..72f2dd526867 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4665,6 +4665,31 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-lspconfig-nvim = buildVimPluginFrom2Nix { + pname = "mason-lspconfig.nvim"; + version = "2022-07-25"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason-lspconfig.nvim"; + rev = "ad3b109cff22af979ab3d15564cd63dc3ae2f0f0"; + sha256 = "0jvnc9zlr5cazdrhjm1v0bjkrz5lb2z8dzlkq59b433f52qv9zrf"; + }; + meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + }; + + mason-tool-installer-nvim = buildVimPluginFrom2Nix { + pname = "mason-tool-installer.nvim"; + version = "2022-07-26"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "6d9276655c09ef2358ddb105cac4a34cfa8853c0"; + sha256 = "0j5k9fhjffkx3b5asnwxzj22fvncs69vs0rkx13ii3gdvwczbc5w"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + + mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; version = "2022-07-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a9ddfea76515..4cfe4228ea9f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -391,6 +391,8 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, From bc7d5cea0aa5e24c097d301630a105b8938ee9ed Mon Sep 17 00:00:00 2001 From: The Hedgehog Date: Wed, 27 Jul 2022 11:58:39 -0400 Subject: [PATCH 59/61] add overrides for vimPlugins.mason-tool-install-nvim and vimPlugins.mason-lspconfig-nvim --- pkgs/applications/editors/vim/plugins/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e94ac82659d7..8d5f6bcd27d3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -598,6 +598,14 @@ self: super: { ''; }); + mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim nvim-lspconfig ]; + }); + + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; From 2f0f80b7fe025e59a50fb20c08c35e32d25c2364 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 4 Jan 2023 17:04:15 +0100 Subject: [PATCH 60/61] broot: 1.18.0 -> 1.19.0 https://github.com/Canop/broot/releases/tag/v1.19.0 Fetch the source from GitHub because the newest version has not yet been released on crates.io. --- pkgs/tools/misc/broot/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5bd2f231392f..c920aebd3216 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchCrate +, fetchFromGitHub , installShellFiles , makeWrapper , pkg-config @@ -15,14 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.18.0"; + version = "1.19.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-GR0a5NDJBcRLoNOeG6S+fP3Fr7r5fVB9oEcjANRYJt4="; + src = fetchFromGitHub { + owner = "Canop"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo="; }; - cargoHash = "sha256-Hk9bc1mo8GxcPICKXc9zDq18S5TZElDncxJ+w2fC2do="; + cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M="; nativeBuildInputs = [ installShellFiles From 4045943b6411536f9c0484b7cb3772200895e97d Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 5 Jan 2023 00:10:43 +0100 Subject: [PATCH 61/61] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 8 +++++ .../transitive-broken.yaml | 17 +++++++---- .../haskell-modules/hackage-packages.nix | 29 ++++++++++++++++++- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7f107e484808..77a9f16f4a2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1485,6 +1485,7 @@ broken-packages: - Feval - fez-conf - ffeed + - fft - ffunctor - fgl-extras-decompositions - fib @@ -2322,6 +2323,7 @@ broken-packages: - HLogger - hlongurl - hls-brittany-plugin + - hls-call-hierarchy-plugin - hls-haddock-comments-plugin - hls-selection-range-plugin - hls-stan-plugin @@ -3666,6 +3668,7 @@ broken-packages: - OddWord - oden-go-packages - oeis2 + - OGDF - OGL - ogma-language-c - ogma-language-cocospec @@ -3701,6 +3704,7 @@ broken-packages: - open-adt - OpenAFP - openai-hs + - openapi3 - openapi3-code-generator - openapi-petstore - openapi-typed @@ -4268,6 +4272,7 @@ broken-packages: - QuickAnnotate - quickbooks - quickcheck-arbitrary-template + - quickcheck-monoid-subclasses - quickcheck-property-comb - quickcheck-property-monad - quickcheck-rematch @@ -4894,6 +4899,7 @@ broken-packages: - SNet - snipcheck - snorkels + - snowchecked - snowtify - socket-activation - socketed @@ -5008,6 +5014,7 @@ broken-packages: - stm-firehose - stm-incremental - stm-promise + - stm-queue - stm-stats - stochastic - Stomp @@ -5545,6 +5552,7 @@ broken-packages: - unix-recursive - unlift - unlifted-list + - unliftio-messagebox - unlift-stm - unm-hip - unordered-containers-rematch diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 141df6fa0e88..3ff14c0e1d54 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -239,6 +239,7 @@ dont-distribute-packages: - JsContracts - JsonGrammar - JuPyTer-notebook + - JuicyPixels-scale-dct - JunkDB-driver-gdbm - JunkDB-driver-hashtables - KiCS @@ -694,6 +695,7 @@ dont-distribute-packages: - audiovisual - aura - authoring + - autodocodec-openapi3 - automata - autonix-deps-kf5 - avers @@ -1357,15 +1359,11 @@ dont-distribute-packages: - essence-of-live-coding-PortMidi - essence-of-live-coding-gloss - essence-of-live-coding-gloss-example - - essence-of-live-coding-gloss_0_2_7 - essence-of-live-coding-pulse - essence-of-live-coding-pulse-example - - essence-of-live-coding-pulse_0_2_7 - essence-of-live-coding-quickcheck - - essence-of-live-coding-quickcheck_0_2_7 - essence-of-live-coding-vivid - essence-of-live-coding-warp - - essence-of-live-coding-warp_0_2_7 - estimators - estreps - eternity @@ -1404,7 +1402,6 @@ dont-distribute-packages: - exinst-serialise - exist - exist-instances - - exon - expand - expat-enumerator - expiring-containers @@ -2427,6 +2424,8 @@ dont-distribute-packages: - jmacro-rpc-happstack - jmacro-rpc-snap - join + - jordan-openapi + - jordan-servant-openapi - jot - jsaddle-hello - jsc @@ -2875,6 +2874,7 @@ dont-distribute-packages: - nakadi-client - named-servant-client - named-servant-server + - named-text - nats-queue - natural-number - nemesis-titan @@ -3349,6 +3349,7 @@ dont-distribute-packages: - remotion - repa-array - repa-convert + - repa-fftw - repa-flow - repa-plugin - repa-stream @@ -3394,6 +3395,7 @@ dont-distribute-packages: - ribosome-root - ribosome-test - ridley-extras + - rio-process-pool - riot - ripple - ripple-federation @@ -3535,6 +3537,7 @@ dont-distribute-packages: - servant-matrix-param - servant-oauth2 - servant-oauth2-examples + - servant-openapi3 - servant-postgresql - servant-pushbullet-client - servant-rate-limit @@ -3547,6 +3550,8 @@ dont-distribute-packages: - servant-streamly - servant-swagger-tags - servant-to-elm + - servant-util + - servant-util-beam-pg - servant-waargonaut - servant-zeppelin-client - servant-zeppelin-server @@ -3721,6 +3726,7 @@ dont-distribute-packages: - statsd-client - statsdi - stern-brocot + - stm-actor - stm-supply - stmcontrol - storablevector-carray @@ -4133,6 +4139,7 @@ dont-distribute-packages: - webcloud - webcrank-wai - webdriver-w3c + - webgear-openapi - webify - webserver - websockets-rpc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index da3d47efd98a..f49e34b1f4dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12172,6 +12172,7 @@ self: { ]; description = "Scale JuicyPixels images with DCT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "JuicyPixels-stbir" = callPackage @@ -15311,6 +15312,8 @@ self: { librarySystemDepends = [ COIN OGDF ]; description = "Haskell binding to OGDF"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {COIN = null; OGDF = null;}; "OGL" = callPackage @@ -37662,6 +37665,7 @@ self: { ]; description = "Autodocodec interpreters for openapi3"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "autodocodec-schema" = callPackage @@ -94399,7 +94403,6 @@ self: { benchmarkHaskellDepends = [ base criterion incipit-base ]; description = "Customizable Quasiquote Interpolation"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "exotic-list-monads" = callPackage @@ -97787,6 +97790,8 @@ self: { testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftw-ffi" = callPackage @@ -140734,6 +140739,8 @@ self: { ]; description = "Call hierarchy plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-change-type-signature-plugin" = callPackage @@ -165311,6 +165318,7 @@ self: { ]; description = "OpenAPI Definitions for Jordan, Automatically"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant" = callPackage @@ -165380,6 +165388,7 @@ self: { ]; description = "OpenAPI schemas for Jordan-Powered Servant APIs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant-server" = callPackage @@ -199238,6 +199247,7 @@ self: { ]; description = "A parameterized named text type and associated functionality"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; }) {}; "namelist" = callPackage @@ -208110,7 +208120,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "OpenAPI 3.0 data model"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "openapi3-code-generator" = callPackage @@ -233441,6 +233453,8 @@ self: { doHaddock = false; description = "Testing monoid subclass instances with QuickCheck"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quickcheck-poly" = callPackage @@ -241618,6 +241632,7 @@ self: { ]; description = "Perform fft with repa via FFTW"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -244403,6 +244418,7 @@ self: { ]; description = "A library for process pools coupled with asynchronous message queues"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; mainProgram = "rio-process-pool-memleak-test"; }) {}; @@ -254444,6 +254460,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "servant-options" = callPackage @@ -255504,6 +255521,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant servers utilities"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-util-examples"; }) {}; @@ -255535,6 +255553,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Implementation of servant-util primitives for beam-postgres"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-util-beam-pg-examples"; }) {}; @@ -264399,6 +264418,8 @@ self: { ]; description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snowflake" = callPackage @@ -270155,6 +270176,7 @@ self: { testHaskellDepends = [ base hspec mtl stm stm-queue ]; description = "A simplistic actor model based on STM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "stm-channelize" = callPackage @@ -270394,6 +270416,8 @@ self: { ]; description = "An implementation of a real-time concurrent queue"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stm-queue-extras" = callPackage @@ -296604,7 +296628,9 @@ self: { ]; description = "Fast and robust message queues for concurrent processes"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; mainProgram = "unliftio-messagebox-memleak-test"; + broken = true; }) {}; "unliftio-path" = callPackage @@ -305808,6 +305834,7 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "webgear-server" = callPackage