From dd21919e9f6507b84a8a5e6d44f70c41bd5396a2 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 1 Sep 2024 12:49:45 +0200 Subject: [PATCH 001/173] trace-cmd: Add updateScript --- pkgs/os-specific/linux/trace-cmd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 80b20c555b4e..48da6b31b240 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: +{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: stdenv.mkDerivation rec { pname = "trace-cmd"; version = "3.2"; @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions" ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"; + rev-prefix = "trace-cmd-v"; + }; + meta = with lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; mainProgram = "trace-cmd"; From 28603d0f8d15b3056f54e63610bfda38cef9798e Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 1 Sep 2024 12:50:56 +0200 Subject: [PATCH 002/173] trace-cmd: 3.2 -> 3.3.1 --- pkgs/os-specific/linux/trace-cmd/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 48da6b31b240..5c339c093dd5 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,21 +1,13 @@ -{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: +{ lib, stdenv, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.2"; + version = "3.3.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-rTcaaEQ3Y4cneNnZSGiMZNp+Z7dyAa3oNTNMAEXr28g="; + hash = "sha256-kEji3qDqQsSK0tL8Fx2ycSd2lTXBXOHHTvsb6XDNSa8="; }; - patches = [ - # Upstream patches to be released in the next version - (fetchpatch { - sha256 = "sha256-eGuHODm29M7rbGYsyXUPoNe1xsIG3eJYhwXQDakRJHA="; - url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/patch/?id=6b07a7df871342068604b204711ab741d421d051"; - }) - ]; - # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \ From 926fb03392796effcf68010f70a5a7af2e4c12dc Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 16 Oct 2024 15:03:01 -0700 Subject: [PATCH 003/173] culvert: init at 0.4.0.unstable-2024-10-16 --- pkgs/by-name/cu/culvert/package.nix | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/cu/culvert/package.nix diff --git a/pkgs/by-name/cu/culvert/package.nix b/pkgs/by-name/cu/culvert/package.nix new file mode 100644 index 000000000000..a2c69e5df2c5 --- /dev/null +++ b/pkgs/by-name/cu/culvert/package.nix @@ -0,0 +1,46 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + meson, + ninja, + pkg-config, + dtc, +}: + +stdenv.mkDerivation rec { + pname = "culvert"; + version = "0.4.0.unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "amboar"; + repo = "culvert"; + rev = "770a6ed4badec1c6e3079cd9b354d0996d55b326"; + hash = "sha256-Lj72uYItTxTVYcSEbr/XezeyFvrcqqMTu74tOE+DwJE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + dtc # The dtc binary to compile device trees + ]; + + buildInputs = [ + dtc # provides libfdt + ]; + + mesonFlags = [ + "-Db_lto=false" + ]; + + meta = with lib; { + homepage = "https://github.com/amboar/culvert"; + description = "A Test and Debug Tool for BMC AHB Interfaces "; + mainProgram = "culvert"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.linux; + }; +} From bb814ee6497958aa6c69449a6a7d9f0f862452a1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 23 Oct 2024 15:08:05 +0200 Subject: [PATCH 004/173] all-cabal-hashes: 2024-10-05T14:46:54Z -> 2024-10-25T11:10:52Z 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 557a787a0965..dcff9e8cb404 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "750067bc36e810a96c066c8800438e0ce9ced327", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz", - "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny", - "msg": "Update from Hackage at 2024-10-05T14:46:54Z" + "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz", + "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn", + "msg": "Update from Hackage at 2024-10-25T11:10:52Z" } From e790d59f98e8032c2d933d2539e782851cee1220 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 23 Oct 2024 15:08:28 +0200 Subject: [PATCH 005/173] haskellPackages: stackage LTS 22.36 -> LTS 22.39 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 235261802442..5bde9a49a237 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.36 +# Stackage LTS 22.39 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -397,7 +397,7 @@ default-package-overrides: - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - atomic-primops ==0.8.8 - - atomic-write ==0.2.0.7 + - atomic-write ==0.2.1.0 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 @@ -454,7 +454,7 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.1.0 + - beam-core ==0.10.3.0 - bech32 ==1.1.7 - bech32-th ==1.1.7 - benchpress ==0.2.2.23 @@ -508,6 +508,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 + - bluefin ==0.0.9.0 + - bluefin-internal ==0.0.9.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -527,7 +529,7 @@ default-package-overrides: - bounded-qsem ==0.1.0.2 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.3.1 + - box ==0.9.3.2 - boxes ==0.1.5 - breakpoint ==0.1.4.0 - brick ==2.1.1 @@ -552,7 +554,7 @@ default-package-overrides: - bv-sized ==1.0.5 - byteable ==0.1.1 - bytebuild ==0.3.16.2 - - byte-count-reader ==0.10.1.11 + - byte-count-reader ==0.10.1.12 - bytedump ==1.0 - bytehash ==0.1.1.0 - byte-order ==0.1.3.1 @@ -577,7 +579,7 @@ default-package-overrides: - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.3 + - cabal-debian ==5.2.4 - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 @@ -683,9 +685,9 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.6 + - commonmark ==0.2.6.1 - commonmark-extensions ==0.2.5.5 - - commonmark-pandoc ==0.2.2.1 + - commonmark-pandoc ==0.2.2.2 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 @@ -824,14 +826,14 @@ default-package-overrides: - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-base ==0.1.0.1 + - data-default ==0.7.1.2 + - data-default-class ==0.1.2.2 + - data-default-instances-base ==0.1.0.3 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1 - - data-default-instances-old-locale ==0.0.1 + - data-default-instances-dlist ==0.0.1.2 + - data-default-instances-old-locale ==0.0.1.2 - data-default-instances-unordered-containers ==0.0.1 - data-default-instances-vector ==0.0.1 - data-diverse ==4.7.1.0 @@ -1057,7 +1059,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 - - fakedata ==1.0.3 + - fakedata ==1.0.5 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -1066,7 +1068,7 @@ default-package-overrides: - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.3 + - fast-logger ==3.2.4 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fb ==2.1.1.1 @@ -1074,12 +1076,11 @@ default-package-overrides: - fclabels ==2.0.5.1 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-dists ==2.1.1 - - fedora-haskell-tools ==1.1 + - fedora-releases ==0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - - fgl ==5.8.2.0 + - fgl ==5.8.3.0 - fgl-arbitrary ==0.2.0.6 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 @@ -1132,7 +1133,7 @@ default-package-overrides: - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.3.0.1 + - formatn ==0.3.1.0 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -1170,7 +1171,7 @@ default-package-overrides: - generically ==0.1.1 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.1.0.0 + - generic-data ==1.1.0.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.5 - generic-functor ==1.1.0.0 @@ -1296,7 +1297,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.6 - gnuplot ==0.5.7 - - goldplate ==0.2.1.1 + - goldplate ==0.2.2.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gpolyline ==0.1.0.1 @@ -1343,7 +1344,7 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.11 + - haskell-gi ==0.26.12 - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1476,7 +1477,7 @@ default-package-overrides: - hslua-classes ==2.3.1 - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - - hslua-list ==1.1.3 + - hslua-list ==1.1.4 - hslua-marshalling ==2.3.1 - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 @@ -1731,7 +1732,7 @@ default-package-overrides: - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 - - language-c ==0.9.3 + - language-c ==0.9.4 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 @@ -1781,7 +1782,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.5 + - lifted-async ==0.10.2.6 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1853,7 +1854,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1 + - markup-parse ==0.1.1.1 - mason ==0.2.6 - massiv ==1.0.4.0 - massiv-io ==1.0.0.1 @@ -1872,7 +1873,7 @@ default-package-overrides: - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox-utility ==0.0.3.1 - - mcmc ==0.8.2.0 + - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.3 @@ -2153,7 +2154,7 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.8 + - pandoc-lua-marshal ==0.2.9 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2317,7 +2318,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.3 - - primitive-extras ==0.10.2 + - primitive-extras ==0.10.2.1 - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 @@ -2362,8 +2363,8 @@ default-package-overrides: - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.9 - - qrcode-juicypixels ==0.8.5 + - qrcode-core ==0.9.10 + - qrcode-juicypixels ==0.8.6 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 @@ -2464,7 +2465,7 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.1.0 + - relude ==1.2.2.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2606,7 +2607,7 @@ default-package-overrides: - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-server ==0.20.2 - - servant-static-th ==1.0.0.0 + - servant-static-th ==1.0.0.1 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.0 @@ -2635,8 +2636,8 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.1 - - shellmet ==0.0.4.1 + - shellify ==0.11.0.3 + - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - shell-utility ==0.1 - shellwords ==0.1.3.1 @@ -2762,7 +2763,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.2 + - streaming-bytestring ==0.3.3 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.10.1 @@ -3094,9 +3095,9 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2.1 + - universum ==1.8.2.2 - unix-bytestring ==0.4.0.2 - - unix-compat ==0.7.2 + - unix-compat ==0.7.3 - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 @@ -3282,7 +3283,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.10 + - Yampa ==0.14.11 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 From 7ae9e346a4aa709476e3de6d01ffc99413721775 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 23 Oct 2024 15:11:01 +0200 Subject: [PATCH 006/173] 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 | 2652 +++++++++++------ 1 file changed, 1683 insertions(+), 969 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 540563af0030..ec9e120d4bf1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3379,6 +3379,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.15"; sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; + revision = "1"; + editedCabalFile = "1h3c5dhaqkpmc7cvivigadfkjkjjriahzcpdw8qg62fl44gbkmh2"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -5885,8 +5887,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; - revision = "1"; - editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; + revision = "2"; + editedCabalFile = "05z8vn26yr8hl2dh23g80fpxj8s90hdaajjfnpblrkzhczz7317s"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -10783,8 +10785,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.9"; - sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; + version = "0.4.10"; + sha256 = "0ydaw5xwck2l9xzlqrdf3qv7p5s6dqd131q3mx6g0wpqpkjjic4q"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = lib.licenses.bsd3; @@ -11801,8 +11803,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.1.0"; - sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; + version = "0.2.2"; + sha256 = "1p8rv0rhjyjjic03zzjp7qw1j3p5nz4if5ib9w1l0frlrybqb1s8"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11933,8 +11935,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.3"; - sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; + version = "0.3.3.4"; + sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14365,8 +14367,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.18.0"; - sha256 = "1w1aazbsl80xk6kxmkcii6y33i42hw64bhjwcn62grh5xb220hag"; + version = "0.10.3.0"; + sha256 = "11zhgmkzkxxjhnf0jnzk50hsm60zxil5mqa6m1yq6wmg2h1g0vkf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14674,6 +14676,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "MonadRandom_0_6_1" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.6.1"; + sha256 = "09v56xbp4l0qpv8l18289p4xmjjh56q07crj9h5801fiji8zz4w8"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15258,6 +15276,8 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; + revision = "1"; + editedCabalFile = "0kdr24dw1z1vj0a63bqsdz55ps4lksf4c5fw7l19bn51f71lpqrf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18070,14 +18090,24 @@ self: { }) {}; "RandomDotOrg" = callPackage - ({ mkDerivation, base, HTTP-Simple, network }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-media, servant, servant-client + , servant-client-core, servant-jsonrpc, servant-jsonrpc-client + , text, time, unordered-containers, uuid-types + }: mkDerivation { pname = "RandomDotOrg"; - version = "0.2.1"; - sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; - libraryHaskellDepends = [ base HTTP-Simple network ]; - description = "Interface to random.org"; - license = lib.licenses.publicDomain; + version = "1.0"; + sha256 = "10a4vh3n308i628v58s6wb5yn3vhpb4d989bmd4vvyv39xv92sj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-media + servant servant-client servant-client-core servant-jsonrpc + servant-jsonrpc-client text time unordered-containers uuid-types + ]; + description = "Haskell bindings to the RANDOM.ORG Core API"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20330,6 +20360,8 @@ self: { pname = "Spintax"; version = "0.3.6.1"; sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; + revision = "1"; + editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20916,6 +20948,29 @@ self: { broken = true; }) {}; + "THSH" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, parsec, process, PyF + , split, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "THSH"; + version = "0.0.0.5"; + sha256 = "0hfc3f68w5n55k5gnlf6ip76j3b7yvirb81k373w8vq4rgqf447s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc parsec process PyF template-haskell temporary + text transformers + ]; + executableHaskellDepends = [ + base extra filepath ghc process PyF split template-haskell + ]; + testHaskellDepends = [ base ghc PyF template-haskell ]; + description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell"; + license = lib.licenses.mit; + mainProgram = "thsh"; + }) {}; + "TLT" = callPackage ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet , STMonadTrans, transformers @@ -23359,8 +23414,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.10"; - sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; + version = "0.14.11"; + sha256 = "1pz1s0vb2h62zggbj6y6c3qhx7008758zq9gds347qv1hwg82jn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26012,15 +26067,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-mp_0_2_16_0" = callPackage + "aern2-mp_0_2_16_1" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.2.16.0"; - sha256 = "1q9rc53zj49yfn5ap8khx8gvgphw7dr86agi77xaj1d0d97x35pi"; + version = "0.2.16.1"; + sha256 = "0y0043ckrg1cx1kpf18jk9nmav2h3bp1w4ywwnbwq2abqf3kmd1p"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -26054,14 +26109,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_16_0" = callPackage + "aern2-real_0_2_16_1" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.16.0"; - sha256 = "14rdjkqpmk4f7135ssn03b7bqbakixx0hrrx742dc379pjq57k7d"; + version = "0.2.16.1"; + sha256 = "00g504rqvr3z5a8asnhr6c9xrhd6wjqzcscgik1qj2wvxfls32f6"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -26619,6 +26674,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-generic-default" = callPackage + ({ mkDerivation, aeson, base, data-default, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "aeson-generic-default"; + version = "0.1.1.0"; + sha256 = "0al9xd9mdxffvpx0mb3rll68gmizwknh3g6ixfnvxx62anb47w2p"; + libraryHaskellDepends = [ aeson base data-default text ]; + testHaskellDepends = [ + aeson base data-default tasty tasty-hunit text + ]; + description = "Type-level default fields for aeson Generic FromJSON parser"; + license = lib.licenses.bsd3; + }) {}; + "aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, process, QuickCheck, random, split @@ -27387,8 +27458,8 @@ self: { }: mkDerivation { pname = "aftovolio"; - version = "0.2.1.0"; - sha256 = "18z69rzzzfkf4mivjzz9g5h4l1c7lc8s1dnsa6d1xwafhbc2mp2h"; + version = "0.4.0.0"; + sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36369,7 +36440,7 @@ self: { mainProgram = "amqp-builder"; }) {}; - "amqp_0_23_0" = callPackage + "amqp_0_24_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, containers , crypton-connection, data-binary-ieee754, data-default-class , hspec, hspec-expectations, monad-control, network, network-uri @@ -36377,8 +36448,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.23.0"; - sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + version = "0.24.0"; + sha256 = "0swrh5dh9hwp8m15x4hiplm89ls19bpmir44wnffzgz7v8rxh1mx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37038,14 +37109,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "annotated-exception_0_3_0_1" = callPackage + "annotated-exception_0_3_0_2" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , safe-exceptions, text, unliftio-core }: mkDerivation { pname = "annotated-exception"; - version = "0.3.0.1"; - sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; + version = "0.3.0.2"; + sha256 = "1xsyq28hkf7ngkq9v5ga958d2fqbmshc9gl8lzms6vknr64gaqr7"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -37260,8 +37331,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; - revision = "1"; - editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; + revision = "2"; + editedCabalFile = "0kq3dijahr4yxp13v3v5d5v0v3zswkxh8idx5hyv0yp9d1czqars"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -39620,10 +39691,8 @@ self: { }: mkDerivation { pname = "arch-web"; - version = "0.2"; - sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; - revision = "1"; - editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; + version = "0.3.1"; + sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -42274,24 +42343,6 @@ self: { }) {}; "atomic-write" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix-compat - }: - mkDerivation { - pname = "atomic-write"; - version = "0.2.0.7"; - sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; - libraryHaskellDepends = [ - base bytestring directory filepath temporary text unix-compat - ]; - testHaskellDepends = [ - base bytestring filepath hspec temporary text unix-compat - ]; - description = "Atomically write to a file"; - license = lib.licenses.mit; - }) {}; - - "atomic-write_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , hspec-discover, temporary, text, unix-compat }: @@ -42308,7 +42359,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Atomically write to a file"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "atomo" = callPackage @@ -46418,8 +46468,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "1"; - editedCabalFile = "00r0j3l3af912b33mlsr5a48rr0l31gh34cmj8jf247c4a332rlk"; + revision = "2"; + editedCabalFile = "1dcb8m73xj2dfb8xbz731l91nm2jz532v971rsfm0kkid5ap9bvl"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -47718,10 +47768,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.1.0"; - sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; - revision = "1"; - editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; + version = "0.10.3.0"; + sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47742,10 +47790,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.2.1"; - sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; - revision = "2"; - editedCabalFile = "0788nzixn3fnm57vw5s69rwc3qmw0rr1d46lqwzxdsxqzcywq644"; + version = "0.5.3.1"; + sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47797,15 +47843,13 @@ self: { , bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific - , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , tagged, tasty, tasty-hunit, testcontainers, text, time , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.3.1"; - sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; - revision = "2"; - editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; + version = "0.5.4.1"; + sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47815,7 +47859,7 @@ self: { ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog - postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + postgresql-simple tasty tasty-hunit testcontainers text uuid vector ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; @@ -47902,8 +47946,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.10"; - sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; + version = "0.14.11"; + sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -53292,8 +53336,10 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.8.0"; - sha256 = "16gzb82lrxhw4s1b1gmq03k094lfpczsls8csv02l77bkipjmfh8"; + version = "0.0.9.0"; + sha256 = "11balgaw73fi3bqnajhs570nfy5lcjzhxdkms2jbxsd80l6n1zx1"; + revision = "1"; + editedCabalFile = "0xll6fdlhr9h9kswn6kdbdk3wbd1z87wsrgr4g3bqsj29bdjqvb7"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53324,10 +53370,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.8.0"; - sha256 = "1knhqll525qn74zbyqxn6k8d1zbb974h1qh92qpc7r3bqp5v576p"; - revision = "1"; - editedCabalFile = "1j27hka5sm5vld2mgvw238c4bg6ys7mzfjskdmdvbxs5yn6ywqpr"; + version = "0.0.9.0"; + sha256 = "06y5vq24jrm5l3lf2sq43qnc0i8zazrf9g28spmgzjlsqcv84g4d"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -54680,18 +54724,19 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant - , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time + , dlist, doctest-parallel, exceptions, kan-extensions, mtl + , profunctors, semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.3.1"; - sha256 = "09mqz1ifq9sbq2h5wqy0lfvlc3v9m2nsw2f7gdss93qx8bz5cxmy"; + version = "0.9.3.2"; + sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time ]; - description = "A profunctor effect system"; + testHaskellDepends = [ base doctest-parallel ]; + description = "A profunctor effect system?"; license = lib.licenses.bsd3; }) {}; @@ -54709,13 +54754,14 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, async, base, box, bytestring, network-simple - , optparse-applicative, profunctors, text, websockets + ({ mkDerivation, async, base, box, bytestring, doctest-parallel + , network-simple, optparse-applicative, profunctors, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.5.1.0"; - sha256 = "0bm3csgz72fv41pilbwn0f2dx9gplin7qxi5i8mrwflaix156sy5"; + version = "0.5.2.0"; + sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54723,6 +54769,7 @@ self: { websockets ]; executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Box websockets"; license = lib.licenses.bsd3; mainProgram = "box-socket"; @@ -54888,14 +54935,16 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit , conduit-extra, containers, criterion, deepseq, fast-myers-diff - , file-embed, megaparsec, mtl, optparse-applicative, parallel - , parser-combinators, split, tasty, tasty-golden, text - , transformers, utf8-string, vector + , file-embed, megaparsec, mtl, optparse-applicative, pandoc + , pandoc-types, parallel, parser-combinators, split, tasty + , tasty-golden, text, transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.3.0"; - sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; + version = "1.0.0"; + sha256 = "04nrfc448m0kz73rwnvb6c0h9mhh55vjxxls6ddyq80avypsgb57"; + revision = "1"; + editedCabalFile = "1vqakf9jh6hrbicbrpwsv3fjqwi0mngnvrwg58xaaqhb4h18kzj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54907,8 +54956,8 @@ self: { deepseq optparse-applicative parallel text ]; testHaskellDepends = [ - base bytestring conduit tasty tasty-golden text transformers - utf8-string + base bytestring conduit pandoc pandoc-types tasty tasty-golden text + transformers utf8-string ]; benchmarkHaskellDepends = [ base criterion file-embed parallel text @@ -55121,8 +55170,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.13"; - sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; + version = "0.1.1.14"; + sha256 = "1gyc59y2ch2w5chiyx1d1s6rd71cvgvccmdfkbyzvcm8sywaqnnr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55176,8 +55225,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.11"; - sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; + version = "2.2.0.12"; + sha256 = "0ss1rakdpv82pbyf9cnfd3sysap2ggjc7cpz4vh46w55ivy3ba3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56947,8 +56996,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.11"; - sha256 = "1mi0560rcajp9q83y6vsw7ld1n429jdsmswassnyhh1z4hs6ihv7"; + version = "0.10.1.12"; + sha256 = "0bzks15c2s2xiv95v7fyzsndyiinp9ar8ajcalxs68zpwmbpzk3h"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -58555,8 +58604,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.3"; - sha256 = "0gj6w5r07bmij41flx7rw4ad0qjl2fmbxp9jrdkl8k33b045lfc7"; + version = "5.2.4"; + sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58726,14 +58775,15 @@ self: { "cabal-fix" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, Cabal-syntax - , containers, directory, dotparse, filepath, flatparse - , optics-extra, optparse-applicative, pretty, pretty-simple - , string-interpolate, tar, text, these, tree-diff, vector + , containers, directory, doctest-parallel, dotparse, filepath + , flatparse, optics-extra, optparse-applicative, pretty + , pretty-simple, string-interpolate, tar, text, these, tree-diff + , vector }: mkDerivation { pname = "cabal-fix"; - version = "0.0.0.2"; - sha256 = "050003nvqc0x44jik7x5gsljqsrandpsl77xkqbhrh3xglw8cydb"; + version = "0.1.0.0"; + sha256 = "09q9nzxybkrqg96ys45jpq37ar5dgdvxc3yacfngk3kzxcw3ykms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58745,6 +58795,7 @@ self: { base bytestring directory filepath optparse-applicative pretty-simple text tree-diff ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -60128,21 +60179,22 @@ self: { , conduit-concurrent-map, conduit-extra, conduit-zstd, containers , crypton, deepseq, dhall, directory, ed25519, either, exceptions , extra, filepath, fsnotify, generic-lens, hercules-ci-cnix-store - , here, hnix-store-core, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, immortal, inline-c-cpp - , katip, lukko, lzma-conduit, megaparsec, memory, microlens, netrc - , network, nix, nix-narinfo, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , uri-bytestring, uuid, vector, versions, websockets, wuss + , here, hnix-store-core, hnix-store-nar, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, http-types, immortal + , inline-c-cpp, katip, lukko, lzma-conduit, megaparsec, memory + , microlens, netrc, network, nix, nix-narinfo, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, uri-bytestring, uuid, vector, versions + , websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.7.4"; - sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; + version = "1.7.5"; + sha256 = "0f9lp7drhiadn8blcf1m4hxmv3zj1ah9n0w6s9v5ad1zp1lgcd0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60151,15 +60203,15 @@ self: { concurrent-extra conduit conduit-concurrent-map conduit-extra conduit-zstd containers crypton deepseq dhall directory ed25519 either exceptions extra filepath fsnotify generic-lens - hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types immortal inline-c-cpp katip - lukko lzma-conduit megaparsec memory microlens netrc network - nix-narinfo optparse-applicative pretty-terminal prettyprinter - process protolude resourcet retry safe-exceptions servant - servant-auth servant-auth-client servant-client servant-conduit stm - stm-chans stm-conduit systemd temporary text time transformers unix - unliftio unliftio-core unordered-containers uri-bytestring uuid - vector versions websockets wuss + hercules-ci-cnix-store here hnix-store-core hnix-store-nar + http-client http-client-tls http-conduit http-types immortal + inline-c-cpp katip lukko lzma-conduit megaparsec memory microlens + netrc network nix-narinfo optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-conduit stm stm-chans stm-conduit systemd temporary text + time transformers unix unliftio unliftio-core unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -60168,8 +60220,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring cachix-api containers dhall directory - extra here hspec protolude retry servant-auth-client - servant-client-core stm temporary time versions + extra hercules-ci-cnix-store here hspec protolude retry + servant-auth-client servant-client-core stm temporary time versions ]; testToolDepends = [ hspec-discover ]; description = "Command-line client for Nix binary cache hosting https://cachix.org"; @@ -60178,18 +60230,18 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover - , http-media, jose, memory, nix-narinfo, protolude, resourcet - , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text - , time, unordered-containers, uuid, websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit, crypton + , deriving-aeson, exceptions, hspec, hspec-discover, http-media + , jose, memory, nix-narinfo, protolude, resourcet, safe-exceptions + , servant, servant-auth, stm-chans, swagger2, text, time + , unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.7.4"; - sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; + version = "1.7.5"; + sha256 = "03iq1kwy2jnbpf2c2v0hs9s44sd2w92srrrcb61jm00ws7qnh5sw"; libraryHaskellDepends = [ - aeson async base bytestring conduit cryptonite deriving-aeson + aeson async base bytestring conduit crypton deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet safe-exceptions servant servant-auth stm-chans swagger2 text time unordered-containers uuid websockets @@ -60523,8 +60575,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.12.0.0"; - sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; + version = "0.12.1.0"; + sha256 = "0ccwrnymkd96ca85n097iw9x5pnirc3ccmalyl1w507c56ph3jb4"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -64246,20 +64298,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_6_1_0" = callPackage - ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color - , containers, cubicbezier, doctest-parallel, flatparse, foldl - , formatn, markup-parse, mtl, numhask, numhask-array, numhask-space - , optics-core, random, string-interpolate, text, time + "chart-svg_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, containers, cubicbezier + , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl + , numhask, numhask-space, optics-core, random, string-interpolate + , text, time }: mkDerivation { pname = "chart-svg"; - version = "0.6.1.0"; - sha256 = "05z9raqqjnq0wvlknkl2z2g20hxal6nnz7g8p0fqplggv52f53vd"; + version = "0.7.0.0"; + sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; libraryHaskellDepends = [ - adjunctions attoparsec base bytestring Color containers cubicbezier - flatparse foldl formatn markup-parse mtl numhask numhask-array - numhask-space optics-core random string-interpolate text time + base bytestring Color containers cubicbezier flatparse formatn + harpie markup-parse mtl numhask numhask-space optics-core random + string-interpolate text time ]; testHaskellDepends = [ base doctest-parallel ]; description = "Charting library targetting SVGs"; @@ -64783,8 +64835,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.1"; - sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; + version = "0.9.4.0"; + sha256 = "1dbbhpvpnrlx3a4a66q0732fdvb132xax0p5fh41xfhjfxxspzf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66111,6 +66163,8 @@ self: { pname = "citeproc"; version = "0.8.1.1"; sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; + revision = "1"; + editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70849,6 +70903,21 @@ self: { license = "unknown"; }) {}; + "comma-and" = callPackage + ({ mkDerivation, base, data-default-class, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "comma-and"; + version = "0.1.0.0"; + sha256 = "13z5z7c2xgljxk9lr786wbmayyqng3pp16pkhv6ch9p0a0adwwkc"; + libraryHaskellDepends = [ base data-default-class ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Join text together with commas, and \"and\""; + license = lib.licenses.bsd3; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -70954,28 +71023,6 @@ self: { }) {}; "commonmark" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-data, unicode-transforms - }: - mkDerivation { - pname = "commonmark"; - version = "0.2.6"; - sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers unicode-data - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-data, unicode-transforms @@ -70995,7 +71042,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -71041,21 +71087,6 @@ self: { }) {}; "commonmark-pandoc" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; - version = "0.2.2.1"; - sha256 = "1kbs165li9fcizzivlb9ajsh9livc7vq8s903g5n829fpwayp431"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_2_2" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text }: @@ -71068,7 +71099,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-simple" = callPackage @@ -74174,8 +74204,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "7"; - editedCabalFile = "0bzrsy2qlz6ylml38q905rcw2lg0khz6iqr67hhcihbgwgazrrsj"; + revision = "8"; + editedCabalFile = "1sfj9c77y7j5y5l7vsix4v94hmi5lajm1v5lgvwvcl7y063h0p2r"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -75832,6 +75862,20 @@ self: { license = lib.licenses.publicDomain; }) {}; + "control-monad-omega_0_3_3" = callPackage + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: + mkDerivation { + pname = "control-monad-omega"; + version = "0.3.3"; + sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "A breadth-first list monad"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79746,15 +79790,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_1_0_0" = callPackage + "crypton_1_0_1" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "1.0.0"; - sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; + version = "1.0.1"; + sha256 = "19674xqf6zp17g4qwlz1m3dzdsl05s1frb2drxb77iccfhabnhli"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -80404,8 +80448,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "1.0.0.1"; - sha256 = "16falqdvm94dr4fjb9dndax1vj50amf1ns95x0hribww0vp85w8c"; + version = "1.0.1.0"; + sha256 = "0qlw5hhsrfpw972ryp3mr895q77d6p1g2q1z7jl7hf1xz7ba0c1r"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ordered-containers @@ -81408,7 +81452,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "cut-the-crap"; broken = true; - }) {pocketsphinx = null; sphinxbase = null;}; + }) {inherit (pkgs) pocketsphinx; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -82762,28 +82806,42 @@ self: { }) {}; "data-default" = callPackage - ({ mkDerivation, base, data-default-class + ({ mkDerivation, base, containers, data-default-class , data-default-instances-containers, data-default-instances-dlist - , data-default-instances-old-locale + , data-default-instances-old-locale, mtl, old-locale }: mkDerivation { pname = "data-default"; - version = "0.7.1.1"; - sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; + version = "0.7.1.2"; + sha256 = "0kzq84bflmfhzc7650wykjamwq8zsxm9q2c1s7nfbgig5xyizkjc"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale ]; + testHaskellDepends = [ base containers mtl old-locale ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; + "data-default_0_8_0_0" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "data-default"; + version = "0.8.0.0"; + sha256 = "0cfxfbgsxxla1hr59rnm1cljb6i18rbp8yq7f0bfwvwpi4q0xwi3"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl ]; + description = "A class for types with a default value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-default-class"; - version = "0.1.2.0"; - sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; + version = "0.1.2.2"; + sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; @@ -82841,8 +82899,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "data-default-instances-base"; - version = "0.1.0.1"; - sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; + version = "0.1.0.3"; + sha256 = "1cslj2bywl4w58f6wr4knk7zj6v8v7rykjxq9ddy8vzbydns1bn8"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; @@ -82885,12 +82943,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-default-instances-containers_0_1_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class }: + mkDerivation { + pname = "data-default-instances-containers"; + version = "0.1.0.3"; + sha256 = "0awk655khqc1cqfc2kcxkcxqpa90l882cz89f2gip6v31vyzmpdr"; + libraryHaskellDepends = [ base containers data-default-class ]; + description = "Default instances for types in containers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-instances-dlist" = callPackage ({ mkDerivation, base, data-default-class, dlist }: mkDerivation { pname = "data-default-instances-dlist"; - version = "0.0.1"; - sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; + version = "0.0.1.2"; + sha256 = "02wy7rq6d5z2hpxdw6vwnb1bri5bz9yrw5hnc1i7l0x5q68g3gg0"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; @@ -82913,8 +82983,8 @@ self: { ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { pname = "data-default-instances-old-locale"; - version = "0.0.1"; - sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; + version = "0.0.1.2"; + sha256 = "0vxqr7hmp1vxjv08lmrf15x4p6s7l44qz1c834a8dds807zri03h"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; @@ -83064,8 +83134,10 @@ self: { }: mkDerivation { pname = "data-effects"; - version = "0.1.2.0"; - sha256 = "1gx04k8rsk2qcq74ya44w0249vfb8n3qqwc3bj95askm4nr7nfl6"; + version = "0.2.0.0"; + sha256 = "1fmag3frj414q3anp8711l53diy603rz6sh6pl3p9bliwk8npwfs"; + revision = "1"; + editedCabalFile = "13j27hw73a8kzjf6hvz8pyj8xfv6j9bzp8y2ahd8w6ycv7kdcl10"; libraryHaskellDepends = [ base data-default data-effects-core data-effects-th lens text these time @@ -83083,8 +83155,8 @@ self: { }: mkDerivation { pname = "data-effects-core"; - version = "0.1.0.0"; - sha256 = "1sz3wnna9h6211lc9pbvgf6wjr6csqzpl2q2jz8z3s4hky0m32jg"; + version = "0.2.0.0"; + sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; libraryHaskellDepends = [ base compdata mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83102,8 +83174,10 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.1.2.0"; - sha256 = "05jzplb3vxxhy8ham7v8w3n943fng3fk8v1pa09vbv68k3r1p14w"; + version = "0.2.0.0"; + sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; + revision = "1"; + editedCabalFile = "1bi4rhb6wl5n5myp1jc5rv3s483jspqfa53dkv7xsq6chvfqhf7h"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83114,7 +83188,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; - license = lib.licenses.mpl20; + license = "MPL-2.0 AND BSD-3-Clause"; hydraPlatforms = lib.platforms.none; }) {}; @@ -85151,17 +85225,17 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_7" = callPackage + "dbus_1_3_8" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + , deepseq, directory, exceptions, extra, filepath, lens, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types }: mkDerivation { pname = "dbus"; - version = "1.3.7"; - sha256 = "0yjsgabcihy8gzzckh5ipy5bwspw3pg3ghj3in6mzlkyqj1hx964"; + version = "1.3.8"; + sha256 = "1vw6268w3gs7lzi3p0g1vhi930cwwb2l38w6mnv1yzsm26v6np4s"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85172,7 +85246,6 @@ self: { parsec process QuickCheck random resourcet tasty tasty-hunit tasty-quickcheck temporary text transformers unix vector ]; - benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; @@ -87180,6 +87253,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.4"; sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; + revision = "1"; + editedCabalFile = "0qm6b15ljxdpnyihz6ip932spbgz0kgkgqpif961599l35l1ajg9"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -87223,8 +87298,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; - revision = "1"; - editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; + revision = "2"; + editedCabalFile = "1w50zxcngacgaq534dza7p1h37nkshmh9nhcaxlwkia2mr26fiv5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -87508,8 +87583,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.2"; - sha256 = "03w0qvs7adgwc676gk0q36bm9s7f7b709siy4dh0y27qblcjb6a4"; + version = "0.0.1.4"; + sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -87927,8 +88002,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.0"; - sha256 = "18cgwz8cgsj1vjhk4rgv4lakqbnrrb5pspkpg5lnkc9kq7953d1g"; + version = "0.6.0.2"; + sha256 = "04z1d3gqcd0qvrvfhiv51sdhra5m39dq5jvp8hsrw2k32mkdixn9"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory filepath modern-uri network random text unix @@ -89179,8 +89254,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "1"; - editedCabalFile = "1w9bjc6zizp779rk4frfmffzlv4vq4sljdcvql9ma5qy679phiyr"; + revision = "2"; + editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -90506,6 +90581,8 @@ self: { pname = "dimensional"; version = "1.5"; sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + revision = "1"; + editedCabalFile = "1149vwz3ywi2kkblsl8ayhca4ibwn76zdc5g6l18j8b03hvf3yzg"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90526,6 +90603,8 @@ self: { pname = "dimensional"; version = "1.6"; sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; + revision = "1"; + editedCabalFile = "0g51fw0k86jr0nlvriiprw5zpjqkifxc16s18h1h240y2v0cbgq0"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90901,13 +90980,13 @@ self: { broken = true; }) {}; - "directory_1_3_8_5" = callPackage - ({ mkDerivation, base, filepath, time, unix }: + "directory_1_3_9_0" = callPackage + ({ mkDerivation, base, file-io, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.5"; - sha256 = "0s57dq5l02b9z3h17slw3yg73mzdx15pzj02xg91avpwvmafsr78"; - libraryHaskellDepends = [ base filepath time unix ]; + version = "1.3.9.0"; + sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; + libraryHaskellDepends = [ base file-io filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = lib.licenses.bsd3; @@ -91473,8 +91552,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "3"; - editedCabalFile = "1i3mkza18y2dxj03zn9419rh7jgpkg1kq97blhjrcw5174p9p3c6"; + revision = "4"; + editedCabalFile = "1m4sv7mdqdm5xx5khbyq0il3dn5isg575vgn1akb283l2jkz4v1g"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -93497,7 +93576,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_10" = callPackage + "doctest_0_23_0" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93505,8 +93584,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.10"; - sha256 = "0ylckg8mzfkv25a3yymfv8yal05ypr1qrx99qv4xakzpn8149m46"; + version = "0.23.0"; + sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94413,18 +94492,20 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, flatparse, numhask-space, optics-core, process-extras - , string-interpolate, template-haskell, text, these + , containers, doctest-parallel, flatparse, numhask-space + , optics-core, process-extras, string-interpolate, template-haskell + , text, these }: mkDerivation { pname = "dotparse"; - version = "0.1.0.0"; - sha256 = "06knlrrb2ma57d5rnv2xdqp7avdbcbnd5m6pk45953lmhz217ls6"; + version = "0.1.1.0"; + sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate template-haskell text these ]; + testHaskellDepends = [ base doctest-parallel ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -95428,6 +95509,8 @@ self: { pname = "dsp"; version = "0.2.5.2"; sha256 = "0inar9c0n4x0li9c7krr17qv7zc49162wchhyn6ix7adni8j92z0"; + revision = "1"; + editedCabalFile = "06lrjxcsyviifpw398za544r5wqfjlx3h206g1lmjmcqj0ph1n5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -95599,8 +95682,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "8"; - editedCabalFile = "1c4m2nwmnrjs8rinfa9p9vynmdr56i5ggydgnjs3d8szpbbbbrml"; + revision = "9"; + editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95817,8 +95900,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.1"; - sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; + version = "0.13.2"; + sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95849,8 +95932,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.1"; - sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; + version = "0.13.2"; + sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -97790,6 +97873,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process + , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench + , tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.5.0.0"; + sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm + strict-mutable-base time unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + safe-exceptions strict-mutable-base tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -97806,6 +97915,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_5_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , monad-control, primitive, strict-mutable-base, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.5.0.0"; + sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-control primitive + strict-mutable-base transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -97818,6 +97945,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_4" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.4"; + sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; + libraryHaskellDepends = [ base containers effectful-core ghc ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -97850,14 +97990,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-th_1_0_0_2" = callPackage + "effectful-th_1_0_0_3" = callPackage ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.2"; - sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + version = "1.0.0.3"; + sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98833,6 +98973,8 @@ self: { pname = "eliminators"; version = "0.9.5"; sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; + revision = "1"; + editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -102037,6 +102179,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_13_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, template-haskell, text, time + , transformers, unliftio, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.13.0"; + sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged template-haskell text time + transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged template-haskell text + time transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "esqueleto-compat" = callPackage ({ mkDerivation, base, conduit, esqueleto, hspec, persistent , resourcet, transformers @@ -104576,8 +104747,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; - revision = "1"; - editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; + revision = "2"; + editedCabalFile = "1lg38r5i6wdi39561g6kpdcdkhr34idkvh8n128gc7dz2a9irycl"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -105323,8 +105494,8 @@ self: { }: mkDerivation { pname = "extism-pdk"; - version = "1.1.0.0"; - sha256 = "0bnhi02f3m9shsn1x2vn7rpjaii72sb6lrsw9njzk743ap23d1kr"; + version = "1.2.0.0"; + sha256 = "1ph4c2l22mhdn8053shsh2spq5wdgvi7zw279ay9ffhhwkyan654"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105346,6 +105517,8 @@ self: { pname = "extra"; version = "1.7.16"; sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; + revision = "1"; + editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -105356,6 +105529,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_8" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.8"; + sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extra-data-yj" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105735,6 +105927,8 @@ self: { pname = "failure"; version = "0.2.0.3"; sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; + revision = "1"; + editedCabalFile = "0lnvh6slp057kl0sjn14iab8y3cpic60lhbmn9502zryp7by23ky"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; license = lib.licenses.bsd3; @@ -105831,8 +106025,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.3"; - sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + version = "1.0.5"; + sha256 = "179j2r6ws6ngmwsswkmpas4ij5jywlvhk0rhbk8rn3vxc3yj7gnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers directory exceptions @@ -106194,8 +106388,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.3"; - sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; + version = "3.2.4"; + sha256 = "1fxh94qk24c7mki0049zc0h5g0cyn78fp54bgxczqcba6lqknx9r"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -108153,23 +108347,6 @@ self: { }) {}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , microbench, QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.8.2.0"; - sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base deepseq microbench ]; - description = "Martin Erwig's Functional Graph Library"; - license = lib.licenses.bsd3; - }) {}; - - "fgl_5_8_3_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -108184,7 +108361,6 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -112394,12 +112570,15 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, QuickCheck, text }: + ({ mkDerivation, base, containers, doctest-parallel, QuickCheck + , text + }: mkDerivation { pname = "formatn"; - version = "0.3.0.1"; - sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; - libraryHaskellDepends = [ base containers QuickCheck text ]; + version = "0.3.1.0"; + sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; }) {}; @@ -113328,14 +113507,15 @@ self: { , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 , path-pieces, persistent, persistent-postgresql, postgresql-simple , primitive, QuickCheck, resource-pool, resourcet, scientist - , semigroupoids, template-haskell, text, time, transformers - , transformers-base, typed-process, unliftio, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core, yesod-test + , semigroupoids, servant-server, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.2.1"; - sha256 = "09j74p9mxhxz689c9i46474d23hp5p1xmfz2l4pbfh8wfg91bb5a"; + version = "1.20.3.0"; + sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava @@ -113349,15 +113529,16 @@ self: { monad-validate MonadRandom mtl nonempty-containers openapi3 path-pieces persistent persistent-postgresql postgresql-simple primitive QuickCheck resource-pool resourcet scientist - semigroupoids template-haskell text time transformers - transformers-base typed-process unliftio unordered-containers - vector wai wai-extra yaml yesod-core yesod-test + semigroupoids servant-server template-haskell text time + transformers transformers-base typed-process unliftio + unordered-containers vector wai wai-extra yaml yesod-core + yesod-test ]; testHaskellDepends = [ aeson annotated-exception async base Blammo bugsnag bytestring cassava conduit hs-opentelemetry-api hspec http-types HUnit - monad-validate nonempty-containers postgresql-simple QuickCheck - vector wai wai-extra + monad-validate nonempty-containers path-pieces persistent + postgresql-simple QuickCheck servant-server vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113566,8 +113747,8 @@ self: { }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.7"; - sha256 = "033h3ghq7ibq74har4mv4njpwl6c6gndibq1qhlgx3x82ymxkgpk"; + version = "1.0.0.8"; + sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hspec QuickCheck relude tasty tasty-hspec text time @@ -116054,8 +116235,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.22"; - sha256 = "12x8n953l5j3msh95vbf94yh5yfw9x80grms2r59i3k6vg32bx01"; + version = "0.25.23"; + sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116127,8 +116308,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.2.1"; - sha256 = "0g8n1gkl4y2a65z1idx58b1ls2g4jf0pwjhnc3w5wffq9mpwliaq"; + version = "1.2.3.0"; + sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -118038,19 +118219,16 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, contravariant - , deepseq, generic-lens, ghc-boot-th, one-liner, show-combinators - , tasty, tasty-bench, tasty-hunit + ({ mkDerivation, ap-normalize, base, base-orphans, deepseq + , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty + , tasty-bench, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "1.1.0.0"; - sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; - revision = "2"; - editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; + version = "1.1.0.1"; + sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators + ap-normalize base base-orphans ghc-boot-th show-combinators ]; testHaskellDepends = [ base generic-lens one-liner show-combinators tasty tasty-hunit @@ -121092,7 +121270,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_2_20240223" = callPackage + "ghc-lib_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121100,8 +121278,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.2.20240223"; - sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia"; + version = "9.8.3.20241022"; + sha256 = "0irdlkkb139spmggjam2n4ydcwkb1r8vsv29g5w9rxqd5rd66w1b"; + revision = "1"; + editedCabalFile = "0r1a022nf2kk9vk5ca7crx74fzi0vcd8r5c5ldarcvqjfhgayfvi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121124,6 +121304,8 @@ self: { pname = "ghc-lib"; version = "9.10.1.20240511"; sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; + revision = "1"; + editedCabalFile = "0zzp85lr6lps0w1ld535sc73nz4dmrk48rwvngzdwzb460lnqsiv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121177,15 +121359,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_2_20240223" = callPackage + "ghc-lib-parser_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.2.20240223"; - sha256 = "05k5grbh3s0ywm8y6cp9hqfj4bbq0nh1bx1ysgfv88df5hgg47r9"; + version = "9.8.3.20241022"; + sha256 = "0gnd9dvjbis9vdgjk671x9ys6b0af7399mim8gpi6dpa1nczgc7b"; + revision = "2"; + editedCabalFile = "0qbqx6qg8hab2il9idmxjfwhk7s86ffp24836irc85aazmpvzsxv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121207,6 +121391,8 @@ self: { pname = "ghc-lib-parser"; version = "9.10.1.20240511"; sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; + revision = "1"; + editedCabalFile = "0lsjzmdyqbganrq492vwwkx5j05p34vwn4bjkrd5zjww17fazfcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -122001,8 +122187,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.11.0.0"; - sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; + version = "0.12.0.0"; + sha256 = "0gl5zhfvvkqa36ccl5hxjrw6pgpl1giwa1ysq4kbw41df8cwcxxl"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -125414,8 +125600,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "5"; - editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; + revision = "6"; + editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -129998,30 +130184,6 @@ self: { }) {}; "goldplate" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff - , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, unordered-containers - }: - mkDerivation { - pname = "goldplate"; - version = "0.2.1.1"; - sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "6"; - editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text - unordered-containers - ]; - testHaskellDepends = [ base process ]; - description = "A lightweight golden test runner"; - license = lib.licenses.asl20; - mainProgram = "goldplate"; - }) {}; - - "goldplate_0_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -130041,7 +130203,6 @@ self: { testHaskellDepends = [ aeson base bytestring process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -131805,8 +131966,8 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.3.0"; - sha256 = "1jzrhbpxswi4znalwswjh43pwcysw7nzj6d1xa446xc3w8azs3ic"; + version = "1.0.4.0"; + sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -134091,8 +134252,10 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.0.0"; - sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; + version = "5.5.2.0"; + sha256 = "19y2vgy0s4mw47ip3jb78n2gjab2qyp6vyn5fra293srsp25qn5j"; + revision = "4"; + editedCabalFile = "17jcpz9vywj1kjg5llxb2qn0zx3cny4mh8xr478bd6l2m93ywm3b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136489,8 +136652,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "2"; - editedCabalFile = "15457i7cjr2khv3ipis013cm11hinxr5r0s32bgmmbbdqi1g1y2s"; + revision = "3"; + editedCabalFile = "15q1wkjisjgvjn3mq6bj1rfrdsa50r0c37c4g75g905g7zrbmk51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136516,6 +136679,47 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; + "hakyll_4_16_3_0" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lrucache, mtl, network-uri, optparse-applicative + , pandoc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, util-linux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.16.3.0"; + sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc parsec process random regex-tdfa + resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + aeson base bytestring containers filepath pandoc QuickCheck tagsoup + tasty tasty-golden tasty-hunit tasty-quickcheck text + unordered-containers yaml + ]; + testToolDepends = [ util-linux ]; + description = "A static website compiler library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hakyll-init"; + maintainers = [ lib.maintainers.erictapen ]; + }) {inherit (pkgs) util-linux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -138669,13 +138873,13 @@ self: { mainProgram = "happy"; }) {}; - "happy_2_0_2" = callPackage + "happy_2_1_1" = callPackage ({ mkDerivation, array, base, containers, happy-lib, mtl, process }: mkDerivation { pname = "happy"; - version = "2.0.2"; - sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp"; + version = "2.1.1"; + sha256 = "05vnv5dila8scra69vqn7gpxwn667nhsv9jx79pnx30444d8p8px"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers happy-lib mtl ]; @@ -138743,8 +138947,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "happy-lib"; - version = "2.0.2"; - sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29"; + version = "2.1.1"; + sha256 = "04sq8kzcgp6iv117s8z0469lg5g0qhc1s3grszksv781w71ljpp7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl transformers ]; doHaddock = false; @@ -139082,8 +139286,8 @@ self: { }: mkDerivation { pname = "harpie"; - version = "0.1.0.0"; - sha256 = "11jdq7d1zx17qa2i1nvg6iysm56plikwk5bkq32xjbjq28yb0jhs"; + version = "0.1.1.0"; + sha256 = "18f49jjkf3zf20bmd9rfan768wlkaggikr1r6px354mfkfs8nb36"; libraryHaskellDepends = [ adjunctions base distributive first-class-families prettyprinter QuickCheck quickcheck-instances random vector vector-algorithms @@ -139095,6 +139299,22 @@ self: { broken = true; }) {}; + "harpie-numhask" = callPackage + ({ mkDerivation, adjunctions, base, doctest-parallel + , first-class-families, harpie, numhask, prettyprinter + }: + mkDerivation { + pname = "harpie-numhask"; + version = "0.1.0.1"; + sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; + libraryHaskellDepends = [ + adjunctions base first-class-families harpie numhask + ]; + testHaskellDepends = [ base doctest-parallel prettyprinter ]; + description = "numhask shim for harpie"; + license = lib.licenses.bsd3; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -139501,8 +139721,8 @@ self: { }: mkDerivation { pname = "hash-cons"; - version = "0.1.0.0"; - sha256 = "04rdgc8lyf2byvjx5p3g06vcwjc6g0bh9qgk08c304p4q6rrijv4"; + version = "0.2.0.0"; + sha256 = "0dyg0xx8bxmh97p58bd8znlxjbld54af7q6blrsmaqqfvv4amxhn"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ async base hashable tasty tasty-hunit tasty-quickcheck @@ -140930,28 +141150,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.11"; - sha256 = "0raf97k9w0794i1viv0xqcpwp6ahpqdja11a4d5qk80r811rc5iw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_12" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -140971,7 +141169,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -143515,8 +143712,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.12"; - sha256 = "19v7bwy3c3xwvsgxnch8p68fw67h0yy89sppjwhbndk2f5avshgq"; + version = "1.5.13"; + sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144446,8 +144643,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.8"; - sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; + version = "0.0.0.10"; + sha256 = "0b80519m7g2iww89wj1vs6hz9sfkv8iv904si9wl83f0adh7r99w"; libraryHaskellDepends = [ aeson base containers data-default exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -145304,8 +145501,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.0"; - sha256 = "1dl72axgr6jaz9m243krys9x2svsrc7rnanc4pfvjx9w5648j3mq"; + version = "0.2.1"; + sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell optics-core pretty-simple prettyprinter @@ -148146,19 +148343,15 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, constraints, data-effects, extensible, free - , kan-extensions, membership, mtl, singletons-base, singletons-th - , tasty, tasty-discover, tasty-hunit, transformers - , transformers-base, unliftio + ({ mkDerivation, base, data-effects, freer-simple, mtl, tasty + , tasty-discover, tasty-hunit, unliftio }: mkDerivation { pname = "heftia"; - version = "0.3.1.0"; - sha256 = "09kvmpfkb88mgh3vvx78dn719ipifknav2b602l65ah7bwwn962n"; + version = "0.4.0.0"; + sha256 = "19p1l14cg6iqf5bk7pvllpd8z4qhzbpfvfzkvr3rgl7zsz7f28ih"; libraryHaskellDepends = [ - base constraints data-effects extensible free kan-extensions - membership mtl singletons-base singletons-th transformers - transformers-base unliftio + base data-effects freer-simple mtl unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -148168,34 +148361,41 @@ self: { }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, extensible, extra - , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty - , tasty-discover, tasty-hspec, text, time, transformers - , unbounded-delays, unliftio + ({ mkDerivation, base, containers, data-effects, eff, effectful + , eveff, extra, freer-simple, fused-effects, ghc-typelits-knownnat + , heftia, hspec, logict, mpeff, mtl, polysemy, tasty, tasty-bench + , tasty-discover, tasty-hspec, text, time, unbounded-delays + , unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.3.1.0"; - sha256 = "1kdhhzw3kcpkjl5f4li6w3kygppj57bpscgdcxygy34cflgy4pdc"; + version = "0.4.0.1"; + sha256 = "05zsgfx2kmhgga4zczz2d9k45f1dkk12qvx5cwf2cx9kx44zi0ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects extensible extra free - ghc-typelits-knownnat heftia mtl time transformers unbounded-delays - unliftio + base containers data-effects ghc-typelits-knownnat heftia time + unbounded-delays unliftio ]; executableHaskellDepends = [ - base data-effects extra ghc-typelits-knownnat heftia text time + base containers data-effects extra ghc-typelits-knownnat heftia + text time unbounded-delays unliftio ]; testHaskellDepends = [ - base data-effects ghc-typelits-knownnat heftia hspec tasty - tasty-hspec unliftio + base containers data-effects ghc-typelits-knownnat heftia hspec + tasty tasty-hspec time unbounded-delays unliftio ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base containers data-effects eff effectful eveff freer-simple + fused-effects ghc-typelits-knownnat heftia logict mpeff mtl + polysemy tasty-bench time unbounded-delays unliftio + ]; description = "higher-order effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - }) {}; + broken = true; + }) {eff = null;}; "hegg" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench @@ -148407,6 +148607,8 @@ self: { pname = "helf"; version = "1.0.20240318"; sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; + revision = "1"; + editedCabalFile = "151jk61357vydckahj0rhphph0yn8qm243p3rzvqi27w65969lyy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -150975,6 +151177,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_7_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.7.0"; + sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio text vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -151129,8 +151350,8 @@ self: { pname = "hie-bios"; version = "0.14.0"; sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; - revision = "1"; - editedCabalFile = "1g9gagj12jpazrq9zwq8vwv5saf23gqjgcvzcg81q7s4bn115l72"; + revision = "2"; + editedCabalFile = "0an5jy6hqa7v7r4s2lgzcb5sl7jlx5slncf73s4vyplx7qskjcah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155575,8 +155796,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.14.3"; - sha256 = "02bcxzpmjm6kqcvx7036055chbyfyhi6pl4xrrxwwmkp85fh0apb"; + version = "2.15.0"; + sha256 = "12h06yzp3jiswfy95bryppc352wfkn666c17bd4g00v7k3qnda6p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155926,8 +156147,8 @@ self: { }: mkDerivation { pname = "hnix-store-nar"; - version = "0.1.0.0"; - sha256 = "1kr8hmycb29sv646a3f3lpl0zzng9dg3nix7n0yfrfapycqd04cg"; + version = "0.1.1.0"; + sha256 = "16g03bvgdmpmzvq1acsayfq4b9xh7cgf41xn9bqjl0w72var67qp"; libraryHaskellDepends = [ algebraic-graphs base bytestring case-insensitive cereal containers directory filepath lifted-base monad-control mtl text unix @@ -158195,6 +158416,26 @@ self: { mainProgram = "hp2pretty"; }) {}; + "hp2pretty_0_10_1" = callPackage + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, optparse-applicative, semigroups, text + }: + mkDerivation { + pname = "hp2pretty"; + version = "0.10.1"; + sha256 = "1wx3vxrx8qp85wfhpvv5vjxd45hmgy8m807m62b32ydxpw8mm89k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text + ]; + description = "generate pretty graphs from heap profiles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hp2pretty"; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec @@ -160559,8 +160800,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; - revision = "1"; - editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; + revision = "2"; + editedCabalFile = "00c8grlybwb22r5rqw82lmplgr3njkpij8ns1rx0caz2g6xr91xb"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -160840,6 +161081,19 @@ self: { broken = true; }) {}; + "hs-tango" = callPackage + ({ mkDerivation, base, derive-storable, tango, text, unliftio }: + mkDerivation { + pname = "hs-tango"; + version = "1.0.0"; + sha256 = "0ah4xp3vrarq8kpvgwk78hck8bj9w0fk3d6m5vi28cy8dq62qb5c"; + libraryHaskellDepends = [ base derive-storable text unliftio ]; + libraryPkgconfigDepends = [ tango ]; + benchmarkHaskellDepends = [ base text ]; + description = "Bindings to the Tango Controls system"; + license = lib.licenses.mit; + }) {inherit (pkgs) tango;}; + "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -161398,8 +161652,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "2"; - editedCabalFile = "099303623kck9pv6x0q2dzvwb3w39v5dazn3wryafcnwc1n8prv0"; + revision = "3"; + editedCabalFile = "0ndpgzmq2h2kv7xr9iaf957jnnykbjpd6vlii0n2rkahfckjaqr7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163054,18 +163308,6 @@ self: { }) {}; "hslua-list" = callPackage - ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: - mkDerivation { - pname = "hslua-list"; - version = "1.1.3"; - sha256 = "1ipmf3rpc3ndc23zjmyjmy9lx0q53pm6bjwsgidbqxi4rxsbddqw"; - libraryHaskellDepends = [ base bytestring hslua-core ]; - testHaskellDepends = [ base hslua-core tasty tasty-lua ]; - description = "Opinionated, but extensible Lua list type"; - license = lib.licenses.mit; - }) {}; - - "hslua-list_1_1_4" = callPackage ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; @@ -163075,7 +163317,6 @@ self: { testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-marshalling" = callPackage @@ -165211,10 +165452,8 @@ self: { }: mkDerivation { pname = "hstar"; - version = "0.1.0.6"; - sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; - revision = "2"; - editedCabalFile = "0ncj58a8rkwkwlcv50q5i6c9szss0kp0gbx8z38ycx1fhniig5qv"; + version = "0.1.0.7"; + sha256 = "00y5napbsbxdi3yjl9sj23zncqmxhnvdjppc2pwzj53xynpa4x94"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167547,8 +167786,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.2.1"; - sha256 = "1nzxqrlxmkld86msmdp1zaqvsw3jbbj63n7r0bpgmyq7nnxqxiks"; + version = "0.3.0"; + sha256 = "0kviffsmvggzpbwxnqxshjq3w3yz5v367l5fywq9zcmzrc5ykklw"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -167930,19 +168169,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls, unliftio + , network-control, network-run, recv, time-manager, tls , utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.2"; - sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; + version = "0.4.3"; + sha256 = "0pfjybiqiqafpbm9cr8dx4b2914l0n62xd36aw5jm8d9x8xsqdzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv - time-manager tls unliftio utf8-string + time-manager tls utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -169606,8 +169845,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.1"; - sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; + version = "6.0.2"; + sha256 = "13lrmpglh31srd74a1ch68g723x08wns9sapmlckm1bzs6jj7s06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169797,27 +170036,27 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, bytestring, contravariant, Diff, directory, exceptions - , filepath, generic-lens, ghc-prim, http-conduit, lens, mtl - , network, polysemy, polysemy-log, polysemy-plugin, polysemy-time - , prettyprinter, process, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, temporary, testcontainers, text, time - , transformers, ulid, unliftio, yaml + , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens + , mtl, network, polysemy, polysemy-log, polysemy-plugin + , polysemy-time, prettyprinter, process, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, temporary, testcontainers, text + , time, transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.14.11"; - sha256 = "1a71d98arml7qbq1374b4shkxv366f5w0agg4k6c89605h2zmfwl"; + version = "0.3.0.0"; + sha256 = "16cgg0z13f46hqp0abbv70pk6mw1lhckf2kf0hz994mjbprxrp2a"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit - lens mtl network polysemy polysemy-log polysemy-plugin + hw-prelude lens mtl network polysemy polysemy-log polysemy-plugin polysemy-time prettyprinter process resourcet stm temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ - amazonka-s3 base filepath generic-lens lens polysemy polysemy-log - polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers - text + amazonka-s3 base filepath generic-lens hw-prelude lens polysemy + polysemy-log polysemy-plugin tasty tasty-discover tasty-hedgehog + testcontainers text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -169826,6 +170065,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hw-prelude" = callPackage + ({ mkDerivation, async, base, bytestring, contravariant, directory + , filepath, network, process, resourcet, text, unliftio + }: + mkDerivation { + pname = "hw-prelude"; + version = "0.0.0.1"; + sha256 = "13zi55k9by4ysf0r48a7bhh6sb5qri39rqv5c33d4a9aw4jp5jyj"; + libraryHaskellDepends = [ + async base bytestring contravariant directory filepath network + process resourcet text unliftio + ]; + description = "Opinionated prelude library"; + license = lib.licenses.asl20; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -171749,6 +172004,8 @@ self: { pname = "iCalendar"; version = "0.4.1.0"; sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; + revision = "1"; + editedCabalFile = "037il8bdhxbbpq5p7lpvjyvlrnx24km9lib9kz6q70p8m8mi43xn"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network-uri old-locale parsec text time @@ -173990,14 +174247,16 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-base_0_6_0_0" = callPackage + "incipit-base_0_6_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, stm , text }: mkDerivation { pname = "incipit-base"; - version = "0.6.0.0"; - sha256 = "15mmnixl4ny32h5aflqcq8kv37zhddhqwixa53mkz6ksrrdkpsxc"; + version = "0.6.1.0"; + sha256 = "1vlvwhgn4wfb6gaw1rld1qa1b54dvsymri0mf9x737faah0arhpy"; + revision = "1"; + editedCabalFile = "0gg499hfbi7fs7pffh00md4wdz2bcpm3wg2cqrb3kyr16y6nri1j"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -174019,12 +174278,12 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-core_0_6_0_0" = callPackage + "incipit-core_0_6_1_0" = callPackage ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.6.0.0"; - sha256 = "103fxzx6riyx5scfw340gj5dldxia7zw1i0xk5bkfbn1p5fw3sf4"; + version = "0.6.1.0"; + sha256 = "19m4pvrv6fyxj7ilns3ipfjhibmhgcrjz376djadbqb8fzxba2xb"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -175426,8 +175685,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "2"; - editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; + revision = "3"; + editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -177035,6 +177294,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "io-embed" = callPackage + ({ mkDerivation, base, bytestring, hspec, template-haskell }: + mkDerivation { + pname = "io-embed"; + version = "0.1.0.1"; + sha256 = "0k50rkvak2647w43k083ib1yr845hmlh9wppgjg0fdyvqzxk45vb"; + libraryHaskellDepends = [ base bytestring hspec template-haskell ]; + testHaskellDepends = [ base bytestring hspec template-haskell ]; + description = "Use Template Haskell to embed the result of an IO computation"; + license = lib.licenses.bsd3; + }) {}; + "io-machine" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -177620,6 +177891,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "iproute_1_7_15" = callPackage + ({ mkDerivation, appar, base, byteorder, bytestring, containers + , hspec, hspec-discover, network, QuickCheck, safe + }: + mkDerivation { + pname = "iproute"; + version = "1.7.15"; + sha256 = "19abgdk9pk6n8qmvfcpqp282dgbn1mxmg5fsla4xryg6w2kk38qq"; + libraryHaskellDepends = [ + appar base byteorder bytestring containers network + ]; + testHaskellDepends = [ + appar base byteorder bytestring containers hspec network QuickCheck + safe + ]; + testToolDepends = [ hspec-discover ]; + description = "IP Routing Table"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -179294,8 +179586,10 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.1.1.1"; - sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; + version = "3.2.0.0"; + sha256 = "0vm55xalnlj7kkpc0n2hdzs5i5rizbig4bi2r77h1b5d9yz0iwjw"; + revision = "2"; + editedCabalFile = "0qf5zi8k7vlkli1d51mhhc9lbh39xd4gvrhcpar792npdi8jwx1c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -180985,6 +181279,17 @@ self: { ]; }) {}; + "jsaddle-wasm" = callPackage + ({ mkDerivation, base, jsaddle }: + mkDerivation { + pname = "jsaddle-wasm"; + version = "0.0.0.0"; + sha256 = "03n1541sajbms1pkad6jajxfddx6xm5py4b7j1v77kafxi61dlxw"; + libraryHaskellDepends = [ base jsaddle ]; + description = "Run JSaddle @JSM@ with the GHC WASM backend"; + license = lib.licenses.cc0; + }) {}; + "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base @@ -182429,8 +182734,8 @@ self: { }: mkDerivation { pname = "jsonrpc-tinyclient"; - version = "1.0.0.0"; - sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + version = "1.0.1.0"; + sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl random text websockets @@ -184975,6 +185280,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "keycode_0_2_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "keycode"; + version = "0.2.3"; + sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keyed" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -187857,8 +188176,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.3"; - sha256 = "0lz2djw7zs8wnp23amqqxdyin3jgbjfh2dr2sr1v0kqpqav3yw81"; + version = "0.9.4"; + sha256 = "0cv2hqg4miajspwndn15s37nkra27bffqm4vv2gkk79nr86k9v31"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -189348,30 +189667,32 @@ self: { "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, deepseq, hashable - , HTF, QuickCheck, safecopy, scientific, strict, template-haskell - , text, time, transformers, unordered-containers, utf8-light - , vector, void + , bytestring, cereal, containers, cpphs, criterion, cryptohash + , cryptonite, deepseq, hashable, HTF, inspection-testing, memory + , QuickCheck, safecopy, scientific, strict, template-haskell, text + , time, transformers, unordered-containers, vector, void }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.4"; - sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; - revision = "1"; - editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; + version = "0.1.1.0"; + sha256 = "0i7xk128c1hp1bw50n4wpbdyd6paqbl6vmnknyymkaaga07g5ba0"; libraryHaskellDepends = [ - aeson base base16-bytestring bytes bytestring containers scientific - strict template-haskell text time transformers unordered-containers - utf8-light vector void + aeson base base16-bytestring bytes bytestring containers cryptonite + memory scientific strict template-haskell text time transformers + unordered-containers vector void ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - aeson base bytes bytestring containers hashable HTF QuickCheck - scientific strict text time unordered-containers vector + aeson base bytes bytestring containers hashable HTF + inspection-testing QuickCheck scientific strict text time + unordered-containers vector ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base base16-bytestring byteable bytes bytestring cereal cryptohash - deepseq safecopy text transformers + base base16-bytestring byteable bytes bytestring cereal criterion + cryptohash deepseq safecopy text transformers ]; + benchmarkToolDepends = [ cpphs ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; @@ -189379,22 +189700,22 @@ self: { }) {}; "large-records" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc + ({ mkDerivation, base, containers, generic-deriving, ghc, ghc-prim , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "large-records"; - version = "0.4.1"; - sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; + version = "0.4.2"; + sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell transformers ]; testHaskellDepends = [ - base generic-deriving large-generics mtl newtype + base generic-deriving ghc-prim large-generics mtl newtype record-dot-preprocessor record-hasfield tasty tasty-hunit template-haskell transformers ]; @@ -189701,8 +190022,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.2.0"; - sha256 = "1ip40njah6i25v7wzkd5vpw9gs43dinb1x8ri8mhdn430h30mr05"; + version = "4.3.0"; + sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -193033,8 +193354,8 @@ self: { ({ mkDerivation, base, libsodium }: mkDerivation { pname = "libsodium-bindings"; - version = "0.0.1.1"; - sha256 = "0gfksw47rl13a3mhyzawhxrcp9ia6g85m5v59pp85jci0bgs7bda"; + version = "0.0.2.0"; + sha256 = "12zg8ckvv8qhdmw6pdwfyif23y6iw5hgwcyhb4hlhfk8q7qv2av3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsodium ]; description = "FFI bindings to libsodium"; @@ -193498,6 +193819,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lift-generics_0_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift-instances + }: + mkDerivation { + pname = "lift-generics"; + version = "0.3"; + sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base containers hspec mtl template-haskell th-compat + th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193522,29 +193864,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, deepseq, HUnit - , lifted-base, monad-control, mtl, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.2.5"; - sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; - revision = "1"; - editedCabalFile = "18z12n6v3n810qp7hxanixwhznphpw69jz9ahwxfknww51dj2jx0"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_2_6" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -193563,7 +193882,6 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -196291,6 +196609,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "llvm-codegen" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dlist + , ghc-prim, hspec, hspec-hedgehog, mmorph, mtl, neat-interpolation + , text, text-builder-linear + }: + mkDerivation { + pname = "llvm-codegen"; + version = "0.1.0.0"; + sha256 = "1iqrfkyhqdw7mvpl86jrccl6iqmdp64mmzmhlc4bp59cbxifb0zz"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + base bytestring containers dlist ghc-prim mmorph mtl text + text-builder-linear + ]; + testHaskellDepends = [ + base bytestring containers dlist ghc-prim hspec hspec-hedgehog + mmorph mtl neat-interpolation text text-builder-linear + ]; + description = "A DSL for LLVM IR code generation based on llvm-hs"; + license = lib.licenses.bsd3; + }) {}; + "llvm-data-interop" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, containers , data-default, deepseq, dwarf, hashable, hashtables @@ -198711,6 +199051,8 @@ self: { pname = "lrucache"; version = "1.2.0.1"; sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; + revision = "1"; + editedCabalFile = "0v2wc5k2knvv5knbarzspmbzf657r52jyjm9kf6r4ylsmi9cbq0k"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; license = lib.licenses.bsd3; @@ -202324,25 +202666,21 @@ self: { }) {}; "markup-parse" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, flatparse - , html-parse, optparse-applicative, perf, string-interpolate, tasty - , tasty-golden, text, these, tree-diff + ({ mkDerivation, base, bytestring, containers, deepseq + , doctest-parallel, flatparse, string-interpolate, tasty + , tasty-golden, these, tree-diff }: mkDerivation { pname = "markup-parse"; - version = "0.1.1"; - sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; - revision = "1"; - editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; + version = "0.1.1.1"; + sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse string-interpolate tasty tasty-golden these tree-diff ]; testHaskellDepends = [ - base bytestring string-interpolate tasty tasty-golden tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring flatparse html-parse optparse-applicative perf text + base bytestring doctest-parallel string-interpolate tasty + tasty-golden tree-diff ]; description = "A markup parser"; license = lib.licenses.bsd3; @@ -203831,8 +204169,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.2.0"; - sha256 = "0ms2v86wam1gl5ibhs8pl8rqxxbp2zlr3pv7vfbbp6vgjw2i4x7h"; + version = "0.8.3.1"; + sha256 = "1x0r4ph3vc5aamd1pbpbx39l8cih0nmm7pl3ywkl8hmbgzmmkami"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -203848,33 +204186,6 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; - "mcmc_0_8_3_0" = callPackage - ({ mkDerivation, ad, aeson, async, base, bytestring, circular - , containers, covariance, criterion, directory, dirichlet - , fixed-vector, hmatrix, hspec, log-domain, math-functions - , microlens, mwc-random, parallel, primitive, random, splitmix - , statistics, time, transformers, vector, zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.8.3.0"; - sha256 = "1p4j59wzzbrn5xy64pcg42g2qicski3j16prpm082sags0pv3i7r"; - libraryHaskellDepends = [ - ad aeson async base bytestring circular containers covariance - directory dirichlet hmatrix log-domain math-functions microlens - mwc-random parallel primitive random splitmix statistics time - transformers vector zlib - ]; - testHaskellDepends = [ base hspec random statistics ]; - benchmarkHaskellDepends = [ - aeson base criterion fixed-vector math-functions random vector - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -204049,16 +204360,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, doctest-parallel - , mwc-probability, numhask, numhask-array, primitive, profunctors - , tdigest, text, vector, vector-algorithms + , harpie, harpie-numhask, mwc-probability, numhask, primitive + , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.4.5.0"; - sha256 = "1lyqskr9pddhdm0i8ncykz9gvbjxhfac3y49cvm6vziy3wmxd6ji"; + version = "0.5.0.0"; + sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; libraryHaskellDepends = [ - adjunctions base containers mwc-probability numhask numhask-array - primitive profunctors tdigest text vector vector-algorithms + adjunctions base containers harpie harpie-numhask mwc-probability + numhask primitive profunctors tdigest text vector vector-algorithms ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; @@ -207449,17 +207760,17 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, directory, file-embed-lzma, filepath , http-api-data, http-types, insert-ordered-containers, lens - , minion, minion-wai-extra, openapi3, template-haskell, text + , minion, openapi3, template-haskell, text }: mkDerivation { pname = "minion-openapi3"; - version = "0.1.0.0"; - sha256 = "03rqqx8dy6sk8ryp2a0ykw67rxj531sw12vzpnz8f17vw90x5npp"; + version = "0.1.0.1"; + sha256 = "1vc1cmmf1sspdfcbxk1d1807rggiridyhvvsh27j0z34n3p9whih"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive directory file-embed-lzma filepath http-api-data http-types - insert-ordered-containers lens minion minion-wai-extra openapi3 - template-haskell text + insert-ordered-containers lens minion openapi3 template-haskell + text ]; description = "Minion openapi3 support"; license = lib.licenses.mit; @@ -208049,17 +208360,19 @@ self: { "mit-3qvpPyAi6mH" = callPackage ({ mkDerivation, base, base64, containers, directory, ki - , optparse-applicative, parsec, process, stm, text, text-ansi, unix + , optparse-applicative, parsec, process, stm, text, text-ansi + , text-builder-linear, unconditional-jump, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "11"; - sha256 = "0p5v2spwd8rz5h5zclbr7wq5m4qvsihvp91p52d2vd3jdd6xaszx"; + version = "12"; + sha256 = "0lvn4fal9my2gngcic6kx5xq3sdsl63xm9b6bnsy23ww10zkxdp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64 containers directory ki optparse-applicative parsec - process stm text text-ansi unix + process stm text text-ansi text-builder-linear unconditional-jump + unix ]; executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; @@ -208696,18 +209009,19 @@ self: { "mmzk-typeid" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, containers - , entropy, hashable, hspec, random, text, time, uuid, uuid-types + , entropy, hashable, hint, hspec, random, text, time, uuid + , uuid-types }: mkDerivation { pname = "mmzk-typeid"; - version = "0.7.0.0"; - sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; + version = "0.7.0.1"; + sha256 = "1c2mybdgnn9nzvk2php5i3xid3cm1ws7zrcsg4ngy2a60057pwbz"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types ]; testHaskellDepends = [ - aeson array base binary bytestring containers entropy hashable + aeson array base binary bytestring containers entropy hashable hint hspec random text time uuid uuid-types ]; description = "A TypeID and UUIDv7 implementation for Haskell"; @@ -213233,12 +213547,12 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; - "mpi-hs_0_7_3_0" = callPackage + "mpi-hs_0_7_3_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: mkDerivation { pname = "mpi-hs"; - version = "0.7.3.0"; - sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + version = "0.7.3.1"; + sha256 = "1f4jdk5wysi54skz2jpzh83v5xi4gqa0q3r89l1adlz4m5i90l70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -221457,6 +221771,8 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; + revision = "1"; + editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221712,8 +222028,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.4.1"; - sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; + version = "0.5.0"; + sha256 = "0gjmmnkizqb5pzzr13a1bzs0smch353nvhwplcp04kwcdgm22axd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223315,23 +223631,27 @@ self: { }) {}; "nri-redis" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis - , nri-env-parser, nri-observability, nri-prelude, resourcet - , safe-exceptions, text, unordered-containers, uuid + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, cryptohash-sha1, haskell-src-meta, hedis, megaparsec + , modern-uri, nri-env-parser, nri-observability, nri-prelude + , pcre-light, resourcet, safe-exceptions, template-haskell, text + , unordered-containers, uuid }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.4"; - sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; + version = "0.2.0.2"; + sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; libraryHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; testHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; description = "An intuitive hedis wrapper library"; license = lib.licenses.bsd3; @@ -224022,13 +224342,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_12_0_3" = callPackage - ({ mkDerivation, base, QuickCheck }: + "numhask_0_12_1_0" = callPackage + ({ mkDerivation, base, doctest-parallel, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.12.0.3"; - sha256 = "0rxh2avhfb2m5ss8b70k7dv3scla9ki7a8d73hnqlcfp7vjwm9qk"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.12.1.0"; + sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -225656,6 +225977,22 @@ self: { broken = true; }) {}; + "ollama-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-types + , silently, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.1.0.2"; + sha256 = "12m9ar8fyfxj2bd2q6qgslmyh85fxzqvh09mgvxskdb14yxzil1c"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types text time + ]; + testHaskellDepends = [ base silently tasty tasty-hunit text ]; + description = "Ollama Haskell library"; + license = lib.licenses.mit; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -226168,6 +226505,8 @@ self: { pname = "one-time-password"; version = "3.0.0.0"; sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + revision = "3"; + editedCabalFile = "0dbck4bw97w1ci6yjgvgzzgbpr9xlnc8kghndigipxxy77sx5nqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227558,8 +227897,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.0"; - sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; + version = "1.1.1"; + sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm @@ -228150,8 +228489,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.5.1.0"; - sha256 = "024qqi8gfha21ch54dja0rrmcqalmxn6qgxypzvmqzxdmv1fcwjh"; + version = "0.6.0.2"; + sha256 = "1mwj5x3s40w7rgl6s87l29q47qv26nzrpilr1qfm0xinvrnq6bj2"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -230858,39 +231197,39 @@ self: { ]; }) {}; - "pandoc_3_4" = callPackage + "pandoc_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, containers, crypton-connection + , commonmark-pandoc, containers, crypton, crypton-connection , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-bench - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, tls, typst, unicode-collation + , process, random, safe, scientific, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text + , text-conversions, time, tls, typst, unicode-collation , unicode-transforms, unix, vector, xml, xml-conduit, xml-types , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.4"; - sha256 = "0kwq6xpycd5sv5h6mbiv08imnzzsgchvyxx5hzscha4kkk2hr0nw"; + version = "3.5"; + sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive citeproc commonmark commonmark-extensions commonmark-pandoc containers - crypton-connection crypton-x509-system data-default deepseq + crypton crypton-connection crypton-x509-system data-default deepseq directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific SHA skylighting + pretty-show process random safe scientific skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -231000,14 +231339,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_4" = callPackage + "pandoc-cli_3_5" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.4"; - sha256 = "0qrgjx1q7g80lx98580q3w4pddmh2qqpxkmg005hmdmp6hqvd30s"; + version = "3.5"; + sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231047,10 +231386,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.17.1"; - sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "3"; - editedCabalFile = "14zqqrv5mgd8kdnis2k97ydcbi2rr77cq09z918lwcfcx7dxsl6w"; + version = "0.3.18.0"; + sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; + revision = "1"; + editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231388,25 +231727,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_2" = callPackage + "pandoc-lua-engine_0_3_3" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers - , data-default, directory, doclayout, doctemplates, exceptions - , filepath, hslua, hslua-module-doclayout, hslua-module-path - , hslua-module-system, hslua-module-text, hslua-module-version - , hslua-module-zip, hslua-repl, lpeg, mtl, pandoc - , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , crypton, data-default, directory, doclayout, doctemplates + , exceptions, filepath, hslua, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, hslua-repl, lpeg, mtl + , pandoc, pandoc-lua-marshal, pandoc-types, parsec, tasty , tasty-golden, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.2"; - sha256 = "0lh533m3xvr8c29mazdb09b7w7ivrlscc5dxzmrfnkwkr0friw8c"; + version = "0.3.3"; + sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; libraryHaskellDepends = [ - aeson base bytestring citeproc containers data-default doclayout - doctemplates exceptions hslua hslua-module-doclayout + aeson base bytestring citeproc containers crypton data-default + doclayout doctemplates exceptions hslua hslua-module-doclayout hslua-module-path hslua-module-system hslua-module-text hslua-module-version hslua-module-zip hslua-repl lpeg mtl pandoc - pandoc-lua-marshal pandoc-types parsec SHA text + pandoc-lua-marshal pandoc-types parsec text ]; testHaskellDepends = [ base bytestring data-default directory exceptions filepath hslua @@ -231418,28 +231757,6 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck - , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; - version = "0.2.8"; - sha256 = "0z58mn895hhgkl9lww2zxc0zrpqdnf6m8bpvxfdsh8az0sxgsgba"; - libraryHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types safe text - ]; - testHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit - tasty-lua tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -231459,7 +231776,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -231684,7 +232000,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_8" = callPackage + "pandoc-server_0_1_0_9" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -231692,8 +232008,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.8"; - sha256 = "1ffsbi1ik0lx06xj1ffr2zpn4a9wn8lsawyhak77nqaih93336a5"; + version = "0.1.0.9"; + sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -232133,8 +232449,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; - revision = "1"; - editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; + revision = "2"; + editedCabalFile = "1v2d03rzrj0gmilx2qa1c0y1srzjh96xq02sd7qarc2kjw4rjgyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234127,6 +234443,33 @@ self: { maintainers = [ lib.maintainers.cdepillabout ]; }) {}; + "password_3_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, crypton, doctest, memory, password-types + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "3.1.0.0"; + sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring crypton memory password-types + template-haskell text + ]; + testHaskellDepends = [ + base base-compat base64 bytestring crypton doctest memory + password-types QuickCheck quickcheck-instances scrypt tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "Hashing and checking of passwords"; + license = lib.licenses.bsd3; + platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + "password-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest , doctest, http-api-data, password, password-types, persistent @@ -236098,6 +236441,31 @@ self: { mainProgram = "perf-explore"; }) {}; + "perf_0_13_0_0" = callPackage + ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl + , numhask-space, optparse-applicative, recursion-schemes, text + , vector + }: + mkDerivation { + pname = "perf"; + version = "0.13.0.0"; + sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers deepseq formatn mtl numhask-space + optparse-applicative recursion-schemes text vector + ]; + executableHaskellDepends = [ + base clock containers deepseq formatn mtl optparse-applicative text + ]; + benchmarkHaskellDepends = [ base ]; + description = "Performance methods and monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "perf-explore"; + }) {}; + "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -237608,8 +237976,8 @@ self: { pname = "pg-entity"; version = "0.0.4.4"; sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2"; - revision = "2"; - editedCabalFile = "19firm055d3j9gw8cf6qb6n2jy5jgs287mcgmskbcj78fs1a9g62"; + revision = "5"; + editedCabalFile = "1dawp5f6pha1z96bkx34whpqik20azx6aizcv8xrmj0ai6vvkhik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242247,6 +242615,8 @@ self: { pname = "pointfree"; version = "1.1.1.12"; sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; + revision = "1"; + editedCabalFile = "1nl2rbkg4dl5ljg77fazg88xs496hx1q7vj3b9wiqvf96g9j2lyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246396,6 +246766,84 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-hmac-drbg" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , criterion, ppad-sha256, ppad-sha512, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "ppad-hmac-drbg"; + version = "0.1.1"; + sha256 = "0wqkl3bk2yzyz4ldzx8njf9qawwfcr9ya3alpmdqid68bldagxl7"; + libraryHaskellDepends = [ base bytestring primitive ]; + testHaskellDepends = [ + attoparsec base base16-bytestring bytestring ppad-sha256 + ppad-sha512 tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ppad-sha256 + ]; + description = "HMAC-based deterministic random bit generator"; + license = lib.licenses.mit; + }) {}; + + "ppad-secp256k1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-secp256k1"; + version = "0.1.0"; + sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; + libraryHaskellDepends = [ + base bytestring ppad-hmac-drbg ppad-sha256 + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring tasty + tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base base16-bytestring bytestring criterion deepseq + ]; + description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; + license = lib.licenses.mit; + }) {}; + + "ppad-sha256" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha256"; + version = "0.2.1"; + sha256 = "0l33nmpp26d9mha8cr2r4p8b1xp2211rdm1gd9rk6lfg1vzw7a1f"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-256 and HMAC-SHA256 algorithms"; + license = lib.licenses.mit; + }) {}; + + "ppad-sha512" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha512"; + version = "0.1.1"; + sha256 = "0hm4z1samk203p7m2qwfg58mcadmybc987plg31rwf29s0z63yvy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-512 and HMAC-SHA512 algorithms"; + license = lib.licenses.mit; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -246693,12 +247141,17 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: + ({ mkDerivation, adjunctions, base, deepseq, pretty-simple + , prettyprinter, recover-rtti, text + }: mkDerivation { pname = "predicate-transformers"; - version = "0.15.0.0"; - sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; - libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; + version = "0.17.0.0"; + sha256 = "0ifqa30w96jm5l9834qcga6ml2vyyk9ywd0ij7is0jf4gp1rdw5c"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + text + ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247533,17 +247986,18 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, markup-parse, numhask-space, optics-core, text, time - , web-rep + , containers, doctest-parallel, markup-parse, numhask-space + , optics-core, text, time, web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.0.0"; - sha256 = "1mpbn9i9h3g374nn6v7h664rypcxwbq3l94bxxmwy6jzpp8hzz0q"; + version = "0.2.2.0"; + sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; libraryHaskellDepends = [ async base box bytestring chart-svg containers markup-parse numhask-space optics-core text time web-rep ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247999,8 +248453,8 @@ self: { pname = "primitive"; version = "0.9.0.0"; sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; - revision = "1"; - editedCabalFile = "0g6rsz6hbpyfwbai04gmxil7wfcs1nd0xxcycvqwfn9mkr0ca21f"; + revision = "2"; + editedCabalFile = "0nc7cd9921bzf31k48pnmx3k2bfaxakgv3jchn4215qzzx7by86y"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -248103,8 +248557,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.2"; - sha256 = "0z7xgd42dg5dq2ikjdbxjq39acv98s0p0sk3fincapw9vnxicnqy"; + version = "0.10.2.1"; + sha256 = "0h3q5zr0k3rns1mq4y56d2ji477h1kjqsv6hp3bbs0yfzkjjk5z2"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -248311,6 +248765,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-unlifted_2_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: + mkDerivation { + pname = "primitive-unlifted"; + version = "2.2.0.0"; + sha256 = "06r10v5dp1a4zpvv8ffmjab8bjsn5gmkx7irr02xwahwb8q4dv69"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; + description = "Primitive GHC types with unlifted types inside"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -248748,12 +249222,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_24_0" = callPackage + "process_1_6_25_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.24.0"; - sha256 = "1fl1y0zc4dsifw1f5nkmy18l46i8wlkcq9h8jp2cm4gzww8x92qy"; + version = "1.6.25.0"; + sha256 = "0rbfwyz2418nw15fb5a8l1f8vsyzcz4wjakpx49b259rdibf0vs9"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -250035,8 +250509,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.2"; - sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; + version = "0.1.3"; + sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -250175,8 +250649,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "1"; - editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; + revision = "2"; + editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -251763,6 +252237,26 @@ self: { broken = true; }) {}; + "pure-noise" = callPackage + ({ mkDerivation, base, deepseq, mwc-random, tasty, tasty-bench + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pure-noise"; + version = "0.1.0.1"; + sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base tasty tasty-discover tasty-hunit tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base deepseq mwc-random tasty tasty-bench vector + ]; + description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite."; + license = lib.licenses.bsd3; + }) {}; + "pure-priority-queue" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -253170,22 +253664,6 @@ self: { }) {}; "qrcode-core" = callPackage - ({ mkDerivation, base, binary, bytestring, case-insensitive - , containers, dlist, primitive, text, vector - }: - mkDerivation { - pname = "qrcode-core"; - version = "0.9.9"; - sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; - libraryHaskellDepends = [ - base binary bytestring case-insensitive containers dlist primitive - text vector - ]; - description = "QR code library in pure Haskell"; - license = lib.licenses.mit; - }) {}; - - "qrcode-core_0_9_10" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, dlist, primitive, text, vector }: @@ -253199,26 +253677,9 @@ self: { ]; description = "QR code library in pure Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qrcode-juicypixels" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; - version = "0.8.5"; - sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_6" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -253232,7 +253693,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qsem" = callPackage @@ -254299,8 +254759,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.5"; - sha256 = "0w54yxwmrf228q0bi3cymlfm2gbv098i0yfpm8xqp6wl5afm5291"; + version = "0.0.1.6"; + sha256 = "1vm8654n4s0ylqssihwkv5w7gg9ml6ks8cbvbdfvcff7xmc38yrv"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -257082,6 +257542,25 @@ self: { license = lib.licenses.asl20; }) {}; + "rawlock" = callPackage + ({ mkDerivation, base, io-classes, io-sim, mtl, nothunks + , QuickCheck, strict-mvar, strict-stm, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "rawlock"; + version = "0.1.0.0"; + sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; + libraryHaskellDepends = [ + base io-classes nothunks strict-mvar strict-stm + ]; + testHaskellDepends = [ + base io-classes io-sim mtl QuickCheck strict-stm tasty + tasty-quickcheck + ]; + description = "A writer-biased RAW lock"; + license = lib.licenses.asl20; + }) {}; + "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -257379,29 +257858,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base , base64-bytestring, bytestring, contravariant, generic-lens - , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens - , mtl, optparse-applicative, polysemy-log, polysemy-plugin - , polysemy-time, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, testcontainers, text, time, transformers, ulid - , uuid + , hedgehog, hedgehog-extras, http-client, hw-polysemy, hw-prelude + , microlens, mtl, optparse-applicative, polysemy-log + , polysemy-plugin, polysemy-time, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, testcontainers, text, time + , transformers, ulid, uuid }: mkDerivation { pname = "rds-data"; - version = "0.0.0.10"; - sha256 = "15kxk1k59b97nbs1kj2j8gy473bdzmzv7684kr3vwhd0mjwg69z2"; + version = "0.1.0.0"; + sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-rds amazonka-rds-data amazonka-secretsmanager base base64-bytestring bytestring - contravariant generic-lens hw-polysemy microlens mtl polysemy-log - polysemy-plugin text time transformers ulid uuid + contravariant generic-lens hw-polysemy hw-prelude microlens mtl + polysemy-log polysemy-plugin text time transformers ulid uuid ]; executableHaskellDepends = [ aeson amazonka amazonka-rds-data base bytestring generic-lens - hedgehog http-client hw-polysemy microlens optparse-applicative - polysemy-log polysemy-plugin polysemy-time resourcet stm - testcontainers text time ulid uuid + hedgehog http-client hw-polysemy hw-prelude microlens + optparse-applicative polysemy-log polysemy-plugin polysemy-time + resourcet stm testcontainers text time ulid uuid ]; testHaskellDepends = [ aeson aeson-pretty amazonka amazonka-core amazonka-rds @@ -257684,8 +258163,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.6"; - sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq"; + version = "0.5.7"; + sha256 = "1wj790yahgham9llbw3c642lmi9nliy4bx48d3pws3i6hpvvi7k7"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -258222,8 +258701,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.3"; - sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; + version = "0.1.0.4"; + sha256 = "1ibyp3zhfassg1yhfjnn636mbcbd6b7n42y2pzcnsmhjs8n78j2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -258475,18 +258954,26 @@ self: { }) {}; "recommender-als" = callPackage - ({ mkDerivation, base, containers, data-default-class, hmatrix - , parallel, random, vector + ({ mkDerivation, base, bytestring, cassava, containers + , data-default-class, hmatrix, optparse-applicative, parallel + , random, text, vector }: mkDerivation { pname = "recommender-als"; - version = "0.2.1.1"; - sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; + version = "0.2.2.0"; + sha256 = "19as4cd5p2y174zxn5rksa5hza5l667wkk9r40ny3lwmrgkng905"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; + executableHaskellDepends = [ + base bytestring cassava containers data-default-class + optparse-applicative text vector + ]; description = "Recommendations using alternating least squares algorithm"; license = lib.licenses.bsd3; + mainProgram = "movielens"; }) {}; "record" = callPackage @@ -262118,10 +262605,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.1.0"; - sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; - revision = "3"; - editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; + version = "1.2.2.0"; + sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -263286,15 +263771,20 @@ self: { "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show + , type-spec }: mkDerivation { pname = "rerefined"; - version = "0.6.0"; - sha256 = "0msawph4qcl3ch2821bq1kfjmzkxl6vkhglcp6glimkcsmkbabyv"; + version = "0.8.0"; + sha256 = "1w6p7sfl5mcq37cqlyfk3zzfb3sbw12idhdnk97jbrn0psms12rk"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show ]; + testHaskellDepends = [ + base mono-traversable QuickCheck template-haskell text + text-builder-linear type-level-show type-spec + ]; description = "Refinement types, again"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -263593,6 +264083,27 @@ self: { broken = true; }) {}; + "resource-registry" = callPackage + ({ mkDerivation, base, bimap, containers, generics-sop, io-classes + , mtl, nothunks, QuickCheck, quickcheck-state-machine, si-timers + , strict-mvar, strict-stm, tasty, tasty-quickcheck, tree-diff + }: + mkDerivation { + pname = "resource-registry"; + version = "0.1.0.0"; + sha256 = "0mkx8hf6k0117c15kq3cyqgxbfwjjk0yywp5xf6svdi5g2xpkg5p"; + libraryHaskellDepends = [ + base bimap containers io-classes mtl nothunks strict-stm + ]; + testHaskellDepends = [ + base containers generics-sop io-classes mtl QuickCheck + quickcheck-state-machine si-timers strict-mvar strict-stm tasty + tasty-quickcheck tree-diff + ]; + description = "Track allocated resources"; + license = lib.licenses.asl20; + }) {}; + "resource-simple" = callPackage ({ mkDerivation, base, containers, monad-control, monad-fork , mtl-evil-instances, transformers, transformers-base @@ -265337,8 +265848,8 @@ self: { }: mkDerivation { pname = "ring-buffer"; - version = "0.4"; - sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; + version = "0.4.1"; + sha256 = "0j5ysm2aliq06cic2y21587lcighagih9vc48dr7z4mvrfym4yz7"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; @@ -270136,7 +270647,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_1_0" = callPackage + "sbp_6_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -270145,8 +270656,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.1.0"; - sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; + version = "6.2.1"; + sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273002,8 +273513,8 @@ self: { }: mkDerivation { pname = "sel"; - version = "0.0.1.0"; - sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; + version = "0.0.2.0"; + sha256 = "0gidvbkcjgyq47gh2p19iawv8jcs7ajvih4mk6pwwbkjs8iybpx4"; libraryHaskellDepends = [ base base16 bytestring libsodium-bindings text text-display ]; @@ -274172,6 +274683,8 @@ self: { pname = "sequitur"; version = "0.2.0.0"; sha256 = "1k38xkhyika7aamzrkalc7kbz0v832amj4gxxs9l6si9v19ja185"; + revision = "1"; + editedCabalFile = "1l5jz58wxr5a20pjg842x931w195ab50n4w0jrbppchc836080fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276991,34 +277504,6 @@ self: { }) {}; "servant-static-th" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, doctest, filepath, Glob, hspec-wai, http-media - , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai - }: - mkDerivation { - pname = "servant-static-th"; - version = "1.0.0.0"; - sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html bytestring containers directory filepath http-media - semigroups servant servant-blaze servant-server template-haskell - text - ]; - testHaskellDepends = [ - base blaze-html bytestring directory doctest filepath Glob - hspec-wai servant servant-blaze servant-server tasty tasty-hspec - tasty-hunit wai - ]; - description = "Embed a directory of static files in your Servant server"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-static-th_1_0_0_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hspec, hspec-wai, http-media, semigroups , servant, servant-blaze, servant-server, tasty, tasty-hspec @@ -279775,8 +280260,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.1"; - sha256 = "1ighr9py1c2njiwdzb4fy0rlz7k8zb51la5mr8ciwh7r8zkmi0gv"; + version = "0.11.0.3"; + sha256 = "1hkf1p2qjb5jc7qkizwsrcb16fhnf2jvqg1y17ly0pgr22lkvxf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279849,10 +280334,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.4.1"; - sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; - revision = "1"; - editedCabalFile = "1ivpa3nrbp8qjam99m6dblhakc8gml1hhhigsmb708ndsyqfqa2i"; + version = "0.0.5.0"; + sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -281904,22 +282387,23 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, containers, megaparsec, mtl - , parser-combinators, prettyprinter, tasty, tasty-hunit, text + ({ mkDerivation, base, containers, filepath, hspec + , hspec-expectations, hspec-golden, hspec-megaparsec, megaparsec + , mtl, parser-combinators, pretty-show, prettyprinter + , raw-strings-qq, text }: mkDerivation { pname = "simple-sql-parser"; - version = "0.7.1"; - sha256 = "0jzmc5ian4y2jpng8c5xqf8igx5h186nw131vh6vq76nyzxxbx87"; - isLibrary = true; - isExecutable = true; + version = "0.8.0"; + sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; libraryHaskellDepends = [ base containers megaparsec mtl parser-combinators prettyprinter text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators prettyprinter - tasty tasty-hunit text + base containers filepath hspec hspec-expectations hspec-golden + hspec-megaparsec megaparsec mtl parser-combinators pretty-show + prettyprinter raw-strings-qq text ]; description = "A parser for SQL"; license = lib.licenses.bsd3; @@ -288682,13 +289166,14 @@ self: { }) {}; "specup" = callPackage - ({ mkDerivation, base, bytestring, extra, hspec, hspec-core - , megaparsec, optparse-applicative, stache, text, yaml + ({ mkDerivation, base, bytestring, directory, extra, hspec + , hspec-core, megaparsec, optparse-applicative, process, stache + , text, yaml }: mkDerivation { pname = "specup"; - version = "0.2.0.1"; - sha256 = "054v8qffs9wwl6vnfxmjv0753bchvsjibbvcs8fnnmy8si5hk80h"; + version = "0.2.0.2"; + sha256 = "19419bzrgaky1ja5isx15fl1xbi9yrxh8i7nd06mh7bmymsprxja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288697,7 +289182,9 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring hspec hspec-core text ]; + testHaskellDepends = [ + base bytestring directory extra hspec hspec-core process text + ]; description = "Manage the application of templates to custom yaml"; license = lib.licenses.gpl2Only; mainProgram = "specup"; @@ -290731,15 +291218,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_3" = callPackage + "stack-all_0_6_4" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.3"; - sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; + version = "0.6.4"; + sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -292045,6 +292532,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "static-bytes_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory + , primitive, QuickCheck, rio, text, vector + }: + mkDerivation { + pname = "static-bytes"; + version = "0.1.1"; + sha256 = "14a0ww31y54hsvv2qf1wchpvzbsnxjjwgm13h9ysc3fclkwa0ba9"; + libraryHaskellDepends = [ + base bytestring memory primitive rio vector + ]; + testHaskellDepends = [ + base bytestring hspec memory primitive QuickCheck rio text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "static-canvas" = callPackage ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { @@ -293970,27 +294477,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.3.2"; - sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -294009,7 +294495,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -294424,20 +294909,24 @@ self: { }) {}; "streamly-archive" = callPackage - ({ mkDerivation, archive, base, bytestring, cryptonite, directory - , filepath, QuickCheck, streamly, streamly-core, tar, tasty - , tasty-hunit, tasty-quickcheck, temporary, zlib + ({ mkDerivation, archive, async, base, bytestring, containers + , cryptonite, directory, filepath, QuickCheck, split, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.2.0"; - sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; + version = "0.3.0"; + sha256 = "1azjv8lsy4mp9brz6zdfls4srxr8zl3ki80d50k7ikzxhv117sp1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring streamly streamly-core ]; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ - base bytestring cryptonite directory filepath QuickCheck streamly - streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib + async base bytestring containers cryptonite directory filepath + QuickCheck split streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -294578,21 +295067,24 @@ self: { }) {}; "streamly-lmdb" = callPackage - ({ mkDerivation, async, base, bytestring, directory, lmdb - , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck - , temporary + ({ mkDerivation, async, base, bytestring, cereal, containers + , directory, lifted-base, lmdb, monad-control, mtl, QuickCheck + , random, safe-exceptions, stm, streamly, streamly-core, tasty + , tasty-hunit, tasty-quickcheck, temporary, transformers, vector }: mkDerivation { pname = "streamly-lmdb"; - version = "0.7.0"; - sha256 = "1hr3zpvvnazxss12nqys000vcgvbni3c7zl14pi3j838dsw72qwi"; + version = "0.8.0"; + sha256 = "1yi3nfkv8jd3wl4hap4zcxs760ff61a0yxqvqz0jv0f0164czjkp"; libraryHaskellDepends = [ - async base bytestring streamly streamly-core + base bytestring containers directory lifted-base monad-control + safe-exceptions stm streamly streamly-core ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring directory QuickCheck streamly streamly-core - tasty tasty-quickcheck temporary + async base bytestring cereal containers directory mtl QuickCheck + random streamly streamly-core tasty tasty-hunit tasty-quickcheck + temporary transformers vector ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -296027,8 +296519,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.9.1"; - sha256 = "0bq9vamnzidmcbapn6lc6vyz3lk2m0ld475z6a311xr5x0d70vad"; + version = "0.11.0"; + sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; libraryHaskellDepends = [ base rerefined text text-builder-linear vector vector-sized ]; @@ -298529,14 +299021,14 @@ self: { license = "unknown"; }) {}; - "sydtest-aeson_0_2_0_0" = callPackage + "sydtest-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.2.0.0"; - sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + version = "0.2.0.1"; + sha256 = "0qxbsbrz1vyafg7wx2yappzqj821dr86cafx34rx15zbyrbkmpvz"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq path path-io sydtest text @@ -298661,6 +299153,25 @@ self: { broken = true; }) {}; + "sydtest-hspec_0_4_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm + , sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.4.0.3"; + sha256 = "1vnc6b8vswqbpz6l2rgx4r8k658wzdmv4ca601rfy03539n98nzl"; + libraryHaskellDepends = [ + base hspec-core mtl QuickCheck stm sydtest + ]; + testHaskellDepends = [ base hspec stm sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -300916,43 +301427,45 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, broadcast-chan , bytestring, conduit, containers, data-default, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk + , filepath, gi-cairo-connector, gi-cairo-render, gi-gdk , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-conduit, http-types, multimap, old-locale + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi-base, hslogger, hspec + , hspec-core, hspec-discover, hspec-golden, HStringTemplate + , http-client, http-client-tls, http-conduit, http-types, multimap , optparse-applicative, parsec, process, rate-limit, regex-compat , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir + , temporary, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir , xdg-desktop-entry, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "4.0.2"; - sha256 = "1w1lsz8bk4xq4dzsfi2yf3x036a8y6b14jpil74c1xbicjc74gmg"; + version = "4.0.3"; + sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base broadcast-chan bytestring conduit containers data-default dbus dbus-hslogger directory dyre either - enclosed-exceptions filepath gi-cairo gi-cairo-connector - gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk - gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-conduit http-types multimap old-locale parsec + enclosed-exceptions filepath gi-cairo-connector gi-cairo-render + gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi-base hslogger HStringTemplate + http-client http-client-tls http-conduit http-types multimap parsec process rate-limit regex-compat safe scotty split status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers - xmonad + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xdg-desktop-entry xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base data-default directory hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + base directory filepath hspec hspec-core hspec-golden temporary + ]; + testToolDepends = [ hspec-discover ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; @@ -302699,6 +303212,8 @@ self: { pname = "tasty-flaky"; version = "0.1.0.0"; sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; + revision = "1"; + editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; libraryHaskellDepends = [ base retry tagged tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Handle flaky Tasty-based tests"; @@ -304169,8 +304684,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4"; - sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; + version = "7.4.1"; + sha256 = "1ppjyq278ri2467vcyb1z01jsqbirls8lazi1lr8pk9z0sw8mz5y"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -304193,8 +304708,10 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.2"; - sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; + version = "0.14.3"; + sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; + revision = "1"; + editedCabalFile = "0warsrhsk3vqg9hyr5ircm01shls4n201z7nmjigli1nzzidljf8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307404,6 +307921,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_11" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, containers, criterion, deepseq + , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec + , hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.11"; + sha256 = "1hp8bw5cmppdwqjvnmv7h38rckvdpxrzgcvbllgvf4zm9ns6dsr8"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring containers + ghc-boot-th ghc-prim template-haskell text th-abstraction + transformers transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + deriving-compat generic-deriving ghc-prim hspec QuickCheck + quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -307441,6 +307988,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show-instances_3_9_9" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , 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.9"; + sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + ghc-boot-th haskeline hpc nonempty-vector 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 + nonempty-vector 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; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308265,8 +308848,8 @@ self: { pname = "th-lift"; version = "0.8.4"; sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "2"; - editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; + revision = "3"; + editedCabalFile = "053glydkbz2h03s4l0isbabp4w4w4b8k3xfd61awf5vdnnyrq612"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308275,6 +308858,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift_0_8_5" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.5"; + sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -308315,8 +308914,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "3"; - editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; + revision = "4"; + editedCabalFile = "10fq55a34h1cysgigf1s2vlb0ka9s7d0lklpk63zla53fx7jshrl"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -308328,6 +308927,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_15" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.15"; + sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -311471,7 +312090,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_0" = callPackage + "tls_2_1_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -311480,8 +312099,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.0"; - sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; + version = "2.1.1"; + sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -314391,7 +315010,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_1" = callPackage + "tree-diff_0_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -314401,10 +315020,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.1"; - sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; - revision = "1"; - editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; + version = "0.3.2"; + sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316132,8 +316749,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.1.2.0"; - sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; + version = "2.2.0.0"; + sha256 = "1d69hc5nxc6pxbwbf13ch9yfmf9zphznv1w9hmszbndjwpc767nj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -318712,12 +319329,12 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_6" = callPackage + "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.6"; - sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + version = "0.1.7"; + sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -318756,8 +319373,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "6"; - editedCabalFile = "0za67vc1lvadrl6r287cmkkz7cnharm1yhsyin8qbn9xlm5r8ci0"; + revision = "7"; + editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -319759,8 +320376,8 @@ self: { }: mkDerivation { pname = "unclogging"; - version = "0.1.0.2"; - sha256 = "1w38pifsff5c2p22afnnw6c6n5qxivyvbdciy5z0d46q7nxqgysr"; + version = "0.1.0.3"; + sha256 = "1iy5aacr19xcabs0q2a2vqc43lsaxayy8avw0wbnkqnb5y7cjm5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -319776,6 +320393,17 @@ self: { mainProgram = "unclogging"; }) {}; + "unconditional-jump" = callPackage + ({ mkDerivation, base, int-supply }: + mkDerivation { + pname = "unconditional-jump"; + version = "1.0.0"; + sha256 = "1nmzqph0wchzr2cq7009d9xfchryb0nis74mcj7nbkz42r14k570"; + libraryHaskellDepends = [ base int-supply ]; + description = "Unconditional jumps"; + license = lib.licenses.bsd3; + }) {}; + "unconstrained" = callPackage ({ mkDerivation }: mkDerivation { @@ -321483,15 +322111,15 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.2.1"; - sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; + version = "1.8.2.2"; + sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -321501,9 +322129,6 @@ self: { base bytestring hedgehog tasty tasty-hedgehog text ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; }) {}; @@ -321542,8 +322167,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.2"; - sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; + version = "0.7.3"; + sha256 = "11qxh9l2kqx4pqphbbmcbmc9bb2mifnjmzlcbkak5mjj163sskvs"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -323613,8 +324238,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.10.0"; - sha256 = "0y1v4a8shg05mphcly4n77qf8a3jp43girc9kf3302p8sjgx2zv2"; + version = "0.0.11.0"; + sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -325473,8 +326098,8 @@ self: { pname = "vector"; version = "0.13.1.0"; sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; - revision = "1"; - editedCabalFile = "03fpy8vnjyk7hw6sci361pmb05jl5z05yb08yjv5wxqxnp7jq0xw"; + revision = "2"; + editedCabalFile = "0ii5bzccaw632sjz9avbasmfabxc82w9vrn6lala9x9d1dyllmn8"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -326068,8 +326693,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "1"; - editedCabalFile = "17sa7mq3maphzgwdjwxr1q9dm92gz4hcbyk0d3hkayqxswp9x9hn"; + revision = "2"; + editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -327209,8 +327834,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.2.0"; - sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; + version = "0.5.2.1"; + sha256 = "006y380fva59xr5wv6vn802wxssd91fgvfvb3g65zscv8dhb0z5d"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -328580,6 +329205,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_5_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, fast-logger + , http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.5.0"; + sha256 = "1171qfz6wlmq69virwvlg79j4smk6sqhdvrdpnisr50zdc3x7ysw"; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -329289,6 +329930,8 @@ self: { pname = "wai-middleware-throttle"; version = "0.3.0.1"; sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq"; + revision = "1"; + editedCabalFile = "1d6zyjpvjm03vsmi04n9zdmaxlq5by326lyf0xlvh05562jnvrqc"; libraryHaskellDepends = [ base bytestring bytestring-builder cache clock containers hashable http-types mtl network safe-exceptions stm text token-bucket @@ -330218,7 +330861,7 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_2" = callPackage + "warp_3_4_3" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -330228,8 +330871,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.2"; - sha256 = "0b7f5darsa7n2bwlnj46xrgwbrb46yl62qyrcq84hvdpq2sfnxdl"; + version = "3.4.3"; + sha256 = "1g6g3bm8a4yjrd3h6r31ypf93r2as93d7cy17z6chwv8p41v0c86"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -330916,15 +331559,16 @@ self: { "web-rep" = callPackage ({ mkDerivation, async, base, bifunctors, box, box-socket - , bytestring, flatparse, markup-parse, mtl, optics-core - , optics-extra, optparse-applicative, profunctors, scotty - , string-interpolate, text, transformers, unordered-containers - , wai-middleware-static, wai-websockets, websockets + , bytestring, doctest-parallel, flatparse, markup-parse, mtl + , optics-core, optics-extra, optparse-applicative, profunctors + , scotty, string-interpolate, text, transformers + , unordered-containers, wai-middleware-static, wai-websockets + , websockets }: mkDerivation { pname = "web-rep"; - version = "0.12.1.0"; - sha256 = "0hiqmivic82plziwa2fvc3rfz1h60f8i7vcb6hw65pfrz1aswk6n"; + version = "0.12.3.0"; + sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330936,6 +331580,7 @@ self: { executableHaskellDepends = [ base box markup-parse optics-core optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "representations of a web page"; license = lib.licenses.bsd3; mainProgram = "web-rep-example"; @@ -331181,20 +331826,20 @@ self: { }) {}; "web3-crypto" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + ({ mkDerivation, aeson, base, bytestring, containers, crypton , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory , memory-hexstring, text, uuid-types, vector }: mkDerivation { pname = "web3-crypto"; - version = "1.0.0.0"; - sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + version = "1.0.1.0"; + sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite memory memory-hexstring + aeson base bytestring containers crypton memory memory-hexstring text uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers cryptonite hspec hspec-contrib + aeson base bytestring containers crypton hspec hspec-contrib hspec-discover hspec-expectations memory memory-hexstring text uuid-types vector ]; @@ -331644,8 +332289,8 @@ self: { }: mkDerivation { pname = "webdriver-wrapper"; - version = "0.2.0.0"; - sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; + version = "0.2.0.1"; + sha256 = "1dvd2649vapwd8qcfv6arsi119rffbb89mzcpdcwdf827x243sci"; libraryHaskellDepends = [ aeson async base bytestring directory extra filepath http-conduit http-types process process-extras retry string-interpolate tar text @@ -333323,6 +333968,8 @@ self: { pname = "window-utils"; version = "0.2.2.0"; sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; + revision = "1"; + editedCabalFile = "154cqir749zr19vap4zxm1dfj6ylz6p7rpqm0n0kmg2vl05ksimv"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -333536,6 +334183,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.2.2.0"; + sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -339289,8 +339956,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.10"; - sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; + version = "0.14.11"; + sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339564,19 +340231,17 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, foldable1-classes-compat, free, kan-extensions, lens - , profunctors, strict, template-haskell, th-abstraction - , transformers + , either, free, kan-extensions, lens, profunctors, strict + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "yaya"; - version = "0.6.2.0"; - sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; + version = "0.6.2.2"; + sha256 = "0b6sd8rdp6qys45s2lps0nhmqbs9x63axmhh3k71y81lmzyq1cax"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either foldable1-classes-compat free kan-extensions - lens profunctors strict template-haskell th-abstraction - transformers + base comonad either free kan-extensions lens profunctors strict + template-haskell th-abstraction transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -339591,8 +340256,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.2.0"; - sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; + version = "0.1.2.1"; + sha256 = "17akwh7inlcnizhx600ydf5j6fgbl25cnwm2fr2f6rlabkxvraki"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -339607,8 +340272,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.2"; - sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; + version = "0.3.0.3"; + sha256 = "1adqxgpgarwka93h9xzx6443vj6b0nx4cyrh3dp38zcq2c7xji2v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -339621,14 +340286,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , splitmix, yaya + , yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.1"; - sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; + version = "0.2.0.2"; + sha256 = "13c8zyv83sik5ms2p49850jrpvhmr4wacz27ib79pbgp2lh538n9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; + libraryHaskellDepends = [ base QuickCheck yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -339655,15 +340320,15 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, comonad - , doctest, free, hedgehog, lens, yaya, yaya-hedgehog + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest, free + , hedgehog, lens, yaya, yaya-hedgehog }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.1.1"; - sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; + version = "0.4.1.2"; + sha256 = "0n4c2zf6ds2y4433j44hi890rwjchd09qfrdx2s61vis28xqyc1k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; + libraryHaskellDepends = [ base comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -340975,6 +341640,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-form_1_7_9" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , shakespeare, text, time, transformers, wai, xss-sanitize + , yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.7.9"; + sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet shakespeare text time transformers + wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -342016,6 +342704,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-test_1_6_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.19"; + sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + bytestring case-insensitive conduit containers cookie hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -342278,21 +342994,21 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs - , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript - , yi-rope + , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty + , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript, yi-rope }: mkDerivation { pname = "yi"; - version = "0.19.0"; - sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni"; + version = "0.19.2"; + sha256 = "04ppydc16w6m0ldvpxq2xr313rwak18c4k4i1jsqlb8drcwfx7ch"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes - yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim + yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; license = lib.licenses.gpl2Only; @@ -342331,8 +343047,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.3"; - sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; + version = "0.19.4"; + sha256 = "0gahw4cxzk9vfx2cnf63vgpcbn874aandml844z3jj6w4v78vbps"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -342386,8 +343102,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.19.1"; - sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9"; + version = "0.19.2"; + sha256 = "1rghdvcf22rwkjq1p8jdrwlsixy5fi9yclbzfwgyrchzqbrv9nqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -342401,16 +343117,16 @@ self: { "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language, yi-rope + , microlens-platform, pointedlist, stm, text, vty + , vty-crossplatform, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.19.0"; - sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays"; + version = "0.19.1"; + sha256 = "1n73vvyzwl1f94z1gwr2pacw0hnm2gqcqwbji3qps301802337vs"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language yi-rope + stm text vty vty-crossplatform yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; @@ -342538,8 +343254,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.19.0"; - sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z"; + version = "0.19.1"; + sha256 = "0vy0dsrgg3mg1v982v71rlyshsf64rzx25x667ybsk27sl7jp6r0"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -342564,8 +343280,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.19.0"; - sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s"; + version = "0.19.1"; + sha256 = "1j0rq3495ywac5yk5ar7c77jfahi8rm3ivf25wdw0kbfc764bs95"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342582,8 +343298,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.19.0"; - sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y"; + version = "0.19.1"; + sha256 = "1hhf98gvwfl8y51jkab1nxvm8ma1h19qjqzc7nvmjb9mz9c4clzw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342601,10 +343317,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.19.0"; - sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; - revision = "1"; - editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; + version = "0.19.1"; + sha256 = "0d1ishhv6sfk0q711rbapr5srf28n7rrf0m5kjd382r13266wr3a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope From 31e0477d2b29433c3d89d144884d75e8738ec2ad Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 25 Oct 2024 16:18:30 +0200 Subject: [PATCH 007/173] haskellPackages.mpi-hs: 0.7.3.0 -> 0.7.3.1 I do not know why we are ignoring Stackage for this package. https://github.com/NixOS/nixpkgs/commit/fe7d494468a8df2432d1c1ff4f1824dfc9af71cf#commitcomment-148356941 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 269fef0dd6a8..df8173ec4f26 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1414,7 +1414,7 @@ self: super: builtins.intersectAttrs super { mpiImpl = pkgs.mpi.pname; disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); in lib.pipe - (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + (super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; }) ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] ++ disableUnused ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) From 1277fb618e323764021e1fb3c93bf6f63ed75b2e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 24 Oct 2024 11:43:36 +0200 Subject: [PATCH 008/173] yi: re-init at 0.19.2 This reverts commit accf9337b31fe9de5f87751bfd8094ad4fd07bb2 with some additional modifications. --- pkgs/applications/editors/yi/wrapper.nix | 26 ++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 27 ++++--------------- .../haskell-modules/hackage-packages.nix | 25 +++-------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 3 +++ pkgs/top-level/release-haskell.nix | 1 + 7 files changed, 38 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/editors/yi/wrapper.nix diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix new file mode 100644 index 000000000000..962537fdf2f0 --- /dev/null +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -0,0 +1,26 @@ +# To use this for hacking of your Yi config file, drop into a shell +# with env attribute. +{ lib, stdenv, makeWrapper +, haskellPackages +, extraPackages ? (s: []) +}: +let + yiEnv = haskellPackages.ghcWithPackages + (self: [ self.yi ] ++ extraPackages self); +in +stdenv.mkDerivation { + pname = "yi-custom"; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \ + --set NIX_GHC ${yiEnv}/bin/ghc + ''; + + # For hacking purposes + passthru.env = yiEnv; + + inherit (haskellPackages.yi) meta version; +} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d8bc6ad3b76..a55302397bd5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -6839,7 +6839,6 @@ broken-packages: - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 - - yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9fef480d2c11..2d2a835657cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -802,7 +802,7 @@ dont-distribute-packages: - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_6_1_0 + - chart-svg_0_7_0_0 - chart-unit - chassis - chatty @@ -1262,7 +1262,6 @@ dont-distribute-packages: - essence-of-live-coding-pulse - essence-of-live-coding-pulse-example - essence-of-live-coding-quickcheck - - essence-of-live-coding-vivid - essence-of-live-coding-warp - estimators - estreps @@ -1866,6 +1865,7 @@ dont-distribute-packages: - hark - harmony - haroonga-httpd + - harpie-numhask - has-th - hasbolt - hascat @@ -2013,7 +2013,6 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heftia - - heftia-effects - heist-aeson - helic - helics @@ -3028,6 +3027,7 @@ dont-distribute-packages: - perdure - perf - perf-analysis + - perf_0_13_0_0 - perfecthash - periodic-client - periodic-client-exe @@ -3290,6 +3290,7 @@ dont-distribute-packages: - rasa-ext-vim - rascal - raw-feldspar + - rawlock - rawr - razom-text-util - rbr @@ -3379,6 +3380,7 @@ dont-distribute-packages: - reserve - resin - resource-pool-catchio + - resource-registry - resource-simple - respond - rest-client @@ -4289,25 +4291,6 @@ dont-distribute-packages: - yesod-routes-typescript - yesod-session-redis - yesod-worker - - yi - - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - - yi-monokai - - yi-snippet - - yi-solarized - - yi-spolsky - yjftp - yjftp-libs - yoko diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ec9e120d4bf1..e424c08e3a2e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -102465,7 +102465,6 @@ self: { libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "essence-of-live-coding-warp" = callPackage @@ -139313,6 +139312,7 @@ self: { testHaskellDepends = [ base doctest-parallel prettyprinter ]; description = "numhask shim for harpie"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "harpy" = callPackage @@ -257559,6 +257559,7 @@ self: { ]; description = "A writer-biased RAW lock"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "rawr" = callPackage @@ -264102,6 +264103,7 @@ self: { ]; description = "Track allocated resources"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "resource-simple" = callPackage @@ -343012,7 +343014,6 @@ self: { ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "yi"; }) {}; @@ -343032,7 +343033,6 @@ self: { ]; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-core" = callPackage @@ -343063,7 +343063,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -343080,7 +343079,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -343092,7 +343090,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -343112,7 +343109,6 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage @@ -343130,7 +343126,6 @@ self: { ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage @@ -343149,7 +343144,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -343177,7 +343171,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage @@ -343193,7 +343186,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -343213,7 +343205,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -343242,7 +343233,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-language" = callPackage @@ -343270,8 +343260,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -343289,7 +343277,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -343307,7 +343294,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -343326,7 +343312,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -343338,7 +343323,6 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -343378,7 +343362,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -343390,7 +343373,6 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -343402,7 +343384,6 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "yi-vty" = callPackage diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8a8d21480c33..ced1194d2bd6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1261,7 +1261,6 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 520600b554a6..9165ed3d388d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13986,6 +13986,9 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; + # To expose more packages for Yi, override the extraPackages arg. + yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index e83e8a794fa7..b10201ff2091 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -379,6 +379,7 @@ let xmobar xmonadctl xmonad-with-packages + yi zsh-git-prompt ; From a62d4fe4996720888784d5b90f112cc088911143 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 25 Oct 2024 17:39:57 +0200 Subject: [PATCH 009/173] haskell.packages.ghc98*.ghc-lib{,-parser}: use 9.8.3 versions --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index fb7115d6bbd2..a34c2210e7df 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -54,9 +54,9 @@ self: super: { # Version upgrades # th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; + ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022; megaparsec = doDistribute self.megaparsec_9_6_1; # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f From a3532c957dcd5e75894302a3a4d1170713d8769b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 26 Oct 2024 01:19:25 +0200 Subject: [PATCH 010/173] haskell.packages.ghc983.generic-arbitrary: disable broken test suite Fails to compile due to a newly exposed type in deepseq 1.5.10: . --- .../haskell-modules/configuration-ghc-9.8.x.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index a34c2210e7df..91b24ebf9429 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,7 +4,7 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - + inherit (pkgs) lib; in self: super: { @@ -147,3 +147,8 @@ self: super: { }) super.reflex; } +// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { + # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 + # https://github.com/typeable/generic-arbitrary/issues/18 + generic-arbitrary = dontCheck super.generic-arbitrary; +} From 169b24df4179a8ebc96258756e1dfe064da3ef1c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 26 Oct 2024 01:35:13 +0200 Subject: [PATCH 011/173] haskellPackages.password: use crypton, disable scrypt on non-x86 - crypton is maintained, contrary to cryptonite - since the Hackage scrypt package uses SSE2, we can't build it on non-x86 platforms (non x86_64 even probably). The best option is to disable the Scrypt module. To prevent cabal from pulling in scrypt in spite of that, we need to patch build-depends to respect the flag. --- .../configuration-hackage2nix/main.yaml | 2 -- .../haskell-modules/configuration-nix.nix | 29 +++++++++++++++++++ .../haskell-modules/hackage-packages.nix | 3 -- .../password-3.0.4.0-scrypt-conditional.patch | 21 ++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 960d784c07df..c64f66df752c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -829,8 +829,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 - password: [ platforms.x86 ] # uses scrypt, which requries x86 - password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux scat: [ platforms.x86 ] # uses scrypt, which requries x86 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index df8173ec4f26..c58cf0af6570 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -113,6 +113,35 @@ self: super: builtins.intersectAttrs super { '' + drv.preCheck or ""; }) super.agda2lagda; + # - Disable scrypt support since the library used only works on x86 due to SSE2: + # https://github.com/informatikr/scrypt/issues/8 + # - Use crypton as the encryption backend. That override becomes obsolete with + # 3.1.* since cabal2nix picks crypton by default then. + password = + let + scryptSupported = pkgs.stdenv.hostPlatform.isx86; + in + + lib.pipe + (super.password.override ({ + cryptonite = self.crypton; + } // lib.optionalAttrs (!scryptSupported) { + scrypt = null; + })) + ([ + (enableCabalFlag "crypton") + (disableCabalFlag "cryptonite") + # https://github.com/cdepillabout/password/pull/84 + (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch) + (overrideCabal (drv: { + # patch doesn't apply otherwise because of revisions + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + })) + ] ++ lib.optionals (!scryptSupported) [ + (disableCabalFlag "scrypt") + ]); audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e424c08e3a2e..1ec297a9ad39 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -234439,7 +234439,6 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -234465,7 +234464,6 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -234491,7 +234489,6 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch new file mode 100644 index 000000000000..1e9cc4c65ded --- /dev/null +++ b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch @@ -0,0 +1,21 @@ +diff --git a/password/password.cabal b/password/password.cabal +index 506457e..8fa978b 100644 +--- a/password.cabal ++++ b/password.cabal +@@ -186,6 +186,8 @@ test-suite password-tasty + other-modules: + Scrypt + Data.Password.Scrypt ++ build-depends: ++ scrypt + ghc-options: + -threaded -O2 -rtsopts -with-rtsopts=-N + build-depends: +@@ -195,7 +197,6 @@ test-suite password-tasty + , bytestring + , memory + , quickcheck-instances +- , scrypt + , tasty + , tasty-hunit + , tasty-quickcheck From 0d6cba9f6571c92c9f895bb222fc2b763fa82c87 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Mon, 28 Oct 2024 11:07:32 +0100 Subject: [PATCH 012/173] maintainers: add griffi-gh --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb00954eda12..bb099994610c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8212,6 +8212,13 @@ githubId = 201997; name = "Eric Seidel"; }; + griffi-gh = { + name = "Alex Prasol"; + email = "prasol258@gmail.com"; + matrix = "@voxel:nyanbinary.rs"; + github = "griffi-gh"; + githubId = 45996170; + }; grimmauld = { name = "Sören Bender"; email = "soeren@benjos.de"; From 04f2513a229955a44397155086aa4aafec946cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20Baksa?= <62813600+Golbinex@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:17:00 +0100 Subject: [PATCH 013/173] fdroidserver: Add libvirt --- pkgs/by-name/fd/fdroidserver/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index d8699f481089..494dcb78a905 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication { defusedxml gitpython libcloud + libvirt mwclient oscrypto paramiko From 907c79314b6be75ca717c980c03d4d8f3f436363 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 31 Oct 2024 01:42:45 +0100 Subject: [PATCH 014/173] nixos/mobilizon: change psql socket dir to none symlinked directory --- nixos/modules/services/web-apps/mobilizon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index b7fad7f3066e..922d385f8d3b 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -52,7 +52,7 @@ let dbUser = if repoSettings.username != null then repoSettings.username else "mobilizon"; postgresql = config.services.postgresql.package; - postgresqlSocketDir = "/var/run/postgresql"; + postgresqlSocketDir = "/run/postgresql"; secretEnvFile = "/var/lib/mobilizon/secret-env.sh"; in From 7eae33bc747672057ddcc4a18bb3a49cffed2127 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Oct 2024 19:10:28 +0100 Subject: [PATCH 015/173] haskellPackages.large-hashable: unstable-2022-06-10 -> 0.1.1.0 --- .../haskell-modules/configuration-common.nix | 38 ------------------- pkgs/top-level/release-haskell.nix | 3 -- 2 files changed, 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8078db8925de..ab4df1defe7a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2276,44 +2276,6 @@ self: super: { # Too strict bound on hspec (<2.11) utf8-light = doJailbreak super.utf8-light; - large-hashable = lib.pipe (super.large-hashable.override { - # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c - utf8-light = null; - }) [ - # 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0 - (assert super.large-hashable.version == "0.1.0.4"; overrideSrc { - version = "unstable-2022-06-10"; - src = pkgs.fetchFromGitHub { - owner = "factisresearch"; - repo = "large-hashable"; - rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1"; - sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0"; - }; - }) - # Provide newly added dependencies - (overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.cryptonite - self.memory - ]; - testHaskellDepends = drv.testHaskellDepends or [] ++ [ - self.inspection-testing - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/24 - (overrideCabal (drv: { - testFlags = drv.testFlags or [] ++ [ - "-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$" - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/25 - # Currently broken with text >= 2.0 - (overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") { - broken = true; - hydraPlatforms = []; - })) - ]; - # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 bson = appendConfigureFlag "-f-_old_network" (super.bson.override { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index b10201ff2091..3842a8e1b128 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -591,9 +591,6 @@ let language-nix = lib.subtractLists [ compilerNames.ghc9101 ] released; - large-hashable = [ - compilerNames.ghc928 - ]; nix-paths = released; titlecase = lib.subtractLists [ compilerNames.ghc9101 From 001ff8665b8b08dd8e3a681c624fd8495e8b6a4b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Oct 2024 19:11:16 +0100 Subject: [PATCH 016/173] haskellPackages.vivid: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ab4df1defe7a..5a79e45bbf42 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2002,14 +2002,6 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; { - # 2024-10-18: Some library dependency must have stopped - # re-exporting 'void', so now it needs an extra import line. - # Fixed in 0.5.2.1. - postPatch = '' - sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs - ''; - }) super.vivid; # Test suite does not compile. feed = dontCheck super.feed; From ef3f248740845fb118392d36a92326aa34653db7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Oct 2024 19:30:24 +0100 Subject: [PATCH 017/173] haskellPackages.Cabal_*: use process 1.6.25.0 for GHC < 9.2.5 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a79e45bbf42..e4e1c2cb0e67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,14 +27,14 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_24_0; + process = self.process_1_6_25_0; })); Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_12_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_24_0; + process = self.process_1_6_25_0; })); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only From 7f5fafc9009446a633573f48b73fdf10ff21f771 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 11:36:08 +0100 Subject: [PATCH 018/173] haskellPackages.http-semantics: restrict to < 0.3.0 http-semantics is a package implementing some logic common between http2 and http3. There aren't matching releases of the latter packages for http-semantics == 0.3.* yet. --- .../configuration-hackage2nix/main.yaml | 3 ++- .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 960d784c07df..bc205e2b2f9b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -36,7 +36,8 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2024-09-12: match xmonad 0.17.* from Stackage LTS - xmonad-contrib < 0.18.1 - + # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment + - http-semantics < 0.3.0 extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e424c08e3a2e..8299160e7373 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -167780,6 +167780,23 @@ self: { }) {}; "http-semantics" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , http-types, network, network-byte-order, time-manager + , utf8-string + }: + mkDerivation { + pname = "http-semantics"; + version = "0.2.1"; + sha256 = "1nzxqrlxmkld86msmdp1zaqvsw3jbbj63n7r0bpgmyq7nnxqxiks"; + libraryHaskellDepends = [ + array base bytestring case-insensitive http-types network + network-byte-order time-manager utf8-string + ]; + description = "HTTP senmatics libarry"; + license = lib.licenses.bsd3; + }) {}; + + "http-semantics_0_3_0" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , http-types, network, network-byte-order, time-manager , utf8-string @@ -167794,6 +167811,7 @@ self: { ]; description = "HTTP senmatics libarry"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "http-server" = callPackage From ae929641efde1f5826b9c202a5686bc18df94978 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 11:37:31 +0100 Subject: [PATCH 019/173] haskell.packages.ghc9101.warp: 3.4.2 -> 3.4.3 --- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index dcb91d08add0..6d0cd255ef9c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -69,7 +69,7 @@ self: super: { integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = super.http2_5_3_4; + http2 = self.http2_5_3_4; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; @@ -84,6 +84,7 @@ self: super: { time-manager = super.time-manager_0_1_0; th-abstraction = doDistribute self.th-abstraction_0_7_0_0; uuid-types = doDistribute self.uuid-types_1_0_6; + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -126,7 +127,6 @@ self: super: { primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); From 7261decc5929425d51287c02f1967b89cad0c9df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 12:13:13 +0100 Subject: [PATCH 020/173] stack: provide requested static-bytes >= 0.1.1 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4e1c2cb0e67..647d96748c7f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1270,6 +1270,7 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries pantry = lself.pantry_0_10_0; + static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0 tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to From a721517d5e05f0ea87ea1b71eb31269158584867 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 12:26:29 +0100 Subject: [PATCH 021/173] top-level/release-haskell.nix: remove ineffectual Cabal-syntax jobs These jobs weren't actually generated since we don't add doDistribute to Cabal-syntax*. It doesn't really matter since the Cabal job always causes the corresponding Cabal-syntax to be built. --- pkgs/top-level/release-haskell.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 3842a8e1b128..d3b8ce555398 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -561,9 +561,7 @@ let compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = released; - Cabal-syntax_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal-syntax_3_12_1_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released; From 71b09ef3316bc0423a906d3960fb5454a753d0ab Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 12:45:24 +0100 Subject: [PATCH 022/173] haskellPackages.Cabal_3_14_0_0: build against matching Cabal-syntax --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/top-level/release-haskell.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 647d96748c7f..969862c387d7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -36,6 +36,9 @@ self: super: { # Use process core package when possible process = self.process_1_6_25_0; })); + Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_0_0; + }); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d3b8ce555398..7a5a87ccf42e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -562,6 +562,7 @@ let ] released; Cabal_3_10_3_0 = released; Cabal_3_12_1_0 = released; + Cabal_3_14_0_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released; From c409770da864bb27b263845e2740aea753444651 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 12:46:35 +0100 Subject: [PATCH 023/173] haskell.compiler.ghcHEAD: 9.11.20240423 -> 9.13.20241031 Unfortunately, it won't be possible to build 9.12 nor, in all likelihood, 9.14 with Cabal 3.12 or 3.14 (which are shipped with GHC 9.8 and 9.10, respectively) due to . Since this has been confirmed by upstream, we'll have to bite the bullet and adjust our hadrian bootstrapping logic to deal with that. Fortunately, we at least have gotten a hackage released version of Cabal 3.14, so we don't need to bootstrap from an in tree Cabal version. --- pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/development/tools/haskell/hadrian/make-hadrian.nix | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8830b8d179b2..10554c4cb48a 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.11.20240423"; - rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6"; - sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9"; + version = "9.13.20241031"; + rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; + sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; } diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index fb9ee89f7cdb..8db821a9794d 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({ # to build hadrian. (Hackage-released conditional dependencies are handled # in ./hadrian.nix without requiring intervention here.) inherit ghc-platform ghc-toolchain; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { + # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c + Cabal = bootPkgs.Cabal_3_14_0_0; }) From 30bae674b0e0c56c7bdc65a45a20313ed228d621 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 13:17:30 +0100 Subject: [PATCH 024/173] haskell.packages.*.Cabal_3_1*: never supply non corepkg process For Cabal, using a more recent version of process is practically never necessary since it has support for a very wide range. The process override is a relic from when we were testing cabal-install with all GHC versions. cabal-install(-solvers) needs directory >=1.3.7.0 which in turn needs a recent version of process to work. Consequently, the used Cabal version needed to use the same process version or we'd have inconsistent dependencies when building cabal-install. Since we only support cabal-install with GHCs that ship new enough versions of both process and directory out of the box, we can drop these overrides. --- .../haskell-modules/configuration-common.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 969862c387d7..2a37000fee8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,20 +22,13 @@ self: super: { # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); - # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + # Make sure that Cabal_* can be built as-is + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { Cabal-syntax = self.Cabal-syntax_3_10_3_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_25_0; - })); - - Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + }); + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { Cabal-syntax = self.Cabal-syntax_3_12_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_25_0; - })); + }); Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { Cabal-syntax = self.Cabal-syntax_3_14_0_0; }); From d2b766c1b10f3fae7f1aacf63ef3eb9ccfcaddbe Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 1 Nov 2024 03:18:57 +0000 Subject: [PATCH 025/173] haskellPackages.snap: fix tests on darwin with sandbox --- pkgs/development/haskell-modules/configuration-darwin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index e931a60ada41..1c432ce3c937 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -331,6 +331,10 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + snap = super.snap.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + warp = super.warp.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); From f908b35d9e873f26fc3702faedf5266852c2f7a7 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 2 Nov 2024 10:51:25 +0100 Subject: [PATCH 026/173] yi: Fix formatting --- pkgs/applications/editors/yi/wrapper.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 962537fdf2f0..98b1697e9e70 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -1,12 +1,14 @@ # To use this for hacking of your Yi config file, drop into a shell # with env attribute. -{ lib, stdenv, makeWrapper -, haskellPackages -, extraPackages ? (s: []) +{ + lib, + stdenv, + makeWrapper, + haskellPackages, + extraPackages ? (s: [ ]), }: let - yiEnv = haskellPackages.ghcWithPackages - (self: [ self.yi ] ++ extraPackages self); + yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in stdenv.mkDerivation { pname = "yi-custom"; From c0aaeb7ff3e0a707e4fd966c1c121cb8f4c6f97b Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 31 Oct 2024 03:30:23 +0000 Subject: [PATCH 027/173] nixos/release{,-combined}: drop the VirtualBox OVA --- .../installing-virtualbox-guest.section.md | 6 ++---- nixos/release-combined.nix | 1 - nixos/release.nix | 15 --------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md index 415119bd8c89..a887a923e57f 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -1,10 +1,8 @@ # Installing in a VirtualBox guest {#sec-installing-virtualbox-guest} Installing NixOS into a VirtualBox guest is convenient for users who -want to try NixOS without installing it on bare metal. If you want to -use a pre-made VirtualBox appliance, it is available at [the downloads -page](https://nixos.org/download/#nixos-virtualbox). If you want to set -up a VirtualBox guest manually, follow these instructions: +want to try NixOS without installing it on bare metal. If you want to set +up a VirtualBox guest, follow these instructions: 1. Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 0724d51b1971..06403e0fe81e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -53,7 +53,6 @@ in rec { (onFullSupported "nixos.iso_plasma6") (onFullSupported "nixos.iso_gnome") (onFullSupported "nixos.manual") - (onSystems ["x86_64-linux"] "nixos.ova") (onSystems ["aarch64-linux"] "nixos.sd_image") (onFullSupported "nixos.tests.acme") (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom") diff --git a/nixos/release.nix b/nixos/release.nix index 797a07ec575e..67fb96740007 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -230,21 +230,6 @@ in rec { inherit system; }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). - ova = forMatchingSystems [ "x86_64-linux" ] (system: - - with import ./.. { inherit system; }; - - hydraJob ((import lib/eval-config.nix { - inherit system; - modules = - [ versionModule - ./modules/installer/virtualbox-demo.nix - ]; - }).config.system.build.virtualBoxOVA) - - ); - # KVM image for proxmox in VMA format proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (system: with import ./.. { inherit system; }; From b5ee5415240d2b903b763fae04f4278ac9c07010 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 3 Nov 2024 12:29:33 +0100 Subject: [PATCH 028/173] doc/haskell: update default GHC version --- doc/languages-frameworks/haskell.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index feeb6f38673d..d01991784977 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc964`: +9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias +for `haskell.packages.ghc966`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. From b84e822858af980539ffc70556bb97a2969e0df7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 3 Nov 2024 12:45:35 +0100 Subject: [PATCH 029/173] mailctl: delete unused source files This was forgotten when the mailctl attribute was removed. --- pkgs/tools/networking/mailctl/default.nix | 97 ----------------------- 1 file changed, 97 deletions(-) delete mode 100644 pkgs/tools/networking/mailctl/default.nix diff --git a/pkgs/tools/networking/mailctl/default.nix b/pkgs/tools/networking/mailctl/default.nix deleted file mode 100644 index 2e6233269280..000000000000 --- a/pkgs/tools/networking/mailctl/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ mkDerivation -, fetchFromGitHub -, aeson -, base -, base64 -, bytestring -, containers -, directory -, hsyslog -, http-conduit -, lib -, network-uri -, optparse-applicative -, pretty-simple -, process -, random -, strings -, template-haskell -, text -, time -, twain -, unix -, utf8-string -, warp -, yaml -}: -mkDerivation rec { - pname = "mailctl"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "pdobsan"; - repo = "mailctl"; - rev = version; - hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU="; - }; - - isLibrary = true; - isExecutable = true; - - libraryHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - executableHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - description = "OAuth2 tool for mail clients"; - homepage = "https://github.com/pdobsan/mailctl"; - changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ aidalgol ]; - mainProgram = "mailctl"; -} From 92ce112366294e58ae099eeb5b289873238ea443 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 3 Nov 2024 12:47:56 +0100 Subject: [PATCH 030/173] haskellPackages.twain: build with up to date dependencies twain 2.2.0.0 means that we can finally stop depending on out of date versions of http2 and warp. --- pkgs/by-name/oa/oama/package.nix | 9 +-- .../haskell-modules/configuration-common.nix | 9 --- .../configuration-hackage2nix/main.yaml | 2 - .../haskell-modules/configuration-nix.nix | 1 - .../haskell-modules/hackage-packages.nix | 71 ------------------- 5 files changed, 1 insertion(+), 91 deletions(-) diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index e938805bac86..1f87b3bffe43 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -15,14 +15,7 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( - final: prev: { - # Dependency twain requires an older version of http2, and we cannot mix - # versions of transitive dependencies. - http2 = final.http2_3_0_3; - warp = final.warp_3_3_30; - } - ); + raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ (overrideCabal overrides) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2a37000fee8f..f265f86fb963 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -362,15 +362,6 @@ self: super: { ] super.threadscope); - # http2 also overridden in all-packages.nix for mailctl. - # twain is currently only used by mailctl, so the .overrideScope shouldn't - # negatively affect any other packages, at least currently... - # https://github.com/alexmingoia/twain/issues/5 - twain = super.twain.overrideScope (self: _: { - http2 = self.http2_3_0_3; - warp = self.warp_3_3_30; - }); - # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a53ca9b9162d..279fedc18701 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -73,7 +73,6 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - - http2 < 3.3 # 2023-08-24: Needed for twain - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript @@ -90,7 +89,6 @@ extra-packages: - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - - warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a41c02d7918a..f6e2ad0755c1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -410,7 +410,6 @@ self: super: builtins.intersectAttrs super { # The curl executable is required for withApplication tests. warp = addTestToolDepend pkgs.curl super.warp; - warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; safe-exceptions = overrideCabal (drv: { # Fix strictDeps build error "could not execute: hspec-discover" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b0766569d38f..aa47d771c7e3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -167967,41 +167967,6 @@ self: { broken = true; }) {}; - "http2_3_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filepath, gauge, Glob, heaps, hspec - , hspec-discover, http-types, mwc-random, network - , network-byte-order, network-run, psqueues, stm, text - , time-manager, typed-process, unix-time, unordered-containers - , vector - }: - mkDerivation { - pname = "http2"; - version = "3.0.3"; - sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager unix-time - ]; - testHaskellDepends = [ - aeson aeson-pretty async base base16-bytestring bytestring - cryptonite directory filepath Glob hspec http-types network - network-byte-order network-run text typed-process - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers @@ -330807,42 +330772,6 @@ self: { broken = true; }) {}; - "warp_3_3_30" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client - , http-date, http-types, http2, iproute, network, process - , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.3.30"; - sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 - ]; - testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers crypton-x509 gauge hashable - http-date http-types network recv time-manager unix unliftio - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "warp" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory From 54d6c4b1547020151a9cf9a4cedf3645a3dcbcc6 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Mon, 28 Oct 2024 12:39:40 +0100 Subject: [PATCH 031/173] earbuds: init at 0.1.9-unstable-2024-06-28 --- pkgs/by-name/ea/earbuds/Cargo.lock | 2534 ++++++++++++++++++++++ pkgs/by-name/ea/earbuds/fix-daemon.patch | 26 + pkgs/by-name/ea/earbuds/package.nix | 77 + 3 files changed, 2637 insertions(+) create mode 100644 pkgs/by-name/ea/earbuds/Cargo.lock create mode 100644 pkgs/by-name/ea/earbuds/fix-daemon.patch create mode 100644 pkgs/by-name/ea/earbuds/package.nix diff --git a/pkgs/by-name/ea/earbuds/Cargo.lock b/pkgs/by-name/ea/earbuds/Cargo.lock new file mode 100644 index 000000000000..8069e07ec078 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/Cargo.lock @@ -0,0 +1,2534 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel 2.3.1", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if 1.0.0", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "bluetooth-serial-port-async" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60c2ea2fbe8638ca6c8d456000df6d77d856b18d43c2c96bdd0e338d99b599e8" +dependencies = [ + "async-std", + "enum_primitive", + "libc", + "mio", + "nix 0.19.1", +] + +[[package]] +name = "blurz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bc2df4d0f1d373b324672d9966aca3f5ba1f03d69edad6240144774539ea59" +dependencies = [ + "dbus 0.6.5", + "hex 0.3.2", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "cc" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "clap" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_complete" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d598e88f6874d4b888ed40c71efbcbf4076f1dfbae128a08a8c9e45f710605d" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote 1.0.36", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi 0.3.9", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_is_enum_variant" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ac8859845146979953797f03cc5b282fb4396891807cdb3d04929a88418197" +dependencies = [ + "heck", + "quote 0.3.15", + "syn 0.11.11", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "earbuds" +version = "0.1.9" +dependencies = [ + "async-std", + "bluetooth-serial-port-async", + "blurz", + "clap", + "clap_complete", + "galaxy_buds_rs", + "human-panic", + "log", + "mpris", + "nix 0.29.0", + "notify-rust", + "ofiles", + "pretty_env_logger", + "rust-pulsectl-fork", + "serde", + "serde_json", + "toml", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-kinds" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "from_variants" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e859c8f2057687618905dbe99fc76e836e0a69738865ef90e46fc214a41bbf2" +dependencies = [ + "from_variants_impl", +] + +[[package]] +name = "from_variants_impl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" +dependencies = [ + "darling", + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "galaxy_buds_rs" +version = "0.2.10" +source = "git+https://github.com/JojiiOfficial/GalaxyBuds-rs#a463fadd83580dedab0e72a7f7b0eb9b53191cd3" +dependencies = [ + "async-std", + "bluetooth-serial-port-async", + "serde", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "human-panic" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" +dependencies = [ + "anstream", + "anstyle", + "backtrace", + "os_info", + "serde", + "serde_derive", + "toml", + "uuid", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libpulse-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libpulse-sys", + "num-derive", + "num-traits 0.2.19", + "winapi 0.3.9", +] + +[[package]] +name = "libpulse-sys" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" +dependencies = [ + "libc", + "num-derive", + "num-traits 0.2.19", + "pkg-config", + "winapi 0.3.9", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "mpris" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cef955a7826b1e00e901a3652e7a895abd221fb4ab61547e7d0e4c235d7feb" +dependencies = [ + "dbus 0.9.7", + "derive_is_enum_variant", + "enum-kinds", + "from_variants", + "thiserror", +] + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 0.1.10", + "libc", + "void", +] + +[[package]] +name = "nix" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.1.1", + "libc", + "memoffset", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.19", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "memchr", +] + +[[package]] +name = "ofiles" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6d996a29712d694df329d19f0e18632466a42c9de4aab73dca087a1a4c1bd7d" +dependencies = [ + "error-chain", + "glob", + "log", + "nix 0.17.0", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if 1.0.0", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rust-pulsectl-fork" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbc90699dd6a642a98b11320c10751a834bda66f0038993578e6afdf514e81e" +dependencies = [ + "libpulse-binding", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "unicode-ident", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml", + "windows", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom", +] + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote 1.0.36", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex 0.4.3", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] diff --git a/pkgs/by-name/ea/earbuds/fix-daemon.patch b/pkgs/by-name/ea/earbuds/fix-daemon.patch new file mode 100644 index 000000000000..bb0ba90c4949 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/fix-daemon.patch @@ -0,0 +1,26 @@ +From 6f52bee7f71e253b0504164fc268750116945108 Mon Sep 17 00:00:00 2001 +From: griffi-gh +Date: Mon, 4 Nov 2024 00:43:49 +0100 +Subject: [PATCH] fix daemon autostart + +--- + src/daemon_utils.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/daemon_utils.rs b/src/daemon_utils.rs +index cd8f49b..f56e100 100644 +--- a/src/daemon_utils.rs ++++ b/src/daemon_utils.rs +@@ -13,7 +13,11 @@ use nix::{ + pub fn start() -> bool { + let curr_exe = env::current_exe().expect("Couldn't get current executable!"); + let mut cmd = Command::new("nohup"); +- let cmd = cmd.arg(curr_exe).arg("-d").arg("--no-fork").arg("-q"); ++ let cmd = cmd ++ .arg(curr_exe) ++ .arg("--daemon").arg("true") ++ .arg("--no-fork").arg("true") ++ .arg("--quiet").arg("true"); + cmd.stdout(Stdio::null()); + cmd.stderr(Stdio::null()); + let status = cmd.spawn(); diff --git a/pkgs/by-name/ea/earbuds/package.nix b/pkgs/by-name/ea/earbuds/package.nix new file mode 100644 index 000000000000..bbb2ff1cff11 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + nix-update-script, + pkg-config, + dbus, + libpulseaudio, + bluez, +}: +rustPlatform.buildRustPackage { + pname = "earbuds"; + version = "0.1.9-unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "JojiiOfficial"; + repo = "LiveBudsCli"; + rev = "df46706e44fa9e7de355b11eab4cc850efe968a3"; + hash = "sha256-IEor7aZnwCA6Rg2gXIYSQ65hV/jJOKehujOSZnVzVis="; + }; + + # fix daemon autostart not working + patches = [ + ./fix-daemon.patch + ]; + + # git dependencies are currently not supported in the fixed-output derivation fetcher. + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "galaxy_buds_rs-0.2.10" = "sha256-95PBmGwHJiXi72Rir8KK7as+i9yjs5nf45SaBhj1geg="; + }; + }; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + dbus + libpulseaudio + bluez + ]; + + # package does not contain any tests + doCheck = false; + + # nativeInstallCheckInputs = [ + # versionCheckHook + # ]; + # versionCheckProgramArg = [ "--version" ]; + # doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd earbuds \ + --bash <($out/bin/earbuds --generate bash) \ + --fish <($out/bin/earbuds --generate fish) \ + --zsh <($out/bin/earbuds --generate zsh) + ''; + + meta = { + description = "Free CLI tool to control your Galaxy Buds"; + homepage = "https://github.com/JojiiOfficial/LiveBudsCli"; + changelog = "https://github.com/JojiiOfficial/LiveBudsCli/releases"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ griffi-gh ]; + mainProgram = "earbuds"; + platforms = lib.platforms.linux; + }; +} From e89fc9caf5e7acd48e1a4663a7860a4ebc2e30c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 18 Oct 2024 17:17:32 +0200 Subject: [PATCH 032/173] bitwarden-desktop: further simplify checkPhase --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index bd023bcb76c8..ce31c0fdd96c 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -127,7 +127,7 @@ in buildNpmPackage rec { postBuild = '' pushd apps/desktop - # desktop_native/index.js loads a file of that name regarldess of the libc being used + # desktop_native/index.js loads a file of that name regardless of the libc being used mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node npm exec electron-builder -- \ @@ -148,17 +148,14 @@ in buildNpmPackage rec { "--skip=password::password::tests::test" ]; - checkPhase = '' - runHook preCheck + preCheck = '' + pushd ${cargoRoot} + cargoCheckType=release + HOME=$(mktemp -d) + ''; - ( - cd ${cargoRoot} - HOME=$(mktemp -d) - cargoCheckType=release - cargoCheckHook - ) - - runHook postCheck + postCheck = '' + popd ''; installPhase = '' From 053fbe5f03de69c2d163b390c3ea8870b6080a81 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 7 Nov 2024 00:40:10 +0900 Subject: [PATCH 033/173] python312Packages.htseq: 2.0.4 -> 2.0.9 Diff: https://github.com/htseq/htseq/compare/release_2.0.4...release_2.0.9 --- pkgs/development/python-modules/htseq/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix index f5327c0edb40..fc965bbae573 100644 --- a/pkgs/development/python-modules/htseq/default.nix +++ b/pkgs/development/python-modules/htseq/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, swig, cython, matplotlib, @@ -15,25 +14,16 @@ }: buildPythonPackage rec { pname = "htseq"; - version = "2.0.4"; + version = "2.0.9"; pyproject = true; src = fetchFromGitHub { owner = "htseq"; repo = "htseq"; rev = "release_${version}"; - hash = "sha256-7ocrmuj9LOtPz9XbI5rKGcdE5JbFz/pZh00Nie65XxE="; + hash = "sha256-i83BY7/p98/pfYzebolNW/6yNwtb2R5ARCSG3rAq2/M="; }; - patches = [ - # https://github.com/htseq/htseq/pull/84 - (fetchpatch { - name = "replace-distutils-with-sysconfig.patch"; - url = "https://github.com/htseq/htseq/commit/f0f1e464ee9aee56f0b44f905e7b3355b0bb8f29.patch"; - hash = "sha256-yDYkXCPy+YFgnk1rnXwCB998aZwVd5nJeejZIgeEzAo="; - }) - ]; - nativeBuildInputs = [ swig ]; build-system = [ From a711606443a94644fadbb999795182645c7cc36a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 6 Nov 2024 12:00:11 -0500 Subject: [PATCH 034/173] ytt: 0.50.0 -> 0.51.0 Diff: https://github.com/carvel-dev/ytt/compare/v0.50.0...v0.51.0 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index a2de21fd7a2b..45a7b65e97d8 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "ytt"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "ytt"; rev = "v${version}"; - sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4="; + sha256 = "sha256-7PN6ejI7Ov0O3oJW71P3s3RWeRrX6M4+GTqsVlr8+7w="; }; vendorHash = null; From 1cd7975c3b87a71c43bb90eb0ac2758cf03e3dfd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 6 Nov 2024 18:26:19 +0100 Subject: [PATCH 035/173] .github/labeler.yml: add automatic labeling for more topics --- .github/labeler.yml | 136 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 074116f1d398..77ed9da6df72 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -8,6 +8,12 @@ - pkgs/development/libraries/agda/**/* - pkgs/top-level/agda-packages.nix +"6.topic: bsd": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/bsd/**/* + "6.topic: cinnamon": - any: - changed-files: @@ -21,6 +27,55 @@ - pkgs/by-name/ne/nemo/**/* - pkgs/by-name/ne/nemo-*/**/* +"6.topic: continuous integration": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/**/* + - ci/**/* + +"6.topic: coq": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/science/logic/coq/**/* + - pkgs/development/coq-modules/**/* + - pkgs/top-level/coq-packages.nix + +"6.topic: crystal": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/compilers/crystal/**/* + +"6.topic: cuda": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/cuda-modules/**/* + - pkgs/top-level/cuda-packages.nix + +"6.topic: darwin": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/darwin/**/* + - pkgs/top-level/darwin-aliases.nix + - pkgs/top-level/darwin-packages.nix + +"6.topic: deepin": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/desktops/deepin/**/* + - pkgs/desktops/deepin/**/* + +"6.topic: docker tools": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/virtualization/docker/**/* + "6.topic: dotnet": - any: - changed-files: @@ -86,6 +141,12 @@ - pkgs/build-support/flutter/*.nix - pkgs/development/compilers/flutter/**/*.nix +"6.topic: games": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/games/**/* + "6.topic: GNOME": - any: - changed-files: @@ -105,6 +166,12 @@ - pkgs/build-support/go/**/* - pkgs/development/compilers/go/**/* +"6.topic: hardware": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/hardware/**/* + "6.topic: haskell": - any: - changed-files: @@ -118,6 +185,28 @@ - pkgs/top-level/haskell-packages.nix - pkgs/top-level/release-haskell.nix +"6.topic: java": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/programs/java.nix + - pkgs/development/compilers/graalvm/**/* + - pkgs/development/compilers/openjdk/**/* + - pkgs/development/compilers/temurin-bin/**/* + - pkgs/development/compilers/zulu/**/* + - pkgs/development/java-modules/**/* + - pkgs/top-level/java-packages.nix + +"6.topic: jitsi": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/networking/jitsi-videobridge.nix + - nixos/modules/services/web-apps/jitsi-meet.nix + - pkgs/servers/web-apps/jitsi-meet/**/* + - pkgs/servers/jitsi-videobridge/**/* + - pkgs/applications/networking/instant-messengers/jitsi/**/* + "6.topic: julia": - any: - changed-files: @@ -205,6 +294,12 @@ - lib/tests/modules.sh - lib/tests/modules/** +"6.topic: musl": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/linux/musl/**/* + "6.topic: nixos": - any: - changed-files: @@ -213,6 +308,13 @@ - pkgs/by-name/sw/switch-to-configuration-ng/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* +"6.topic: nixos-container": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/virtualisation/nixos-containers.nix + - pkgs/tools/virtualization/nixos-container/**/* + "6.topic: nim": - any: - changed-files: @@ -234,6 +336,15 @@ - pkgs/development/tools/pnpm/**/* - pkgs/development/web/nodejs/* +"6.topic: nvidia": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/hardware/video/nvidia.nix + - nixos/modules/services/hardware/nvidia-container-toolkit/**/* + - nixos/modules/services/hardware/nvidia-optimus.nix + - pkgs/os-specific/linux/nvidia-x11/**/* + "6.topic: ocaml": - any: - changed-files: @@ -306,6 +417,19 @@ - pkgs/development/libraries/kde-frameworks/**/* - pkgs/development/libraries/qt-5/**/* +"6.topic: R": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/science/math/R/**/* + - pkgs/development/r-modules/**/* + +"6.topic: rocm": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/rocm-modules/**/* + "6.topic: ruby": - any: - changed-files: @@ -374,6 +498,12 @@ - nixos/tests/make-test-python.nix # legacy # lib/debug.nix has a test framework (runTests) but it's not the main focus +"6.topic: updaters": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/common-updater/**/* + "6.topic: vim": - any: - changed-files: @@ -390,6 +520,12 @@ - any-glob-to-any-file: - pkgs/applications/editors/vscode/**/* +"6.topic: windows": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/windows/**/* + "6.topic: xen-project": - any: - changed-files: From 738d2fee793735852743a3f57b5920bc3a6f1e12 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:44:17 +0100 Subject: [PATCH 036/173] nightfox-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/ni/nightfox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index a19fcea686f0..fd2a32f20c5e 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "14decf0378650b7a960f4761fd6178cda0d07aac"; - hash = "sha256-TWJyj5MlQtNqCuh1GD1LoXEQ4wcobhyKPQXZ31ALcMM="; + rev = "d9534b5275eb4bc588890c7bd8b30cf2b535c8e0"; + hash = "sha256-VVro8kkQisLkTyQVIBDSf55Qfnwb85glWOYWVfJbueI="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From cbf06c0be6bf210de35c4875db75e6d354d2becf Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:51:02 +0100 Subject: [PATCH 037/173] gruvbox-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 2605f504889d..72a3e999840b 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "eed38589ce90aaca4c278e13087c2babaccea4da"; - hash = "sha256-FXzD7wHqh9pZgjGXFYko43yaFCn+Y317N8xRsgt6RhE="; + rev = "d064cd480a1e4802851b35bf051e48c808802c2a"; + hash = "sha256-LOizbRbPj3X0B0bED6fRcwxYeRFY8vtLk0i64pqyIyY="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 76ac69177ae3095d794a4dcae91043b0976bdbe7 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:57:52 +0100 Subject: [PATCH 038/173] tokyonight-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 588125ede99e..346b4d69a03d 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Tokyonight-GTK-Theme"; - rev = "6c8f79f841550a463039e313535c6bc0d55dbde8"; - hash = "sha256-KVUcMffz/ZdCg5ivXC82WczodkckLH3XX73qm418pcE="; + rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64"; + hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From f748977943928c649202ae43aadc8dc3486363f9 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 21:03:07 +0100 Subject: [PATCH 039/173] matrix-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/ma/matrix-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 62f290fa70d1..00a3f052847e 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "Matrix-GTK-Theme"; - rev = "15a799b6e2bd7f3ad89eaffa7d26beebf09b9e68"; - hash = "sha256-gyKHOS3hEppOvc10u8T5wGWlVrFSC29MofMHjEcf8i4="; + rev = "a91254e5827f5fb331308ecf893881bc9643f01a"; + hash = "sha256-XiXKzXzzWcJIfEV8ngczovyjCqH7uX8tToihq66q+jo="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 205faabfebf134a403e25916d9c73dc82bf703a3 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 02:12:45 -0400 Subject: [PATCH 040/173] lib.systems.doubles: add aarch64-windows double --- lib/systems/doubles.nix | 2 +- lib/tests/systems.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 6939e9a40c2d..f60c6a8addef 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -55,7 +55,7 @@ let "wasm64-wasi" "wasm32-wasi" # Windows - "x86_64-windows" "i686-windows" + "aarch64-windows" "x86_64-windows" "i686-windows" ]; allParsed = map parse.mkSystemFromString all; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index f5e7bdd5b705..3a8054ef4bc8 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -60,7 +60,7 @@ lib.runTests ( testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; - testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; + testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "aarch64-windows" "i686-windows" "x86_64-windows" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); }) From b5bf8e3fc7ecb579fc9a30484bcb31554d28b076 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 02:14:36 -0400 Subject: [PATCH 041/173] lib.systems.examples: add aarch64-w64-mingw32 --- lib/systems/examples.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5059f6e0c838..20f96f0849d1 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -325,6 +325,13 @@ rec { libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain }; + # LLVM-based mingw-w64 for ARM + ucrtAarch64 = { + config = "aarch64-w64-mingw32"; + libc = "ucrt"; + useLLVM = true; + }; + # BSDs x86_64-freebsd = { From 613a1dafd55a909ba53292cde11ca60f2f06dd42 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:35:01 -0400 Subject: [PATCH 042/173] windows.*: format with nixfmt --- .../windows/cygwin-setup/default.nix | 48 ++++++++++--- pkgs/os-specific/windows/default.nix | 70 ++++++++++--------- pkgs/os-specific/windows/dlfcn/default.nix | 7 +- pkgs/os-specific/windows/libgnurx/default.nix | 9 ++- .../windows/mcfgthreads/default.nix | 18 ++--- .../os-specific/windows/mingw-w64/default.nix | 25 ++++--- .../os-specific/windows/mingw-w64/headers.nix | 6 +- pkgs/os-specific/windows/mingwrt/default.nix | 11 ++- .../windows/npiperelay/default.nix | 6 +- .../windows/pthread-w32/default.nix | 11 ++- pkgs/os-specific/windows/w32api/default.nix | 6 +- 11 files changed, 146 insertions(+), 71 deletions(-) diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index a88d802c5cf7..9cc920829ecd 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config -, zlib, bzip2, xz, libgcrypt +{ + lib, + stdenv, + fetchcvs, + autoconf, + automake, + libtool, + flex, + bison, + pkg-config, + zlib, + bzip2, + xz, + libgcrypt, }: stdenv.mkDerivation rec { @@ -13,16 +25,30 @@ stdenv.mkDerivation rec { sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; }; - nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; + nativeBuildInputs = [ + autoconf + automake + libtool + flex + bison + pkg-config + ]; - buildInputs = let - mkStatic = lib.flip lib.overrideDerivation (o: { - dontDisableStatic = true; - configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ]; - buildInputs = map mkStatic (o.buildInputs or []); - propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); - }); - in map mkStatic [ zlib bzip2 xz libgcrypt ]; + buildInputs = + let + mkStatic = lib.flip lib.overrideDerivation (o: { + dontDisableStatic = true; + configureFlags = lib.toList (o.configureFlags or [ ]) ++ [ "--enable-static" ]; + buildInputs = map mkStatic (o.buildInputs or [ ]); + propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or [ ]); + }); + in + map mkStatic [ + zlib + bzip2 + xz + libgcrypt + ]; configureFlags = [ "--disable-shared" ]; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7b9bbcc52f79..59806318a23e 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,46 +1,52 @@ -{ lib, stdenv, buildPackages -, newScope, overrideCC, stdenvNoLibc, libcCross +{ + lib, + stdenv, + buildPackages, + newScope, + overrideCC, + stdenvNoLibc, + libcCross, }: -lib.makeScope newScope (self: with self; { +lib.makeScope newScope ( + self: with self; { - cygwinSetup = callPackage ./cygwin-setup { }; + cygwinSetup = callPackage ./cygwin-setup { }; - dlfcn = callPackage ./dlfcn { }; + dlfcn = callPackage ./dlfcn { }; - w32api = callPackage ./w32api { }; + w32api = callPackage ./w32api { }; - mingwrt = callPackage ./mingwrt { }; - mingw_runtime = mingwrt; + mingwrt = callPackage ./mingwrt { }; + mingw_runtime = mingwrt; - mingw_w64 = callPackage ./mingw-w64 { - stdenv = stdenvNoLibc; - }; + mingw_w64 = callPackage ./mingw-w64 { + stdenv = stdenvNoLibc; + }; - # FIXME untested with llvmPackages_16 was using llvmPackages_8 - crossThreadsStdenv = overrideCC stdenvNoLibc - (if stdenv.hostPlatform.useLLVM or false - then buildPackages.llvmPackages.clangNoLibcxx - else buildPackages.gccWithoutTargetLibc.override (old: { - bintools = old.bintools.override { - libc = libcCross; - }; - libc = libcCross; - })); + # FIXME untested with llvmPackages_16 was using llvmPackages_8 + crossThreadsStdenv = overrideCC stdenvNoLibc ( + if stdenv.hostPlatform.useLLVM or false then + buildPackages.llvmPackages.clangNoLibcxx + else + buildPackages.gccWithoutTargetLibc.override (old: { + bintools = old.bintools.override { + libc = libcCross; + }; + libc = libcCross; + }) + ); - mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; + mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; - mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { - stdenv = crossThreadsStdenv; - }; + mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; }; - mcfgthreads = callPackage ./mcfgthreads { - stdenv = crossThreadsStdenv; - }; + mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; }; - npiperelay = callPackage ./npiperelay { }; + npiperelay = callPackage ./npiperelay { }; - pthreads = callPackage ./pthread-w32 { }; + pthreads = callPackage ./pthread-w32 { }; - libgnurx = callPackage ./libgnurx { }; -}) + libgnurx = callPackage ./libgnurx { }; + } +) diff --git a/pkgs/os-specific/windows/dlfcn/default.nix b/pkgs/os-specific/windows/dlfcn/default.nix index d1fba98e840a..1f4ea20d550d 100644 --- a/pkgs/os-specific/windows/dlfcn/default.nix +++ b/pkgs/os-specific/windows/dlfcn/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "dlfcn"; diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index e760bddabfbf..f3bc160e0cff 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -1,8 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: let version = "2.5.1"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "libgnurx"; inherit version; src = fetchurl { diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix index 9eabaf21e44f..2d5771068dc9 100644 --- a/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -15,12 +16,13 @@ stdenv.mkDerivation rec { hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck="; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoreconfHook + outputs = [ + "out" + "dev" ]; + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Threading support library for Windows 7 and above"; homepage = "https://github.com/lhmouse/mcfgthread/wiki"; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 36cdaf84aab6..ed09a560d42b 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,26 +1,31 @@ -{ lib -, stdenv -, windows -, autoreconfHook -, mingw_w64_headers +{ + lib, + stdenv, + windows, + autoreconfHook, + mingw_w64_headers, }: stdenv.mkDerivation { pname = "mingw-w64"; inherit (mingw_w64_headers) version src meta; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; configureFlags = [ "--enable-idl" "--enable-secure-api" - ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ - "--with-default-msvcrt=ucrt" - ]; + ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ]; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ windows.mingw_w64_headers ]; - hardeningDisable = [ "stackprotector" "fortify" ]; + hardeningDisable = [ + "stackprotector" + "fortify" + ]; } diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index d5edaeaa2bd1..aec85256545e 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,4 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 5bf6951cd434..7a116bcfeb80 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchurl }: +{ + stdenv, + lib, + fetchurl, +}: stdenv.mkDerivation rec { pname = "mingwrt"; @@ -14,5 +18,8 @@ stdenv.mkDerivation rec { }; dontStrip = true; - hardeningDisable = [ "stackprotector" "fortify" ]; + hardeningDisable = [ + "stackprotector" + "fortify" + ]; } diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix index d2347edcbaff..a0c22a8552c5 100644 --- a/pkgs/os-specific/windows/npiperelay/default.nix +++ b/pkgs/os-specific/windows/npiperelay/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "npiperelay"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index b17d839554f5..0db99bf4c97d 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchzip }: +{ + lib, + stdenv, + fetchzip, +}: stdenv.mkDerivation { pname = "pthreads-w32"; @@ -9,7 +13,10 @@ stdenv.mkDerivation { sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; }; - makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; + makeFlags = [ + "CROSS=${stdenv.cc.targetPrefix}" + "GC-static" + ]; installPhase = '' runHook preInstall diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 99faeeb7a8bf..e36833852566 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, lib }: +{ + stdenv, + fetchurl, + lib, +}: stdenv.mkDerivation rec { pname = "w32api"; From 14e440390afe2418b3004afbd6b5ae27ad0db7fd Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:36:42 -0400 Subject: [PATCH 043/173] windows.mingw_w64*: 11.0.1 -> 12.0.0 Changelog: https://www.mingw-w64.org/changelog/#v1200-2024-05-29 Only notable change for our purposes is UCRT now being the default, so either it or MSVCRT must be explicitly passed --- pkgs/os-specific/windows/mingw-w64/default.nix | 9 ++++++++- pkgs/os-specific/windows/mingw-w64/headers.nix | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index ed09a560d42b..1d23bab70692 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -4,8 +4,14 @@ windows, autoreconfHook, mingw_w64_headers, + crt ? stdenv.hostPlatform.libc, }: +assert lib.assertOneOf "crt" crt [ + "msvcrt" + "ucrt" +]; + stdenv.mkDerivation { pname = "mingw-w64"; inherit (mingw_w64_headers) version src meta; @@ -18,7 +24,8 @@ stdenv.mkDerivation { configureFlags = [ "--enable-idl" "--enable-secure-api" - ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ]; + "--with-default-msvcrt=${crt}" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index aec85256545e..daae7ee0aa42 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; - version = "11.0.1"; + version = "12.0.0"; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2"; - hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA="; + hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8="; }; preConfigure = '' From 3d51188a761be97ac5e0afd9764f9a0ba213463e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:43:27 -0400 Subject: [PATCH 044/173] windows.mingw_w64*: use lib for autoconf flags --- pkgs/os-specific/windows/mingw-w64/default.nix | 6 +++--- pkgs/os-specific/windows/mingw-w64/pthreads.nix | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 1d23bab70692..2d335af051cf 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--enable-idl" - "--enable-secure-api" - "--with-default-msvcrt=${crt}" + (lib.enableFeature true "idl") + (lib.enableFeature true "secure-api") + (lib.withFeatureAs true "default-msvcrt" crt) ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index 3c5fab4fa708..690bd7ecf662 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,14 +1,17 @@ -{ stdenv, mingw_w64_headers }: +{ + lib, + stdenv, + mingw_w64_headers, + # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'. + # Enabling this makes it work out of the box instead of failing. + withStatic ? true, +}: stdenv.mkDerivation { pname = "mingw_w64-pthreads"; inherit (mingw_w64_headers) version src meta; - configureFlags = [ - # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'. - # Enabling this makes it work out of the box instead of failing. - "--enable-static" - ]; + configureFlags = [ (lib.enableFeature withStatic "static") ]; preConfigure = '' cd mingw-w64-libraries/winpthreads From b57c78d02648f82bb3ff3ba69ae277a9c4ab5036 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:47:26 -0400 Subject: [PATCH 045/173] windows.mingw_w64: fix building on arm --- pkgs/os-specific/windows/mingw-w64/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 2d335af051cf..d8103d7b8d37 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation { (lib.enableFeature true "idl") (lib.enableFeature true "secure-api") (lib.withFeatureAs true "default-msvcrt" crt) + + # Including other architectures causes errors with invalid asm + (lib.enableFeature stdenv.hostPlatform.isi686 "lib32") + (lib.enableFeature stdenv.hostPlatform.isx86_64 "lib64") + (lib.enableFeature stdenv.hostPlatform.isAarch64 "libarm64") ]; enableParallelBuilding = true; From ad338630ff2b316aa296c1722451e5d8b9b8b151 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:49:37 -0400 Subject: [PATCH 046/173] llvmPackages_18.compiler-rt: fix building on windows --- .../development/compilers/llvm/common/compiler-rt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 9c634650dff2..241fad158c3c 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -41,8 +41,8 @@ let # use clean up the `cmakeFlags` rats nest below. haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; - inherit (stdenv.hostPlatform) isMusl isAarch64; - noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; + inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows; + noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows; baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc"; From fb917de147f9db59ca0ec55d69e5ba83f1c1401f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:51:34 -0400 Subject: [PATCH 047/173] llvmPackages_18.libcxx: fix building on windows --- pkgs/development/compilers/llvm/common/libcxx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 17c687f88394..d4b727bd50d2 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -61,7 +61,8 @@ let ]) ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [ + # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245 "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -91,6 +92,9 @@ let "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + # https://github.com/llvm/llvm-project/issues/55245 + "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [ From 72fc0b165adba16e6cceda5b20361eb011edd216 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:03:49 +0100 Subject: [PATCH 048/173] performous: move to pkgs/by-name --- .../default.nix => by-name/pe/performous/package.nix} | 0 pkgs/{games => by-name/pe}/performous/performous-cmake.patch | 0 pkgs/{games => by-name/pe}/performous/performous-fftw.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{games/performous/default.nix => by-name/pe/performous/package.nix} (100%) rename pkgs/{games => by-name/pe}/performous/performous-cmake.patch (100%) rename pkgs/{games => by-name/pe}/performous/performous-fftw.patch (100%) diff --git a/pkgs/games/performous/default.nix b/pkgs/by-name/pe/performous/package.nix similarity index 100% rename from pkgs/games/performous/default.nix rename to pkgs/by-name/pe/performous/package.nix diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/by-name/pe/performous/performous-cmake.patch similarity index 100% rename from pkgs/games/performous/performous-cmake.patch rename to pkgs/by-name/pe/performous/performous-cmake.patch diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/by-name/pe/performous/performous-fftw.patch similarity index 100% rename from pkgs/games/performous/performous-fftw.patch rename to pkgs/by-name/pe/performous/performous-fftw.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cc0cbc90f96..74353267352d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34721,8 +34721,6 @@ with pkgs; pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { }; - pinball = callPackage ../games/pinball { }; pingus = callPackage ../games/pingus { }; From d74b818ad0310c763bc6e30532e8f80ebbf9dd33 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:04:20 +0100 Subject: [PATCH 049/173] performous: reformat --- pkgs/by-name/pe/performous/package.nix | 43 +++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index 20a40922544e..50d33f01d867 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, aubio -, boost -, cmake -, ffmpeg -, fmt -, gettext -, glew -, glibmm -, glm -, icu -, libepoxy -, librsvg -, libxmlxx -, nlohmann_json -, pango -, pkg-config -, portaudio +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + aubio, + boost, + cmake, + ffmpeg, + fmt, + gettext, + glew, + glibmm, + glm, + icu, + libepoxy, + librsvg, + libxmlxx, + nlohmann_json, + pango, + pkg-config, + portaudio, }: stdenv.mkDerivation rec { From 7a32b49687a699fe10b54fa977b486345d1b4464 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 12:29:44 +0800 Subject: [PATCH 050/173] cargo-risczero: move to by-name --- .../default.nix => by-name/ca/cargo-risczero/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/tools/rust/cargo-risczero/default.nix => by-name/ca/cargo-risczero/package.nix} (100%) diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/by-name/ca/cargo-risczero/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-risczero/default.nix rename to pkgs/by-name/ca/cargo-risczero/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff8d0027675..85b85f03f56f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15471,7 +15471,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme { }; - cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { }; cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; From 8d9209e6d7ccbb37458a5304a8e840c18c445f04 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 12:30:49 +0800 Subject: [PATCH 051/173] cargo-risczero: nixfmt --- pkgs/by-name/ca/cargo-risczero/package.nix | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index bf61c32cf778..b453cff8fc5e 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, pkg-config -, openssl -, darwin +{ + lib, + stdenv, + fetchCrate, + rustPlatform, + pkg-config, + openssl, + darwin, }: rustPlatform.buildRustPackage rec { @@ -22,11 +23,13 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; From 37261f87d59c63db0aef819773bf0e229d79e0b9 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 12:32:10 +0800 Subject: [PATCH 052/173] cargo-risczero: add passthru.updateScript --- pkgs/by-name/ca/cargo-risczero/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index b453cff8fc5e..522db664d61c 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -6,6 +6,7 @@ pkg-config, openssl, darwin, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -34,11 +35,13 @@ rustPlatform.buildRustPackage rec { # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Cargo extension to help create, manage, and test RISC Zero projects"; mainProgram = "cargo-risczero"; homepage = "https://risczero.com"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ cameronfyfe ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ cameronfyfe ]; }; } From c357e610d995d1042f12a840cdac97c99d80cad6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:05:47 +0100 Subject: [PATCH 053/173] performous: fix build with ffmpeg 7 --- pkgs/by-name/pe/performous/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index 50d33f01d867..f1082473cf98 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, SDL2, aubio, boost, @@ -43,6 +44,12 @@ stdenv.mkDerivation rec { patches = [ ./performous-cmake.patch ./performous-fftw.patch + (fetchpatch { + name = "performous-ffmpeg.patch"; + url = "https://github.com/performous/performous/commit/f26c27bf74b85fa3e3b150682ab9ecf9aecb3c50.patch"; + excludes = [ ".github/workflows/macos.yml" ]; + hash = "sha256-cQVelET/g2Kx2PlV3pspjEoNIwwn5Yz6enYl5vCMMKo="; + }) ]; postPatch = '' From de9822cc8aa95758bcacb98462a1bb40fb263f62 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 26 Oct 2024 21:24:13 +0800 Subject: [PATCH 054/173] avalanchego: move to by-name --- .../default.nix => by-name/av/avalanchego/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/networking/avalanchego/default.nix => by-name/av/avalanchego/package.nix} (100%) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/by-name/av/avalanchego/package.nix similarity index 100% rename from pkgs/applications/networking/avalanchego/default.nix rename to pkgs/by-name/av/avalanchego/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff8d0027675..16b91255fa60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27898,10 +27898,6 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; - avalanchego = callPackage ../applications/networking/avalanchego { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - avizo = callPackage ../applications/misc/avizo { }; avocode = callPackage ../applications/graphics/avocode { }; From 36e71377e0ac835277df2ff3ca76a81182dc5773 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 26 Oct 2024 21:24:23 +0800 Subject: [PATCH 055/173] avalanchego: nixfmt --- pkgs/by-name/av/avalanchego/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index 97bf552604d4..8b37a1f1b6b9 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -1,8 +1,9 @@ -{ IOKit -, buildGoModule -, fetchFromGitHub -, lib -, stdenv +{ + IOKit, + buildGoModule, + fetchFromGitHub, + lib, + stdenv, }: buildGoModule rec { @@ -39,7 +40,10 @@ buildGoModule rec { homepage = "https://github.com/ava-labs/avalanchego"; changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ urandom qjoly ]; + maintainers = with maintainers; [ + urandom + qjoly + ]; mainProgram = "avalanchego"; }; } From 20a0bfb3aefdefc6dd06cbd3d1f0daa3dca053a5 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 12:45:45 +0800 Subject: [PATCH 056/173] cargo-risczero: 0.17.0 -> 1.1.2 --- pkgs/by-name/ca/cargo-risczero/package.nix | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 522db664d61c..38f4d6c5d4fc 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -2,35 +2,42 @@ lib, stdenv, fetchCrate, + fetchurl, rustPlatform, pkg-config, openssl, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "cargo-risczero"; - version = "0.17.0"; + version = "1.1.2"; src = fetchCrate { inherit pname version; - hash = "sha256-UXCZ4l45zcyn2AnfDW6dNdEnXCWL2waNwDTbermgS6M="; + hash = "sha256-YZ3yhj1VLxl3Fg/yWhqrZXxIQ7oK6Gdo0NU39oDvoo8="; }; - cargoHash = "sha256-KkV+ZQAPegbeZKj3ixDSFQEyKwkKeMYceSc27xGtQms="; + src-recursion-hash = "28e4eeff7a8f73d27408d99a1e3e8842c79a5f4353e5117ec0b7ffaa7c193612"; # That is from cargoDeps/risc0-circuit-recursion/build.rs + + src-recursion = fetchurl { + url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip"; + hash = "sha256-KOTu/3qPc9J0CNmaHj6IQseaX0NT5RF+wLf/qnwZNhI="; # This hash should be the same as src-recuresion-hash + }; + + env = { + RECURSION_SRC_PATH = src-recursion; + }; + + cargoHash = "sha256-pNgnUtKn2w5rWbgDi0MHZCm9nYPgESL3g7EMaYwoSq4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; From 5adfde47ad0706f4ed9a514342680159433f2311 Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Wed, 6 Nov 2024 22:28:20 -0500 Subject: [PATCH 057/173] prometheus-klipper-exporter: 0.11.2 -> 0.12.0 --- .../pr/prometheus-klipper-exporter/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix index 4b8d9c16c9ec..db41ced6fd45 100644 --- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -2,26 +2,30 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, nixosTests, }: buildGoModule rec { pname = "prometheus-klipper-exporter"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "scross01"; repo = "prometheus-klipper-exporter"; rev = "v${version}"; - sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU="; + sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY="; }; vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0="; doCheck = true; - passthru.tests = { - inherit (nixosTests.prometheus-exporters) process; + passthru = { + tests = { + inherit (nixosTests.prometheus-exporters) process; + }; + updateScript = nix-update-script { }; }; meta = with lib; { From 0720e51827fa00b6fe96a09a375b857cd33bfcbc Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 26 Oct 2024 21:30:28 +0800 Subject: [PATCH 058/173] avalanchego: 1.11.11 -> 1.12.0-initial-poc.6 --- pkgs/by-name/av/avalanchego/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index 8b37a1f1b6b9..c80180fc5621 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -1,27 +1,27 @@ { - IOKit, buildGoModule, fetchFromGitHub, lib, + nix-update-script, stdenv, }: buildGoModule rec { pname = "avalanchego"; - version = "1.11.11"; + version = "1.12.0-initial-poc.6"; src = fetchFromGitHub { owner = "ava-labs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-9NhwxB5AeGvQgZbjNu5WWHiP194ws7s1WDtCntLr//g="; + repo = "avalanchego"; + rev = "refs/tags/v${version}"; + hash = "sha256-LBwmoegsBWC2xlTc3BJDxyYX58b+X7g5xl9vnThVHW0="; }; - vendorHash = "sha256-A8Bf/KzTFvC/hFLU1k6M89649wjoqnIXRQ1uJaTj9YA="; - # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 + # https://github.com/golang/go/issues/57529 proxyVendor = true; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + vendorHash = "sha256-slu0f0Y33aGuVpN5pZcRp9RJAXcLnZyUNO7pFdm+HrY="; + subPackages = [ "main" ]; @@ -35,12 +35,14 @@ buildGoModule rec { mv $out/bin/{main,${pname}} ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Go implementation of an Avalanche node"; homepage = "https://github.com/ava-labs/avalanchego"; changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ urandom qjoly ]; From f644364e7f8b029a85ba7c85eab148c76c734cda Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 7 Nov 2024 12:32:03 +0800 Subject: [PATCH 059/173] nwg-dock-hyprland: move to pkgs/by-name --- .../default.nix => by-name/nw/nwg-dock-hyprland/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/nwg-dock-hyprland/default.nix => by-name/nw/nwg-dock-hyprland/package.nix} (100%) diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix similarity index 100% rename from pkgs/applications/misc/nwg-dock-hyprland/default.nix rename to pkgs/by-name/nw/nwg-dock-hyprland/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff8d0027675..9063b154cf79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30970,8 +30970,6 @@ with pkgs; nwg-dock = callPackage ../applications/misc/nwg-dock { }; - nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { }; - nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-look = callPackage ../applications/misc/nwg-look { }; From 5214dfb6814498ae885105c8c760b99808cc0a20 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 7 Nov 2024 13:40:56 +0800 Subject: [PATCH 060/173] nwg-dock-hyprland: 0.2.2 -> 0.3.2 Diff: https://github.com/nwg-piotr/nwg-dock-hyprland/compare/v0.2.2...v0.3.2 --- pkgs/by-name/nw/nwg-dock-hyprland/package.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 34bbf45e8ebd..a401438a0dca 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -1,27 +1,35 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, gtk-layer-shell +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + gtk-layer-shell, }: buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.2.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; - rev = "v${version}"; - hash = "sha256-iamDOQcQJRdFVnwffWPIXHlY0J4orfrEbfLzaoeV+KM="; + rev = "refs/tags/v${version}"; + hash = "sha256-Vp8JmRQf71vezdknzifxlK7zTlorwiEHsyXpmy6mxIE="; }; - vendorHash = "sha256-cZ5w7B8bi0faOVWoQ6eeW5ejCZJgnNB91DQalC75mPo="; + vendorHash = "sha256-RBU0l4YRtV5JPH1dLT+lZ05jmxRwyn3glMUKHw1Eg8g="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; postInstall = '' From 28404126ddad2dbcc0d69914d27e9a3d6d551b21 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 7 Nov 2024 07:18:36 +0000 Subject: [PATCH 061/173] edk2: 202408 -> 202408.01 https://github.com/tianocore/edk2/releases/tag/edk2-stable202408.01 https://github.com/tianocore/edk2/compare/refs/tags/edk2-stable202408...refs/tags/edk2-stable202408.01 fixes #353769 --- pkgs/by-name/ed/edk2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index e986e42bd47a..20cd4c84ba33 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -35,14 +35,14 @@ buildType = if stdenv.hostPlatform.isDarwin then edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "202408"; + version = "202408.01"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-2odaTqiAZD5xduT0dwIYWj3gY/aFPVsTFbblIsEhBiA="; + hash = "sha256-tome7S8k2vgEFg7CsXnrg9yxCx1kCypc5BkQzDPyFBc="; }; src = applyPatches { From ee21904f1f302b9430af46fa4e102267c0358aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 08:31:54 +0000 Subject: [PATCH 062/173] huggle: 3.4.12 -> 3.4.13 --- pkgs/applications/misc/huggle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 381804c2b8de..6a63e64134aa 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "huggle"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; - sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE="; + sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY="; fetchSubmodules = true; }; From 00c5d680a4a67bac32cf491ac9db225f410e0b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 7 Nov 2024 10:22:21 +0100 Subject: [PATCH 063/173] eza: 0.20.6 -> 0.20.7 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.7 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index be058ca16f25..9925e54a85b2 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-uck/FwVwl9CEqy7zuKgzAahNqNc3DiGSVAsr7rDuk9Y="; + hash = "sha256-1yObVsCUGh2TwZesNNOseFR86oPh+w1q2knQkQ2vjLE="; }; - cargoHash = "sha256-lhVkmSTmFhmg2Pqju79ghooyzjd7b2AJrGaHtATHJcI="; + cargoHash = "sha256-k9zSchHFF2t30ca15eadEhnO0aFH5KIc1i0uuBKZZtc="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From ebf44e2f703f79f05add36465861d53f1d4a5970 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 09:49:34 +0000 Subject: [PATCH 064/173] tpi: 1.0.6 -> 1.0.7 --- pkgs/by-name/tp/tpi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix index bd9965029ea6..7ccd26716664 100644 --- a/pkgs/by-name/tp/tpi/package.nix +++ b/pkgs/by-name/tp/tpi/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tpi"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "turing-machines"; repo = "tpi"; rev = "v${version}"; - hash = "sha256-rkqkb3iJL4obHjTkGEUbVPJmUmfT9KKP4yoQ71cbpKs="; + hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA="; }; - cargoHash = "sha256-hSWDr1XuD6x96QV2QIdhGPQ00Sg7G5O5bkFNTdUx0ug="; + cargoHash = "sha256-5TfLAMPl3I9gkd3SSjPlBeBJzANK9u5XjY0ReHVSTJw="; meta = { description = "CLI tool to control your Turing Pi 2 board"; From 3736f5fa6fb4ebb0665fe2b0ebc508c0f2e18be7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 09:52:47 +0000 Subject: [PATCH 065/173] python312Packages.go2rtc-client: 0.0.1b2 -> 0.1.0 --- pkgs/development/python-modules/go2rtc-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix index e370d262b090..8d110afbbee3 100644 --- a/pkgs/development/python-modules/go2rtc-client/default.nix +++ b/pkgs/development/python-modules/go2rtc-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "go2rtc-client"; - version = "0.0.1b2"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-go2rtc-client"; rev = "refs/tags/${version}"; - hash = "sha256-q1NDHauYy8C3tlIpt6J0iMj0TNtBv2j9aU/IE5CgBjg="; + hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ="; }; postPatch = '' From 52bf1163fadb7ee5e21ee0b8e5cf266acb3e74e9 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 7 Nov 2024 09:43:39 +0000 Subject: [PATCH 066/173] treewide: use getLib when accessing clang / libclang / stdenv.cc.cc In preparation to eliminate the lib output for the unwrapped clang, use `lib.getLib` to access the `lib` output. --- nixos/tests/vscode-remote-ssh.nix | 2 +- .../audio/bitwig-studio/bitwig-studio3.nix | 2 +- .../audio/bitwig-studio/bitwig-studio4.nix | 2 +- .../audio/bitwig-studio/bitwig-studio5.nix | 2 +- .../audio/galaxy-buds-client/default.nix | 2 +- pkgs/applications/audio/midas/generic.nix | 2 +- pkgs/applications/audio/pianoteq/default.nix | 2 +- pkgs/applications/audio/reaper/default.nix | 4 ++-- pkgs/applications/audio/redux/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/rymcast/default.nix | 2 +- .../audio/tonelib-gfx/default.nix | 2 +- .../audio/tonelib-jam/default.nix | 2 +- .../audio/tonelib-metal/default.nix | 2 +- .../audio/tonelib-noisereducer/default.nix | 2 +- .../audio/tonelib-zoom/default.nix | 2 +- pkgs/applications/audio/touchosc/default.nix | 2 +- .../audio/virtual-ans/default.nix | 2 +- pkgs/applications/audio/vital/default.nix | 2 +- .../blockchains/sparrow/default.nix | 2 +- .../blockchains/terra-station/default.nix | 2 +- .../blockchains/wasabibackend/default.nix | 2 +- .../blockchains/wasabiwallet/default.nix | 2 +- .../editors/android-studio/common.nix | 2 +- .../emacs/elisp-packages/melpa-packages.nix | 4 ++-- .../jetbrains/plugins/specialPlugins.nix | 8 ++++---- pkgs/applications/editors/rstudio/default.nix | 4 ++-- .../editors/standardnotes/default.nix | 2 +- .../editors/sublime/2/default.nix | 2 +- .../applications/editors/sublime/3/common.nix | 6 +++--- .../applications/editors/sublime/4/common.nix | 2 +- .../editors/vim/plugins/overrides.nix | 4 ++-- .../editors/vscode/extensions/default.nix | 6 +++--- .../extensions/ms-vscode.cpptools/default.nix | 2 +- .../extensions/sourcery.sourcery/default.nix | 2 +- .../applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/fiji/default.nix | 2 +- .../graphics/kodelife/default.nix | 2 +- pkgs/applications/graphics/pencil/default.nix | 2 +- .../graphics/pixinsight/default.nix | 4 ++-- .../sane/backends/dsseries/default.nix | 2 +- pkgs/applications/kde/kdevelop/kdevelop.nix | 2 +- .../applications/misc/1password-gui/linux.nix | 2 +- .../misc/avalonia-ilspy/default.nix | 2 +- .../misc/azuredatastudio/default.nix | 2 +- pkgs/applications/misc/bloodhound/default.nix | 2 +- pkgs/applications/misc/hubstaff/default.nix | 2 +- pkgs/applications/misc/koreader/default.nix | 2 +- pkgs/applications/misc/sidequest/default.nix | 2 +- .../networking/browsers/firefox/common.nix | 2 +- .../networking/browsers/opera/default.nix | 2 +- .../networking/browsers/palemoon/bin.nix | 2 +- .../browsers/yandex-browser/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 2 +- .../instant-messengers/bluejeans/default.nix | 2 +- .../instant-messengers/franz/generic.nix | 2 +- .../instant-messengers/slack/default.nix | 2 +- .../networking/p2p/transgui/default.nix | 2 +- .../networking/scaleft/default.nix | 2 +- .../office/banana-accounting/default.nix | 2 +- .../applications/office/softmaker/generic.nix | 2 +- pkgs/applications/office/trilium/server.nix | 4 ++-- pkgs/applications/radio/sdrplay/default.nix | 2 +- .../science/biology/quast/default.nix | 2 +- .../science/electronics/eagle/eagle.nix | 2 +- .../science/electronics/picoscope/default.nix | 2 +- .../science/logic/saw-tools/default.nix | 2 +- .../science/logic/verifast/default.nix | 2 +- .../science/math/wolfram-engine/default.nix | 8 ++++---- .../version-management/bcompare/default.nix | 2 +- .../version-management/gitkraken/default.nix | 2 +- .../sublime-merge/common.nix | 2 +- .../addons/inputstream-adaptive/default.nix | 2 +- .../build-dotnet-module/hooks/default.nix | 2 +- pkgs/build-support/libredirect/default.nix | 2 +- .../rust/default-crate-overrides.nix | 2 +- pkgs/build-support/rust/hooks/default.nix | 2 +- pkgs/by-name/am/am2rlauncher/package.nix | 2 +- pkgs/by-name/am/amdenc/package.nix | 2 +- pkgs/by-name/am/amdvlk/package.nix | 2 +- pkgs/by-name/ap/aphorme/package.nix | 2 +- pkgs/by-name/aw/aws-workspaces/package.nix | 2 +- pkgs/by-name/bl/blendfarm/package.nix | 2 +- pkgs/by-name/ca/caligula/package.nix | 2 +- pkgs/by-name/ca/casadi/package.nix | 2 +- pkgs/by-name/cc/ccache/package.nix | 2 +- pkgs/by-name/ch/chatd/package.nix | 2 +- pkgs/by-name/dy/dyalog/package.nix | 2 +- pkgs/by-name/ec/ecc/package.nix | 2 +- pkgs/by-name/eq/equibop/package.nix | 2 +- .../er/erlang-language-platform/package.nix | 2 +- pkgs/by-name/fe/fedimint/package.nix | 4 ++-- pkgs/by-name/gi/github-runner/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/gu/guile-lib/package.nix | 2 +- pkgs/by-name/ig/igir/package.nix | 2 +- pkgs/by-name/in/inko/package.nix | 2 +- pkgs/by-name/in/intune-portal/package.nix | 2 +- pkgs/by-name/is/isabelle/package.nix | 4 ++-- pkgs/by-name/iv/ivm/package.nix | 2 +- pkgs/by-name/je/jextract-21/package.nix | 2 +- pkgs/by-name/je/jextract/package.nix | 2 +- pkgs/by-name/lo/logseq/package.nix | 2 +- pkgs/by-name/lu/lunarvim/package.nix | 2 +- pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +- pkgs/by-name/mi/mihomo-party/package.nix | 2 +- pkgs/by-name/mi/misskey/package.nix | 2 +- pkgs/by-name/mo/modrinth-app/package.nix | 2 +- pkgs/by-name/mo/mongodb-ce/package.nix | 2 +- .../by-name/ms/msalsdk-dbusclient/package.nix | 2 +- pkgs/by-name/ne/neothesia/package.nix | 2 +- pkgs/by-name/nu/nufmt/package.nix | 2 +- .../pa/passmark-performancetest/package.nix | 2 +- pkgs/by-name/ph/pharo/package.nix | 2 +- pkgs/by-name/ph/photonvision/package.nix | 2 +- pkgs/by-name/pl/plasticity/package.nix | 2 +- pkgs/by-name/po/pocl/package.nix | 2 +- pkgs/by-name/po/portablemc/package.nix | 2 +- pkgs/by-name/pr/prismlauncher/package.nix | 2 +- pkgs/by-name/pu/pulsar/package.nix | 2 +- pkgs/by-name/pu/pupdate/package.nix | 2 +- pkgs/by-name/ra/rainbowcrack/package.nix | 2 +- pkgs/by-name/se/segger-jlink/qt4-bundled.nix | 2 +- pkgs/by-name/se/servo/package.nix | 2 +- pkgs/by-name/sk/skypeforlinux/package.nix | 2 +- pkgs/by-name/sl/slimserver/package.nix | 2 +- pkgs/by-name/st/starpls-bin/package.nix | 2 +- pkgs/by-name/st/staruml/package.nix | 2 +- .../st/styluslabs-write-bin/package.nix | 2 +- pkgs/by-name/su/surfer/package.nix | 2 +- pkgs/by-name/sv/svp/package.nix | 2 +- pkgs/by-name/tp/tplay/package.nix | 2 +- pkgs/by-name/tr/tradingview/package.nix | 2 +- pkgs/by-name/ve/vesktop/package.nix | 2 +- pkgs/by-name/wa/warp-terminal/package.nix | 2 +- pkgs/by-name/wi/windmill/package.nix | 4 ++-- .../wl/wl-gammarelay-applet/package.nix | 2 +- pkgs/by-name/ya/yarg/package.nix | 2 +- .../compilers/computecpp/default.nix | 2 +- .../compilers/emscripten/default.nix | 2 +- pkgs/development/compilers/fpc/lazarus.nix | 2 +- .../community-edition/buildGraalvm.nix | 2 +- .../community-edition/buildGraalvmProduct.nix | 2 +- .../compilers/inklecate/default.nix | 2 +- .../development/compilers/llvm/12/default.nix | 2 +- .../compilers/llvm/common/default.nix | 4 ++-- .../compilers/llvm/common/lldb.nix | 2 +- .../compilers/temurin-bin/jdk-linux-base.nix | 2 +- .../generic-builders/manifest.nix | 2 +- pkgs/development/libraries/libcef/default.nix | 2 +- .../development/libraries/libkrun/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 4 ++-- .../libraries/opencl-clang/default.nix | 2 +- .../oracle-instantclient/default.nix | 2 +- .../development/libraries/rocksdb/default.nix | 2 +- .../astronomy/indilib/indi-3rdparty.nix | 16 +++++++-------- .../libraries/science/math/libtorch/bin.nix | 4 ++-- pkgs/development/misc/juce/default.nix | 2 +- .../mobile/androidenv/ndk-bundle/default.nix | 2 +- .../mobile/androidenv/platform-tools.nix | 2 +- .../python-modules/ifcopenshell/default.nix | 2 +- .../development/python-modules/jaxlib/bin.nix | 2 +- .../python-modules/pyside6/default.nix | 2 +- .../python-modules/pythran/default.nix | 2 +- .../python-modules/tensorflow/bin.nix | 2 +- .../tools/analysis/codeql/default.nix | 2 +- .../azure-static-sites-client/default.nix | 2 +- .../tools/build-managers/bloop/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 4 ++-- .../tools/electron/binary/generic.nix | 2 +- .../tools/electron/chromedriver/generic.nix | 2 +- pkgs/development/tools/electron/common.nix | 2 +- .../tools/gauge/plugins/dotnet/default.nix | 2 +- .../tools/glamoroustoolkit/default.nix | 2 +- pkgs/development/tools/hotdoc/default.nix | 4 ++-- pkgs/development/tools/iaca/2.1.nix | 2 +- .../tools/mblock-mlink/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- .../tools/misc/netcoredbg/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 6 +++--- .../tools/misc/segger-ozone/default.nix | 2 +- pkgs/development/tools/misc/yakut/default.nix | 2 +- pkgs/development/tools/replay-io/default.nix | 6 +++--- .../tools/rust/bindgen/default.nix | 4 ++-- .../tools/rust/bindgen/unwrapped.nix | 4 ++-- pkgs/development/web/postman/linux.nix | 2 +- pkgs/games/airshipper/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/arena/default.nix | 2 +- pkgs/games/clonehero/default.nix | 2 +- pkgs/games/dwarf-fortress/game.nix | 2 +- pkgs/games/everspace/default.nix | 2 +- pkgs/games/oilrush/default.nix | 20 +++++++++---------- pkgs/games/planetaryannihilation/default.nix | 6 +++--- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/kde/gear/kdevelop/default.nix | 2 +- pkgs/misc/cups/drivers/canon/default.nix | 10 +++++----- .../cups/drivers/samsung/1.00.36/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- pkgs/misc/drivers/epkowa/default.nix | 2 +- .../firmware/ipu6-camera-bins/default.nix | 2 +- .../linux/intel-compute-runtime/default.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 2 +- pkgs/os-specific/linux/scx/default.nix | 2 +- pkgs/os-specific/linux/uhk-agent/default.nix | 2 +- .../xp-pen-drivers/deco-01-v2/default.nix | 2 +- .../linux/xp-pen-drivers/g430/default.nix | 2 +- pkgs/servers/blockbook/default.nix | 2 +- pkgs/servers/meteor/default.nix | 4 ++-- pkgs/servers/networkaudiod/default.nix | 2 +- pkgs/servers/photoprism/libtensorflow.nix | 2 +- pkgs/servers/roon-bridge/default.nix | 2 +- pkgs/servers/roon-server/default.nix | 2 +- pkgs/servers/search/opensearch/default.nix | 2 +- pkgs/servers/urserver/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 6 +++--- pkgs/tools/admin/pulumi-bin/default.nix | 2 +- pkgs/tools/admin/pulumi/default.nix | 2 +- pkgs/tools/archivers/rar/default.nix | 2 +- pkgs/tools/audio/stt/default.nix | 2 +- .../tools/filesystems/yandex-disk/default.nix | 4 ++-- pkgs/tools/games/opentracker/default.nix | 2 +- pkgs/tools/misc/esphome/default.nix | 2 +- pkgs/tools/misc/geekbench/5.nix | 2 +- pkgs/tools/misc/geekbench/6.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- .../networking/cloudflare-warp/default.nix | 2 +- .../networking/mqttmultimeter/default.nix | 2 +- pkgs/tools/package-management/lix/common.nix | 2 +- pkgs/tools/package-management/nix/common.nix | 2 +- pkgs/tools/security/ghidra/default.nix | 2 +- .../system/dell-command-configure/default.nix | 2 +- 233 files changed, 289 insertions(+), 289 deletions(-) diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 278f2308cc16..305f931d4df1 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -28,7 +28,7 @@ in { networking.interfaces.eth1.ipv4.addresses = [ { address = serverAddress; prefixLength = 24; } ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; - virtualisation.additionalPaths = with pkgs; [ patchelf bintools stdenv.cc.cc.lib ]; + virtualisation.additionalPaths = with pkgs; [ patchelf bintools (lib.getLib stdenv.cc.cc) ]; }; client = { ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 71243f677460..2bc9a28b961f 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor (lib.getLib stdenv.cc.cc) ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 6e0643b270d1..efbeb091e210 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxkbcommon pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 0ab023e2300c..2c5911cfda0e 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pango pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) vulkan-loader xcb-imdkit xcbutil diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index a1ac12d00757..f5019ba29c30 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -30,7 +30,7 @@ buildDotnetModule rec { graphicsmagick ]; - buildInputs = [ stdenv.cc.cc.lib fontconfig ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig ]; runtimeDeps = [ libglvnd diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index fa5a7b5e46a3..6e71620ad444 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libXext # libXext.so.6 alsa-lib # libasound.so.2 freetype # libfreetype.so.6 - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 ]; in '' patchelf \ diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 908c667253d1..13b179331215 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -45,7 +45,7 @@ let ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 # libX11.so.6 xorg.libXext # libXext.so.6 alsa-lib # libasound.so.2 diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index db5d74810bee..91b6598ece94 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ - stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. # Note that libcurl and libxml2 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index a21202ebd5ba..1ddf62dd2ca2 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libX11 libXext alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7e178728c2dd..dd350e02249a 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { ln -s $path/lib/*.so* $out/lib/ done - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ mkdir $out/bin ln -s $out/renoise $out/bin/renoise diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 4fecaf373726..ddd9c751083f 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ]; + buildInputs = [ alsa-lib curl gtk3 (lib.getLib stdenv.cc.cc) webkitgtk_4_0 zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 032706e47f46..5e076f77ca6b 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 289f8b92a189..293e8885626a 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index aee3c383ae68..f337e59c2274 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix index f2f01b9326bc..df86ff86aabb 100644 --- a/pkgs/applications/audio/tonelib-noisereducer/default.nix +++ b/pkgs/applications/audio/tonelib-noisereducer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index af5dd750c50a..9f07141437fe 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index e63be43fe6b5..a212a5122907 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib ]; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 22e18502866a..4a7467da125d 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libX11 libXi libGL diff --git a/pkgs/applications/audio/vital/default.nix b/pkgs/applications/audio/vital/default.nix index 84c910eecb95..8a794925a7f3 100644 --- a/pkgs/applications/audio/vital/default.nix +++ b/pkgs/applications/audio/vital/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libGL xorg.libSM xorg.libICE diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index e43e628f0ec4..ec5bea453502 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -136,7 +136,7 @@ let sparrow-modules = stdenvNoCC.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook (lib.getLib stdenv.cc.cc) zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index fef54f6844fa..f5365f29b2f1 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # patch pre-built node modules asar e $out/share/${pname}/resources/app.asar asar-unpacked find asar-unpacked -name '*.node' -exec patchelf \ - --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \ {} \; asar p asar-unpacked $out/share/${pname}/resources/app.asar diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 59a3c1689b07..394c6fc744ee 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - buildInputs = [stdenv.cc.cc.lib zlib]; + buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; runtimeDeps = [openssl zlib]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index b010eb1184e7..ad05e27385a6 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -16,7 +16,7 @@ let runtimeLibs = [ fontconfig.lib openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libICE xorg.libSM diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 28d9f496ae8c..04887dd80868 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -137,7 +137,7 @@ let e2fsprogs # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index f963b626fa6e..670b6faa51b5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -153,8 +153,8 @@ let # https://github.com/Golevka/emacs-clang-complete-async/issues/90 auto-complete-clang-async = (addPackageRequires super.auto-complete-clang-async [ self.auto-complete ]).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; - CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; - LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; + CFLAGS = "-I${lib.getLib pkgs.llvmPackages.libclang}/include"; + LDFLAGS = "-L${lib.getLib pkgs.llvmPackages.libclang}/lib"; }); # part of a larger package diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 513f0e3d74f9..1ba1e0f38c1f 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -5,17 +5,17 @@ "631" = { # Python nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "7322" = { # Python community edition nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "8182" = { # Rust (deprecated) nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin @@ -66,7 +66,7 @@ "22407" = { # Rust nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 55998bcbe3c9..ff0c468fc509 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -146,8 +146,8 @@ in --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ - --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \ + --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ --replace-fail '@pandoc@' ${pandoc} \ diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 70b5900ccde8..ff52167dd344 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libsecret glib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; in '' diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index a57fc8d7de90..1a62b1256cca 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 7eff7d9bf4df..7c5e9aef1ea1 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -65,7 +65,7 @@ let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index b594633ea3cb..8390a004b1f4 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -88,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 755751ac5741..2c677d1c250b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -293,7 +293,7 @@ in --replace "let g:clang_library_path = '' + "''" + '' - " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" + " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'" substituteInPlace "$out"/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -302,7 +302,7 @@ in clighter8 = super.clighter8.overrideAttrs { preFixup = '' - sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ + sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/plugin/clighter8.vim ''; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b3a4bc513f00..0296d6d68b88 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1072,7 +1072,7 @@ let } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; @@ -1349,7 +1349,7 @@ let buildInputs = [ zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; postInstall = '' @@ -3245,7 +3245,7 @@ let // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index fd3358e99f6d..e652e80fb068 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -71,7 +71,7 @@ vscode-utils.buildVscodeMarketplaceExtension { lttng-ust libkrb5 zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontAutoPatchelf = isx86Linux; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index c6b0f26aa5c6..cc1d7af92f2f 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -23,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index e9ab27660605..0878d91bba8a 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; libPath = lib.makeLibraryPath (with xorg; [ - stdenv.cc.cc.lib + stdenv.cc.cc at-spi2-core.out gdk-pixbuf glib diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 3d8cf49711c8..18a2ebb15d21 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontBuild = true; nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 35ec592d24cc..564be8f10593 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib gstreamer gst-plugins-base diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 4b7b6f9b6a47..96d9ddd0ab21 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -37,7 +37,7 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc.cc ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index c034e23d4a78..a6692b350f3c 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc libGL libpulseaudio @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchelf ./installer \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.cc.cc.lib}/lib + --set-rpath ${lib.getLib stdenv.cc.cc}/lib ''; dontConfigure = true; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 93e179d867d9..941db899721c 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in `find $out/lib/sane/ -type f`; do # Make it possible to find libstdc++.so.6 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:$out/lib/sane $f + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib:$out/lib/sane $f # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path. # We can directly modify the binary to force a relative lookup instead. diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 3c7be8d6172a..f62d71726b22 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -35,7 +35,7 @@ mkDerivation rec { # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b # required as nixos seems to be unable to find CLANG_BUILTIN_DIR cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include" + "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include" ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 3361d4e92d9c..5b9af43cc169 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { pango systemd ] - + ":${stdenv.cc.cc.lib}/lib64"; + + ":${lib.getLib stdenv.cc.cc}/lib64"; in '' runHook preInstall diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index d8ae98e66acd..fd1ad1a5237a 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -44,7 +44,7 @@ buildDotnetModule rec { buildInputs = [ # Dependencies of nuget packages w/ native binaries - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 86d50c030e17..62ddf238f703 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + stdenv.cc.cc systemd ]) targetPath diff --git a/pkgs/applications/misc/bloodhound/default.nix b/pkgs/applications/misc/bloodhound/default.nix index 175b293c9d88..f4e67ecacf12 100644 --- a/pkgs/applications/misc/bloodhound/default.nix +++ b/pkgs/applications/misc/bloodhound/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { nss pango systemd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) udev xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index e642cecf69d6..e9b8d07a7e9e 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -10,7 +10,7 @@ let rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft - libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 + libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3 curl libXfixes libXScrnSaver ]; in diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 014bc216b40b..4d4f2332995e 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; find $out -xtype l -print -delete wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc ] } ''; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index c90a7116b6df..ef8e0a20560b 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -82,7 +82,7 @@ libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) systemd ]; in '' diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 52165b672179..dc52606f24b7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -384,7 +384,7 @@ buildStdenv.mkDerivation { "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" "--enable-system-pixman" "--with-distribution-id=org.nixos" - "--with-libclang-path=${llvmPackagesBuildBuild.libclang.lib}/lib" + "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib" "--with-system-ffi" "--with-system-icu" "--with-system-jpeg" diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 73dc8ccc6913..a6f2cf3d4f08 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { nspr nss pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) qt6.qtbase ]; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 7f70a49e1a06..66a0f65c2b76 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { dbus-glib gtk2-x11 libXt - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ] ++ lib.optionals withGTK3 [ gtk3 ]; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 06d4251b9faa..21469edcbca9 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { nspr nss pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libqt5pas qt6.qtbase ]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 02acad93a315..1fdcbd5e5649 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -45,7 +45,7 @@ let nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 732f121f9dfa..62655ada43a9 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { freetype nspr glib - stdenv.cc.cc.lib + stdenv.cc.cc nss libX11 libXrandr diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index dcbb29e61afc..5009ab5af0df 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation (rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; + runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 14fef76ef438..7640d72c670d 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -138,7 +138,7 @@ let xorg.libXtst xorg.libxkbfile xorg.libxshmfence - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64"; buildInputs = [ gtk3 # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index e39bbee5cd88..6985ee6770b1 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; NIX_LDFLAGS = '' - -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 + -L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto ''; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 942cad0d42fe..a184e0488692 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath - [ stdenv.cc stdenv.cc.cc.lib ]; + [ stdenv.cc stdenv.cc.cc ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index 8afc96eaf88c..cd00995f13d9 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { e2fsprogs gmp gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libGL libX11 libgcrypt diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 0cdbe16e1133..ab47d26f9862 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { libXmu libXrandr libXrender - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontBuild = true; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4d6dbaa0f7cf..125c23050d74 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -1,4 +1,4 @@ -{ stdenv, autoPatchelfHook, fetchurl, nixosTests +{ lib, stdenv, autoPatchelfHook, fetchurl, nixosTests , metaCommon }: let @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = [ diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index d19ed4b02794..b3259412da24 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ libusb1 udev stdenv.cc.cc.lib ]; + buildInputs = [ libusb1 udev (lib.getLib stdenv.cc.cc) ]; unpackPhase = '' sh "$src" --noexec --target source diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index f280f81fae84..e390b5d3ec67 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -35,7 +35,7 @@ pythonPackages.buildPythonApplication rec { postFixup = '' for file in $(find $out -type f -type f -perm /0111); do old_rpath=$(patchelf --print-rpath $file) && \ - patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true + patchelf --set-rpath $old_rpath:${lib.getLib stdenv.cc.cc}/lib $file || true done # Link to the master program ln -s $out/bin/quast.py $out/bin/quast diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 6302c2dbfa38..a8da40bd070b 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -47,7 +47,7 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \ + --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \ "$out"/eagle-${version}/eagle mkdir -p "$out"/bin diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 27e527a01d87..7fc737eb1d38 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -28,7 +28,7 @@ let inherit (sources.libpicoipp) version; src = fetchurl { inherit (sources.libpicoipp) url sha256; }; nativeBuildInputs = [ dpkg autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; sourceRoot = "."; unpackCmd = "dpkg-deb -x $src ."; installPhase = '' diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index b6291bfae369..ca2e3d303571 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -7,7 +7,7 @@ let gmp4 ncurses zlib - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64"; url = "https://github.com/GaloisInc/saw-script/releases/download"; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 9515bda467cf..3f990a6fb554 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -6,7 +6,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index c7a1b585379a..5eff7513953c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ncurses opencv4 openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) unixODBC xkeyboard_config libxml2 @@ -113,15 +113,15 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/${dirName}/Executables for path in MathKernel math mcc wolfram; do - makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done for path in WolframKernel wolframscript; do - makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \ - --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ + --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \ diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 5a60f9a1d546..6b1be920833e 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -51,7 +51,7 @@ let nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) gtk2 pango cairo diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 5f2003e84617..3347a8cebbbb 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -107,7 +107,7 @@ let dontConfigure = true; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc curlWithGnuTls udev libX11 diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 84f41e6e26c6..3c6edb20297f 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -85,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1a82cd1c19b9..2e407ba094bf 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -28,7 +28,7 @@ buildKodiBinaryAddon rec { extraBuildInputs = [ pugixml rapidjson ]; - extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + extraRuntimeDependencies = [ glib nspr nss (lib.getLib stdenv.cc.cc) ]; extraInstallPhase = let n = namespace; in '' ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 377f027910bc..98a52aee2fe6 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -17,7 +17,7 @@ substitutions = { dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc stdenv.cc.libc dotnet-sdk.passthru.icu zlib diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index c30f4c90e2e6..24754041a1b6 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -42,7 +42,7 @@ else stdenv.mkDerivation rec { PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \ clang -arch x86_64 -arch arm64 -arch arm64e \ -isystem "$SDKROOT/usr/include" \ - -isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \ + -isystem ${lib.getLib llvmPackages.libclang}/lib/clang/*/include \ "-L$SDKROOT/usr/lib" \ -Wl,-install_name,$out/lib/$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 21ca75357fbb..407f7e652c38 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -232,7 +232,7 @@ in nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; openssl = attrs: { diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 7b55af079ee8..37d1b6686255 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -92,7 +92,7 @@ bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); inherit clang; }; } diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index cf2f5ebc7167..02a97b5ad008 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -26,7 +26,7 @@ let multiArch = true; multiPkgs = pkgs: with pkgs; [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libXext xorg.libXrandr diff --git a/pkgs/by-name/am/amdenc/package.nix b/pkgs/by-name/am/amdenc/package.nix index 4887dc53000d..3953ac7beb69 100644 --- a/pkgs/by-name/am/amdenc/package.nix +++ b/pkgs/by-name/am/amdenc/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index 2c7b0c918e16..f0d60c42a33a 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { [ libdrm openssl - stdenv.cc.cc.lib + stdenv.cc.cc zlib ] ++ (with xorg; [ diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 153de3c7b74c..37b06b0f0d64 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # No tests exist doCheck = false; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; runtimeDependencies = [ diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index fad93e74d47f..9598f6118cb1 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libkrb5 curl lttng-ust diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index 4eeabc18efaf..26b00115c2a2 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -64,7 +64,7 @@ buildDotnetModule rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig openssl libkrb5 diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index d957b2c79a92..b423fa01beca 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 891b423d9e7a..37bd4b1f567e 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # nix provide lib/clang headers in libclang, not in llvm. substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ '$'{CLANG_LLVM_LIB_DIR} \ - ${llvmPackages_17.libclang.lib}/lib + ${lib.getLib llvmPackages_17.libclang}/lib # help casadi find its own libs substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index c30543cdbdd1..25753bd55557 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { isGNU = unwrappedCC.isGNU or false; isCcache = true; }; - inherit (unwrappedCC) lib; + lib = lib.getLib unwrappedCC; nativeBuildInputs = [ makeWrapper ]; # Unwrapped clang does not have a targetPrefix because it is multi-target # target is decided with argv0. diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 59e36a2f298c..28a3f6d5cf3e 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -37,7 +37,7 @@ buildNpmPackage rec { ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs buildInputs = [ - stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime + (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime vips # or it will try to download from the Internet ]; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1833320dd13e..b983a88b5656 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib # Used by Conga and .NET Bridge + (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge ncurses5 # Used by the dyalog binary to correctly display in the terminal ] ++ lib.optionals htmlRendererSupport [ diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index cf91d52875cc..df4c9f4c4e59 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram $out/bin/ecc-rs \ - --prefix LIBCLANG_PATH : ${llvmPackages.libclang.lib}/lib \ + --prefix LIBCLANG_PATH : ${lib.getLib llvmPackages.libclang}/lib \ --prefix PATH : ${lib.makeBinPath (with llvmPackages; [clang bintools-unwrapped])} ''; diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 95c5d372fba6..27658012b324 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 0c100c35700f..33a8f8a7d1be 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; sourceRoot = "."; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index f55bbbf14763..a3d2d5c7f97a 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -39,7 +39,7 @@ buildRustPackage rec { protobuf pkg-config clang - libclang.lib + (lib.getLib libclang) ]; buildInputs = [ @@ -79,7 +79,7 @@ buildRustPackage rec { PROTOC = "${buildPackages.protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; OPENSSL_DIR = openssl.dev; - LIBCLANG_PATH = "${libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 93997cb01d62..392edeb7abfe 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -119,7 +119,7 @@ buildDotnetModule rec { darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 92d46adbd7d6..65160701b52a 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; pnpmDeps = pnpm'.fetchDeps { diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix index 5143c959ccd5..4d32bbb04614 100644 --- a/pkgs/by-name/gu/guile-lib/package.nix +++ b/pkgs/by-name/gu/guile-lib/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + "$(dirname $(echo ${lib.getLib stdenv.cc.cc}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; meta = with lib; { diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 4ad62dff661a..25d968c19975 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -28,7 +28,7 @@ buildNpmPackage rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node # Irrelevant to our use diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 70abc78b0fe3..a623379d0915 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { libz libxml2 ncurses - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index f9ff4b6119ca..0e4d2947643b 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { let libPath = { intune = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc libuuid xorg.libX11 curlMinimal diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 1012d06542ec..504213a29ad0 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -151,10 +151,10 @@ in stdenv.mkDerivation (finalAttrs: rec { done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do - patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so + patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${lib.getLib stdenv.cc.cc}/lib" ]}" $d/*.so done '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3 ''; buildPhase = '' diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 705bbf14a041..15644f2710b5 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0="; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix index ec2ad3b1485d..485f5e47de80 100644 --- a/pkgs/by-name/je/jextract-21/package.nix +++ b/pkgs/by-name/je/jextract-21/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pjdk21_home=${jdk21}" ]; diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index c6fd96de393a..a20c5d03baef 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pjdk22_home=${jdk23}" ]; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index c99e04a36bf6..0f56d5def56d 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -41,7 +41,7 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dontUnpack = stdenv.hostPlatform.isLinux; dontConfigure = true; diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix index 6050010bdbb5..df4b07ff14ce 100644 --- a/pkgs/by-name/lu/lunarvim/package.nix +++ b/pkgs/by-name/lu/lunarvim/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \ - --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \ + --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \ --prefix CC : ${stdenv.cc.targetPrefix}cc '' + lib.optionalString finalAttrs.nvimAlias '' ln -s $out/bin/lvim $out/bin/nvim diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index ea066fc7ba3d..e5f9fcafc412 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -39,7 +39,7 @@ let runtimeLibs = lib.makeLibraryPath [ libGL - stdenv.cc.cc.lib + stdenv.cc.cc ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 80df07cd6cb1..1a879e408e93 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { alsa-lib openssl webkitgtk_4_0 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6c23db392279..db8a687cdda2 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeLibraryPath [ jemalloc ffmpeg-headless - stdenv.cc.cc.lib + stdenv.cc.cc ] } diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index 8f17cd3c9e7c..2e25bc8f0489 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -48,7 +48,7 @@ symlinkJoin rec { xorg.libXxf86vm # lwjgl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # narrator support flite diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index a7ee195c9874..3b7802b8178a 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl.dev openssl.dev - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix index b06f097c76d8..5fd09f0035f8 100644 --- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix +++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib install -m 755 usr/lib/libmsal_dbus_client.so $out/lib/ - patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc.lib sdbus-cpp ]} $out/lib/libmsal_dbus_client.so + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc sdbus-cpp ]} $out/lib/libmsal_dbus_client.so runHook postInstall ''; diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index fbf3624ee0f6..f474a82d2bf1 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { ''; env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; meta = { diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 6e0140d79556..f91ce84fc683 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { apple-sdk_11 ]; - env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib"; + env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib"; cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k="; diff --git a/pkgs/by-name/pa/passmark-performancetest/package.nix b/pkgs/by-name/pa/passmark-performancetest/package.nix index 72914a647126..1d021281f154 100644 --- a/pkgs/by-name/pa/passmark-performancetest/package.nix +++ b/pkgs/by-name/pa/passmark-performancetest/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip autoPatchelfHook makeWrapper ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) curl ncurses5 ]; diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index 8e6d7bf31127..f05cf2752522 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let libPath = lib.makeLibraryPath (finalAttrs.buildInputs ++ [ - stdenv.cc.cc.lib + stdenv.cc.cc "$out" ]); in '' diff --git a/pkgs/by-name/ph/photonvision/package.nix b/pkgs/by-name/ph/photonvision/package.nix index 408dfb123f30..09330c9c442b 100644 --- a/pkgs/by-name/ph/photonvision/package.nix +++ b/pkgs/by-name/ph/photonvision/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { install -D $src $out/lib/photonvision.jar makeWrapper ${temurin-jre-bin-11}/bin/java $out/bin/photonvision \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib suitesparse ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc suitesparse ]} \ --prefix PATH : ${lib.makeBinPath [ temurin-jre-bin-11 bash.out ]} \ --add-flags "-jar $out/lib/photonvision.jar" diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index fb477ce07f2a..cc17a083f913 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { nss openssl pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) trash-cli xdg-utils ]; diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index d3c58c00e21e..795a3893d873 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -30,7 +30,7 @@ let rm -f $out/bin/$BASENAME makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ --add-flags "-L$LIBGCC_DIR" \ - --add-flags "-L${stdenv.cc.cc.lib}/lib" + --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" done ''; in diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 12872711f56a..3b3c399d4a9e 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -35,7 +35,7 @@ let libGL glfw openal - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # oshi udev diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index ab9b7144b922..03c1f0421530 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -78,7 +78,7 @@ symlinkJoin { let runtimeLibs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ## native versions glfw3-minecraft openal diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 8e5f9d295fb7..b50947419c23 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -70,7 +70,7 @@ let libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + stdenv.cc.cc systemd ]; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index 2c3121a39ba1..b537d4c1b834 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -20,7 +20,7 @@ buildDotnetModule rec { }; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib openssl ]; diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix index bc138dbc9c74..40ddf8df8963 100644 --- a/pkgs/by-name/ra/rainbowcrack/package.nix +++ b/pkgs/by-name/ra/rainbowcrack/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dontConfigure = true; diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix index b1cce1f4a351..76fb252afe25 100644 --- a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix +++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig xorg.libXrandr xorg.libXfixes diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index fc586d5ddcd9..af6fb95d9585 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -142,7 +142,7 @@ rustPlatform.buildRustPackage { --prefix LD_LIBRARY_PATH : ${runtimePaths} ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; meta = { description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index fa58fd862638..16822a140032 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -96,7 +96,7 @@ let xorg.libXScrnSaver xorg.libxcb ] - + ":${stdenv.cc.cc.lib}/lib64"; + + ":${lib.getLib stdenv.cc.cc}/lib64"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index abdb045e7ced..0fd579e7a3b8 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -28,7 +28,7 @@ let ); libPath = lib.makeLibraryPath [ zlib - stdenv.cc.cc.lib + stdenv.cc.cc ]; in perlPackages.buildPerlPackage rec { diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix index ada91ae6bc42..a41e194615c0 100644 --- a/pkgs/by-name/st/starpls-bin/package.nix +++ b/pkgs/by-name/st/starpls-bin/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = lib.optionals stdenv.hostPlatform.isElf [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 634bdf0eb474..84703b0c8c88 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/opt/StarUML/staruml" "$out/bin/staruml" mkdir -p $out/lib - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf \ diff --git a/pkgs/by-name/st/styluslabs-write-bin/package.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix index 4e5ca2af4942..d15875494d79 100644 --- a/pkgs/by-name/st/styluslabs-write-bin/package.nix +++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libsForQt5.qtbase # libQt5PrintSupport.so.5 libsForQt5.qtsvg # libQt5Svg.so.5 - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 libglvnd # libGL.so.1 libX11 # libX11.so.6 libXi # libXi.so.6 diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 08fba6bdb0ce..ff820885e643 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index 0978a9e64f69..41c20ed0a48f 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -53,7 +53,7 @@ let libusb1 mpvForSVP ocl-icd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) vapoursynth xdg-utils xorg.libX11 diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 39204176b534..600e61fa7795 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev alsa-lib.dev - libclang.lib + (lib.getLib libclang) ffmpeg.dev opencv ]; diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 9c7fb11aa345..958e0f4135e4 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib atk at-spi2-atk diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index aa43c93ba98e..02b11d55baa3 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index adb2b2614e82..646750978bc9 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -48,7 +48,7 @@ linux = stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl fontconfig - stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so zlib ]; diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix index b6f4d07bd649..ec030845cc00 100644 --- a/pkgs/by-name/wi/windmill/package.nix +++ b/pkgs/by-name/wi/windmill/package.nix @@ -144,7 +144,7 @@ rustPlatform.buildRustPackage { openssl rustfmt lld - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ @@ -170,7 +170,7 @@ rustPlatform.buildRustPackage { bash ] } \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]} \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix index 64388cf0b7be..7da62ca22f87 100644 --- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix +++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = [ diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix index 47c179af860f..8bf3447b9ac5 100644 --- a/pkgs/by-name/ya/yarg/package.nix +++ b/pkgs/by-name/ya/yarg/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { # Load-time libraries (loaded from DT_NEEDED section in ELF binary) alsa-lib gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib # Run-time libraries (loaded with dlopen) diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 4e6e7ad43416..d6835ba05f78 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dontStrip = true; - buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ocl-icd zlib ]; nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; installPhase = '' diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2d94880976d7..7779bbbc670b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped) lld llvm ]; }; nodeModules = buildNpmPackage { diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index ba2eeada5e46..4cd1dd9ab2f0 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { LCL_PLATFORM = if withQt then "qt5" else "gtk2"; NIX_LDFLAGS = lib.concatStringsSep " " ([ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lX11" "-lXext" "-lXi" diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index f5b18d196ff5..6db4e4312f29 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -112,7 +112,7 @@ let buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 2c8220d89a0a..39b4136698c7 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation ({ ++ extraNativeBuildInputs; buildInputs = [ - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index 52c278a1bd30..629b2f38ccfa 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -16,7 +16,7 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; projectFile = "inklecate/inklecate.csproj"; nugetDeps = ./deps.nix; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 4e2754def4de..352cf8313d67 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -199,7 +199,7 @@ let ({ substituteAll, libclang }: substituteAll { src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }) { }; in diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index eaba6f45edfe..1826215ba3ef 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -355,7 +355,7 @@ let mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommandsBasicRt = @@ -649,7 +649,7 @@ let { substituteAll, libclang }: (substituteAll { src = metadata.getVersionFile "lldb/resource-dir.patch"; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }).overrideAttrs (_: _: { name = "resource-dir.patch"; }) ) { }; diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index dafecdd709bd..1e2233790738 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ - "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" + "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}" ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 29cdf778f541..9d9033506aac 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -59,7 +59,7 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index eccc7c2d216f..26f4f1b972ae 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -215,7 +215,7 @@ backendStdenv.mkDerivation (finalAttrs: { # one that is compatible with the rest of nixpkgs, even when # nvcc forces us to use an older gcc # NB: We don't actually know if this is the right thing to do - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; # Picked up by autoPatchelf diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ce83c3c22cd4..9595efc1c1b9 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -31,7 +31,7 @@ let gl_rpath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc ]; rpath = lib.makeLibraryPath [ diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 222d8320026d..0da33d028e1c 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSound pipewire ++ lib.optional sevVariant openssl; - env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so"; + env.LIBCLANG_PATH = "${lib.getLib llvmPackages.clang-unwrapped}/lib/libclang.so"; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f5d44ff4623a..fb5f6b1d817c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -170,7 +170,7 @@ in stdenv.mkDerivation { # Needed to discover llvm-config for cross preConfigure = '' - PATH=${llvmPackages.libllvm.dev}/bin:$PATH + PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH ''; mesonFlags = [ @@ -204,7 +204,7 @@ in stdenv.mkDerivation { # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) - (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") + (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index a4d2f115cc67..ecd22f70b772 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" + "-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/" "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 4d6a605bf084..c97b17a60a89 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { inherit pname version srcs; - buildInputs = [ stdenv.cc.cc.lib ] + buildInputs = [ (lib.getLib stdenv.cc.cc) ] ++ optional stdenv.hostPlatform.isLinux libaio ++ optional odbcSupport unixODBC; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d2f3c320997e..c08f38accaf0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) '' - ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} + ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {} ''; # Old version doesn't ship the .pc file, new version puts wrong paths in there. diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 50ec95ee2f8f..72a9c747eeb4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -171,7 +171,7 @@ let pname = "libasi"; buildInputs = [ libusb1 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { @@ -182,7 +182,7 @@ let libastroasis = buildIndi3rdParty { pname = "libastroasis"; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { license = licenses.unfreeRedistributable; @@ -193,7 +193,7 @@ let libatik = buildIndi3rdParty { pname = "libatik"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd libdc1394 @@ -247,7 +247,7 @@ let libinovasdk = buildIndi3rdParty { pname = "libinovasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -348,7 +348,7 @@ let ''; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd ]; @@ -377,7 +377,7 @@ let cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -404,7 +404,7 @@ let libricohcamerasdk = buildIndi3rdParty { pname = "libricohcamerasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -447,7 +447,7 @@ let libsvbony = buildIndi3rdParty { pname = "libsvbony"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index ee24908eb512..8cbe481207e2 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -23,7 +23,7 @@ let device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc); in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -59,7 +59,7 @@ in stdenv.mkDerivation { ''; postFixup = let - rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + rpath = lib.makeLibraryPath [ stdenv.cc.cc ]; in lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 610434dfe624..476913f0e7ca 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype # libfreetype.so curl # libcurl.so - stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so pcre # libpcre2.pc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b9c11cb46e97..f72fa0c8bd4a 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -12,7 +12,7 @@ deployAndroidPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ]; patchElfBnaries = '' # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 4ed98e7a7d7f..05542ae6dc02 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc.lib pkgs.zlib pkgs.ncurses5 ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 80acaeb1f10d..c9b5183e4f9e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { buildInputs = [ # ifcopenshell needs stdc++ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) boost179 cgal eigen diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index a08264849770..5b7fb2d88a93 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -189,7 +189,7 @@ buildPythonPackage { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # jaxlib contains shared libraries that open other shared libraries via dlopen # and these implicit dependencies are not recognized by ldd or diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 088f4e785af6..9464034178b2 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; + LLVM_INSTALL_DIR = "${lib.getLib llvmPackages.libclang}/lib"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index c1fce200011b..2146c8c02245 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${ - if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib + if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc) }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index c187737eeead..7a5127582a64 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -154,7 +154,7 @@ buildPythonPackage { ]; libpaths = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 632d2c4a9153..c981487935c5 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { xorg.libXrender freetype jdk17 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) curl ]; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 126eaf1ec68e..18b80555833e 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { libkrb5 lttng-ust openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index b6db8634c06e..3e7ab2d44af5 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dontUnpack = true; nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) zlib ]; propagatedBuildInputs = [ jre ]; installPhase = '' diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a2a1c1115a53..e1087a476c5c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -112,7 +112,7 @@ rec { for variant in "" "-ncurses5" "-ncurses6"; do autoPatchelfInJar \ $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done # The file-events library _seems_ to follow the native-platform version, but @@ -120,7 +120,7 @@ rec { fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" autoPatchelfInJar \ $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 585b5d947263..6835c8a6263e 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -97,7 +97,7 @@ let xorg.libxkbfile pango pciutils - stdenv.cc.cc.lib + stdenv.cc.cc systemd ] ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index 1eb1a8d870b8..6ee587b26ef9 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -51,7 +51,7 @@ let src = fetcher version (get tags platform) (get hashes platform); buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) glib xorg.libxcb nspr diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index bed48f725649..bd4843edbcca 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -193,7 +193,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { libPath = lib.makeLibraryPath [ libnotify pipewire - stdenv.cc.cc.lib + stdenv.cc.cc libsecret libpulseaudio speechd-minimal diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix index 2b79004073ec..dbac34acdac7 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix +++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -12,7 +12,7 @@ makeGaugePlugin { releasePrefix = "gauge-dotnet-"; isCrossArch = true; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Gauge plugin that lets you write tests in C#"; diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 3fb6aed7f031..cd55899e6c9f 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz # libWebView.so libsoup_3 # libWebView.so webkitgtk_4_1 # libWebView.so - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; binPath = lib.makeBinPath [ zenity # File selection dialog diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 8dcee1b730dd..9a1bfe9ded9e 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -101,8 +101,8 @@ buildPythonApplication rec { substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 584b8856e89f..e368d608d593 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix index 0b6ec3252ef5..d2bdb21ec930 100644 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ b/pkgs/development/tools/mblock-mlink/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 40808bcdb439..f936ae7c89eb 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -15,7 +15,7 @@ # $debugdir:$datadir/auto-load are whitelisted by default by GDB "$debugdir" "$datadir/auto-load" # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb - targetPackages.stdenv.cc.cc.lib + (lib.getLib targetPackages.stdenv.cc.cc) ] , writeScript }: diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 3fd8c3eeaa94..a225d814aae2 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { src = managed; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' mkdir -p $out/share/netcoredbg $out/bin cp ${unmanaged}/* $out/share/netcoredbg diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index d4f17fb595d0..27b01dc5ffe1 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -16,7 +16,7 @@ let libPath = lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 - libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib + libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc dbus libGL ]; @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { "$out/libQt5Gui.so.5" \ "$out/libQt5Core.so.5" \ "$out/libQt5Network.so.5" ; do - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" done - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix index 8109c1e42a36..ea8ddd53c09f 100644 --- a/pkgs/development/tools/misc/segger-ozone/default.nix +++ b/pkgs/development/tools/misc/segger-ozone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libXfixes libXrandr libXrender - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index c4589eefb4de..c4f5d4e051c6 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { }; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) click coloredlogs psutil diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix index 51daef23b527..4f65c853da4a 100644 --- a/pkgs/development/tools/replay-io/default.nix +++ b/pkgs/development/tools/replay-io/default.nix @@ -8,7 +8,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz" metadata.recordreplay.url); nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib openssl zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) openssl zlib ]; src = (fetchzip metadata.recordreplay); dontBuild = true; @@ -73,7 +73,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url); nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; src = (fetchurl metadata.replay-node); dontUnpack = true; @@ -114,7 +114,7 @@ in rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib nodejs ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) nodejs ]; dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 462eb6022c5a..1e2af744f9bc 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: +{ lib, rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: let clang = rust-bindgen-unwrapped.clang; self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" @@ -6,7 +6,7 @@ let #for substituteAll inherit bash; unwrapped = rust-bindgen-unwrapped; - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); meta = rust-bindgen-unwrapped.meta // { longDescription = rust-bindgen-unwrapped.meta.longDescription + '' This version of bindgen is wrapped with the required compiler flags diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index a862878c9f7a..a45754a6b70c 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage rec { cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; - buildInputs = [ clang.cc.lib ]; + buildInputs = [ (lib.getLib clang.cc) ]; preConfigure = '' - export LIBCLANG_PATH="${clang.cc.lib}/lib" + export LIBCLANG_PATH="${lib.getLib clang.cc}/lib" ''; doCheck = true; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index bc1119103c44..4ef52b253205 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) atk at-spi2-atk at-spi2-core diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 0d55a703c0d5..bf66cbbfa81b 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -31,7 +31,7 @@ let runtimeLibs = [ udev alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libxkbcommon libxcb libX11 diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index ecd1dfc9b3cd..c9e8a0695ba2 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{opt/andyetitmoves,bin} cp -r * $out/opt/andyetitmoves/ - fullPath=${stdenv.cc.cc.lib}/lib64 + fullPath=${lib.getLib stdenv.cc.cc}/lib64 for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index 9b31c41ea68a..c0bbc364617e 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way? - buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib]; + buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 (lib.getLib stdenv.cc.cc)]; unpackPhase = '' # This is is a tar bomb, i.e. it extract a dozen files and directories to diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index daebe74e30b4..7af6a21199f2 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # Load-time libraries (loaded from DT_NEEDED section in ELF binary) alsa-lib gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib # Run-time libraries (loaded with dlopen) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 02dfd89f636d..820b6def9d17 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation { buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck - ++ [ stdenv.cc.cc.lib ]; + ++ [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/games/everspace/default.nix b/pkgs/games/everspace/default.nix index abf568d6acab..3d5ddad7b8c6 100644 --- a/pkgs/games/everspace/default.nix +++ b/pkgs/games/everspace/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pango gtk2-x11 openal - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = [ diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 5715c5e029b9..d3a66ea95fb8 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -26,25 +26,25 @@ stdenv.mkDerivation { do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libNetwork_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtGuiUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtWebKitUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtXmlUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ OilRush_$arch ''; installPhase = '' diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index e99f5541f284..23cd996dfcf1 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f done ''; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index a54cea0ae9f9..16d3e67e892c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; sourceRoot = pname; - libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer + libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc SDL2 SDL2_mixer libogg libvorbis ]; unpackPhase = '' diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix index cf506b1f91cc..5a2b02b41530 100644 --- a/pkgs/kde/gear/kdevelop/default.nix +++ b/pkgs/kde/gear/kdevelop/default.nix @@ -39,7 +39,7 @@ mkKdeDerivation { ]; extraCmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include" + "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include" "-DAPR_CONFIG_PATH=${apr.dev}/bin" "-DAPU_CONFIG_PATH=${aprutil.dev}/bin" ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index afee42090329..e39bcf05e427 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -147,15 +147,15 @@ stdenv.mkDerivation rec { ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 ) ( cd $out/bin - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 wrapProgram $out/bin/cnrsdrvufr2 \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index a76ecd6dcbf6..0a09bdb272e6 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ''; # all binaries are already stripped diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 59a210e6f534..326106b38878 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ''; # all binaries are already stripped diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index eaba99839f61..b822fa140bb0 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -24,7 +24,7 @@ let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; - libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index b29572b436bd..bb0e1eb7b6fd 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -385,7 +385,7 @@ let plugins = { # for the version, look for the driver of XP-750 in the search page version = "2.30.4"; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 873e0c971d67..8ea3d96157a4 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ autoPatchelfHook - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) expat zlib ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 312d008cf5b6..872281f6c9d0 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc ]} \ $out/lib/intel-opencl/libigdrcl.so ''; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 3b83b16cb09e..ad5699ab2f55 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc ncurses5 numactl zlib diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix index 881bf7a6add4..52fd174546cf 100644 --- a/pkgs/os-specific/linux/scx/default.nix +++ b/pkgs/os-specific/linux/scx/default.nix @@ -39,7 +39,7 @@ let zlib ] ++ (args.buildInputs or [ ]); - env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${llvmPackages.libclang.lib}/lib"; + env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${lib.getLib llvmPackages.libclang}/lib"; # Needs to be disabled in BPF builds hardeningDisable = [ diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 8177c7d1efda..d2a4078a8957 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index 18aa86282567..ba3dc3b37351 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libXinerama glibc libGL - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) qtx11extras ]; diff --git a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix index 10169ff3fe4e..9381463c8fa1 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { libXtst qtbase libglvnd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 47eb65bf70d2..2dfde248b9b9 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { tags = [ "rocksdb_7_10" ]; CGO_LDFLAGS = [ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lrocksdb" "-lz" "-lbz2" diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 1454f4994c15..31491c8b5846 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { # Patch node. patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${lib.getLib stdenv.cc.cc}/lib" \ $out/dev_bundle/bin/node # Patch mongo. @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Patch node dlls. for p in $(find $out/packages -name '*.node'); do patchelf \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ + --set-rpath "$(patchelf --print-rpath $p):${lib.getLib stdenv.cc.cc}/lib" \ $p || true done ''; diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index a6a858637fe3..c2566f4451ea 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontConfigure = true; diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/servers/photoprism/libtensorflow.nix index e1c8f9338cc8..db1be8d95e24 100644 --- a/pkgs/servers/photoprism/libtensorflow.nix +++ b/pkgs/servers/photoprism/libtensorflow.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # Patch library to use our libc, libstdc++ and others patchPhase = let - rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; + rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc ]; in '' chmod -R +w lib diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 4e37f52bbd60..876702f6beb7 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index cb78bb675310..de90d8b8e040 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { krb5 libtasn1 lttng-ust_2_12 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 7a9cf1ce2efc..a537d2a6bfd8 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { wrapProgram $out/bin/opensearch \ --prefix PATH : "${lib.makeBinPath [ gnugrep coreutils ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/plugins/opensearch-knn/lib/" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/plugins/opensearch-knn/lib/" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 0e73bebe71fb..1df9c40aee32 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) bluez libX11 libXtst diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5a3ef15e392d..4d6fd822db78 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -129,7 +129,7 @@ let rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc" + ln -s "$(clangResourceRootIncludePath "${lib.getLib clang-unwrapped}")" "$rsrc" ln -s "${compiler-rt.out}/lib" "$rsrc/lib" ln -s "${compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags @@ -1036,7 +1036,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check extraBuildCommands = '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share" @@ -1211,7 +1211,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ++ (with prevStage.llvmPackages; [ bintools-unwrapped clang-unwrapped - clang-unwrapped.lib + (lib.getLib clang-unwrapped) compiler-rt compiler-rt.dev libcxx diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix index ec61e5aef2d0..5c152d4d008c 100644 --- a/pkgs/tools/admin/pulumi-bin/default.nix +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * '' + lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib" '' + '' installShellCompletion --cmd pulumi \ --bash <($out/bin/pulumi completion bash) \ diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e79000e70217..f46f3c25775e 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -132,7 +132,7 @@ buildGoModule rec { mkdir -p $out/bin makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \ --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \ - --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib" ''; }; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index fe378514adea..fb95f4de5650 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { dontBuild = true; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 89ed5f983973..8d3cb54d614b 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 xz - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6e7a19ad8ee8..b0056602c387 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -3,13 +3,13 @@ let p = if stdenv.hostPlatform.is64bit then { arch = "x86_64"; - gcclib = "${stdenv.cc.cc.lib}/lib64"; + gcclib = "${lib.getLib stdenv.cc.cc}/lib64"; sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0="; webarchive = "20220519080155"; } else { arch = "i386"; - gcclib = "${stdenv.cc.cc.lib}/lib"; + gcclib = "${lib.getLib stdenv.cc.cc}/lib"; sha256 = "sha256-28dmdnJf+qh9r3F0quwlYXB/UqcOzcHzuzFq8vt2bf0="; webarchive = "20220519080430"; }; diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 459541ddb1d0..2946ff08b2f0 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -47,7 +47,7 @@ buildDotnetModule rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig gtk3 icu diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index b30cc6101209..3a80e8e0d556 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -102,7 +102,7 @@ python.pkgs.buildPythonApplication rec { # inetutils is used in esphome/dashboard/status/ping.py "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}" "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}" "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/tools/misc/geekbench/5.nix index 0c23877ee847..c7504585dc0f 100644 --- a/pkgs/tools/misc/geekbench/5.nix +++ b/pkgs/tools/misc/geekbench/5.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 2f1d2d0b6be1..6b78d65b39a1 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index b198b030f3ea..37d9616446f1 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib \ $out/opt/MegaRAID/MegaCli/MegaCli64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index fb03bee688a6..ea789e9b52f9 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libpcap openssl nss - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; desktopItems = [ diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index 1374dbc119dd..191bc642d7c7 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -32,7 +32,7 @@ buildDotnetModule rec { copyDesktopItems ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*} diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 521c27b7e7bc..2970b421fd5f 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation { rm -f $out/lib/*.a ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* ''} ${lib.optionalString stdenv.hostPlatform.isDarwin '' for LIB in $out/lib/*.dylib; do diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 07e58a41e400..5c913f681275 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -184,7 +184,7 @@ self = stdenv.mkDerivation { rm -f $out/lib/*.a ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* ''} '' + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 8f39076b4eec..a2e1399a2fd9 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) pam ]; diff --git a/pkgs/tools/system/dell-command-configure/default.nix b/pkgs/tools/system/dell-command-configure/default.nix index cd313751c7b6..c69bc0d63f90 100644 --- a/pkgs/tools/system/dell-command-configure/default.nix +++ b/pkgs/tools/system/dell-command-configure/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { inherit version; pname = "dell-command-configure"; - buildInputs = [ openssl stdenv.cc.cc.lib ]; + buildInputs = [ openssl (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; dontConfigure = true; From 99a3481c2228d908fa3b68216c2ffe4e3efbe32f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 11:03:19 +0000 Subject: [PATCH 067/173] slackdump: 2.5.11 -> 2.6.0 --- pkgs/by-name/sl/slackdump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index b3c9f9558556..734d8de262b6 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "slackdump"; - version = "2.5.11"; + version = "2.6.0"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; rev = "refs/tags/v${version}"; - hash = "sha256-othSIR+KyekUt+/LWhaM5Y6LGsujDCZTfLJotTcPXc0="; + hash = "sha256-hdSsvV1mQet61pWeo5icDhFxAVNP5QU1fdb1YgyXVWU="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -30,7 +30,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-6GVXzaJ5Lrt4fF0c9cbx6AqpgCwlYgKf6jUJkUyxc0s="; + vendorHash = "sha256-LjZP00YL0Coc7yY0Bm7AaYoAP37vQVJpVYPxuEnVEp4="; meta = { homepage = "https://github.com/rusq/slackdump"; From d04df75f40a526596d67335dbed65a9190f22694 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 4 Nov 2024 12:02:20 +0100 Subject: [PATCH 068/173] zellij: 0.40.1 -> 0.41.1 https://github.com/zellij-org/zellij/releases/tag/v0.41.0 https://github.com/zellij-org/zellij/releases/tag/v0.41.1 --- pkgs/tools/misc/zellij/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2097787f4855..4559d83d41e3 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,18 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.40.1"; + version = "0.41.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-n8cwsCeKWzTw/psvLL3chBr8EcwGoeKB8JeiLSLna1k="; + hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw="; }; - cargoHash = "sha256-TyIQaovmpiu7USURA//+IQWNT95rrVk0x9TRspXYUNk="; + cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I="; + + env.OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ mandown @@ -32,8 +34,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 64721203dfb18421f385537608ee3be3ca0ed1af Mon Sep 17 00:00:00 2001 From: Jan Weitz Date: Mon, 4 Nov 2024 13:40:11 +0100 Subject: [PATCH 069/173] powerpipe: 0.4.4 -> 1.0.0 --- pkgs/by-name/po/powerpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index b64c4a39ad78..99807e5cfe26 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "powerpipe"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; rev = "refs/tags/v${version}"; - hash = "sha256-B88Kc4cCadsyN/sx3TimFX3ad6WZqn/Qaw39ms8b+HE="; + hash = "sha256-ou24M5S6GfrQxmcmESzhU52ZQqdb+1s2ExLBljM0RR0="; }; - vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk="; + vendorHash = "sha256-CveNSjZCdV8YEis0PNP8F9+ht+Q9vz0VWCEp9lCJsTs="; proxyVendor = true; nativeBuildInputs = [ From 925774043e138114a7895dc54648615873de705c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 11:10:51 +0000 Subject: [PATCH 070/173] python312Packages.pynecil: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/pynecil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix index 2066dc3ec02b..70a5a432af1a 100644 --- a/pkgs/development/python-modules/pynecil/default.nix +++ b/pkgs/development/python-modules/pynecil/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynecil"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "pynecil"; rev = "refs/tags/v${version}"; - hash = "sha256-57TPgEC7NY75iVj31tdpCOrXUOcsFBy/4XltEHxlNFk="; + hash = "sha256-ZltGA3O6DDOiOddKHMalqmOYrp3IbhAGN7wGfPBP2aA="; }; build-system = [ From ac1436458b61d7961d9e2a38f4df21b924ce7659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 12:25:32 +0000 Subject: [PATCH 071/173] bootc: 1.1.0 -> 1.1.2 --- pkgs/by-name/bo/bootc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix index c1d496512b5a..164f428b4830 100644 --- a/pkgs/by-name/bo/bootc/package.nix +++ b/pkgs/by-name/bo/bootc/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bootc"; - version = "1.1.0"; - cargoHash = "sha256-2Ka3n6sT1RUlReNjtV6tMe4ow/M7DFNvWPZktwcEi/w="; + version = "1.1.2"; + cargoHash = "sha256-i8eYypTgm43Ib1HZ2e9WBLUyDAGCZPpvpzmjTS8d9e0="; doInstallCheck = true; src = fetchFromGitHub { owner = "containers"; repo = "bootc"; rev = "v${version}"; - hash = "sha256-vsJwJHPE5Puv9xCnDRDtHzNuFj1U7s1HzZ2vQKTavhs="; + hash = "sha256-p1+j62MllmPcvWnijieSZmlgwYy76X17fv12Haetz78="; }; nativeBuildInputs = [ pkg-config ]; From b3415064825f1b7be3247fb9ab85aee2ed6dd27d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 12:42:27 +0000 Subject: [PATCH 072/173] python312Packages.pythonqwt: 0.12.7 -> 0.14.1 --- pkgs/development/python-modules/pythonqwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix index 1eb3e3e2aedc..8888d8d1e1e3 100644 --- a/pkgs/development/python-modules/pythonqwt/default.nix +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pythonqwt"; - version = "0.12.7"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PythonQwt"; rev = "refs/tags/v${version}"; - hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4="; + hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k="; }; build-system = [ From 4833d9711d947d2997f58196e056b81301fa6fc2 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 13:43:54 +0100 Subject: [PATCH 073/173] zellij: adapt to new darwin SDK pattern --- pkgs/tools/misc/zellij/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 4559d83d41e3..5aa3aabf8afb 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,10 +4,7 @@ , stdenv , installShellFiles , pkg-config -, libiconv , openssl -, DiskArbitration -, Foundation , mandown , zellij , testers @@ -36,10 +33,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - DiskArbitration - Foundation ]; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf056feef01..b0c8e2f6b1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,9 +13877,7 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; + zellij = callPackage ../tools/misc/zellij { }; zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; From 21de802c9f23bb75a02a737aaf928200c10fba3d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:06:13 +0100 Subject: [PATCH 074/173] zellij: make sure to link to our provided curl --- pkgs/tools/misc/zellij/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 5aa3aabf8afb..adc720ec3f66 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,6 +4,7 @@ , stdenv , installShellFiles , pkg-config +, curl , openssl , mandown , zellij @@ -25,13 +26,21 @@ rustPlatform.buildRustPackage rec { env.OPENSSL_NO_VENDOR = 1; + # Workaround for https://github.com/zellij-org/zellij/issues/3720 + postPatch = '' + substituteInPlace zellij-utils/Cargo.toml \ + --replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }' + ''; + nativeBuildInputs = [ mandown installShellFiles pkg-config + (lib.getDev curl) ]; buildInputs = [ + curl openssl ]; @@ -39,6 +48,16 @@ rustPlatform.buildRustPackage rec { HOME=$TMPDIR ''; + # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs + doInstallCheck = stdenv.hostPlatform.libc == "glibc"; + installCheckPhase = '' + runHook preInstallCheck + + ldd "$out/bin/zellij" | grep libcurl.so + + runHook postInstallCheck + ''; + postInstall = '' mandown docs/MANPAGE.md > zellij.1 installManPage zellij.1 From 10c96e20677472ec3851d3c2ef1ac3ceb136d1d9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:08 +0100 Subject: [PATCH 075/173] zellij: move to by-name --- .../misc/zellij/default.nix => by-name/ze/zellij/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/zellij/default.nix => by-name/ze/zellij/package.nix} (100%) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/by-name/ze/zellij/package.nix similarity index 100% rename from pkgs/tools/misc/zellij/default.nix rename to pkgs/by-name/ze/zellij/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0c8e2f6b1a3..eaa654e80121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,8 +13877,6 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { }; - zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; }; From b00e0d4b1d2793a1b73734116adeee2660144d53 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:38 +0100 Subject: [PATCH 076/173] zellij: format --- pkgs/by-name/ze/zellij/package.nix | 50 +++++++++++++++++------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index adc720ec3f66..5d7b348bc1f8 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -1,14 +1,15 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, stdenv -, installShellFiles -, pkg-config -, curl -, openssl -, mandown -, zellij -, testers +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + installShellFiles, + pkg-config, + curl, + openssl, + mandown, + zellij, + testers, }: rustPlatform.buildRustPackage rec { @@ -58,16 +59,18 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - postInstall = '' - mandown docs/MANPAGE.md > zellij.1 - installManPage zellij.1 + postInstall = + '' + mandown docs/MANPAGE.md > zellij.1 + installManPage zellij.1 - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij setup --generate-completion bash) \ - --fish <($out/bin/zellij setup --generate-completion fish) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) - ''; + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd $pname \ + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) + ''; passthru.tests.version = testers.testVersion { package = zellij; }; @@ -76,7 +79,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh _0x4A6F abbe pyrox0 ]; + maintainers = with maintainers; [ + therealansh + _0x4A6F + abbe + pyrox0 + ]; mainProgram = "zellij"; }; } From 9527546079f16dfbfad224ff7877b3ca8a30dee6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 13:50:41 +0000 Subject: [PATCH 077/173] python312Packages.ssort: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/ssort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix index 71a950b98bd7..6a60f6ab1e53 100644 --- a/pkgs/development/python-modules/ssort/default.nix +++ b/pkgs/development/python-modules/ssort/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ssort"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "bwhmather"; repo = "ssort"; rev = "refs/tags/${version}"; - hash = "sha256-P/FUayCC7KfXjtzclTPLhLw5o0bV4L98tes69w+038o="; + hash = "sha256-TINktjuTdyRYkqIs3Jyv6vobSBqV1iPoHrG36sBHah8="; }; build-system = [ setuptools ]; From 7a9a124cad78b449bd02b142582534d12b013cf9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 6 Nov 2024 13:01:45 +0100 Subject: [PATCH 078/173] =?UTF-8?q?coqPackages.ExtLib:=200.12.1=20?= =?UTF-8?q?=E2=86=92=200.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename package from `coq-ext-lib` to `ExtLib`. --- .../coq-modules/{coq-ext-lib => ExtLib}/default.nix | 4 ++-- pkgs/development/coq-modules/ITree/default.nix | 4 ++-- pkgs/development/coq-modules/QuickChick/default.nix | 4 ++-- pkgs/development/coq-modules/parsec/default.nix | 4 ++-- pkgs/development/coq-modules/simple-io/default.nix | 4 ++-- pkgs/top-level/coq-packages.nix | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/coq-modules/{coq-ext-lib => ExtLib}/default.nix (93%) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix similarity index 93% rename from pkgs/development/coq-modules/coq-ext-lib/default.nix rename to pkgs/development/coq-modules/ExtLib/default.nix index 4ec805e8f028..398185396f3a 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -2,10 +2,9 @@ mkCoqDerivation rec { pname = "coq-ext-lib"; - owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.20"; out = "0.12.1"; } + { case = range "8.14" "8.20"; out = "0.12.2"; } { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -14,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.12.2".sha256 = "sha256-lSTlbpkSuAY6B9cqofXSlDk2VchtqfZpRQ0+y/BAbEY="; release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 693b1b260c1e..78d788b96295 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: +{ lib, mkCoqDerivation, coq, version ? null , paco, ExtLib }: mkCoqDerivation rec { pname = "InteractionTrees"; @@ -15,7 +15,7 @@ mkCoqDerivation rec { release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; release."3.2.0".sha256 = "sha256-10ckCAqSQ0I3CZKlSllI1obOgWVxDagTd7eyhrl1xpE="; releaseRev = v: "${v}"; - propagatedBuildInputs = [ coq-ext-lib paco ]; + propagatedBuildInputs = [ ExtLib paco ]; meta = { description = "Library for Representing Recursive and Impure Programs in Coq"; maintainers = with lib.maintainers; [ larsr ]; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index d9a0182c2659..16f4eedb5cca 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: +{ lib, mkCoqDerivation, coq, ssreflect, ExtLib, simple-io, version ? null }: let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev"; in (mkCoqDerivation { @@ -47,7 +47,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" mlPlugin = true; nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; propagatedBuildInputs = [ ssreflect ] - ++ lib.optionals recent [ coq-ext-lib simple-io ]; + ++ lib.optionals recent [ ExtLib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 292e7e369b61..b66baa5358ce 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: +{ lib, mkCoqDerivation, coq, ceres, ExtLib, version ? null }: mkCoqDerivation { @@ -6,7 +6,7 @@ mkCoqDerivation { repo = "coq-parsec"; owner = "liyishuai"; - propagatedBuildInputs = [ ceres coq-ext-lib ]; + propagatedBuildInputs = [ ceres ExtLib ]; releaseRev = (v: "v${v}"); inherit version; diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index e3fa7036a866..1c96922b2efd 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: +{ lib, callPackage, mkCoqDerivation, coq, ExtLib, version ? null }: (mkCoqDerivation { pname = "simple-io"; @@ -16,7 +16,7 @@ release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; mlPlugin = true; nativeBuildInputs = [ coq.ocamlPackages.cppo ]; - propagatedBuildInputs = [ coq-ext-lib ] + propagatedBuildInputs = [ ExtLib ] ++ (with coq.ocamlPackages; [ ocaml findlib ocamlbuild ]); doCheck = true; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 0181ceb3da71..0caf0c98a51f 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -41,7 +41,6 @@ let }; coq-bits = callPackage ../development/coq-modules/coq-bits {}; coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; - coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-hammer = callPackage ../development/coq-modules/coq-hammer { }; coq-hammer-tactics = callPackage ../development/coq-modules/coq-hammer/tactics.nix { }; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; @@ -63,6 +62,7 @@ let dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; ElmExtraction = callPackage ../development/coq-modules/ElmExtraction {}; equations = callPackage ../development/coq-modules/equations { }; + ExtLib = callPackage ../development/coq-modules/ExtLib {}; extructures = callPackage ../development/coq-modules/extructures { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; flocq = callPackage ../development/coq-modules/flocq {}; From c079b152c1f50b767da8b5d488f2e0b3d37a7710 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Nov 2024 14:37:25 +0100 Subject: [PATCH 079/173] haskellPackages.llvm-codegen: provide LLVM 17 --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f6e2ad0755c1..3480076bb178 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -185,6 +185,11 @@ self: super: builtins.intersectAttrs super { ''; }) super.nvvm; + # Doesn't declare LLVM dependency, needs llvm-config + llvm-codegen = addBuildTools [ + pkgs.llvmPackages_17.llvm.dev # for native llvm-config + ] super.llvm-codegen; + # hledger* overrides inherit ( let From 7dfefc7b11b7caccf8f0e3485d5af2c55d0cd30c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Nov 2024 14:47:26 +0100 Subject: [PATCH 080/173] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1809809](https://hydra.nixos.org/eval/1809809) of nixpkgs commit [84527c8](https://github.com/NixOS/nixpkgs/commits/84527c8ca39ea9a3186b33390ca312e5eb9c2db3) as of 2024-11-06 13:00 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 13 ++++++++ .../transitive-broken.yaml | 4 +++ .../haskell-modules/hackage-packages.nix | 30 +++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a55302397bd5..a34c5110db85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -84,6 +84,7 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 + - aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -2159,6 +2160,7 @@ broken-packages: - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02 - graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02 + - graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06 - graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02 - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 @@ -2909,6 +2911,7 @@ broken-packages: - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 - HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 + - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02 - hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3068,6 +3071,7 @@ broken-packages: - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 + - if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3807,6 +3811,7 @@ broken-packages: - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 + - MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 - microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16 @@ -4227,6 +4232,7 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 + - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02 - ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02 @@ -4731,6 +4737,8 @@ broken-packages: - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 + - ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06 + - ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06 - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 @@ -6287,6 +6295,7 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 + - typelet # failure in job https://hydra.nixos.org/build/276367145 at 2024-11-06 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -6839,6 +6848,10 @@ broken-packages: - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 + - yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06 + - yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06 + - yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06 + - yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d2a835657cf..7d3699af9eb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1262,6 +1262,7 @@ dont-distribute-packages: - essence-of-live-coding-pulse - essence-of-live-coding-pulse-example - essence-of-live-coding-quickcheck + - essence-of-live-coding-vivid - essence-of-live-coding-warp - estimators - estreps @@ -2497,6 +2498,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -3162,6 +3164,8 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs + - ppad-hmac-drbg + - ppad-secp256k1 - pqueue-mtl - practice-room - pred-set diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d4fb631042f5..67ba06fe891d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14377,7 +14377,9 @@ self: { ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; + broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -26688,6 +26690,8 @@ self: { ]; description = "Type-level default fields for aeson Generic FromJSON parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aeson-generics-typescript" = callPackage @@ -102465,6 +102469,7 @@ self: { libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "essence-of-live-coding-warp" = callPackage @@ -131978,6 +131983,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "GraphQL with batteries"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graphql-utils" = callPackage @@ -161092,6 +161099,8 @@ self: { benchmarkHaskellDepends = [ base text ]; description = "Bindings to the Tango Controls system"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) tango;}; "hs-term-emulator" = callPackage @@ -172711,6 +172720,8 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ifcxt" = callPackage @@ -189624,6 +189635,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -225974,6 +225986,8 @@ self: { testHaskellDepends = [ base silently tasty tasty-hunit text ]; description = "Ollama Haskell library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "olwrapper" = callPackage @@ -246766,6 +246780,7 @@ self: { ]; description = "HMAC-based deterministic random bit generator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "ppad-secp256k1" = callPackage @@ -246789,6 +246804,7 @@ self: { ]; description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "ppad-sha256" = callPackage @@ -246806,6 +246822,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion SHA ]; description = "The SHA-256 and HMAC-SHA256 algorithms"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ppad-sha512" = callPackage @@ -246823,6 +246841,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion SHA ]; description = "The SHA-512 and HMAC-SHA512 algorithms"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ppm" = callPackage @@ -318873,6 +318893,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -342978,6 +343000,8 @@ self: { ]; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-core" = callPackage @@ -343268,6 +343292,8 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-rope" = callPackage @@ -343318,6 +343344,8 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-spolsky" = callPackage @@ -343329,6 +343357,8 @@ self: { libraryHaskellDepends = [ base yi ]; description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-vty" = callPackage From a235f519bc00dfb439258508e9a7e59f145ed5e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 14:07:48 +0000 Subject: [PATCH 081/173] git-backup-go: 1.6.0 -> 1.6.1 --- pkgs/by-name/gi/git-backup-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix index 761912e118c3..41fa743ccc5d 100644 --- a/pkgs/by-name/gi/git-backup-go/package.nix +++ b/pkgs/by-name/gi/git-backup-go/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "git-backup-go"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ChappIO"; repo = "git-backup"; rev = "v${version}"; - hash = "sha256-C/ha/GuRvqxmgrbOgkhup1tNoDT3pDIbE+nO5eMZGlY="; + hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks="; }; - vendorHash = "sha256-wzivnTe9Rx3YLz6lvrzsLiJIbxX7QE059Kzb4rUfD+s="; + vendorHash = "sha256-BLnnwwCrJJd8ihpgfdWel7l8aAIVVJBIpE+97J9ojPo="; ldflags = [ "-X main.Version=${version}" ]; From 41179d87156ae123df971bca08b542bcf0af44b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Nov 2024 00:42:42 +1000 Subject: [PATCH 082/173] intel-vaapi-driver: 2.4.1-unstable-2024-10-27 -> 2.4.1-unstable-2024-10-29 (#354221) --- pkgs/by-name/in/intel-vaapi-driver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix index bc008a3de1ca..ec93f3efe588 100644 --- a/pkgs/by-name/in/intel-vaapi-driver/package.nix +++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "intel-vaapi-driver"; - version = "2.4.1-unstable-2024-10-27"; + version = "2.4.1-unstable-2024-10-29"; src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; - rev = "d30e01329344858f3c84d0ef9c2b68cbde37bb9a"; - hash = "sha256-hMXFLXXTe2qvdk8svVlJ0sWJUIv8lu5DXk53SlBO0Cg="; + rev = "fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea"; + hash = "sha256-OMFdRjzpUKdxB9eK/1OLYLaOC3NHnzZVxmh6yKrbYoE="; }; # Set the correct install path: From fa80238cb1d22b5ba061d849fb6aed14eadd317c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 14:45:46 +0000 Subject: [PATCH 083/173] zizmor: 0.1.4 -> 0.2.1 --- pkgs/by-name/zi/zizmor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 3ce77d3d1667..c16ecd20e9d3 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "0.1.4"; + version = "0.2.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; rev = "v${version}"; - hash = "sha256-S2B4GQAqx4t9AZf3QDUhzku68j0buZdW0cLhmOiRssk="; + hash = "sha256-3W5S49eHZZfKXTI2xdB32kLoTnCVKYtwLbJwempnXCc="; }; - cargoHash = "sha256-hoZXR+zYuK/r4/r3QwIhTmMTCs5M0lMACH4QPEq07ZU="; + cargoHash = "sha256-ZCCmdnSj6u+k+dRUHFyKuDvnVNBtMAkmcz6TMQ1i7zs="; buildInputs = [ openssl ]; From 7284119ae2f42947bf77ef4e0b4fa52cd71d90a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 15:24:48 +0000 Subject: [PATCH 084/173] python312Packages.huum: 0.7.10 -> 0.7.11 --- pkgs/development/python-modules/huum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 7e8d4ff033b7..8eb7b4567459 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "huum"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frwickst"; repo = "pyhuum"; rev = "refs/tags/${version}"; - hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY="; + hash = "sha256-anYVrisn68EFpMsZXQb4PMsDKpRzUomoaJpOFtYVzhc="; }; nativeBuildInputs = [ poetry-core ]; From 90480efc2c0c20a31f285959a6d8be79d34630b8 Mon Sep 17 00:00:00 2001 From: Kek5chen Date: Wed, 6 Nov 2024 05:42:18 +0100 Subject: [PATCH 085/173] maintainers: add kekschen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 017dc28e493f..9fbc06675b97 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11292,6 +11292,12 @@ github = "keenanweaver"; githubId = 37268985; }; + kekschen = { + email = "kx@imkx.dev"; + github = "kek5chen"; + githubId = 52585984; + name = "Kek5chen"; + }; keksgesicht = { name = "Jan Braun"; email = "git@keksgesicht.de"; From 5a919f979447220f10544058fe6242fa298d7e52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 15:41:15 +0000 Subject: [PATCH 086/173] python312Packages.ttp-templates: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/ttp-templates/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index e22190ff82d9..b4297f30fb97 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; From 34d1552a83d57b488467ea3aa7302313f9cd5ff2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:45:10 +0100 Subject: [PATCH 087/173] signal-desktop: 7.31.0 -> 7.32.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index eba218c54994..f1fc184a8b12 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.31.0"; + version = "7.32.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-7UumNusnexW3ujA65SzxKAdRrWxmKrgZFzK0GMlURaM="; + hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU="; } From 550ae7093ebe8d4863988c0c701d2e7b29bc622c Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:50:28 +0100 Subject: [PATCH 088/173] signal-desktop-(generic): add libpulseaudio to bui ldInputs --- .../networking/instant-messengers/signal-desktop/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 85e9b9c9f667..ab5ec2a53391 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -157,6 +157,7 @@ stdenv.mkDerivation rec { libXrender libXtst libappindicator-gtk3 + libpulseaudio libnotify libuuid mesa # for libgbm From e630ab066e270a522e817985cbee640b8299e6be Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:51:25 +0100 Subject: [PATCH 089/173] signal-desktop-beta:7.32.0-beta.1 -> 7.33.0-beta.1 --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index a0d752151b96..fa07e2d1e477 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.32.0-beta.1"; + version = "7.33.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-WrHF7Y8OcEOr+W/Jhc+Hj5jCtOjKigZ02N9N/hE+XLA="; + hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0="; } From 614795583f3a13d4b1e055425898c4e5c2c2b5b8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:52:36 +0100 Subject: [PATCH 090/173] signal-desktop-(generic): use --replace-fail --- .../networking/instant-messengers/signal-desktop/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index ab5ec2a53391..77754a0122e1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -237,7 +237,7 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace-fail "/opt/${dir}/${pname}" $out/bin/${pname} \ --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" # Note: The following path contains bundled libraries: From c455166b5f3e62357fd0c40be2721dd78c36cfca Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:18:33 +0000 Subject: [PATCH 091/173] python{27,39,310,311,312,313,314}: use a bootstrap SDK on Darwin Not sure why this is necessary now, since it should already be handled as part of the bootstrap. This might not be the right fix but it does fix eval. --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 20c7c0c145ef..a7b34e3329d1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -180,7 +180,7 @@ let darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.hostPlatform.isDarwin [ # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default. - apple-sdk_11 + (apple-sdk_11.override { enableBootstrap = true; }) ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads From ef10762159e9d37397ac252a8f4669a149c1c885 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:41:56 -0800 Subject: [PATCH 092/173] atuin: migrate to new darwin SDK pattern --- pkgs/by-name/at/atuin/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index e50cdde161ef..f863e578a076 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -3,9 +3,8 @@ , fetchFromGitHub , installShellFiles , rustPlatform -, libiconv , buildPackages -, darwin +, apple-sdk_11 , nixosTests }: @@ -36,10 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration + apple-sdk_11 ]; preBuild = '' From ad625dd17211a42d6e19513e61bdf1382bb89602 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:56:32 +0000 Subject: [PATCH 093/173] stdenv/darwin: fix SDK overlays for macOS SDK < 11 Quite impressive that this worked up until now. Co-authored-by: Lily Foster --- pkgs/stdenv/darwin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 35ad94c41633..6f8ffaec92f1 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1273,7 +1273,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check patch ; - "apple-sdk_${sdkMajorVersion}" = self.apple-sdk; + # TODO: Simplify when dropping support for macOS < 11. + "apple-sdk_${builtins.replaceStrings [ "." ] [ "_" ] sdkMajorVersion}" = self.apple-sdk; darwin = super.darwin.overrideScope ( _: _: From cf03e22456c092e6bf822e807efcae95633a8adf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Nov 2024 20:47:43 +0100 Subject: [PATCH 094/173] python312Packages.aioairzone-cloud: 0.6.7 -> 0.6.10 (#351282) Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.6.7...0.6.10 Changelog: - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.8 - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.9 - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.10 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 5e5499e2bcaa..685e50650602 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.7"; + version = "0.6.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs="; + hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM="; }; build-system = [ setuptools ]; From aed1f3d336bf5e8442b9c3ec13e93bd76c96f233 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:49:02 +0100 Subject: [PATCH 095/173] python312Packages.aioautomower: 2024.10.0 -> 2024.10.3 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.1 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.2 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.3 --- .../python-modules/aioautomower/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 8884f0ef904f..9caf6af5bbbf 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -9,14 +9,16 @@ poetry-core, pyjwt, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, + tzlocal, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.10.0"; + version = "2024.10.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,14 +27,13 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY="; + hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ poetry-core ]; @@ -42,11 +43,13 @@ buildPythonPackage rec { ical mashumaro pyjwt + tzlocal ]; nativeCheckInputs = [ freezegun pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; From 4a55bd85c832303e70c333a4f9305c73559f2a26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:52:52 +0100 Subject: [PATCH 096/173] python312Packages.aioesphomeapi: 27.0.0 -> 27.0.1 https://github.com/esphome/aioesphomeapi/releases/tag/v27.0.1 --- .../development/python-modules/aioesphomeapi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 4d6f597fb2a9..461fe2c4ff43 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "27.0.0"; + version = "27.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM="; + hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; }; build-system = [ @@ -70,6 +70,11 @@ buildPythonPackage rec { "test_start_connection_can_only_increase_buffer_size_to_262144" ]; + disabledTestPaths = [ + # benchmarking requires pytest-codespeed + "tests/test_bluetooth_benchmarks.py" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; meta = with lib; { From d5031e726e03fc7d97dfae9681f54619a62e0b85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:26:40 +0100 Subject: [PATCH 097/173] python312Packages.aiohasupervisor: 0.1.0 -> 0.2.1 --- pkgs/development/python-modules/aiohasupervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 969e72889da6..2f906fef1954 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM="; + hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; }; postPatch = '' From 36dd3d5662037996f82cd44af8bfb9c382d4025c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:55:19 +0100 Subject: [PATCH 098/173] python312Packages.aiohomekit: 3.2.4 -> 3.2.6 https://github.com/Jc2k/aiohomekit/releases/tag/3.2.5 https://github.com/Jc2k/aiohomekit/releases/tag/3.2.6 --- .../python-modules/aiohomekit/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index eb6524e1d2fb..1887ed1cebf1 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.4"; + version = "3.2.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-9TvpdsWmNXz7UAh0BCgjdRWLKCP2FdE8TIjvyDXydLU="; + hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks="; }; build-system = [ poetry-core ]; @@ -49,8 +49,6 @@ buildPythonPackage rec { zeroconf ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook @@ -61,17 +59,6 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; - disabledTests = [ - # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' - "test_discover_find_one_unpaired" - "test_find_device_id_case_lower" - "test_find_device_id_case_upper" - "test_discover_missing_csharp" - "test_discover_csharp_case" - "test_discover_device_id_case_lower" - "test_discover_device_id_case_upper" - ]; - pythonImportsCheck = [ "aiohomekit" ]; meta = with lib; { From 7aa60361f455ced1153fdeeedb1c6b9789a90889 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Oct 2024 09:25:41 +0100 Subject: [PATCH 099/173] python312Packages.aioshelly: 11.4.2 -> 12.0.1 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/12.0.1 --- pkgs/development/python-modules/aioshelly/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a7d2a5349852..34f6b0d45677 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, bluetooth-data-tools, buildPythonPackage, fetchFromGitHub, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.4.2"; + version = "12.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; + hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; @@ -48,7 +50,7 @@ buildPythonPackage rec { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From da4dc05e620906a89d6998e4fbf819424c974309 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:01:36 +0100 Subject: [PATCH 100/173] python312Packages.aioswitcher: 4.3.0 -> 4.4.1 https://github.com/TomerFi/aioswitcher/releases/tag/4.4.1 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index e2c08fc5ba7c..08cbff77d200 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "4.3.0"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-NQm3mKjXsv+0xFuRY3w7f4RmMhOjdb8wGVYcXoto8ZE="; + hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY="; }; __darwinAllowLocalNetworking = true; From b6f0d7af1133312f17edcb1a0818a9882beafc1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 09:02:28 +0200 Subject: [PATCH 101/173] python312Packages.async-upnp-client: 0.40.0 -> 0.41.0 Diff: https://github.com/StevenLooman/async_upnp_client/compare/refs/tags/0.40.0...0.41.0 Changelog: https://github.com/StevenLooman/async_upnp_client/blob/0.41.0/CHANGES.rst --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index d1719497d7ba..a19d99c2f8ac 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM="; + hash = "sha256-36pMEyLnyl8PS8ZVt+yNdpJGAVpoWTxfTxr+WQw/Go8="; }; pythonRelaxDeps = [ "defusedxml" ]; From dbe3e84d346a1b69043117c9afb2cada9f14006b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 02:29:34 +0000 Subject: [PATCH 102/173] python312Packages.axis: 62 -> 63 --- pkgs/development/python-modules/axis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index e0a316317ef3..766e8ff1026a 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "axis"; - version = "62"; + version = "63"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A="; + hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o="; }; postPatch = '' From efe25a55efd36bec4020bf5e3437f00aba49c746 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:06:08 +0100 Subject: [PATCH 103/173] python312Packages.ayla-iot-unofficial: 1.4.2 -> 1.4.3 https://github.com/rewardone/ayla-iot-unofficial/releases/tag/v1.4.3 --- .../python-modules/ayla-iot-unofficial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 462a9f1130b4..df170b4e7992 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc="; + hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU="; }; build-system = [ setuptools ]; From 53a2c709facca4e39055359cdd7c028f091f15af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 23:14:58 +0100 Subject: [PATCH 104/173] python312Packages.cached-ipaddress: 0.6.0 -> 0.8.0 Diff: https://github.com/bdraco/cached-ipaddress/compare/refs/tags/v0.6.0...v0.8.0 Changelog: https://github.com/bdraco/cached-ipaddress/blob/refs/tags/v0.8.0/CHANGELOG.md --- .../python-modules/cached-ipaddress/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index de17cb4106b4..b00a6b5df4ef 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -8,11 +8,12 @@ pytestCheckHook, pythonOlder, setuptools, + propcache, }: buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs="; + hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo="; }; build-system = [ @@ -30,6 +31,8 @@ buildPythonPackage rec { setuptools ]; + dependencies = [ propcache ]; + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook From cc882676aa2b0f93850fcc7b510b6dbb8e25ba27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:09:22 +0100 Subject: [PATCH 105/173] python312Packages.dbus-fast: 2.24.2 -> 2.24.3 https://github.com/Bluetooth-Devices/dbus-fast/blob/refs/tags/v2.24.3/CHANGELOG.md --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 878e560a583b..89358afbf5f0 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.24.2"; + version = "2.24.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-3kgNr7kTKsgjLhxXZddyMs9VjxbWaHqdYYGaHc7NXq0="; + hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk="; }; # The project can build both an optimized cython version and an unoptimized From 03849651829c043b3ed3e2c6e8970d669f4070db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:14:18 +0100 Subject: [PATCH 106/173] python312Packages.doorbirdpy: 3.0.5 -> 3.0.8 --- pkgs/development/python-modules/doorbirdpy/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index b0ae8cfcea08..1c6034c8e2e4 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "3.0.5"; + version = "3.0.8"; pyproject = true; src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; rev = "refs/tags/${version}"; - hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs="; + hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0="; }; build-system = [ setuptools ]; @@ -35,11 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # connection error on mock host - "test_info_auth_fails" - ]; - pythonImportsCheck = [ "doorbirdpy" ]; meta = with lib; { From 3b43e3a2b3e71db33c2e626e98531bdb30b55452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Aug 2024 12:57:29 -0700 Subject: [PATCH 107/173] python312Packages.fritzconnection: 1.13.2 -> 1.14.0 Diff: https://github.com/kbr/fritzconnection/compare/refs/tags/1.13.2...1.14.0 Changelog: https://fritzconnection.readthedocs.io/en/1.14.0/sources/version_history.html --- .../python-modules/fritzconnection/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 9e49e8c420c8..84afd730f495 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -6,23 +6,26 @@ pytestCheckHook, requests, segno, + setuptools, }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.2"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; - repo = pname; + repo = "fritzconnection"; rev = "refs/tags/${version}"; - hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; + hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; optional-dependencies = { qr = [ segno ]; From 636bb54e4f987e6f4c2ddb778983636689d53871 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:20:25 +0100 Subject: [PATCH 108/173] python312Packages.go2rtc-client: 0.0.1b2 -> 0.1.0 https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/0.1.0 --- pkgs/development/python-modules/go2rtc-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix index e370d262b090..8d110afbbee3 100644 --- a/pkgs/development/python-modules/go2rtc-client/default.nix +++ b/pkgs/development/python-modules/go2rtc-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "go2rtc-client"; - version = "0.0.1b2"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-go2rtc-client"; rev = "refs/tags/${version}"; - hash = "sha256-q1NDHauYy8C3tlIpt6J0iMj0TNtBv2j9aU/IE5CgBjg="; + hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ="; }; postPatch = '' From 9763290b8fb0db7134653ab3dd70eee55402919e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:20:54 +0100 Subject: [PATCH 109/173] python312Packages.google-nest-sdm: 6.1.0 -> 6.1.3 https://github.com/allenporter/python-google-nest-sdm/releases/tag/6.1.3 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 0c2664caa51c..1f4e2ef3cdc4 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.0"; + version = "6.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; + hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo="; }; build-system = [ setuptools ]; From 56aec06b4cc44125e5dcd804a5d5dd113e1676c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:21:36 +0100 Subject: [PATCH 110/173] python312Packages.habitipy: 0.3.1 -> 0.3.3 https://github.com/ASMfreaK/habitipy/compare/faaca8840575fe8b807bf17acea6266d5ce92a99...v0.3.3 --- pkgs/development/python-modules/habitipy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 980dc0726991..44548561b349 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "habitipy"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - # TODO: https://github.com/ASMfreaK/habitipy/issues/27 - rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; - hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; + rev = "refs/tags/v${version}"; + hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A="; }; build-system = [ setuptools ]; From c67bf93d906a9870a5cc83d268ed935168939b74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:25:20 +0100 Subject: [PATCH 111/173] python312Packages.habluetooth: 3.4.1 -> 3.6.0 https://github.com/Bluetooth-Devices/habluetooth/blob/v3.6.0/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index f6deb6625535..fb5757ae114f 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.4.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-pJ294WnJjZXYFlezjfNXmUS+ouaZUGPLxUqj2sMQdU0="; + hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; }; build-system = [ From 060c517baef227aa614c69227e3ef0f92a9627f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:26:51 +0100 Subject: [PATCH 112/173] python312Packages.hass-nabucasa: 0.82.0 -> 0.83.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.83.0 --- .../development/python-modules/hass-nabucasa/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index d814bf89fb3d..bfe31c016bc3 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,7 +8,6 @@ ciso8601, cryptography, fetchFromGitHub, - fetchpatch2, pycognito, pyjwt, pytest-aiohttp, @@ -18,21 +17,22 @@ setuptools, snitun, syrupy, + webrtc-models, xmltodict, }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.82.0"; + version = "0.83.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I="; + hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; }; pythonRelaxDeps = [ "acme" ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { pycognito pyjwt snitun + webrtc-models ]; nativeCheckInputs = [ From c5b33821281a34e39847502f1b832f22e2e03d20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:30:47 +0100 Subject: [PATCH 113/173] home-assistant.intents: 2024.10.2 -> 2024.11.4 https://github.com/home-assistant/intents/releases/tag/2024.11.4 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index a7360dd7e2e5..57598ad2b0f5 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.10.2"; + version = "2024.11.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-bVKsZvQ4JhVpwILkRR/+lUzchBGwG2D4TTdBD7lDRcY="; + hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA="; }; build-system = [ From 549e4ee5a41ca5210528f338f8697a038bef1e62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:31:16 +0100 Subject: [PATCH 114/173] python312Packages.lcn-frontend: 0.1.7 -> 0.2.1 https://github.com/alengwenus/lcn-frontend/releases/tag/0.2.1 --- pkgs/development/python-modules/lcn-frontend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix index 310d407fa70a..206f6720f634 100644 --- a/pkgs/development/python-modules/lcn-frontend/default.nix +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lcn-frontend"; - version = "0.1.7"; + version = "0.2.1"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; inherit version; - hash = "sha256-S/7NUduAiekQ5CDOw8JRCTO9mbvLW6MmB/n8iQQPkok="; + hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4="; }; postPatch = '' From be3b1aa9d5c25ac04e226db173922a387f6fdb5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 00:48:01 +0200 Subject: [PATCH 115/173] python312Packages.mozart-api: 3.4.1.8.8 -> 4.1.1.116.0 Changelog: https://github.com/bang-olufsen/mozart-open-api/releases/tag/4.1.1.116.0 --- pkgs/development/python-modules/mozart-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 053b922c148b..f84ad7a37a86 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.8"; + version = "4.1.1.116.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; + hash = "sha256-QVh1MplzUL0LO3gPvxC/5uJjFoK57j2WdT2oMsneIkA="; }; build-system = [ poetry-core ]; From 626f11a9932666c8be0c871aa79479c48a723871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 02:21:06 +0000 Subject: [PATCH 116/173] python312Packages.py-aosmith: 1.0.8 -> 1.0.10 --- pkgs/development/python-modules/py-aosmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix index 199011b934b1..0a7ad4b872cb 100644 --- a/pkgs/development/python-modules/py-aosmith/default.nix +++ b/pkgs/development/python-modules/py-aosmith/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-aosmith"; - version = "1.0.8"; + version = "1.0.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdr99"; repo = "py-aosmith"; rev = "refs/tags/${version}"; - hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; + hash = "sha256-6wgPj3e3nbv0LM4qgZsj70F4nKy9LmY3RCvs++n1KbE="; }; build-system = [ poetry-core ]; From fcec352722b5b1edaf3166388ed1d8bbfdfdc353 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:56:06 +0100 Subject: [PATCH 117/173] python312Packages.pyfibaro: 0.7.8 -> 0.8.0 https://github.com/rappenze/pyfibaro/releases/tag/0.8.0 --- pkgs/development/python-modules/pyfibaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 1ce5d605f020..ec974f24f6e9 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.8"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = "pyfibaro"; rev = "refs/tags/${version}"; - hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM="; + hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA="; }; build-system = [ setuptools ]; From 503844b0f84ce175d1cba8469c4fed7d8c3c8b10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:57:37 +0100 Subject: [PATCH 118/173] python312Packages.pyopenweathermap: 0.1.1 -> 0.2.1 https://github.com/freekode/pyopenweathermap/compare/refs/tags/v0.1.1...v0.2.1 --- pkgs/development/python-modules/pyopenweathermap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index 6b316dd72cc7..4076913dc9e5 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.1.1"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; + hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; }; build-system = [ poetry-core ]; From 9fe18a87243e20b0e25902d73855583d4bc0f4f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:07:54 +0100 Subject: [PATCH 119/173] python312Packages.pysuez: 0.2.0 -> 0.2.2 Fixes to the pySuezV2 (pypi name) fork. --- .../python-modules/pysuez/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index e78c7f36d81e..8c04887f758c 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -10,26 +10,21 @@ buildPythonPackage rec { pname = "pysuez"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "ooii"; + owner = "jb101010-2"; repo = "pySuez"; - rev = "refs/tags/v${version}"; - hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + rev = "refs/tags/${version}"; + hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'datetime'" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ regex requests ]; @@ -42,8 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; - homepage = "https://github.com/ooii/pySuez"; - changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + homepage = "https://github.com/jb101010-2/pySuez"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 57d9c48c4459281f86610882934effaa4f61f077 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:58:07 +0100 Subject: [PATCH 120/173] python312Packages.pyswitchbot: 0.50.1 -> 0.51.0 https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.51.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 7c5b303c70a8..a5da6bc33006 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.50.1"; + version = "0.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA="; + hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s="; }; build-system = [ setuptools ]; @@ -40,11 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # mismatch in expected data structure - "test_parse_advertisement_data_curtain" - ]; - pythonImportsCheck = [ "switchbot" ]; meta = with lib; { From fa6db55a556dfb9f12faf7d888f06b39647cb363 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 23:51:20 +0200 Subject: [PATCH 121/173] python312Packages.python-bsblan: 0.6.2 -> 0.6.4 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.6.2...v0.6.4 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.6.4 --- .../python-modules/python-bsblan/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index b6312d2c0178..42e9abe85c3b 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -6,9 +6,10 @@ backoff, buildPythonPackage, fetchFromGitHub, + mashumaro, + orjson, packaging, poetry-core, - mashumaro, pytest-asyncio, pytest-cov-stub, pytest-mock, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ="; + hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI="; }; postPatch = '' @@ -43,8 +44,9 @@ buildPythonPackage rec { aiohttp async-timeout backoff - packaging mashumaro + orjson + packaging yarl ]; From 5c9763316b42e1d9ecdf7bba955f80043c84b8c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:02:42 +0100 Subject: [PATCH 122/173] python312Packages.python-homeassistant-analytics: 0.7.0 -> 0.8.0 https://github.com/joostlek/python-homeassistant-analytics/releases/tag/v0.8.0 --- .../python-modules/python-homeassistant-analytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index b4626a8d02db..4433e441b6cb 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; + hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw="; }; postPatch = '' From e46c24420aa18d7ff18831f422b9c3322a9ad3e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Nov 2024 19:31:48 +0100 Subject: [PATCH 123/173] python312Packages.python-kasa: 0.7.5 -> 0.7.7 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.7.5...0.7.7 Changelog: https://github.com/python-kasa/python-kasa/blob/0.7.7/CHANGELOG.md --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 51772d90f942..796b3e601f38 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.5"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; + hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc="; }; build-system = [ hatchling ]; From 080c47b6e775a668ddaa0c49d71cddfdb591bc61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:04:39 +0100 Subject: [PATCH 124/173] python312Packages.python-linkplay: 0.0.16 -> 0.0.17 https://github.com/Velleman/python-linkplay/releases/tag/v0.0.17 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 3efb6a31b201..37ccb0932569 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk="; + hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8="; }; build-system = [ setuptools ]; From e4c3f0240987eb06cbcf7b181529ddffb856f32c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:05:36 +0100 Subject: [PATCH 125/173] python312Packages.pytibber: 0.30.3 -> 0.30.4 https://github.com/Danielhiversen/pyTibber/releases/tag/0.30.4 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1b7af821ade9..fe2802278269 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.30.3"; + version = "0.30.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU="; + hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8="; }; build-system = [ setuptools ]; From a7a5e75d6b72935232efd2dab3ac38fbe06ad236 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:06:51 +0100 Subject: [PATCH 126/173] python312Packages.reolink-aio: 0.10.3 -> 0.10.4 https://github.com/starkillerOG/reolink_aio/releases/tag/0.10.4 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0fdeac33b67f..a42a2b432e6a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-qyz5i4379OelXI+uQwhpeuE4/1mZhPrNnxZ3KAD7JWs="; + hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w="; }; build-system = [ setuptools ]; From da8ca0e58ee33ea9cc4fba34eba8c8aad28ca0de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:07:12 +0100 Subject: [PATCH 127/173] python312Packages.spotifyaio: 0.8.2 -> 0.8.5 https://github.com/joostlek/python-spotify/releases/tag/v0.8.5 --- pkgs/development/python-modules/spotifyaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index 53be565a94ee..de088932713e 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.2"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y="; + hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU="; }; build-system = [ poetry-core ]; From c1c212da04bb9dcceb63cb9e56af24c6995896bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:10:25 +0100 Subject: [PATCH 128/173] python312Packages.zigpy: 0.67.0 -> 0.71.0 https://github.com/zigpy/zigpy/releases/tag/0.71.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9edb65707b9f..f20c1a004406 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.67.0"; + version = "0.71.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E="; + hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s="; }; postPatch = '' From 77cf737ba85a246598fcd9c11086b57a57bf0749 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:11:40 +0100 Subject: [PATCH 129/173] python312Packages.zigpy-deconz: 0.23.3 -> 0.24.1 https://github.com/zigpy/zigpy-deconz/releases/tag/0.24.1 --- .../python-modules/zigpy-deconz/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 04b8efb6f27f..edbba6c73050 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pyserial, pyserial-asyncio, pytest-asyncio, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.3"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,20 +22,13 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k="; + hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch"; - hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ setuptools ]; From bae5b4681ce16e66e22abb91ad7cbd30e7596b37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:15:46 +0100 Subject: [PATCH 130/173] python312Packages.zigpy-xbee: 0.20.2 -> 0.21.0 https://github.com/zigpy/zigpy-xbee/releases/tag/0.21.0 --- pkgs/development/python-modules/zigpy-xbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 0a3c11635f48..449632991f89 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA="; + hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ="; }; postPatch = '' From 024dd5383c949bb2581c281250dfa7ad56e7ffe6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:19:13 +0100 Subject: [PATCH 131/173] python312Packages.zigpy-zigate: 0.13.1 -> 0.13.2 https://github.com/zigpy/zigpy-zigate/releases/tag/0.13.2 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index fc7d291bd2a9..a48feefb0730 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs="; + hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno="; }; postPatch = '' From a357900923d9d7d4158d39c07c74503d280d1655 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:11:58 +0100 Subject: [PATCH 132/173] python312Packages.zigpy-znp: 0.12.4 -> 0.13.1 https://github.com/zigpy/zigpy-znp/releases/tag/v0.13.1 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 98a7661f0483..628a688f0875 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.4"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4="; + hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I="; }; postPatch = '' From fd8401d7f09118fbe40a0713bd86c57c13caaa23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:14:41 +0100 Subject: [PATCH 133/173] python312Packages.zha-quirks: 0.0.122 -> 0.0.124 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.124 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 05040663a579..8946613f81b9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.122"; + version = "0.0.124"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48="; + hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8="; }; postPatch = '' From 2da2f84b9947e72700958807abe82ccdb130fae0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:12:39 +0100 Subject: [PATCH 134/173] python312Packages.bellows: 0.40.6 -> 0.42.0 https://github.com/zigpy/bellows/releases/tag/0.42.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e75685b74768..cbfea2399312 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.40.6"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; + hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE="; }; postPatch = '' From a1718d6bbc51196b566d893bca41c1d0c877d118 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:13:28 +0100 Subject: [PATCH 135/173] python312Packages.universal-silabs-flasher: 0.0.22 -> 0.0.25 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.23 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.24 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.25 --- .../python-modules/universal-silabs-flasher/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index b09942f1beec..025eec125099 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -14,6 +14,7 @@ coloredlogs, crc, libgpiod, + pyserial-asyncio-fast, typing-extensions, zigpy, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.22"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA="; + hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { click coloredlogs crc + pyserial-asyncio-fast typing-extensions zigpy ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; From 74bffdfec9a722dd6e39454d8efb5d83fd780df9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:20:27 +0100 Subject: [PATCH 136/173] python312Packages.zha: 0.0.34 -> 0.0.37 https://github.com/zigpy/zha/releases/tag/0.0.35 https://github.com/zigpy/zha/releases/tag/0.0.36 https://github.com/zigpy/zha/releases/tag/0.0.37 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 1847b2c49d8e..2da990de3650 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.34"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg="; + hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0="; }; postPatch = '' From 1283b540f51238e5401b165866bb83de9e997727 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 12:13:00 +0200 Subject: [PATCH 137/173] python312Packages.zeroconf: 0.135.0 -> 0.136.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.135.0...0.136.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.136.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index b06ccc46b0ad..e9910213140e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.135.0"; + version = "0.136.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs="; + hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4="; }; build-system = [ From 3ad113ef5d50a9992c8c580fdea4bf0ce6d61621 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:28:54 +0100 Subject: [PATCH 138/173] python312Packages.thinqconnect: 0.9.9 -> 1.0.0 --- pkgs/development/python-modules/thinqconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index ec85761f7d05..657eac221a47 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thinqconnect"; - version = "0.9.9"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thinq-connect"; repo = "pythinqconnect"; rev = "refs/tags/${version}"; - hash = "sha256-G6fg+mXrUnSkfpeJAvDXEu57UgkYEObErEnds2PK13Y="; + hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg="; }; build-system = [ setuptools ]; From 2a48297883f7708e922ea7b7ee037c868e6d53f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:34:17 +0100 Subject: [PATCH 139/173] python312Packages.webexpythonsdk: rename from webexteamssdk In version 2.0 the module name was changed. --- .../{webexteamssdk => webexpythonsdk}/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{webexteamssdk => webexpythonsdk}/default.nix (88%) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix similarity index 88% rename from pkgs/development/python-modules/webexteamssdk/default.nix rename to pkgs/development/python-modules/webexpythonsdk/default.nix index 373f06b6d046..fb14d7ab164c 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "webexteamssdk"; + pname = "webexpythonsdk"; version = "2.0.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CiscoDevNet"; - repo = "webexteamssdk"; + repo = "WebexPythonSDK"; rev = "refs/tags/v${version}"; hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; - homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + homepage = "https://github.com/WebexCommunity/WebexPythonSDK"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e31ff8139b6a..9432bbf2ce1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17580,7 +17580,7 @@ self: super: with self; { webencodings = callPackage ../development/python-modules/webencodings { }; - webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; + webexpythonsdk = callPackage ../development/python-modules/webexpythonsdk { }; webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { }; From 9657b7e87e46a4544ee68467f924f9e0654ee932 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:38:23 +0100 Subject: [PATCH 140/173] python312Packages.webexteamssdk: reinit at 1.6.1 Still required by opsdroid. --- .../python-modules/webexteamssdk/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/webexteamssdk/default.nix diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix new file mode 100644 index 000000000000..30eeb64d83a1 --- /dev/null +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + setuptools, + versioneer, +}: + +buildPythonPackage rec { + pname = "webexteamssdk"; + version = "1.6.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "CiscoDevNet"; + repo = "webexteamssdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; + }; + + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + future + pyjwt + requests + requests-toolbelt + ]; + + # Tests require a Webex Teams test domain + doCheck = false; + + pythonImportsCheck = [ "webexteamssdk" ]; + + meta = with lib; { + description = "Python module for Webex Teams APIs"; + homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9432bbf2ce1b..0d4b3e63579c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17582,6 +17582,8 @@ self: super: with self; { webexpythonsdk = callPackage ../development/python-modules/webexpythonsdk { }; + webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; + webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { }; weblate-language-data = callPackage ../development/python-modules/weblate-language-data { }; From 4acbaa55d23d7395b0a3ef638e611eec2eda7fab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:47:22 +0100 Subject: [PATCH 141/173] yt-dlp: expose optional-dependencies This is required so that other packages, that want to consume them can resolve them. --- pkgs/by-name/yt/yt-dlp/package.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 2590f7136eb9..c3149189b538 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -30,17 +30,25 @@ python3Packages.buildPythonApplication rec { hatchling ]; - dependencies = with python3Packages; [ - brotli - certifi - curl-cffi - mutagen - pycryptodomex - requests - secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` - urllib3 - websockets - ]; + # expose optional-dependencies, but provide all features + dependencies = lib.flatten (lib.attrValues optional-dependencies); + + optional-dependencies = { + default = with python3Packages; [ + brotli + certifi + mutagen + pycryptodomex + requests + urllib3 + websockets + ]; + curl-cffi = [ python3Packages.curl-cffi ]; + secretstorage = with python3Packages; [ + cffi + secretstorage + ]; + }; pythonRelaxDeps = [ "websockets" ]; From 10877199d013a5001dfe7ac456e205b1f6b80282 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:55:42 +0100 Subject: [PATCH 142/173] Revert "python312Packages.pyvicare: drop" This reverts commit 6d51ba74705d9a834fbc43e01480a1e28baf9039. Restore pyvicare, as home-assistant switched back to it. --- .../python-modules/pyvicare/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 2 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pyvicare/default.nix diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 000000000000..69edcefbb4a0 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -0,0 +1,50 @@ +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + pkce, + pytestCheckHook, + pythonOlder, + simplejson, +}: + +buildPythonPackage rec { + pname = "pyvicare"; + version = "2.32.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "somm15"; + repo = "PyViCare"; + rev = "refs/tags/${version}"; + hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version_config=True," 'version="${version}",' \ + --replace "'setuptools-git-versioning<1.8.0'" "" + ''; + + propagatedBuildInputs = [ + authlib + pkce + ]; + + nativeCheckInputs = [ + pytestCheckHook + simplejson + ]; + + pythonImportsCheck = [ "PyViCare" ]; + + meta = with lib; { + description = "Python Library to access Viessmann ViCare API"; + homepage = "https://github.com/somm15/PyViCare"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f95a421d109f..102bc381b20a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -549,7 +549,6 @@ mapAliases ({ pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 - pyvicare = pyvicare-neo; # added 2024-08-31 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d4b3e63579c..0a054c262d98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13213,6 +13213,8 @@ self: super: with self; { pyvex = callPackage ../development/python-modules/pyvex { }; + pyvicare = callPackage ../development/python-modules/pyvicare { }; + pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; From 38cc849365c328f6fd998e7712102f59d6bd428c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:59:32 +0100 Subject: [PATCH 143/173] python312Packages.pyvicare: 2.32.0 -> 2.35.0 https://github.com/openviess/PyViCare/releases/tag/2.33.0 https://github.com/openviess/PyViCare/releases/tag/2.33.1 https://github.com/openviess/PyViCare/releases/tag/2.34.0 https://github.com/openviess/PyViCare/releases/tag/2.34.1 https://github.com/openviess/PyViCare/releases/tag/2.35.0 --- .../python-modules/pyvicare/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 69edcefbb4a0..2d60fc3af1f2 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -3,45 +3,46 @@ authlib, buildPythonPackage, fetchFromGitHub, - pkce, + poetry-core, + requests, + pytest-cov-stub, pytestCheckHook, - pythonOlder, simplejson, }: buildPythonPackage rec { pname = "pyvicare"; - version = "2.32.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.35.0"; + pyproject = true; src = fetchFromGitHub { - owner = "somm15"; + owner = "openviess"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; + hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "version_config=True," 'version="${version}",' \ - --replace "'setuptools-git-versioning<1.8.0'" "" + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.1.0"' 'version = "${version}"' ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ authlib - pkce + requests ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook - simplejson ]; pythonImportsCheck = [ "PyViCare" ]; meta = with lib; { + changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}"; description = "Python Library to access Viessmann ViCare API"; homepage = "https://github.com/somm15/PyViCare"; license = with licenses; [ asl20 ]; From 01714b8905078859c9ad259cdc15b69b223cb2d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:52:20 +0100 Subject: [PATCH 144/173] python312Packages.teslemetry-stream: init at 0.4.2 --- .../teslemetry-stream/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/teslemetry-stream/default.nix diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix new file mode 100644 index 000000000000..1154f0380442 --- /dev/null +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "teslemetry-stream"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Teslemetry"; + repo = "python-teslemetry-stream"; + rev = "v${version}"; + hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "teslemetry_stream" ]; + + meta = { + changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}"; + description = "Python library for the Teslemetry Streaming API"; + homepage = "https://github.com/Teslemetry/python-teslemetry-stream"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a054c262d98..e79a9727c83d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15640,6 +15640,8 @@ self: super: with self; { teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; + teslemetry-stream = callPackage ../development/python-modules/teslemetry-stream { }; + tess = callPackage ../development/python-modules/tess { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; From c50bfd50d3acc85b447b878f1e8e9e0514710475 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:52:38 +0100 Subject: [PATCH 145/173] home-assistant: 2024.10.04 -> 2024.11.0 https://www.home-assistant.io/blog/2024/11/06/release-202411/ --- .../home-assistant/component-packages.nix | 106 ++++++++++++++---- pkgs/servers/home-assistant/default.nix | 39 +++++-- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 15 +++ .../update-component-packages.py | 1 + 5 files changed, 132 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 07cc7ecb0e62..f72064a46c0f 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 = "2024.10.4"; + version = "2024.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -145,6 +145,7 @@ asmog ]; "analytics" = ps: with ps; [ + aiohasupervisor fnv-hash-fast psutil-home-assistant sqlalchemy @@ -273,6 +274,7 @@ asyncarve ]; "arwn" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "aseko_pool_live" = ps: with ps; [ @@ -345,6 +347,7 @@ botocore ]; "axis" = ps: with ps; [ + aiohasupervisor axis paho-mqtt_1 ]; @@ -404,8 +407,6 @@ ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api - "bloomsky" = ps: with ps; [ - ]; "blue_current" = ps: with ps; [ bluecurrent-api ]; @@ -605,6 +606,7 @@ py-canary ]; "cast" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -638,6 +640,9 @@ "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; + "cisco_webex_teams" = ps: with ps; [ + webexpythonsdk + ]; "citybikes" = ps: with ps; [ ]; "clementine" = ps: with ps; [ @@ -651,6 +656,7 @@ "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -782,6 +788,7 @@ cached-ipaddress dbus-fast fnv-hash-fast + go2rtc-client ha-ffmpeg habluetooth hass-nabucasa @@ -936,6 +943,7 @@ dremel3dpy ]; "drop_connect" = ps: with ps; [ + aiohasupervisor dropmqttapi paho-mqtt_1 ]; @@ -943,6 +951,7 @@ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "dte_energy_bridge" = ps: with ps; [ @@ -1353,7 +1362,7 @@ forecast-solar ]; "forked_daapd" = ps: with ps; [ - spotipy + spotifyaio ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi @@ -1404,6 +1413,7 @@ ayla-iot-unofficial ]; "fully_kiosk" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 python-fullykiosk ]; @@ -1497,6 +1507,10 @@ "glances" = ps: with ps; [ glances-api ]; + "go2rtc" = ps: with ps; [ + go2rtc-client + pyturbojpeg + ]; "goalzero" = ps: with ps; [ goalzero ]; @@ -1512,6 +1526,7 @@ oauth2client ]; "google_assistant" = ps: with ps; [ + aiohasupervisor python-matter-server pyturbojpeg ]; @@ -1522,8 +1537,6 @@ google-cloud-speech google-cloud-texttospeech ]; - "google_domains" = ps: with ps; [ - ]; "google_generative_ai_conversation" = ps: with ps; [ google-generativeai ha-ffmpeg @@ -1701,6 +1714,7 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + aiohasupervisor ]; "homeassistant_green" = ps: with ps; [ aiohasupervisor @@ -1820,6 +1834,31 @@ "husqvarna_automower" = ps: with ps; [ aioautomower ]; + "husqvarna_automower_ble" = ps: with ps; [ + aioesphomeapi + aioruuvigateway + aioshelly + automower-ble + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + pyudev + zeroconf + ]; "huum" = ps: with ps; [ huum ]; @@ -2042,6 +2081,7 @@ ]; # missing inputs: pyirishrail "iron_os" = ps: with ps; [ aioesphomeapi + aiogithubapi aioruuvigateway aioshelly bleak @@ -2379,6 +2419,9 @@ "lg_soundbar" = ps: with ps; [ temescal ]; + "lg_thinq" = ps: with ps; [ + thinqconnect + ]; "lidarr" = ps: with ps; [ aiopyarr ]; @@ -2462,6 +2505,7 @@ aiolookin ]; "loqed" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2510,12 +2554,8 @@ "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - paho-mqtt_1 - ]; - "map" = ps: with ps; [ aiohasupervisor - home-assistant-frontend - pillow + paho-mqtt_1 ]; "marantz" = ps: with ps; [ ]; @@ -2531,6 +2571,7 @@ pillow ]; "matter" = ps: with ps; [ + aiohasupervisor python-matter-server ]; "maxcube" = ps: with ps; [ @@ -2570,7 +2611,8 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ yt-dlp - ]; + ] + ++ yt-dlp.optional-dependencies.default; "media_player" = ps: with ps; [ ]; "media_source" = ps: with ps; [ @@ -2695,6 +2737,7 @@ zeroconf ]; "mobile_app" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2799,18 +2842,23 @@ mpd2 ]; "mqtt" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_eventstream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_json" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_room" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_statestream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "msteams" = ps: with ps; [ @@ -2830,6 +2878,7 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 pymysensors ]; @@ -2868,6 +2917,7 @@ ha-ffmpeg ]; "netatmo" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3158,6 +3208,7 @@ ovoenergy ]; "owntracks" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3173,6 +3224,8 @@ "p1_monitor" = ps: with ps; [ p1monitor ]; + "palazzetti" = ps: with ps; [ + ]; # missing inputs: pypalazzetti "panasonic_bluray" = ps: with ps; [ panacotta ]; @@ -3187,11 +3240,6 @@ home-assistant-frontend pillow ]; - "panel_iframe" = ps: with ps; [ - aiohasupervisor - home-assistant-frontend - pillow - ]; "pcs_lighting" = ps: with ps; [ ]; "peco" = ps: with ps; [ @@ -3242,6 +3290,7 @@ "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3429,6 +3478,7 @@ zeroconf ]; "rachio" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3444,6 +3494,7 @@ aiopyarr ]; "radio_browser" = ps: with ps; [ + pycountry radios ]; "radiotherm" = ps: with ps; [ @@ -3948,6 +3999,7 @@ "smarther" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3982,6 +4034,7 @@ snapcast ]; "snips" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "snmp" = ps: with ps; [ @@ -4046,7 +4099,7 @@ plexwebsocket soco sonos-websocket - spotipy + spotifyaio zeroconf ]; "sony_projector" = ps: with ps; [ @@ -4064,13 +4117,12 @@ speedtest-cli ]; "spider" = ps: with ps; [ - spiderpy ]; "splunk" = ps: with ps; [ hass-splunk ]; "spotify" = ps: with ps; [ - spotipy + spotifyaio ]; "sql" = ps: with ps; [ sqlalchemy @@ -4253,6 +4305,7 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ + aiohasupervisor hatasmota paho-mqtt_1 ]; @@ -4304,6 +4357,7 @@ ]; "teslemetry" = ps: with ps; [ tesla-fleet-api + teslemetry-stream ]; "tessie" = ps: with ps; [ tesla-fleet-api @@ -4440,6 +4494,7 @@ pytomorrowio ]; "toon" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4650,7 +4705,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ - pyvicare-neo + pyvicare ]; "vilfo" = ps: with ps; [ vilfo-api-client @@ -4766,6 +4821,7 @@ "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ + aiohasupervisor aiowithings ha-ffmpeg hass-nabucasa @@ -4865,6 +4921,7 @@ "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4987,6 +5044,7 @@ zm-py ]; "zwave_js" = ps: with ps; [ + aiohasupervisor pyserial pyudev zwave-js-server-python @@ -5268,6 +5326,7 @@ "gios" "github" "glances" + "go2rtc" "goalzero" "gogogate2" "goodwe" @@ -5275,7 +5334,6 @@ "google_assistant" "google_assistant_sdk" "google_cloud" - "google_domains" "google_generative_ai_conversation" "google_mail" "google_photos" @@ -5332,6 +5390,7 @@ "humidifier" "hunterdouglas_powerview" "husqvarna_automower" + "husqvarna_automower_ble" "huum" "hvv_departures" "hydrawise" @@ -5408,6 +5467,7 @@ "lektrico" "lg_netcast" "lg_soundbar" + "lg_thinq" "lidarr" "life360" "lifx" @@ -5439,7 +5499,6 @@ "mailgun" "manual" "manual_mqtt" - "map" "mastodon" "matrix" "matter" @@ -5558,7 +5617,6 @@ "p1_monitor" "panasonic_viera" "panel_custom" - "panel_iframe" "peco" "pegel_online" "permobil" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0b56bf3763b0..915f4bf10287 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -161,6 +161,15 @@ let doCheck = false; # no tests }); + plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec { + version = "1.4.4"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-dlDytOSp/7npanxXH5uaDv29AP21UciEzIzDlMf6jf8="; + }; + }); + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -226,6 +235,15 @@ let }; }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { + version = "3.6.9"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; + }; + }); + pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { version = "0.1.12"; src = fetchFromGitHub { @@ -335,6 +353,15 @@ let ]; }; + voip-utils = super.voip-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.1.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -403,7 +430,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.4"; + hassVersion = "2024.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -421,13 +448,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-uaGGt5qCdyFXuEtg20MzmFd4PXkdPP8h4HJBvRV6sz8="; + hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-al45WS8SIgOM2TqGPIptZU7iNMapYUg+fK2MLh68lxs="; + hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw="; }; build-system = with python.pkgs; [ @@ -474,12 +501,9 @@ in python.pkgs.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace tests/test_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" - - substituteInPlace pyproject.toml --replace-fail "wheel~=0.43.0" wheel + substituteInPlace tests/test_core_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml - sed -i 's/wheel[~=]/wheel>/' pyproject.toml ''; dependencies = with python.pkgs; [ @@ -509,6 +533,7 @@ in python.pkgs.buildPythonApplication rec { orjson packaging pillow + propcache psutil-home-assistant pyjwt pyopenssl diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bb9cc204bf59..1ee12aaf46f3 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241002.4"; + version = "20241106.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-b1/VrN0r/7rvSCjSn9HugKLaA40yl4AsFugzmCZKzd8="; + hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 4f1ae7204fad..a9d12c4e43cb 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -8,10 +8,12 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { axis = getComponentDeps "deconz"; + gardena_bluetooth = getComponentDeps "husqvarna_automower_ble"; govee_ble = [ ibeacon-ble ]; hassio = getComponentDeps "homeassistant_yellow"; + husqvarna_automower_ble = getComponentDeps "gardena_bluetooth"; lovelace = [ pychromecast ]; @@ -35,6 +37,7 @@ let system_log = [ isal ]; + tesla_fleet = getComponentDeps "teslemetry"; xiaomi_miio = [ arrow ]; @@ -69,6 +72,10 @@ let # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; + honeywell = [ + # Failed: Unused ignore translations: component.honeywell.config.abort.reauth_successful. Please remove them from the ignore_translations fixture. + "--deselect=tests/components/honeywell/test_config_flow.py::test_reauth_flow" + ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" @@ -76,10 +83,18 @@ let # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; + jewish_calendar = [ + # Failed: Unused ignore translations: component.jewish_calendar.config.abort.reconfigure_successful. Please remove them from the ignore_translations fixture. + "--deselect tests/components/jewish_calendar/test_config_flow.py::test_reconfigure" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + nina = [ + # Failed: Unused ignore translations: component.nina.options.error.unknown. Please remove them from the ignore_translations fixture. + "--deselect tests/components/nina/test_config_flow.py::test_options_flow_unexpected_exception" + ]; sql = [ "-W" "ignore::sqlalchemy.exc.SAWarning" diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 1c68331d1c1c..5d8dbacd91bc 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -45,6 +45,7 @@ PKG_PREFERENCES = { "numpy": "numpy_1", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt_1", + "pysuezV2": "pysuez", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", From 5fd3b7e32d803c7fa4672ce52a3d5aaea5c8c3d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:02:35 +0100 Subject: [PATCH 146/173] python312Packages.pyvicare-neo: drop As home-assistant migrated back to pyvicare, this package has become obsolete. --- .../python-modules/pyvicare-neo/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/pyvicare-neo/default.nix diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix deleted file mode 100644 index 5980fca223f2..000000000000 --- a/pkgs/development/python-modules/pyvicare-neo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - authlib, - buildPythonPackage, - fetchFromGitHub, - lib, - poetry-core, - pytestCheckHook, - requests, - types-requests, -}: - -buildPythonPackage rec { - pname = "pyvicare-neo"; - version = "0.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "CFenner"; - repo = "PyViCare"; - rev = "refs/tags/v${version}"; - hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes="; - }; - - build-system = [ poetry-core ]; - - propagatedBuildInputs = [ - authlib - requests - types-requests - ]; - - pythonImportsCheck = [ "PyViCare" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}"; - description = "Library to communicate with the Viessmann ViCare API"; - homepage = "https://github.com/CFenner/PyViCare"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 102bc381b20a..d33cb84c62c2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -548,6 +548,7 @@ mapAliases ({ pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 + pyvicare-neo = pyvicare; # Added 2024-11-06 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e79a9727c83d..453d627ff5ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13215,8 +13215,6 @@ self: super: with self; { pyvicare = callPackage ../development/python-modules/pyvicare { }; - pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; - pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; pyvis = callPackage ../development/python-modules/pyvis { }; From f3e4138399f644a9c840131eaede18f10bd0daf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:51:33 +0100 Subject: [PATCH 147/173] python312Packages.devolo-plc-api: disable failing tests The pytest-httpx upgrade caused a few request mismatches here and there. --- pkgs/development/python-modules/devolo-plc-api/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index da12ca39dbd0..d88de025c3fe 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "protobuf>=4.22.0" "protobuf" + --replace-fail "protobuf>=4.22.0" "protobuf" ''; nativeBuildInputs = [ setuptools-scm ]; @@ -53,6 +53,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # pytest-httpx compat issue + "test_wrong_password_type" + ]; + pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { From 9e96929a3e672d146169c8391096f71ba43a5821 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:57:54 +0100 Subject: [PATCH 148/173] ytdl-sub: 2024.10.27.post5 -> 2024.11.6 https://github.com/jmbannon/ytdl-sub/releases/tag/2024.11.6 --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 5e43a0548088..7e3a59cdb392 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.10.27.post5"; + version = "2024.11.6"; pyproject = true; src = fetchPypi { inherit version; pname = "ytdl_sub"; - hash = "sha256-NVIQOoRAyiFtc83r7z7DfDiIdWIPmUwylNzG3KSyOXw="; + hash = "sha256-YMki+1rC726RtbZceoVbcpk/Gi3F81xxERQjpqLjn+A="; }; build-system = with python3Packages; [ From d8bdd0cfae6d01a0d25f93fabac21a85f313efd8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 00:48:46 +0100 Subject: [PATCH 149/173] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.172 -> 0.13.180 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.180/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 499b4b823ea8..fefbf501f1d2 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.172"; + version = "0.13.180"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo="; + hash = "sha256-OLCGoZ5C39D4yYJagowO914qJlQcJVScm/a1ZbR2alM="; }; build-system = [ setuptools ]; From a71792511cbf1f8ac7fae85c2ef47eac8aedad94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 01:07:26 +0100 Subject: [PATCH 150/173] python312Packages.directv: disable failing test Test is outdated and does not work with recent aiohttp versions. --- pkgs/development/python-modules/directv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 66526a2d0975..43a1a1d0e655 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Host '#' cannot contain '#' (at position 0) + "test_client_error" + ]; + pythonImportsCheck = [ "directv" ]; meta = with lib; { From 11f23199bd0779ccfda411a8cc23cf38d111ef79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 02:41:36 +0100 Subject: [PATCH 151/173] python312Packages.aiomodernforms: disable failing tests --- pkgs/development/python-modules/aiomodernforms/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 4727fa2b46a5..97e7f60eadf5 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/wonderslug/aiomodernforms/issues/273 + "test_connection_error" + "test_empty_response" + ]; + pythonImportsCheck = [ "aiomodernforms" ]; meta = with lib; { From 6e95221e2e76a75bda0395238623295b363f68fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:05:18 +0100 Subject: [PATCH 152/173] python312Packages.homeassistant-stubs: 2024.10.4 -> 2024.11.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.11.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index efd82a902f22..44cff2d2d7ba 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.10.4"; + version = "2024.11.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-MjHqX1OP1mEEypAxZ8Xc+ZWBsfj4yiFG9oItFnf/svk="; + hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc="; }; build-system = [ From e40b41cc5f790ae2d609aba2aa37ffc0f578ee5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:16:33 +0100 Subject: [PATCH 153/173] python312Packages.denonavr: fix tests Makes the tests compatible with pytest-httpx 0.32.0. --- pkgs/development/python-modules/denonavr/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 771e615eca46..4c668367fb00 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, defusedxml, fetchFromGitHub, + fetchpatch2, ftfy, httpx, netifaces, @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/ol-iver/denonavr/commit/5320aadae91135a8c208c83d82688ddf26eb6498.patch"; + hash = "sha256-F9R5GJ1XK3lHWLY+OgzKu3+xCosK3nX4EII9J1jhlys="; + }) + ]; + pythonRelaxDeps = [ "defusedxml" ]; build-system = [ setuptools ]; From f1678e98bd8f2fc1c96deec3b9f86ad957ff2e0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:36:43 +0100 Subject: [PATCH 154/173] python312Packages.glances-api: fix tests --- pkgs/development/python-modules/glances-api/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bceb44eb0b6f..0f0f22280579 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, httpx, poetry-core, pytest-asyncio, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch"; + hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8="; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ httpx ]; From d1dcf229be67e06c201880ef6e1586996ce73584 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:34:00 +0100 Subject: [PATCH 155/173] python312Packages.tesla-powerwall: disable failing test The URL representation changed somewhere between yarl 1.9 and 1.10. --- pkgs/development/python-modules/tesla-powerwall/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 8677ae389af6..b5ce22702ae0 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # yarl compat issue https://github.com/jrester/tesla_powerwall/issues/68 + "test_parse_endpoint" + ]; + pytestFlagsArray = [ "tests/unit" ]; pythonImportsCheck = [ "tesla_powerwall" ]; From 4d69655157fc559a9e1e125cf3896bb864220fdb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:44:17 +0100 Subject: [PATCH 156/173] python312Packagse.aioskybell: disable failing tests Newer aiohttp version (3.10.6+) removed an attribute on an object. --- pkgs/development/python-modules/aioskybell/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 922d60f4c33c..d67a770f18fd 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -47,6 +47,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp compat issues + "test_get_devices" + "test_errors" + "test_async_change_setting" + ]; + pythonImportsCheck = [ "aioskybell" ]; meta = with lib; { From 157d63ef922d9fc3d040ce5ebf30f5046c74eae4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:57:32 +0100 Subject: [PATCH 157/173] python312Packages.pytomorrowio: disable failing test --- pkgs/development/python-modules/pytomorrowio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index b749a805eb27..2e3a5f4afbc3 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp 3.10.6 compat + "test_errors" + ]; + pythonImportsCheck = [ "pytomorrowio" ]; meta = { From 327821b9c0cf465e60a5277223a92c5579b90f69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 05:30:32 +0100 Subject: [PATCH 158/173] Revert "python3Packages.pytubefix: 6.4.2 -> 6.17.0" This reverts commit feeaf70c4d207045565b7c375086cdf5ee25c0ca. API breakage in the testsuite. --- pkgs/development/python-modules/pytubefix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 3610c50b3a00..343bcca0a965 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "6.17.0"; + version = "6.4.2"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; rev = "refs/tags/v${version}"; - hash = "sha256-7AHmRAJ8wL8/V5uQyjdsEUxHQz0n+3pxi9FpMsM1l4U="; + hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM="; }; build-system = [ setuptools ]; From d29b9af649d82fee24795e505fe478e405cea73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Nov 2024 22:22:21 -0800 Subject: [PATCH 159/173] python312Packages.pybase64: use pep517 builder, modernize, fix tests --- .../python-modules/pybase64/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index f41685c71150..5af9c6561a0d 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,33 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pybase64"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cU8CHD6qKHwQl87Wjy30xbLs0lBFUcLnHIQ/VDZaygM="; + src = fetchFromGitHub { + owner = "mayeut"; + repo = "pybase64"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; pythonImportsCheck = [ "pybase64" ]; - meta = with lib; { + meta = { description = "Fast Base64 encoding/decoding"; mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; - changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; - license = licenses.bsd2; + changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.bsd2; maintainers = [ ]; }; } From 27cff3021567389c8633d0ea96d5af04dcb263c7 Mon Sep 17 00:00:00 2001 From: Zuruh Date: Thu, 7 Nov 2024 19:49:58 +0100 Subject: [PATCH 160/173] phpactor: 2024.06.30.0 -> 2024.11.05.0 (#354051) --- pkgs/by-name/ph/phpactor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index dbd86adc44cc..7a171733b480 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2024.06.30.0"; + version = "2024.11.05.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM="; + hash = "sha256-/h7Apqo0N4aQvLfzfV/v35npo1wwOOZksokJKhCp8oA="; }; - vendorHash = "sha256-Q72EeGeVqjaOZeW8VAB59OY0E/wvL8Ljq/9XC4iK/rg="; + vendorHash = "sha256-nfy2H6isjW7m0UdPaX9Kqt2iwA2IwOhHE+xmqJ2t1qo="; nativeBuildInputs = [ installShellFiles ]; From 955ec32efc94de5ae082c02834d74262c352c810 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 7 Nov 2024 06:43:17 +0000 Subject: [PATCH 161/173] warzone2100: 4.5.3 -> 4.5.4 Changes: https://github.com/Warzone2100/warzone2100/releases/tag/4.5.4 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 81ab98e67bc9..e7377243ab3d 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-7tSfLkVth9nbGSwn1uNWeFrHx5ac+jaO3Gk9Bb+hLIk="; + hash = "sha256-v7Odn5UJwNxdr6Pm959VgtdkFJYpN6e9f30bVXqIr8I="; }; buildInputs = [ From 9d4343b7b27a3e6f08fc22ead568233ff24bbbde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 10:19:28 +0000 Subject: [PATCH 162/173] ladybird: 0-unstable-2024-10-22 -> 0-unstable-2024-11-06 --- pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1e445f9dd56d..1a61d7cf77a3 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-10-22"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "648fac7215e1841e3714d4c72c7aee75152da522"; - hash = "sha256-OB9dV+dNr5eA4h1+telYitrI62m+XSK/SYc9UPs7D4M="; + rev = "ad1ba30b27ff2802b6e743c6b8970e4bd1309dfc"; + hash = "sha256-vrRkUTWHm+2GTJ3axO2oPJ0gKyMSH8Reh3TjYYze/Io="; }; postPatch = '' From 38835c82566164a08de5b95531a65ca4a261ec1b Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 19:08:21 +0000 Subject: [PATCH 163/173] stdenv/darwin: add `darwin.{libutil,copyfile}` to SDK packages --- pkgs/stdenv/darwin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6f8ffaec92f1..cce15dff2b7b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -349,9 +349,11 @@ let inherit (prevStage.darwin) Csu adv_cmds + copyfile libiconv libresolv libsbuf + libutil system_cmds ; }; From a061b02a6fc13985524e3fb5bf1da25b950d42ef Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 19:07:30 +0000 Subject: [PATCH 164/173] Revert "python{27,39,310,311,312,313,314}: use a bootstrap SDK on Darwin" No longer necessary to mask an unwanted Python rebuild. This reverts commit c455166b5f3e62357fd0c40be2721dd78c36cfca. --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index a7b34e3329d1..20c7c0c145ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -180,7 +180,7 @@ let darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.hostPlatform.isDarwin [ # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default. - (apple-sdk_11.override { enableBootstrap = true; }) + apple-sdk_11 ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads From ae4fd669e4a5be2038fde3519dce1d79f450be0c Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 00:34:35 +0800 Subject: [PATCH 165/173] qt6.wrapQtAppsHook: add `qtwayland` to `propagatedBuildInputs` qtwayland client side is the wayland platform plugin, provides a way to run Qt applications as Wayland clients without this, Qt applications only work on x11/xwayland Co-authored-by: Artturin --- pkgs/development/libraries/qt-6/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index d306c3e430da..036b4d6eea70 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -164,10 +164,11 @@ let qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtwayland }: makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = lib.optionals stdenv.isLinux [ qtwayland.out ]; } ./hooks/wrap-qt-apps-hook.sh) { }; From b7cd0d3c885afc3e087ea54ed568baaee0bee7ce Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 00:37:09 +0800 Subject: [PATCH 166/173] qt6.wrapQtAppsNoGuiHook: init Unlike wrapQtAppsHook, wrapQtAppsNoGuiHook does not propagate qtwayland, to reduce closure size for CLI or other non-GUI applications. Co-authored-by: eclairevoyant --- pkgs/development/libraries/qt-6/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 036b4d6eea70..34774144f876 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -172,6 +172,14 @@ let } ./hooks/wrap-qt-apps-hook.sh) { }; + wrapQtAppsNoGuiHook = callPackage + ({ makeBinaryWrapper }: makeSetupHook + { + name = "wrap-qt6-apps-no-gui-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; + qmake = callPackage ({ qtbase }: makeSetupHook { From f542c493ada97abfc785a33bf2eb61b7516f2b52 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 01:18:59 +0800 Subject: [PATCH 167/173] qt6.qtwayland: set meta.{platforms,badPlatforms} --- pkgs/development/libraries/qt-6/default.nix | 2 +- pkgs/development/libraries/qt-6/modules/qtwayland.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 34774144f876..b9d3c0e56ced 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -168,7 +168,7 @@ let { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = lib.optionals stdenv.isLinux [ qtwayland.out ]; + depsTargetTargetPropagated = lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ qtwayland.out ]; } ./hooks/wrap-qt-apps-hook.sh) { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 54346345e4e3..d3d55685f5fb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,4 +1,5 @@ -{ qtModule +{ lib +, qtModule , qtbase , qtdeclarative , wayland @@ -22,4 +23,9 @@ qtModule { postPatch = '' cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml ''; + + meta = { + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; } From ff6a0848ca8066e21fd2a64167cf3a002ea39a13 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 5 Nov 2024 23:20:31 +0200 Subject: [PATCH 168/173] qt6.wrapQtAppsHook: Only propagate plugins,qml of `qtwayland` qt6.{wrapQtAppsHook,wrapQtAppsNoGuiHook}: propagate `qtbase` plugins https://www.github.com/NixOS/nixpkgs/pull/352419#discussion_r1823132984 --- pkgs/development/libraries/qt-6/default.nix | 24 ++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index b9d3c0e56ced..a4aa9124c3b9 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -7,6 +7,7 @@ , fetchpatch2 , makeSetupHook , makeWrapper +, runCommand , gst_all_1 , libglvnd , darwin @@ -37,6 +38,15 @@ let apple-sdk_15 (darwinMinVersionHook "12.0") ]; + + onlyPluginsAndQml = drv: let + drv' = drv.__spliced.targetTarget or drv; + inherit (self.qtbase) qtPluginPrefix qtQmlPrefix; + in (runCommand "${drv'.name}-only-plugins-qml" { } '' + mkdir -p $(dirname "$out/${qtPluginPrefix}") + test -d "${drv'}/${qtPluginPrefix}" && ln -s "${drv'}/${qtPluginPrefix}" "$out/${qtPluginPrefix}" || true + test -d "${drv'}/${qtQmlPrefix}" && ln -s "${drv'}/${qtQmlPrefix}" "$out/${qtQmlPrefix}" || true + ''); in { @@ -164,19 +174,27 @@ let qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper, qtwayland }: makeSetupHook + ({ makeBinaryWrapper, qtwayland, qtbase }: + makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ qtwayland.out ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ] ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ + (onlyPluginsAndQml qtwayland) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; wrapQtAppsNoGuiHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtbase }: makeSetupHook { name = "wrap-qt6-apps-no-gui-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; From 9501a2053937d1783e69d29d968014ceb388df12 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:03:22 +0800 Subject: [PATCH 169/173] qtbase-setup-hook: add wrapQtAppsNoGuiHook to error message Co-authored-by: eclairevoyant --- pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 1ccfbd0cba38..4057a3c67eed 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -75,9 +75,9 @@ else # Only set up Qt once. fi qtPreHook() { - # Check that wrapQtAppsHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + echo >&2 "Error: neither wrapQtAppsHook nor wrapQtAppsNoGuiHook are used, and dontWrapQtApps is not set either." exit 1 fi } From a2d3be9d042eecca5eb45a40cf148c62613dcee9 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:20:19 +0800 Subject: [PATCH 170/173] deepin.dde-application-manager: use wrapQtAppsNoGuiHook to avoid propagating qtwayland Co-authored-by: eclairevoyant --- pkgs/desktops/deepin/core/dde-application-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index 73b412d7e6da..d265cfdc6c06 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qt6Packages.wrapQtAppsHook + qt6Packages.wrapQtAppsNoGuiHook ]; buildInputs = [ From 89fd77165500d7488a89a84a78a1b7b1507d8e3e Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:21:41 +0800 Subject: [PATCH 171/173] pineapple-pictures: let wrapQtAppsHook propagate qtwayland --- pkgs/applications/graphics/pineapple-pictures/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 423ceaadc087..cb03e41704c5 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , qtsvg -, qtwayland , qttools , exiv2 , wrapQtAppsHook @@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtsvg - qtwayland exiv2 ]; From 98774a34c85a160386f0b8419364b8eb4867fcba Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:00:13 +0800 Subject: [PATCH 172/173] doc/qt: Mention propagates and wrapQtAppsNoGuiHook Co-authored-by: eclairevoyant Co-authored-by: Artturin --- doc/languages-frameworks/qt.section.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index dcec4b6fff42..6da0d7b501e9 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -25,12 +25,14 @@ stdenv.mkDerivation { The same goes for Qt 5 where libraries and tools are under `libsForQt5`. -Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. +Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ::: {.note} -Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available. -This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674). +`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` to ensure the Wayland platform plugin is available, which is required for graphical applications to run under Wayland on non-Qt based desktops. On platforms that do not support `qtwayland` (e.g. Darwin), only plugins `qtbase` will be propagated. + +`wrapQtAppsNoGuiHook` does not propagate `qtwayland` reduce closure size for purely command-line applications. + ::: ## Packages supporting multiple Qt versions {#qt-versions} From c8aec3b28a36121fce3a8ee71c7c64535e7f45e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 7 Nov 2024 10:52:43 +0300 Subject: [PATCH 173/173] qt: editing pass on docs --- doc/languages-frameworks/qt.section.md | 4 ++-- pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 6da0d7b501e9..9b3d1e054a62 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -29,9 +29,9 @@ Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nati ::: {.note} -`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` to ensure the Wayland platform plugin is available, which is required for graphical applications to run under Wayland on non-Qt based desktops. On platforms that do not support `qtwayland` (e.g. Darwin), only plugins `qtbase` will be propagated. +`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications. -`wrapQtAppsNoGuiHook` does not propagate `qtwayland` reduce closure size for purely command-line applications. +`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications. ::: diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 4057a3c67eed..48beac0b04fa 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -77,7 +77,10 @@ else # Only set up Qt once. qtPreHook() { # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: neither wrapQtAppsHook nor wrapQtAppsNoGuiHook are used, and dontWrapQtApps is not set either." + echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." + echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" + echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi }