From f25ad9c54757eddb2b1040ffe75f154a85a3388c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 21 Apr 2024 17:50:58 +0200 Subject: [PATCH 001/562] aflplusplus: 4.10c -> 4.20c --- pkgs/tools/security/aflplusplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 5d4b761df334..9351a1c8f5c3 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -19,13 +19,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.10c"; + version = "4.20c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; rev = "v${version}"; - sha256 = "sha256-elghcBw2tIttQo7bkMFRCx8iNqxwY0NCz0343wc8hWA="; + sha256 = "sha256-bS4Zxd2CX8m6zxO/izJi7Cj34260mOaU6GWjEj+xEU8="; }; enableParallelBuilding = true; From 4d12a2d7177f9126b8d1be9ec494b6c6c47f03c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Sun, 28 Apr 2024 12:24:01 +0200 Subject: [PATCH 002/562] tilt: 0.33.10 -> 0.33.13 --- .../networking/cluster/tilt/assets.nix | 84 ++++++++++++++----- .../networking/cluster/tilt/default.nix | 4 +- 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix index 8fafcf666d8d..a77db6f1574d 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -1,46 +1,86 @@ { lib , stdenvNoCC -, version, src -, fetchYarnDeps -, fixup-yarn-lock, yarn, nodejs +, nodejs +, yarn-berry +, cacert +, version +, src }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "tilt-assets"; + src = "${src}/web"; + inherit version; - inherit src version; + nativeBuildInputs = [ nodejs yarn-berry ]; - nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; + yarnOfflineCache = stdenvNoCC.mkDerivation { + name = "tilt-assets-deps"; + src = "${src}/web"; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/web/yarn.lock"; - hash = "sha256-0JpoAQKRmU7P1bzYNR/vqtPjOOSw8wSlNjXl2f6uBrw="; + nativeBuildInputs = [ yarn-berry ]; + + supportedArchitectures = builtins.toJSON { + os = [ "darwin" "linux" ]; + cpu = [ "arm" "arm64" "ia32" "x64" ]; + libc = [ "glibc" "musl" ]; + }; + + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + export YARN_ENABLE_TELEMETRY=0 + + yarn config set enableGlobalCache false + yarn config set cacheFolder $out + yarn config set supportedArchitectures --json "$supportedArchitectures" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + yarn install --immutable --mode skip-build + + runHook postBuild + ''; + + dontInstall = true; + + outputHashAlgo = "sha256"; + outputHash = "sha256-UpKWpwKUouW4BHZAQNvg4PeQ3bd28mrbv547GyN/drI="; + outputHashMode = "recursive"; }; configurePhase = '' - export HOME=$(mktemp -d)/yarn_home + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + export YARN_ENABLE_TELEMETRY=0 + + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + runHook postConfigure ''; buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - - cd web - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-engines - patchShebangs node_modules - export PATH=$PWD/node_modules/.bin:$PATH - ./node_modules/.bin/react-scripts build - - mkdir -p $out - cd .. + yarn install --immutable --immutable-cache + yarn build runHook postBuild ''; installPhase = '' - cp -r web/build/* $out + mkdir -p $out + cp -r build/. $out/ ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 819d3dbc5095..af3f171d3c1e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ let args = rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.33.10"; + version = "0.33.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; rev = "v${version}"; - hash = "sha256-LPb2tC3xIGhjiLYkTU+NBIUoqiicO2ORM6Nt1eTnwQs="; + hash = "sha256-B1kau6G56Iz6Yso2KpJCPE18yznhKCmq+Pabi2sxSmI="; }; }; From f46833c5d662daed5e54276d1b9918ab24b6e5d3 Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Mon, 13 May 2024 18:42:16 +0100 Subject: [PATCH 003/562] vimPlugins.advanced-git-search-nvim: init at 2024-05-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 1f59cc3e3541..24f072aaf34f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -508,6 +508,18 @@ final: prev: meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; + advanced-git-search-nvim = buildVimPlugin { + pname = "advanced-git-search.nvim"; + version = "2024-05-13"; + src = fetchFromGitHub { + owner = "aaronhallaert"; + repo = "advanced-git-search.nvim"; + rev = "d11e1360b7cdb9270673b7852bbc1e91e1af25da"; + sha256 = "12ymb4n81z8brzc6n19h5mfb1pnfxwrnvgnss6wqjilzqa1cmjzw"; + }; + meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; + }; + adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; version = "2024-04-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c38f517d7369..5ff8728d623d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -126,6 +126,10 @@ nvimRequireCheck = "alpha"; }; + advanced-git-search-nvim = super.autosave-nvim.overrideAttrs { + dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; + }; + autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index acdd809e5438..88b809ac92be 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -41,6 +41,7 @@ https://github.com/vim-scripts/a.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, https://github.com/aznhe21/actions-preview.nvim/,, +https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD, https://github.com/Mofiqul/adwaita.nvim/,HEAD, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, From 72c75d010197999a8686cba42eb001483cc25791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pe=C3=AFo=20Thibault?= Date: Tue, 21 May 2024 01:14:39 +0200 Subject: [PATCH 004/562] qwerty-fr: init at 0.7.3 --- pkgs/by-name/qw/qwerty-fr/package.nix | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/qw/qwerty-fr/package.nix diff --git a/pkgs/by-name/qw/qwerty-fr/package.nix b/pkgs/by-name/qw/qwerty-fr/package.nix new file mode 100644 index 000000000000..5e182585002f --- /dev/null +++ b/pkgs/by-name/qw/qwerty-fr/package.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, lib +, unzip +, +}: + +stdenv.mkDerivation rec { + pname = "qwerty-fr"; + version = "0.7.3"; + + src = fetchurl { + url = "https://github.com/qwerty-fr/qwerty-fr/releases/download/v${version}/qwerty-fr_${version}_linux.zip"; + sha256 = "0csxzs2gk8l4y5ii1pgad8zxr9m9mfrl9nblywymg01qw74gpvnm"; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/bin + ''; + + meta = with lib; { + description = "Qwerty keyboard layout with French accents"; + homepage = "https://github.com/qwerty-fr/qwerty-fr"; + license = licenses.mit; + maintainers = with maintainers; [ potb ]; + }; +} From 146f08b87ad2fa039d0be5e8299dd80ab4ceb745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pe=C3=AFo=20Thibault?= Date: Fri, 24 May 2024 16:01:53 +0200 Subject: [PATCH 005/562] maintainers: add potb --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dad1f76ab7c3..93e28ba6868e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16325,6 +16325,11 @@ githubId = 146413; name = "Tobias Poschwatta"; }; + potb = { + name = "Peïo Thibault"; + github = "potb"; + githubId = 10779093; + }; poweredbypie = { name = "poweredbypie"; github = "poweredbypie"; From 7f3fcae7214f19283a046963418c0c973aaa2d4d Mon Sep 17 00:00:00 2001 From: 0x61nas Date: Thu, 30 May 2024 19:14:29 +0300 Subject: [PATCH 006/562] mdt: init at 0.8.1 --- pkgs/by-name/md/mdt/package.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/md/mdt/package.nix diff --git a/pkgs/by-name/md/mdt/package.nix b/pkgs/by-name/md/mdt/package.nix new file mode 100644 index 000000000000..be625a812383 --- /dev/null +++ b/pkgs/by-name/md/mdt/package.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, darwin +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "mdt"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "henriklovhaug"; + repo = "md-tui"; + rev = "v${version}"; + hash = "sha256-AwJvB1xLsJCr+r0RJi8jH50QlPq7mbUibvmvYZJi9XE="; + }; + + cargoHash = "sha256-VNuC0tSlFKlQV1KJKxKUiBHEpdVAyQpAJKbYZ8ntVaQ="; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + + meta = { + description = "Markdown renderer in the terminal"; + homepage = "https://github.com/henriklovhaug/md-tui"; + changelog = "https://github.com/henriklovhaug/md-tui/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + mainProgram = "mdt"; + maintainers = with lib.maintainers; [ anas ]; + platforms = with lib.platforms; unix ++ windows; + }; +} From 987e2b5f6bfd98526f443b5fc311f561aa063b73 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 22 Jun 2024 01:06:49 +0200 Subject: [PATCH 007/562] all-cabal-hashes: 2024-05-20T16:06:03Z -> 2024-06-21T20:16:00Z 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 e263b38146cd..3ebc8c86903d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a71af8d538cda614baa0bcb3e44600061f815d57", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a71af8d538cda614baa0bcb3e44600061f815d57.tar.gz", - "sha256": "0hsqzdfb89rqmplipz39x7m80czcvrmk42y05ifnqjhxn6q4v91l", - "msg": "Update from Hackage at 2024-05-20T16:06:03Z" + "commit": "dedf3d10eddcac8df226ecb1597ac081155da8cd", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dedf3d10eddcac8df226ecb1597ac081155da8cd.tar.gz", + "sha256": "0p7bqrwkx8b1ww00zrrxzlbvvimbrdl9gj0llzbjkc15f06kcsa4", + "msg": "Update from Hackage at 2024-06-21T20:16:00Z" } From c93c1b3413bd7e235fc22b469bc0d2feec332cf5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 22 Jun 2024 01:07:17 +0200 Subject: [PATCH 008/562] haskellPackages: stackage LTS 22.22 -> LTS 22.26 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 237 +++++++++--------- 1 file changed, 120 insertions(+), 117 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c1d2610360c2..25a460128134 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.22 +# Stackage LTS 22.26 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -361,6 +361,7 @@ default-package-overrides: - appendful ==0.1.0.0 - appendful-persistent ==0.1.0.1 - appendmap ==0.1.5 + - apply-merge ==0.1.1.0 - apply-refact ==0.13.0.0 - apportionment ==0.0.0.4 - approximate ==0.3.5 @@ -402,8 +403,8 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - - attoparsec-framer ==0.1.0.3 - - attoparsec-iso8601 ==1.1.0.1 + - attoparsec-framer ==0.1.0.4 + - attoparsec-iso8601 ==1.1.1.0 - attoparsec-path ==0.0.0.1 - attoparsec-run ==0.0.2.0 - attoparsec-time ==1.0.3.1 @@ -415,7 +416,7 @@ default-package-overrides: - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 - - autoexporter ==2.0.0.9 + - autoexporter ==2.0.0.12 - auto-update ==0.1.6 - avro ==0.6.1.2 - aws ==0.24.1 @@ -453,8 +454,8 @@ default-package-overrides: - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - beam-core ==0.10.1.0 - - bech32 ==1.1.6 - - bech32-th ==1.1.6 + - bech32 ==1.1.7 + - bech32-th ==1.1.7 - benchpress ==0.2.2.23 - bencode ==0.6.1.1 - benri-hspec ==0.1.0.2 @@ -472,7 +473,7 @@ default-package-overrides: - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.4.1 + - binary-orphans ==1.0.5 - binary-parser ==0.5.7.6 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -490,7 +491,7 @@ default-package-overrides: - bitwise ==1.0.0.1 - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0.1 - - Blammo ==1.1.2.3 + - Blammo ==1.1.3.0 - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 @@ -507,7 +508,7 @@ default-package-overrides: - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 - bm ==0.2.0.0 - - bmp ==1.2.6.3 + - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - BNFC ==2.9.5 - BNFC-meta ==0.6.1 @@ -516,10 +517,10 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolsimplifier ==0.1.8 - - boomerang ==1.4.9.2 + - boomerang ==1.4.9.3 - boomwhacker ==0.0.1 - bordacount ==0.1.0.0 - - boring ==0.2.1 + - boring ==0.2.2 - bound ==2.0.7 - BoundedChan ==1.0.3.0 - bounded-qsem ==0.1.0.2 @@ -527,7 +528,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - box ==0.9.3.1 - boxes ==0.1.5 - - breakpoint ==0.1.3.1 + - breakpoint ==0.1.4.0 - brick ==2.1.1 - broadcast-chan ==0.2.1.2 - brotli ==0.0.0.1 @@ -544,7 +545,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.9 + - burrito ==2.0.1.10 - bv ==0.5 - bv-little ==1.3.2 - bv-sized ==1.0.5 @@ -631,7 +632,7 @@ default-package-overrides: - checkers ==0.6.0 - checksum ==0.0.0.1 - chimera ==0.3.4.0 - - choice ==0.2.3 + - choice ==0.2.4.1 - chronologique ==0.3.1.3 - chronos ==1.1.6.1 - chronos-bench ==0.2.0.2 @@ -666,8 +667,8 @@ default-package-overrides: - collect-errors ==0.1.6.0 - co-log ==0.6.1.0 - co-log-concurrent ==0.5.1.0 - - co-log-core ==0.3.2.1 - - co-log-polysemy ==0.0.1.4 + - co-log-core ==0.3.2.2 + - co-log-polysemy ==0.0.1.5 - colonnade ==1.2.0.2 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 @@ -676,9 +677,9 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.4.2 + - comfort-array ==0.5.5 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.2 + - comfort-blas ==0.0.3 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 @@ -729,7 +730,7 @@ default-package-overrides: - configurator-pg ==0.2.10 - config-value ==0.8.3 - constraints ==0.14.2 - - constraints-extras ==0.4.0.0 + - constraints-extras ==0.4.0.1 - constraint-tuples ==0.1.2 - construct ==0.3.1.2 - context ==0.2.1.0 @@ -759,7 +760,7 @@ default-package-overrides: - core-telemetry ==0.2.9.4 - core-text ==0.3.8.1 - countable ==1.2 - - country ==0.2.4.1 + - country ==0.2.4.2 - covariance ==0.2.0.1 - cpphs ==1.20.9.1 - cpu ==0.1.2 @@ -788,7 +789,7 @@ default-package-overrides: - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypton-x509 ==1.7.6 + - crypton-x509 ==1.7.7 - crypton-x509-store ==1.6.9 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.12 @@ -797,7 +798,7 @@ default-package-overrides: - cryptostore ==0.3.1.0 - crypt-sha512 ==0 - csp ==1.4.0 - - css-syntax ==0.1.0.1 + - css-syntax ==0.1.0.2 - css-text ==0.1.3.0 - c-struct ==0.1.3.0 - csv ==0.1.2 @@ -865,7 +866,7 @@ default-package-overrides: - debian ==4.0.5 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - - dec ==0.0.5 + - dec ==0.0.6 - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 @@ -977,9 +978,9 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.3.0.0 - - effectful-core ==2.3.0.1 - - effectful-plugin ==1.1.0.2 + - effectful ==2.3.1.0 + - effectful-core ==2.3.1.0 + - effectful-plugin ==1.1.0.3 - effectful-th ==1.0.0.1 - egison-pattern-src ==0.2.1.2 - either ==5.0.2 @@ -991,7 +992,7 @@ default-package-overrides: - elm-bridge ==0.8.3 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-street ==0.2.2.0 + - elm-street ==0.2.2.1 - elynx ==0.7.2.2 - elynx-markov ==0.7.2.2 - elynx-nexus ==0.7.2.2 @@ -1014,7 +1015,7 @@ default-package-overrides: - epub-metadata ==5.2 - eq ==4.3 - equal-files ==0.0.5.4 - - equational-reasoning ==0.7.0.2 + - equational-reasoning ==0.7.0.3 - equivalence ==0.4.1 - erf ==2.0.0.0 - errata ==0.4.0.2 @@ -1061,10 +1062,11 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.7 + - faktory ==1.1.3.0 + - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.2 + - fast-logger ==3.2.3 - fast-math ==1.0.2 - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 @@ -1113,7 +1115,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.4 + - flow ==2.0.0.5 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -1234,12 +1236,12 @@ default-package-overrides: - ghc-parser ==0.2.6.0 - ghc-paths ==0.1.0.12 - ghc-syntax-highlighter ==0.0.10.0 - - ghc-tcplugins-extra ==0.4.5 - - ghc-trace-events ==0.1.2.8 - - ghc-typelits-extra ==0.4.6 - - ghc-typelits-knownnat ==0.7.10 - - ghc-typelits-natnormalise ==0.7.9 - - ghc-typelits-presburger ==0.7.3.0 + - ghc-tcplugins-extra ==0.4.6 + - ghc-trace-events ==0.1.2.9 + - ghc-typelits-extra ==0.4.7 + - ghc-typelits-knownnat ==0.7.12 + - ghc-typelits-natnormalise ==0.7.10 + - ghc-typelits-presburger ==0.7.4.0 - ghost-buster ==0.1.1.0 - ghostscript-parallel ==0.0.1 - gi-atk ==2.0.27 @@ -1267,7 +1269,7 @@ default-package-overrides: - gi-soup ==2.4.28 - githash ==0.1.7.0 - github ==0.29 - - github-release ==2.0.0.10 + - github-release ==2.0.0.11 - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 @@ -1321,7 +1323,7 @@ default-package-overrides: - hackage-security ==0.6.2.4 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.2.0 + - hakyll ==4.16.2.1 - hakyllbars ==1.0.1.0 - hal ==1.0.1 - half ==0.3.1 @@ -1341,8 +1343,8 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.8 - - haskell-gi-base ==0.26.4 + - haskell-gi ==0.26.9 + - haskell-gi-base ==0.26.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 - HaskellNet ==0.6.1.2 @@ -1350,7 +1352,7 @@ default-package-overrides: - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.13 + - haskell-src-meta ==0.8.14 - haskintex ==0.8.0.2 - haskoin-core ==1.0.4 - haskoin-node ==1.0.1 @@ -1411,7 +1413,7 @@ default-package-overrides: - histogram-fill ==0.9.1.0 - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - - hkgr ==0.4.4 + - hkgr ==0.4.5 - hledger ==1.32.3 - hledger-iadd ==1.3.20 - hledger-interest ==1.6.6 @@ -1476,9 +1478,9 @@ default-package-overrides: - hslua-core ==2.3.2 - hslua-list ==1.1.1 - hslua-marshalling ==2.3.1 - - hslua-module-doclayout ==1.1.1 + - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 - - hslua-module-system ==1.1.1 + - hslua-module-system ==1.1.2 - hslua-module-text ==1.1.1 - hslua-module-version ==1.1.1 - hslua-module-zip ==1.1.3 @@ -1488,15 +1490,15 @@ default-package-overrides: - hslua-typing ==0.1.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.6 + - HsOpenSSL ==0.11.7.7 - HsOpenSSL-x509-system ==0.1.0.4 - - hspec ==2.11.8 - - hspec-api ==2.11.8 + - hspec ==2.11.9 + - hspec-api ==2.11.9 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.2 - - hspec-core ==2.11.8 - - hspec-discover ==2.11.8 + - hspec-core ==2.11.9 + - hspec-discover ==2.11.9 - hspec-expectations ==0.8.4 - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 @@ -1504,10 +1506,10 @@ default-package-overrides: - hspec-golden ==0.2.2.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.1.1.0 - - hspec-junit-formatter ==1.1.0.2 + - hspec-junit-formatter ==1.1.2.0 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - - hspec-meta ==2.11.8 + - hspec-meta ==2.11.9 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 - hspec-tmp-proc ==0.5.2.0 @@ -1548,7 +1550,7 @@ default-package-overrides: - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.0.2 + - http-reverse-proxy ==0.6.0.3 - http-streams ==0.8.9.9 - http-types ==0.12.4 - human-readable-duration ==0.2.1.4 @@ -1611,8 +1613,8 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.3 - - indexed-traversable-instances ==0.1.1.2 + - indexed-traversable ==0.1.4 + - indexed-traversable-instances ==0.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 - infinite-list ==0.1.1 @@ -1679,18 +1681,18 @@ default-package-overrides: - jose ==0.11 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.6 - - jsaddle ==0.9.9.0 + - jsaddle ==0.9.9.2 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.11 - - json-feed ==2.0.0.11 + - json-feed ==2.0.0.12 - jsonifier ==0.2.1.3 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - json-stream ==0.4.5.3 - - JuicyPixels ==3.3.8 + - JuicyPixels ==3.3.9 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.3 @@ -1700,7 +1702,7 @@ default-package-overrides: - kansas-comet ==0.4.2 - katip ==0.8.8.0 - katip-logstash ==0.1.0.2 - - katip-wai ==0.1.2.3 + - katip-wai ==0.1.2.4 - kazura-queue ==0.1.0.4 - kdt ==0.2.5 - keep-alive ==0.2.1.0 @@ -1723,7 +1725,7 @@ default-package-overrides: - koji-tool ==1.1.1 - kvitable ==1.0.3.0 - labels ==0.3.3 - - lackey ==2.0.0.7 + - lackey ==2.0.0.8 - lambdabot-core ==5.3.1.2 - lambdabot-irc-plugins ==5.3.1.2 - LambdaHack ==0.11.0.1 @@ -1742,7 +1744,7 @@ default-package-overrides: - language-lua ==0.11.0.2 - language-protobuf ==1.0.1 - language-python ==0.5.8 - - lapack ==0.5.1.1 + - lapack ==0.5.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 @@ -1750,7 +1752,7 @@ default-package-overrides: - lapack-hmatrix ==0.0.0.2 - largeword ==1.2.5 - latex ==0.1.0.4 - - lattices ==2.2 + - lattices ==2.2.1 - lawful ==0.1.0.0 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 @@ -1774,7 +1776,7 @@ default-package-overrides: - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - - libBF ==0.6.7 + - libBF ==0.6.8 - libffi ==0.2.1 - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 @@ -1797,9 +1799,9 @@ default-package-overrides: - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-shuffle ==1.0.0 + - list-shuffle ==1.0.0.1 - list-t ==1.0.5.7 - - list-transformer ==1.1.0 + - list-transformer ==1.1.1 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - literatex ==0.3.0.0 @@ -1835,7 +1837,7 @@ default-package-overrides: - lumberjack ==1.0.3.0 - lz4 ==0.2.3.1 - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.1.0 + - lzma ==0.0.1.1 - lzma-clib ==5.2.2 - machines ==0.7.3 - magic ==1.1 @@ -1845,7 +1847,7 @@ default-package-overrides: - main-tester ==0.2.0.1 - managed ==1.0.10 - mandrill ==0.5.7.0 - - mappings ==0.3.0.0 + - mappings ==0.3.1.0 - map-syntax ==0.3 - markdown ==0.1.17.5 - markdown-unlit ==0.6.0 @@ -1913,7 +1915,7 @@ default-package-overrides: - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minisat-solver ==0.1 - - miniterion ==0.1.1.0 + - miniterion ==0.1.1.1 - miniutter ==0.5.1.2 - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 @@ -1936,7 +1938,7 @@ default-package-overrides: - moffy ==0.1.1.0 - moffy-samples ==0.1.0.3 - moffy-samples-events ==0.2.2.5 - - monad-chronicle ==1.0.1 + - monad-chronicle ==1.0.2 - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.2.1 - monad-control-identity ==0.2.0.0 @@ -1965,10 +1967,10 @@ default-package-overrides: - monads-tf ==0.3.0.1 - monad-time ==0.4.0.0 - mongoDB ==2.7.1.4 - - monoidal-containers ==0.6.4.0 + - monoidal-containers ==0.6.5.0 - monoidal-functors ==0.2.3.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.5 + - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - mono-traversable ==1.0.17.0 @@ -2029,7 +2031,7 @@ default-package-overrides: - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - - netlib-ffi ==0.1.1 + - netlib-ffi ==0.1.2 - net-mqtt ==0.8.6.0 - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 @@ -2064,6 +2066,7 @@ default-package-overrides: - non-empty ==0.3.5 - nonempty-containers ==0.3.4.5 - non-empty-sequence ==0.2.0.4 + - non-empty-text ==0.2.1 - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 @@ -2104,7 +2107,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.3.0 + - opaleye ==0.10.3.1 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2136,9 +2139,9 @@ default-package-overrides: - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - - ordered-containers ==0.2.3 + - ordered-containers ==0.2.4 - ormolu ==0.7.2.0 - - os-string ==2.0.2.2 + - os-string ==2.0.3 - overhang ==1.0.0 - packcheck ==0.6.0 - pager ==0.1.1.0 @@ -2184,13 +2187,13 @@ default-package-overrides: - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 - path-extra ==0.3.1 - - path-io ==1.8.1 + - path-io ==1.8.2 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - pathtype ==0.8.1.3 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - - patrol ==1.0.0.7 + - patrol ==1.0.0.8 - pava ==0.1.1.4 - pcf-font ==0.2.2.1 - pcg-random ==0.1.4.0 @@ -2199,9 +2202,9 @@ default-package-overrides: - pcre-light ==0.4.1.2 - pcre-utils ==0.1.9 - pdc ==0.1.1 - - pdf-toolbox-content ==0.1.1 - - pdf-toolbox-core ==0.1.1 - - pdf-toolbox-document ==0.1.2 + - pdf-toolbox-content ==0.1.2 + - pdf-toolbox-core ==0.1.3 + - pdf-toolbox-document ==0.1.4 - peano ==0.1.0.2 - pedersen-commitment ==0.2.0 - pem ==0.2.4 @@ -2264,7 +2267,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.3 + - polysemy ==1.9.2.0 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.2 - polysemy-webserver ==0.2.1.2 @@ -2354,7 +2357,7 @@ default-package-overrides: - pusher-http-haskell ==2.1.0.17 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - - PyF ==0.11.2.1 + - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.9 @@ -2367,11 +2370,11 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-groups ==0.0.1.2 + - quickcheck-groups ==0.0.1.3 - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.3 + - quickcheck-monoid-subclasses ==0.3.0.4 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.8.0 @@ -2385,7 +2388,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.7 + - rampart ==2.0.0.8 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.2 @@ -2399,12 +2402,12 @@ default-package-overrides: - ranges ==0.2.4 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.5.3 + - rank2classes ==1.5.3.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.11 + - ratel ==2.0.0.12 - rate-limit ==1.4.3 - - ratel-wai ==2.0.0.6 + - ratel-wai ==2.0.0.7 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.1.3 @@ -2428,7 +2431,7 @@ default-package-overrides: - rec-def ==0.2.2 - record-hasfield ==1.0.1 - records-sop ==0.1.1.1 - - recursion-schemes ==5.2.2.5 + - recursion-schemes ==5.2.3 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 @@ -2480,12 +2483,12 @@ default-package-overrides: - rfc5051 ==0.2 - rg ==1.4.0.0 - riak-protobuf ==0.25.0.0 - - richenv ==0.1.0.1 + - richenv ==0.1.0.2 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.2 + - roc-id ==0.2.0.3 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.6 - rocksdb-query ==0.4.2 @@ -2524,7 +2527,7 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - saltine ==0.2.1.0 - - salve ==2.0.0.4 + - salve ==2.0.0.5 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2558,13 +2561,13 @@ default-package-overrides: - securemem ==0.1.10 - selections ==0.3.0.0 - selective ==0.7.0.1 - - semialign ==1.3 + - semialign ==1.3.1 - semigroupoids ==6.0.1 - semigroups ==0.20 - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - - sendfile ==0.7.11.5 + - sendfile ==0.7.11.6 - sendgrid-v3 ==1.0.0.1 - seqalign ==0.2.0.4 - seqid ==0.6.3 @@ -2651,23 +2654,23 @@ default-package-overrides: - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-pango ==0.1.0.1 - - simple-prompt ==0.2.2 + - simple-prompt ==0.2.3 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 - simple-templates ==2.0.0 - simple-vec3 ==0.6.0.1 - since ==0.0.0 - - singleton-bool ==0.1.7 + - singleton-bool ==0.1.8 - singleton-nats ==0.4.7 - singletons ==3.0.3 - singletons-base ==3.2 - - singletons-presburger ==0.7.3.0 + - singletons-presburger ==0.7.4.0 - singletons-th ==3.2 - Sit ==0.2023.8.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.3.2 - - sized ==1.1.0.1 + - sized ==1.1.0.2 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 @@ -2767,8 +2770,8 @@ default-package-overrides: - strict-base-types ==0.8 - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - - strict-list ==0.1.7.4 - - strict-tuple ==0.1.5.3 + - strict-list ==0.1.7.5 + - strict-tuple ==0.1.5.4 - strict-wrapper ==0.0.1.0 - stringable ==0.1.3 - stringbuilder ==0.5.1 @@ -2785,11 +2788,11 @@ default-package-overrides: - stripe-concepts ==1.0.3.3 - stripe-signature ==1.0.0.16 - stripe-wreq ==1.0.1.16 - - strive ==6.0.0.11 + - strive ==6.0.0.12 - structs ==0.1.9 - structured ==0.1.1 - stylish-haskell ==0.14.5.0 - - subcategories ==0.2.1.0 + - subcategories ==0.2.1.1 - sundown ==0.6 - superbuffer ==0.3.1.2 - svg-builder ==0.1.1 @@ -2847,7 +2850,7 @@ default-package-overrides: - tar-conduit ==0.4.1 - tasty ==1.4.3 - tasty-ant-xml ==1.1.9 - - tasty-autocollect ==0.4.2 + - tasty-autocollect ==0.4.3 - tasty-bench ==0.3.5 - tasty-bench-fit ==0.1 - tasty-checklist ==1.0.6.0 @@ -2913,7 +2916,7 @@ default-package-overrides: - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - text-icu ==0.8.0.5 - - text-iso8601 ==0.1 + - text-iso8601 ==0.1.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2936,9 +2939,9 @@ default-package-overrides: - th-data-compat ==0.1.3.1 - th-desugar ==1.15 - th-env ==0.1.1 - - these ==1.2 - - these-lens ==1.0.1.3 - - these-optics ==1.0.1.2 + - these ==1.2.1 + - these-lens ==1.0.2 + - these-optics ==1.0.2 - these-skinny ==0.7.6 - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.8 @@ -2974,7 +2977,7 @@ default-package-overrides: - time-parsers ==0.2 - timerep ==2.1.0.0 - timers-tick ==0.5.0.4 - - timer-wheel ==1.0.0 + - timer-wheel ==1.0.0.1 - timespan ==0.4.0.0 - time-units ==1.0.0 - time-units-types ==0.2.0.1 @@ -2996,8 +2999,8 @@ default-package-overrides: - toml-parser ==1.3.2.0 - toml-reader ==0.2.1.0 - toml-reader-parse ==0.1.1.1 - - tophat ==1.0.7.0 - - topograph ==1.0.0.2 + - tophat ==1.0.8.0 + - topograph ==1.0.1 - torrent ==10000.1.3 - torsor ==0.1.0.1 - tostring ==0.2.1.1 @@ -3091,7 +3094,7 @@ default-package-overrides: - universum ==1.8.2.1 - unix-bytestring ==0.4.0.1 - unix-compat ==0.7.1 - - unix-time ==0.4.12 + - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -3138,7 +3141,7 @@ default-package-overrides: - vcs-ignore ==0.0.2.0 - vec ==0.5 - vector ==0.13.1.0 - - vector-algorithms ==0.9.0.1 + - vector-algorithms ==0.9.0.2 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - vector-builder ==0.3.8.5 @@ -3155,7 +3158,7 @@ default-package-overrides: - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - verset ==0.0.1.9 - - versions ==6.0.6 + - versions ==6.0.7 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -3176,7 +3179,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.14 + - wai-extra ==3.1.15 - wai-feature-flags ==0.1.0.8 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -3218,7 +3221,7 @@ default-package-overrides: - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.1.0 + - witch ==1.2.1.1 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -3241,7 +3244,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.8 + - wuss ==2.0.1.9 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3276,7 +3279,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.8 + - Yampa ==0.14.9 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 From 7673ea46c6551c2501b9dc059ca0b47203eb58be Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 22 Jun 2024 01:16:26 +0200 Subject: [PATCH 009/562] 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 | 5698 +++++++++-------- 1 file changed, 3198 insertions(+), 2500 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d05b86212b64..5d599da97be4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2109,8 +2109,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.2.3"; - sha256 = "1qiya1wd0crisjxcnjbxadkbb6ll3zzb102w4q82ga0mglxx5i4r"; + version = "1.1.3.0"; + sha256 = "1wwxiyshsx0lgb99vdliippszl2lrplwji4saavks2fgpqllgsly"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2126,6 +2126,32 @@ self: { license = lib.licenses.mit; }) {}; + "Blammo_1_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock + , containers, dlist, envparse, exceptions, fast-logger, hspec + , http-types, lens, markdown-unlit, monad-logger-aeson, mtl, text + , time, unliftio, unliftio-core, unordered-containers, vector, wai + }: + mkDerivation { + pname = "Blammo"; + version = "1.2.1.0"; + sha256 = "1hirn71nqghv1y7p7217h7kjpv6p9hglhpsxp007vnnhas7my6il"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive clock containers dlist + envparse exceptions fast-logger http-types lens monad-logger-aeson + mtl text time unliftio unliftio-core unordered-containers vector + wai + ]; + testHaskellDepends = [ + aeson base bytestring envparse hspec lens markdown-unlit mtl text + time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Batteries-included Structured Logging library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "BlastHTTP" = callPackage ({ mkDerivation, base, BiobaseBlast, BiobaseFasta, bytestring , conduit, either-unwrap, HTTP, http-conduit, hxt, mtl, network @@ -6387,8 +6413,8 @@ self: { }: mkDerivation { pname = "FiniteCategories"; - version = "0.6.5.0"; - sha256 = "00vdcd8lliwril814r9da57cdjfkq6fpa613j2kadhx9bic5rphs"; + version = "0.6.5.1"; + sha256 = "0wjq5z9rh7c1c08s0vqr45nkvqlimlllh5bdpqi6pajyf3x58504"; libraryHaskellDepends = [ base containers directory filepath random text WeakSets ]; @@ -7398,19 +7424,19 @@ self: { "Gamgine" = callPackage ({ mkDerivation, array, base, bytestring, composition, cpphs - , data-lens, directory, filepath, GLFW-b, ListZipper, mtl + , data-lens-light, directory, filepath, GLFW-b, ListZipper, mtl , OpenGLRaw, parsec, pretty-show, StateVar, time , unordered-containers, utility-ht, Vec, zlib }: mkDerivation { pname = "Gamgine"; - version = "0.6.0"; - sha256 = "171mfxq7s719j3h2nfsck2qmwrkmlp3731na6nd81b5x3jvl3ma0"; + version = "0.7.0"; + sha256 = "01vgfs8yqzplimczjyy2jahm8777vxm23s3qvfy4h6dd32nvp15a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring composition data-lens directory filepath - GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time - unordered-containers utility-ht Vec zlib + array base bytestring composition data-lens-light directory + filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show + StateVar time unordered-containers utility-ht Vec zlib ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; @@ -11451,10 +11477,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.6"; - sha256 = "18n7yhffqhgl2favmwlky9j0xx61bhs1akhf7ccc3ajapf8y4bb6"; - revision = "1"; - editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1"; + version = "0.11.7.7"; + sha256 = "0aza9w7ny1aangaspg4wkzhy0s26ngvfdq4zrd24iha1d9qh4nq8"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11881,8 +11905,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.1"; - sha256 = "0nccfhm8a30ckl5lkaah0nhyikwry12d832wcknzl14jpj6r116d"; + version = "0.3.3.3"; + sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12405,10 +12429,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.3.8"; - sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; - revision = "2"; - editedCabalFile = "0xc9qlfgrlf6v4h5m9rcwy58wsa4ksm8fpnx3fyh5ld9x3nhgfpd"; + version = "3.3.9"; + sha256 = "0kc68bjj3izbdvw67kyzg74fv1ksj2dclq5gxzlnajv87rfsqi1y"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -14305,8 +14327,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.8.0"; - sha256 = "1k96nngfn57fb81wxpkksnmvq2nr7davn8wdwix2w2pk5v67m3fw"; + version = "0.9.11.0"; + sha256 = "1iclg19sxirz7p4r5q2r42w4iibswfinqkn45xqw6h617crwl2pk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -15196,8 +15218,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.4.0.1"; - sha256 = "1g32iiwrs2fhf7l4sjc2l0s51yc3a102scvbwq1ip7532bvmwy23"; + version = "3.4.0.2"; + sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16443,8 +16465,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; - revision = "1"; - editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; + revision = "2"; + editedCabalFile = "1cxv515z5ni102jwgadzsnaphimldrjz1klg33dbha87yblj2pgv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17405,26 +17427,6 @@ self: { }) {}; "PyF" = callPackage - ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, hspec - , HUnit, mtl, parsec, process, template-haskell, temporary, text - , time - }: - mkDerivation { - pname = "PyF"; - version = "0.11.2.1"; - sha256 = "02i2h8dj228w0d4vsjrllrc25hgmx7wys2jzlgq61z13jddc8rg8"; - libraryHaskellDepends = [ - base bytestring ghc mtl parsec template-haskell text time - ]; - testHaskellDepends = [ - base bytestring deepseq filepath hspec HUnit process - template-haskell temporary text time - ]; - description = "Quasiquotations for a python like interpolated string formatter"; - license = lib.licenses.bsd3; - }) {}; - - "PyF_0_11_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, hspec , HUnit, mtl, parsec, process, template-haskell, temporary, text , time @@ -17442,7 +17444,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formatter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "QIO" = callPackage @@ -17568,14 +17569,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "QuickCheck_2_15" = callPackage + "QuickCheck_2_15_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.15"; - sha256 = "10hd896c8vb19aj3q0dg90aymsiq73ffxgx8z1p39w7x21m2vdnc"; + version = "2.15.0.1"; + sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -17764,20 +17765,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "RLP" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec }: - mkDerivation { - pname = "RLP"; - version = "1.1.1"; - sha256 = "075hv3ljc47zr5xkvmbiqq666cgicvwl90isq2n45x9nsbg441d1"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base binary bytestring hspec ]; - description = "RLP serialization as defined in Ethereum Yellow Paper"; - license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "RMP" = callPackage ({ mkDerivation, allocated-processor, base, canlib, cv-combinators , ftd2xx, HOpenCV, vector-space @@ -22889,12 +22876,12 @@ self: { "WringTwistree" = callPackage ({ mkDerivation, arithmoi, array, base, bytestring, containers , deepseq, mod, multiarg, parallel, sort, split, tasty, tasty-hunit - , tasty-quickcheck, utf8-string, vector + , tasty-quickcheck, terminal-progress-bar, utf8-string, vector }: mkDerivation { pname = "WringTwistree"; - version = "0.0.1.1"; - sha256 = "10hbg89y1bs4b8nmw3v5amffgmjmija89c639mk9g8hs3zddgb53"; + version = "0.1.0.0"; + sha256 = "1zslzl8ffw9bf3lm21zj7hr9xsd4503cmvznzsl9fsqgp8ssy533"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22903,7 +22890,7 @@ self: { ]; executableHaskellDepends = [ arithmoi array base bytestring containers deepseq multiarg parallel - sort split utf8-string vector + sort split terminal-progress-bar utf8-string vector ]; testHaskellDepends = [ array base bytestring containers tasty tasty-hunit tasty-quickcheck @@ -23329,8 +23316,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.8"; - sha256 = "0w33n17haja7jzwhha7j6psqkcyq0k06ddckbs96yqldmq96il18"; + version = "0.14.9"; + sha256 = "0khlr63l3xrhylapr5ql62b3kzfak97vlz1cjd15pzfain7pvbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25404,8 +25391,8 @@ self: { pname = "active"; version = "0.2.1"; sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; - revision = "2"; - editedCabalFile = "16gc6vksf5gn5v6m9zbiphb2bd2chbypk8iykn1y7ak3f8g30asn"; + revision = "3"; + editedCabalFile = "0hpnbr1q5nkqp4l7hycba6lnmw22b0ccv2l62lqvis96xw47n75k"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -26051,8 +26038,8 @@ self: { pname = "aeson"; version = "2.1.2.1"; sha256 = "1ii26lz9czxqhck11pzhqlhfhm9zgbrhiydv4gh1w66f0fwl4h2x"; - revision = "3"; - editedCabalFile = "19qj4s625b34kw8ryb2ji0hs6dg2m116x913s722bab316k653av"; + revision = "4"; + editedCabalFile = "0lb30fwqr6q3xzvhi3vv2g0yw3bmwmzfp45jsplhakq2mmzbxa5a"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable @@ -26074,7 +26061,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_2_0" = callPackage + "aeson_2_2_3_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, character-ps, containers, data-fix, deepseq, Diff , directory, dlist, exceptions, filepath, generic-deriving @@ -26088,10 +26075,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.2.0"; - sha256 = "0xk2zl4j64zjymib0qyx889jyghx0fa1nvsz0fx2py9kcd2f3gdk"; - revision = "1"; - editedCabalFile = "18kglyqghxv5gpp9c8kn2rr0h2c09x3rw9rl3a4j3h2l23y0s3dc"; + version = "2.2.3.0"; + sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; libraryHaskellDepends = [ base bytestring character-ps containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable @@ -26513,8 +26498,8 @@ self: { }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.5.1"; - sha256 = "15d706h09igm9ic0sgjamwngghvcqhs2pir5pqb2crlkvmhr25cb"; + version = "0.2.5.2"; + sha256 = "16lzp5rjjsj3l5bazc33r6pn6llz2ycfikxsvzk6bf5b157gzpjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27713,8 +27698,8 @@ self: { }: mkDerivation { pname = "airgql"; - version = "0.7.1.2"; - sha256 = "1fcin7c223xfgyksa50dw8vnxvs0rkwzi16ia5x0rrnfsjv83jwm"; + version = "0.7.1.3"; + sha256 = "1vb5qmvdm803nllfddzh6q89ln5ldxy974yj4v36gjmaqs3wq2dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27824,15 +27809,16 @@ self: { "aivika-distributed" = callPackage ({ mkDerivation, aivika, aivika-transformers, array, base, binary , containers, distributed-process, exceptions, mtl, mwc-random - , random, stm, time + , random, stm, time, vector }: mkDerivation { pname = "aivika-distributed"; - version = "1.4"; - sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k"; + version = "1.5"; + sha256 = "0j9hz6jvp46awnnhmlvam68p7w2ms7lkjfzkils8w063ywphph6q"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time + vector ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = lib.licenses.bsd3; @@ -36242,6 +36228,35 @@ self: { mainProgram = "amqp-builder"; }) {}; + "amqp_0_23_0" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, containers + , crypton-connection, data-binary-ieee754, data-default-class + , hspec, hspec-expectations, monad-control, network, network-uri + , split, stm, text, vector, xml + }: + mkDerivation { + pname = "amqp"; + version = "0.23.0"; + sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class monad-control network + network-uri split stm text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class hspec hspec-expectations + network network-uri split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "amqp-builder"; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -36753,8 +36768,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, vector }: mkDerivation { pname = "anitomata"; - version = "0.1.0.0"; - sha256 = "1gswhhwrjkhy90x23r0lnlyii07vjc85h99b265pm8fzqqgcdyqf"; + version = "0.1.0.2"; + sha256 = "01c1cjczb2mvgl93iqf3zg9sm9rz307bi8f96nk113r036db6nh9"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; testToolDepends = [ hspec-discover ]; @@ -36769,8 +36784,8 @@ self: { }: mkDerivation { pname = "anitomata-aseprite"; - version = "0.1.1.0"; - sha256 = "0qskdfj595gwppaj34krsdfmk8vjwzmrig8ajaddni7znag89gl4"; + version = "0.1.1.2"; + sha256 = "177gqb3p64h8ymw5i20fd0xba1hqcw4j4prqnp6hs1h6wgrcmppq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38656,6 +38671,17 @@ self: { broken = true; }) {}; + "applicative-logic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "applicative-logic"; + version = "0.1.0.2"; + sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd"; + libraryHaskellDepends = [ base ]; + description = "Generalized logic operations for Applicative and Alternative functors"; + license = lib.licenses.bsd3; + }) {}; + "applicative-numbers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39955,8 +39981,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; - revision = "3"; - editedCabalFile = "1v8d7dpzlqqmlfmwb0jylic09yr3f69wpkqxp8kyy1hgbczaig3l"; + revision = "4"; + editedCabalFile = "1dmmbf3bcs4x0w9f609zrwnvrn9ngcqv9l5xgwhf0qxgpizgps2q"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -41981,6 +42007,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_8" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.8"; + sha256 = "1sp7ffyybnvq9s0b73rr33wjck3ffip2v56q1l87d1r5150wwh60"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -42543,8 +42581,8 @@ self: { }: mkDerivation { pname = "attoparsec-framer"; - version = "0.1.0.3"; - sha256 = "0lwrnka25f5a27ym3w48qdrkv3q62q9rs5r6kpgbr7nckcmb9b03"; + version = "0.1.0.4"; + sha256 = "1ijb8br55pchrn525dhsqhmpy9mlzg6as40mpjgmv567ngjp4ia5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42562,6 +42600,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-framer_0_1_0_5" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, hspec, network, network-run, QuickCheck, text + }: + mkDerivation { + pname = "attoparsec-framer"; + version = "0.1.0.5"; + sha256 = "003c40fsvh94v6fdgp4rdx6s109iww5n60n7z2nn7l5zqf44mshj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions text + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions network + network-run QuickCheck text + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions hspec + QuickCheck text + ]; + description = "Use Attoparsec to parse framed protocol byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-ip" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector @@ -42579,21 +42643,6 @@ self: { }) {}; "attoparsec-iso8601" = callPackage - ({ mkDerivation, attoparsec, base, integer-conversion, text, time - , time-compat - }: - mkDerivation { - pname = "attoparsec-iso8601"; - version = "1.1.0.1"; - sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; - libraryHaskellDepends = [ - attoparsec base integer-conversion text time time-compat - ]; - description = "Parsing of ISO 8601 dates, originally from aeson"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec-iso8601_1_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, integer-conversion, text, time , time-compat }: @@ -42606,7 +42655,6 @@ self: { ]; description = "Parsing of ISO 8601 dates, originally from aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iteratee" = callPackage @@ -43236,21 +43284,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "2.0.0.9"; - sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = lib.licenses.mit; - mainProgram = "autoexporter"; - }) {}; - - "autoexporter_2_0_0_12" = callPackage ({ mkDerivation, base, Cabal-syntax, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -43262,7 +43295,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically re-export modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "autoexporter"; }) {}; @@ -43315,8 +43347,8 @@ self: { }: mkDerivation { pname = "automaton"; - version = "1.3"; - sha256 = "04mgsc9cg1w9afica540mgxykdnid4d88j1dn3lnlsm2z3gkh2gx"; + version = "1.4"; + sha256 = "0g04as057ya3r698q8kwc73lzj2pzqwns7pd6dy84qs7rsxyj1fj"; libraryHaskellDepends = [ base mmorph MonadRandom mtl profunctors selective semialign simple-affine-space these transformers @@ -45838,12 +45870,12 @@ self: { broken = true; }) {}; - "base_4_20_0_0" = callPackage + "base_4_20_0_1" = callPackage ({ mkDerivation, ghc-internal, ghc-prim }: mkDerivation { pname = "base"; - version = "4.20.0.0"; - sha256 = "15l9g5v12411baix23ck30s2633mw957xsh2bnxjlrcqjfpqhqbw"; + version = "4.20.0.1"; + sha256 = "0pg93zvlvx56ffz8b2gf920an4jzqyd1305h59c7slx51ibf2aww"; libraryHaskellDepends = [ ghc-internal ghc-prim ]; description = "Core data structures and operations"; license = lib.licenses.bsd3; @@ -46306,6 +46338,8 @@ self: { pname = "base64"; version = "1.0"; sha256 = "1dmjy4pkz66s3wa99lkc0wc4bdjkdkr57a8rsgb5z50432gj6hkr"; + revision = "1"; + editedCabalFile = "0b02k2r5dkzm8rapypkcjl08mz97z5qh4yfxyxn0vwq5hmh8905b"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -47564,37 +47598,6 @@ self: { }) {}; "bech32" = callPackage - ({ mkDerivation, array, base, base58-bytestring, bytestring - , containers, deepseq, extra, hspec, hspec-discover, memory - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , process, QuickCheck, text, vector - }: - mkDerivation { - pname = "bech32"; - version = "1.1.6"; - sha256 = "03a0xf1c7zjirg4y3rv0frrqifzqsqx327hdcvxzbpgflwgs225h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers extra text - ]; - executableHaskellDepends = [ - base base58-bytestring bytestring extra memory optparse-applicative - prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base base58-bytestring bytestring containers deepseq extra hspec - memory process QuickCheck text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "bech32"; - broken = true; - }) {}; - - "bech32_1_1_7" = callPackage ({ mkDerivation, array, base, base58-bytestring, bytestring , containers, deepseq, extra, hspec, hspec-discover, memory , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -47626,22 +47629,6 @@ self: { }) {}; "bech32-th" = callPackage - ({ mkDerivation, base, bech32, hspec, hspec-discover - , template-haskell, text - }: - mkDerivation { - pname = "bech32-th"; - version = "1.1.6"; - sha256 = "0y1hw7419sw84gs13wh40qj9m1snyz0ly5aasmkynjpb9ixhn54k"; - libraryHaskellDepends = [ base bech32 template-haskell text ]; - testHaskellDepends = [ base bech32 hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Template Haskell extensions to the Bech32 library"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - - "bech32-th_1_1_7" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text }: @@ -48670,6 +48657,22 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "bin_0_1_4" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, fin, hashable + , QuickCheck, some + }: + mkDerivation { + pname = "bin"; + version = "0.1.4"; + sha256 = "0amz5naq6p2jpm4rb9ycjg7j75qylp3d689cl55f71rs2idrazpp"; + libraryHaskellDepends = [ + base boring dec deepseq fin hashable QuickCheck some + ]; + description = "Bin: binary natural numbers"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "binance-exports" = callPackage ({ mkDerivation, aeson, base, bytedump, bytestring, cassava , cmdargs, cryptohash-sha256, directory, hedgehog, http-client @@ -48927,6 +48930,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_5" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.5"; + sha256 = "01ycp0dn96n4zavrw1rr5ly0isr3kq16jihwcdg6c022v9w73wkf"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable primitive + QuickCheck quickcheck-instances scientific tagged tasty + tasty-quickcheck text time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -48976,26 +49005,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, base, binary, OneTuple, QuickCheck - , quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "binary-orphans"; - version = "1.0.4.1"; - sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "3"; - editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; - libraryHaskellDepends = [ base binary transformers ]; - testHaskellDepends = [ - base binary OneTuple QuickCheck quickcheck-instances tagged tasty - tasty-quickcheck - ]; - description = "Compatibility package for binary; provides instances"; - license = lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_5" = callPackage ({ mkDerivation, base, binary, OneTuple, QuickCheck , quickcheck-instances, tagged, tasty, tasty-quickcheck }: @@ -49010,7 +49019,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -49111,8 +49119,8 @@ self: { pname = "binary-serialise-cbor"; version = "0.2.2.0"; sha256 = "16yhimka17dza5nda62927k5x66c0yrsxzz92kya3gicd6vaga2g"; - revision = "1"; - editedCabalFile = "1kampfsd9mm2qv726v4dyq0ssx8ismj4hjm61h0jjx9644c8cr18"; + revision = "2"; + editedCabalFile = "1ff948jlri6dz86l45bzlv057mazl1jw1kvj0m8awmy5w4xhjhmp"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = lib.licenses.bsd3; @@ -53062,8 +53070,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "4"; - editedCabalFile = "11mj69y43chqr50m9g8shqdyc3q31hha9gjqx05dn1dnkz3xgzxb"; + revision = "5"; + editedCabalFile = "0db964rq3sxrsa23vxk7sj1cqfxzyv375grxrfnxf0m1sf2finfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53083,10 +53091,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bmp"; - version = "1.2.6.3"; - sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; - revision = "2"; - editedCabalFile = "05ywlglsg9jw1cgdhrz9f4vbm775yvyysmmvjs0xj0dm2ljyskrx"; + version = "1.2.6.4"; + sha256 = "0ifk160rdc7428zkd6a3wfn2c6iv805z731gvbpm58jyv4q7jbhn"; libraryHaskellDepends = [ base binary bytestring ]; description = "Read and write uncompressed BMP image files"; license = lib.licenses.mit; @@ -53696,8 +53702,8 @@ self: { }: mkDerivation { pname = "boomerang"; - version = "1.4.9.2"; - sha256 = "15y098dsbaxk6hyjziwc24yrhv0276jpr3ahp4zlgcyl3axpsncq"; + version = "1.4.9.3"; + sha256 = "1ilai1svi9j10wjll1r082v76299jnd7nznk7bxqgnvn59n43xik"; libraryHaskellDepends = [ base mtl semigroups template-haskell text th-abstraction ]; @@ -53939,19 +53945,6 @@ self: { }) {}; "boring" = callPackage - ({ mkDerivation, base, tagged, transformers }: - mkDerivation { - pname = "boring"; - version = "0.2.1"; - sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; - revision = "1"; - editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; - libraryHaskellDepends = [ base tagged transformers ]; - description = "Boring and Absurd types"; - license = lib.licenses.bsd3; - }) {}; - - "boring_0_2_2" = callPackage ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "boring"; @@ -53960,7 +53953,6 @@ self: { libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boring-game" = callPackage @@ -54005,8 +53997,8 @@ self: { pname = "borsh"; version = "0.3.0"; sha256 = "1y3jirkiyq6hvmsga1g7iyrz90zldm97a97zzfv9krqnjg9vbljn"; - revision = "1"; - editedCabalFile = "0ffl1lyx4pxdy1iipadvg3n3ph5iflkn33158vka3nhlhycy96f4"; + revision = "2"; + editedCabalFile = "1n0566adpwq8y3vs1clzr487biz31zc3648ccqsmw6r7aj15vfg0"; libraryHaskellDepends = [ base bytestring containers generics-sop sop-core text vector wide-word @@ -54590,8 +54582,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.3.1"; - sha256 = "1ayf9mwlcawdlr5pm86zca6zwvi7gcrz3vxpmjflz0vlkzsi9nfc"; + version = "0.1.4.0"; + sha256 = "04fgivxwddm8r5hpj8a1v6r4c59yj618cq14rszrd1qrm9sn1qf6"; libraryHaskellDepends = [ ansi-terminal base containers deepseq ghc haskeline mtl pretty-simple template-haskell text transformers @@ -56241,26 +56233,6 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; - version = "2.0.1.9"; - sha256 = "0sz9j9yv7whwvxrnh4v3r5fz8z4v9c7c2s45kpvsgvshds9vbr7f"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_10" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, parsec , QuickCheck, template-haskell, text, transformers }: @@ -56275,7 +56247,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -57554,6 +57525,8 @@ self: { pname = "bytezap"; version = "1.3.0"; sha256 = "0ichvvl1f76m520q3pq0m90wi4f0gzmhbsxkk5xnh72kdbaj164h"; + revision = "1"; + editedCabalFile = "1vqd9hssgdzc8v8rhnzid0bbbld6g5pyfbk7ps8d12l7f0346l4m"; libraryHaskellDepends = [ base bytestring defun-core generic-type-functions primitive text type-level-bytestrings @@ -58061,8 +58034,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.3.0"; - sha256 = "106q5imjznbh7x2pvvgfsn8qx1awb00w0mgfrkkzbwnwc3g8jnw3"; + version = "2.5.0"; + sha256 = "0ddd6yc9ii7ibw7263aq455hwk50ggij28ycjvfi9p4cl6npp1f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58159,8 +58132,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.3.0"; - sha256 = "08n2n0p3m282yx7cf1nzmlfmw0xikqwrj3l1s8jmx18z2gh0x1h4"; + version = "1.5.0"; + sha256 = "0dmhxrg8d7ajhfg85s7p6py9fywqbrnbd5z9i6mbh3f6cyc9hqak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58533,23 +58506,23 @@ self: { "cabal-gild" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, containers - , directory, exceptions, filepath, hspec, parsec, pretty, temporary - , text, transformers + , directory, exceptions, filepath, filepattern, hspec, parsec + , pretty, temporary, text, transformers }: mkDerivation { pname = "cabal-gild"; - version = "1.3.1.2"; - sha256 = "15ds4x9vh5hfxbrh8k3w719jxs1mfhx8kaj035nj891r5c6llpb2"; + version = "1.4.0.0"; + sha256 = "0yr7g34vqly9w1pn1h90sr506v42wv69y85dgfx8p8r1svfiz1ra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal-syntax containers directory exceptions - filepath parsec pretty text transformers + base bytestring Cabal-syntax containers exceptions filepath + filepattern parsec pretty text transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - temporary transformers + base bytestring containers directory exceptions filepath + filepattern hspec temporary transformers ]; description = "Formats package descriptions"; license = lib.licenses.mit; @@ -58786,8 +58759,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.6.1.1"; - sha256 = "1w4kbc7435qbkflb8rkmfgyqw3fynyfqgvy4mxay1r1zfknqvq0b"; + version = "0.6.2"; + sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal-syntax containers cryptohash-sha256 deepseq directory @@ -58855,8 +58828,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.10.1"; - sha256 = "0pjzz5d2s6b2xaqgb7z3ry5zpba84x3iy2hw3a7xq32ciyl3gnhb"; + version = "0.14.0"; + sha256 = "0ab6j4svnchw741spi1b4zsdiwr7hvl141dn30ggqq6lkn32icwm"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -59000,6 +58973,35 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan_0_7_4_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.4.0"; + sha256 = "10x69i01q8nmdq5q2523rmqfn5nglvmbdysgdn46h1iw2gavar76"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base bytestring containers directory mtl + optics-core optparse-applicative parsec process semialign + singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan"; + }) {}; + "cabal-plan-bounds" = callPackage ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax , containers, optparse-applicative, pretty, text @@ -59793,8 +59795,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.7.3"; - sha256 = "0xgcqgdawzb8ckdc4w0yp5lbdxmj3cd0w93wzp2nx585pi1ils7i"; + version = "1.7.4"; + sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59838,8 +59840,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.7.3"; - sha256 = "0srzvhmvp927qnk31p0nlal7wl14205s1a27frj68g2yi4a1w92j"; + version = "1.7.4"; + sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; libraryHaskellDepends = [ aeson async base bytestring conduit cryptonite deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet @@ -62573,6 +62575,8 @@ self: { pname = "cborg"; version = "0.2.10.0"; sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp"; + revision = "1"; + editedCabalFile = "0x48942znc78nh63lxibaascaj1wxsqjg7r4vifisl9zlzccpcpp"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -62596,8 +62600,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; - revision = "1"; - editedCabalFile = "0bgr0m1p4r2snp8d1irsyql2a9kcpp09lkajjfsyqq8riaf75a2v"; + revision = "2"; + editedCabalFile = "1vj7p8k3ksb6fizsl39rb99zsjfh1wm7i9q9m18s4c8llnylhw0a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring cborg scientific text unordered-containers vector @@ -63680,6 +63684,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "char-boxdrawing" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "char-boxdrawing"; + version = "1"; + sha256 = "1nbylqdk8x615kjbpxqa7wp8m75iq7akva8ridym3jsnjhhp7rgn"; + libraryHaskellDepends = [ base ]; + description = "Combinators for unicode or ASCII box drawing characters"; + license = lib.licenses.bsd3; + }) {}; + "char-decode" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -64197,8 +64212,8 @@ self: { ({ mkDerivation, base, containers, doctest, QuickCheck }: mkDerivation { pname = "check-cfg-ambiguity"; - version = "0.1.0.0"; - sha256 = "0iswfg7m9qnhr1128xbhaa06ai2rhnr7c781y7z92v29xd7mjyjg"; + version = "0.1.1.0"; + sha256 = "1h3i3hk6ggsxgcxih0mwljfli0gn8ja7d2vkzz7gxqppwx9ryirj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Checks context free grammar for ambiguity using brute force up to given limit"; @@ -64643,8 +64658,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "choice"; - version = "0.2.3"; - sha256 = "15nls2azmhwi3nnf5rkl954pa0bjgi231ff74hgw8r3nb5axrgrn"; + version = "0.2.4.1"; + sha256 = "099c5ibal8llzr5nh62dnpb1pwj30gxqwdcjx0rds51ga2j32z5i"; libraryHaskellDepends = [ base ]; description = "A solution to boolean blindness"; license = lib.licenses.publicDomain; @@ -66620,6 +66635,8 @@ self: { pname = "clay"; version = "0.15.0"; sha256 = "1gp7x76cw15jmd3ahqf1q0bc2p6ix182x6s2pzyh8yr4b29b9r3v"; + revision = "1"; + editedCabalFile = "0y6s4digka4b0d238n1vcj2308csxvkr34vfnqr3mc46079vb99k"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -67174,6 +67191,8 @@ self: { pname = "cli-extras"; version = "0.2.1.0"; sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f"; + revision = "1"; + editedCabalFile = "0fcybjf8zqzzjzfc5205plzphzk7z5v9p8nadqq7lp7m10ggjasc"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -67190,8 +67209,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.2.0.0"; - sha256 = "0sv4ycc6n54419bcg0i6vh8l5a1370l0k1qg9n1nydb9wx5n7927"; + version = "0.2.0.1"; + sha256 = "09i3v77xhdfsmvq7c10plxnqmq2wn8gxc16za4h96s7pnvn8bppv"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text which @@ -67209,6 +67228,8 @@ self: { pname = "cli-nix"; version = "0.2.0.0"; sha256 = "02350jvbgapxn14zx0knzyxmdlrq2yk460wiw9p8aq860f299bzh"; + revision = "1"; + editedCabalFile = "1plh0js8lnl2xw3dv5z57ap8g4c9j2n1bzskn993fpgafqlw5mcb"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text which @@ -67813,21 +67834,23 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit, mtl - , network, text + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, conduit, mtl, network, stm, text }: mkDerivation { pname = "clplug"; - version = "0.4.0.0"; - sha256 = "02gixg9xww0gis67rap70pwbrg4gpi514iphbfjqjzbh2chdil5j"; + version = "1.0.0.0"; + sha256 = "0x42kx8ia9i3w3b0y3qn8fv6mc88w17nl82z08bsrh9hla2jl2i1"; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; - description = "Create Core Lightning Plugins"; - license = lib.licenses.bsd3; + description = "Easily add functionality to your lightning node"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68567,8 +68590,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.1"; - sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + version = "0.3.2.2"; + sha256 = "1iydf4d9g2nq1aj993s8whp08xbf59071wf6md8zcq6xda8n3cpp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -68594,8 +68617,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.4"; - sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; + version = "0.0.1.5"; + sha256 = "1gh02nq42a97lvrqdsjzjjdpfwmdk0ax89fziw3pifdjqs446yz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -68988,8 +69011,8 @@ self: { }: mkDerivation { pname = "codet"; - version = "0.1"; - sha256 = "1npz5wfm9wk9pq4rpq9d8cwxawx75awbai1k5k62w620an0mq6xj"; + version = "0.1.0.1"; + sha256 = "0jv3z28sxdgmbpkxics2c8s4r576fz4r8dv7ai4yy1h4fqsli5vw"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; @@ -69009,8 +69032,8 @@ self: { }: mkDerivation { pname = "codet-plugin"; - version = "0.1"; - sha256 = "1npmn69l8n3ni2nd83czq6vvh2j94ik56k9vmprb381mf00zbw5k"; + version = "0.1.0.1"; + sha256 = "11ddf0h01qw00q3dd7gk12j31b98ff0yv5jd04wwngkhpcbshgb6"; libraryHaskellDepends = [ base codet ghc ]; testHaskellDepends = [ base codet directory filepath syb tasty tasty-golden @@ -70197,31 +70220,6 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers - , transformers-compat, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.4.2"; - sha256 = "1fyv4m3qb6rbz1inswzwkbrza1wr3x5gr8p4qbh3bvfqfkj3mh4i"; - libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty prelude-compat - primitive QuickCheck semigroups storable-record storablevector - tagged transformers transformers-compat utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms containers deepseq doctest-exitcode-stdio - doctest-lib QuickCheck tagged utility-ht - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-array_0_5_5" = callPackage ({ mkDerivation, base, bifunctors, ChasingBottoms, containers , deepseq, doctest-exitcode-stdio, doctest-lib, guarded-allocation , non-empty, prelude-compat, primitive, QuickCheck, semigroups @@ -70243,7 +70241,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70272,30 +70269,6 @@ self: { }) {}; "comfort-blas" = callPackage - ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, non-empty, QuickCheck, semigroups, storablevector - , transformers, utility-ht - }: - mkDerivation { - pname = "comfort-blas"; - version = "0.0.2"; - sha256 = "1sw24ai7vlhxvb22y9qf71ak1l55chxdc6x1j5p7m40q5zmahpx6"; - libraryHaskellDepends = [ - base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi non-empty semigroups storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base comfort-array containers doctest-exitcode-stdio doctest-lib - netlib-ffi QuickCheck utility-ht - ]; - description = "Numerical Basic Linear Algebra using BLAS"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-blas_0_0_3" = callPackage ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation , netlib-ffi, non-empty, QuickCheck, semigroups, storablevector @@ -70316,7 +70289,6 @@ self: { ]; description = "Numerical Basic Linear Algebra using BLAS"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70591,6 +70563,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_5_5" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.5.5"; + sha256 = "0szi6rdl6cz39bj28mads5gxfyc5bp29gj6fr5y42v7spyn9f5kx"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -73673,8 +73667,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "4"; - editedCabalFile = "0c6dqygjnsyf986j2f10xvvzkq8h85sad0g9x7wxl42fxlcj1gb6"; + revision = "5"; + editedCabalFile = "0kzsc8v10h3jm2hxx9xc9nfp5f9qc2zp6gplsy4iszgis3spvq9a"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -73709,8 +73703,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "5"; - editedCabalFile = "159xbw9657j7icaway9vv22b0r8bz2s6c8v4w24sldzs7dcbc3sp"; + revision = "6"; + editedCabalFile = "0l4yw8g1f7isr2nj6s4awfm37b4j5pz2pn0wnzwdbain3az4d51v"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -74488,10 +74482,8 @@ self: { ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.4.0.0"; - sha256 = "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"; - revision = "2"; - editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww"; + version = "0.4.0.1"; + sha256 = "0c5cjh986rqf31f4igjbn72kgz8h9md6ivbyg2hn15kfawsgg47z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -76595,33 +76587,6 @@ self: { }) {}; "country" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash - , byteslice, bytestring, compact, contiguous, deepseq, entropy - , gauge, hashable, primitive, primitive-unlifted, QuickCheck - , quickcheck-classes, scientific, tasty, tasty-quickcheck, text - , text-short, unordered-containers - }: - mkDerivation { - pname = "country"; - version = "0.2.4.1"; - sha256 = "1nn3vkyczpc3m4bxfkl6px893l63cp0281z4nlp2063d2azb20r8"; - libraryHaskellDepends = [ - aeson attoparsec base bytebuild bytehash byteslice bytestring - contiguous deepseq entropy hashable primitive primitive-unlifted - scientific text text-short unordered-containers - ]; - testHaskellDepends = [ - base byteslice primitive QuickCheck quickcheck-classes tasty - tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytehash byteslice bytestring compact gauge primitive text - ]; - description = "Country data type and functions"; - license = lib.licenses.bsd3; - }) {}; - - "country_0_2_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash , byteslice, bytestring, compact, contiguous, deepseq, gauge , hashable, primitive, primitive-unlifted, QuickCheck @@ -76646,7 +76611,6 @@ self: { ]; description = "Country data type and functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "country-codes" = callPackage @@ -76970,8 +76934,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.3"; - sha256 = "0pkxwpkiaj4aydifj45wqbhqzqrm92sspgc7m4j1dlxdsj6sbl6h"; + version = "4.4.4"; + sha256 = "0q79ay5zm196sn3xmak9f9swcrgakm9b9w5x86dc4340x30y7i2k"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -77584,15 +77548,15 @@ self: { broken = true; }) {}; - "crc32c_0_2_1" = callPackage + "crc32c_0_2_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hspec-core - , QuickCheck + , QuickCheck, system-cxx-std-lib }: mkDerivation { pname = "crc32c"; - version = "0.2.1"; - sha256 = "1w0zp11l6dd5harn3g3hv1zhcdd7wrx005cvwvf2c652k8dl42wf"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.2"; + sha256 = "1qblck677c2y5bxmnr36k0j248wkw6rmsdd2wc8li9lgdzjnnncm"; + libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck ]; @@ -79217,21 +79181,19 @@ self: { "crypton-x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, crypton, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck, transformers, x509 + , tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "crypton-x509"; - version = "1.7.6"; - sha256 = "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"; - revision = "2"; - editedCabalFile = "1bbn2yv2ldld1cszmq5bq6wplj53ssw2s24xb44c8lirlwrz59hr"; + version = "1.7.7"; + sha256 = "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers crypton hourglass memory pem transformers ]; testHaskellDepends = [ asn1-types base bytestring crypton hourglass mtl tasty - tasty-quickcheck x509 + tasty-quickcheck ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; @@ -79515,8 +79477,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.6.1"; - sha256 = "02lyv19fq80msfsi77bgvwyh13nnvna9jgwwjz4482n8ynpm2h4i"; + version = "0.7.7.0"; + sha256 = "141ybd54bkppk1p2n5yspb99h1bnndvmr5703xffig6dx1nvc5ih"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -79544,8 +79506,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.3.1"; - sha256 = "1xcln5787bgiqp49xgf964jyhsgs0myjd669jbih1ihgpdk2032z"; + version = "5.4.4.1"; + sha256 = "13z3sp3q2bswkwlfaazyp964ar5l85k0xz68fajpmc2bkg32ivba"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -79560,17 +79522,17 @@ self: { ({ mkDerivation, array, base, base64-bytestring, Boolean , bytestring, cereal, cereal-text, containers, cryptohash-sha256 , data-default, data-fix, data-fix-cse, deriving-compat, dlist - , pretty-show, safe, text, transformers, unordered-containers - , vector, wl-pprint-text + , hashable, pretty-show, safe, text, transformers + , unordered-containers, vector, wl-pprint-text }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.9.1"; - sha256 = "1xz7cdwk7ck13ja70znlp8qs6f0vpsq5azmhv1kjdbmq4wkpq66g"; + version = "0.4.0.0"; + sha256 = "0kvirsagmlbgsrl9x8a0xmi9rypspsg85l7yqkk3cph4w4s60brl"; libraryHaskellDepends = [ array base base64-bytestring Boolean bytestring cereal cereal-text containers cryptohash-sha256 data-default data-fix data-fix-cse - deriving-compat dlist pretty-show safe text transformers + deriving-compat dlist hashable pretty-show safe text transformers unordered-containers vector wl-pprint-text ]; description = "dynamic core for csound-expression library"; @@ -79583,8 +79545,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.5.3"; - sha256 = "0psq8vyvv8mp9f506kv54j0gyfkjmzp9spmxjkjqjnzwlmya0nh6"; + version = "0.0.5.4"; + sha256 = "07lihnq0360vg6mbvwzgmangzvq796y9v55y33vaw9ppj8spifz3"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -79600,8 +79562,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.7.1"; - sha256 = "0fzlvs6an5q1lxycwifjhp3ydimky61kki1vb030vpmbhd15nczn"; + version = "0.2.9.0"; + sha256 = "0xj77qxdy2ryb4p3fl935bbh12alimih5cdvjk14059rdyj6fhlc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean bytestring colour containers csound-expression-dynamic @@ -79616,8 +79578,8 @@ self: { ({ mkDerivation, base, csound-expression, text, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.10.2"; - sha256 = "1xkv1q67fv5iggn63fz79rwz8m9i3jda26yfrdzh5l88f8lp6vb2"; + version = "0.0.11.0"; + sha256 = "16nrkz5mqjalapyn0skz4hvkqd9ysmpniiawxyrml5bs6sarch4l"; libraryHaskellDepends = [ base csound-expression text transformers ]; @@ -79747,8 +79709,8 @@ self: { }: mkDerivation { pname = "css-syntax"; - version = "0.1.0.1"; - sha256 = "1k0q7sznbkbiivj03n4zq2sm2hmhql5w2rxjp58mcq3b534p15y3"; + version = "0.1.0.2"; + sha256 = "10xl92ib6hkbqhr75n6nla1v1krx251k9k46jyvkr00kz0a9dpbr"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -80172,8 +80134,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "3"; - editedCabalFile = "1qs26dnfk33bzlvj8mhaw8h1qrcviqyizzwhi58sff01zzcd0r2y"; + revision = "4"; + editedCabalFile = "1r2sf31lkmx5s48r7n0lcy2z1r2vkir8chnjcfd5hhjmpcbwrng1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -80320,6 +80282,7 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Currencies representation, pretty printing and conversion"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "currency" = callPackage @@ -80853,6 +80816,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cvss" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, text }: + mkDerivation { + pname = "cvss"; + version = "0.1"; + sha256 = "02ldb650d053hisyb7fdd19x77k8sxvz4y939hj649pjl75b7qdr"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + description = "Common Vulnerability Scoring System"; + license = lib.licenses.bsd3; + }) {}; + "cybus" = callPackage ({ mkDerivation, adjunctions, base, checkers, deepseq, distributive , indexed-traversable, lens, mtl, pos, primus, profunctors @@ -81342,8 +81317,9 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, exceptions, fgl - , filepath, FindBin, hashable, haskeline, html, http-conduit + , containers, crypton-connection, cryptonite, data-default-class + , data-ordlist, directory, exceptions, fgl, filepath, FindBin + , hashable, haskeline, html, http-client-tls, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa @@ -81356,20 +81332,21 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.18.2"; - sha256 = "11ikl5fx7xkr0zb4kam1hr8kcziz9dg00hqj0ygcpv321a552rg6"; + version = "2.18.3"; + sha256 = "16p6z21xiz8p3acj21wbkzr1flv5wsj17l16sa3l7gksj9idiaql"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring - conduit constraints containers cryptonite data-ordlist directory - exceptions fgl filepath hashable haskeline html http-conduit - http-types memory mmap mtl network network-uri old-time parsec - process regex-applicative regex-base regex-tdfa safe stm - strict-identity tar temporary terminal-size terminfo text time tls - transformers unix unix-compat utf8-string vector zip-archive zlib + conduit constraints containers crypton-connection cryptonite + data-default-class data-ordlist directory exceptions fgl filepath + hashable haskeline html http-client-tls http-conduit http-types + memory mmap mtl network network-uri old-time parsec process + regex-applicative regex-base regex-tdfa safe stm strict-identity + tar temporary terminal-size terminfo text time tls transformers + unix unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -85345,19 +85322,6 @@ self: { }) {}; "dec" = callPackage - ({ mkDerivation, base, boring }: - mkDerivation { - pname = "dec"; - version = "0.0.5"; - sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; - revision = "2"; - editedCabalFile = "1vdnjlhbvh140ml0z4r2w5hl4x4c3fa0cnw68fl65l2mqld44i0h"; - libraryHaskellDepends = [ base boring ]; - description = "Decidable propositions"; - license = lib.licenses.bsd3; - }) {}; - - "dec_0_0_6" = callPackage ({ mkDerivation, base, boring }: mkDerivation { pname = "dec"; @@ -85366,7 +85330,6 @@ self: { libraryHaskellDepends = [ base boring ]; description = "Decidable propositions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "decepticons" = callPackage @@ -86495,8 +86458,8 @@ self: { pname = "dependent-map"; version = "0.4.0.0"; sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; - revision = "1"; - editedCabalFile = "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2"; + revision = "2"; + editedCabalFile = "18jqk1p4paaylqdvglw03v7fhyvlg59csl4kpf067wwpdpyaqs3l"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -86511,8 +86474,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.3"; - sha256 = "12kd8xr32zb21pvns3frabz5p8wlg6s3dcfgmam36hhv0d418r8l"; + version = "0.1.1.4"; + sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -86571,6 +86534,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; + revision = "1"; + editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -86960,6 +86925,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "derive-topdown_0_1_0_0" = callPackage + ({ mkDerivation, base, binary, containers, haskell-src, HUnit, mtl + , primitive, syb, template-haskell, th-abstraction, th-expand-syns + , transformers + }: + mkDerivation { + pname = "derive-topdown"; + version = "0.1.0.0"; + sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr"; + libraryHaskellDepends = [ + base containers mtl primitive syb template-haskell th-abstraction + th-expand-syns transformers + ]; + testHaskellDepends = [ + base binary containers haskell-src HUnit mtl primitive syb + template-haskell th-abstraction th-expand-syns transformers + ]; + description = "Derive type class instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "derive-trie" = callPackage ({ mkDerivation, array, base, containers, template-haskell }: mkDerivation { @@ -88565,8 +88552,8 @@ self: { pname = "diagrams-core"; version = "1.5.1.1"; sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc"; - revision = "1"; - editedCabalFile = "1ii5qcwdzaljzq39vrvrsjf06ydnvvyr5q44ks566c347vna7igb"; + revision = "2"; + editedCabalFile = "0byn0brmsdzhjiiicqbn0b7zd2rjrkcxk4i62ih7bqsw22xids0f"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -88737,6 +88724,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6.2"; sha256 = "0qz5yrrg4k4f72fg20b1rq5mk7n7q531qmj0irpg9lmrr596bdh9"; + revision = "1"; + editedCabalFile = "03spvjxwlv7sfr5cpkfl2ddxap031jsclg88bas99pckw08amp5g"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -89178,8 +89167,8 @@ self: { pname = "dictionary-sharing"; version = "0.1.0.0"; sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc"; - revision = "3"; - editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"; + revision = "4"; + editedCabalFile = "18v6x0pjih851q5d8cdm79bhpdh6wxv9p6z746y7wppmy9j943qy"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; license = lib.licenses.bsd3; @@ -91046,8 +91035,8 @@ self: { pname = "distributed-process"; version = "0.7.6"; sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz"; - revision = "2"; - editedCabalFile = "1l9sq9xfz7wv6grkmlv3wd0i8vbabvl1ldbavcnqr2gna4q36vqi"; + revision = "3"; + editedCabalFile = "0fnanh4yl1z7v8bqlj8q3r0cgbpllv1md9l1hhi73alpn5fmdwc7"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -91874,6 +91863,31 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_1_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra + , filepath, http-client, http-client-tls, http-directory + , http-types, optparse-applicative, regex-posix, simple-cmd + , simple-cmd-args, simple-prompt, text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "1.1"; + sha256 = "0mc0sdc6l2aq1vzz8lqxq9v88350rsv15xqn0q7mg1n255xbiclh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args simple-prompt text time unix + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -92044,8 +92058,8 @@ self: { }: mkDerivation { pname = "dnf-repo"; - version = "0.6"; - sha256 = "1420jj5kmvj2h3ix8v6hmf4fdkzn1ixbvxg9fi7zfdfll7831gk0"; + version = "0.6.1"; + sha256 = "0zxbxadvsvj2247npbn35k4vblaf681lgsq40r06vbh0bildy490"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -92619,6 +92633,8 @@ self: { pname = "docopt"; version = "0.7.0.8"; sha256 = "0pcixlpa5cwf531aa5nmwvp50gagm2khwl1xsy8hi4jn7ksnk1y8"; + revision = "1"; + editedCabalFile = "13p8gyib0w3hhbqaijbm0jajnc7cp0bnd23wih2apg9a6aalwsnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell @@ -92737,6 +92753,8 @@ self: { pname = "doctest"; version = "0.22.2"; sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; + revision = "1"; + editedCabalFile = "1w9nzs10cyfd5922xkm2crvr2191420qzzpbajxjsgdmkjgk55vd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93141,6 +93159,8 @@ self: { pname = "dom-lt"; version = "0.2.3"; sha256 = "1h73159h61f1wv6kans0nqspfq46wiz77isnjg8vd9m127hqn69x"; + revision = "1"; + editedCabalFile = "140hnm6jg74fmhi6vsq2qq8agf3ar7wakwpxfkdf0zg944p41y8x"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -97001,8 +97021,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.3.0.0"; - sha256 = "03yr8hr1aahqfm04jdn7nnfblvxpj1zgrv8c9ymgjnn6gxjvwhk7"; + version = "2.3.1.0"; + sha256 = "11gwck3ndsxslfcl9s16q0n5pgimwynp9qghxp4maf651w371kh3"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -97024,8 +97044,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.3.0.1"; - sha256 = "16vk5sjyy4knw9yss25iv501zxz2258qds3bhl1mrqa24phy3c9w"; + version = "2.3.1.0"; + sha256 = "0kn1xi7ggwdaixy2sy7ajffrplszhc57m36jmvnsz8plph1rdyim"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -97038,8 +97058,8 @@ self: { ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.2"; - sha256 = "1g4ic03aad2sc62jxspcq5zsisqmr03fs39ganzcklh86asmdb8h"; + version = "1.1.0.3"; + sha256 = "07x07h906a9qm1pd4gdk7x5cl4yz3c6xj25q8zadbjwf9smi0lh1"; libraryHaskellDepends = [ base containers effectful-core ghc ]; testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; @@ -97078,6 +97098,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-th_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, effectful-core, exceptions + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "effectful-th"; + version = "1.0.0.2"; + sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + libraryHaskellDepends = [ + base containers effectful-core exceptions template-haskell + th-abstraction + ]; + testHaskellDepends = [ base effectful-core ]; + description = "Template Haskell utilities for the effectful library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -98421,29 +98459,6 @@ self: { }) {}; "elm-street" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, prettyprinter, servant, servant-server, text, time, wai - , warp - }: - mkDerivation { - pname = "elm-street"; - version = "0.2.2.0"; - sha256 = "1wgf5fss6qwgc3q18k5z95658jy4g8gx1v0ys7wwbqix4jhn461s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory filepath prettyprinter text time - ]; - executableHaskellDepends = [ - base directory filepath servant servant-server text wai warp - ]; - testHaskellDepends = [ aeson base bytestring hspec ]; - doHaddock = false; - description = "Crossing the road between Haskell and Elm"; - license = lib.licenses.mpl20; - }) {}; - - "elm-street_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, prettyprinter, servant, servant-server, text, time, wai , warp @@ -98464,7 +98479,6 @@ self: { doHaddock = false; description = "Crossing the road between Haskell and Elm"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "elm-syntax" = callPackage @@ -98559,6 +98573,31 @@ self: { mainProgram = "elm2nix"; }) {}; + "elmental" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec + , hspec-golden, kind-generics, kind-generics-th, neat-interpolation + , pretty-show, text + }: + mkDerivation { + pname = "elmental"; + version = "0.1.0.2"; + sha256 = "1asn28nzrns0p3jgkwaghfs9ka4g3qr02ls151gk8h8cm6mnc98m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath kind-generics neat-interpolation + text + ]; + executableHaskellDepends = [ base kind-generics-th text ]; + testHaskellDepends = [ + base containers hspec hspec-golden kind-generics-th pretty-show + text + ]; + description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes"; + license = lib.licenses.bsd3; + mainProgram = "generate-test-app-code"; + }) {}; + "elminator" = callPackage ({ mkDerivation, aeson, base, containers, mtl, template-haskell , text @@ -99285,6 +99324,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "emojis_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, HUnit, text }: + mkDerivation { + pname = "emojis"; + version = "0.1.4.1"; + sha256 = "1r8a8xjnsqbyzg96fla2s1cg6804297w6487rnrvjhqxgccxc040"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base HUnit text ]; + description = "Conversion between emoji characters and their names"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -99989,8 +100041,8 @@ self: { pname = "env-guard"; version = "0.2"; sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; - revision = "4"; - editedCabalFile = "0fax8g5n9hjaifvf20cszgb513ak9777d816cz50hlwfj114rjds"; + revision = "5"; + editedCabalFile = "0k0q8agfiqykaz5hv9q0g1xxbkkmk8n2pizv1n49kmfn3vg9rf4r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Conditionally running IO actions based on environment variables"; @@ -100121,34 +100173,37 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, Cabal, directory, doctest-parallel - , file-embed, filepath, generic-lens, happy, hspec, hspec-discover - , lens, mtl, optparse-applicative, process, QuickCheck, scientific - , string-interpolate, template-haskell, text, yaml + , blaze-markup, BNFC, bytestring, Cabal, cereal, directory + , doctest-parallel, file-embed, filepath, generic-lens, happy + , hspec, hspec-discover, lens, mtl, optparse-applicative, process + , PyF, QuickCheck, regex-compat, scientific, template-haskell, text + , with-utf8, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.3.1"; - sha256 = "0ap9p8ls5k692ldhkpiasnkdq0a33py8kc3i150yjcbqv5falhc3"; + version = "0.4.1"; + sha256 = "1sgag1wpl7nykq5gkkd6iak1f3nm9908cdmqr02fvn4ywrx8j1pa"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process string-interpolate ]; + setupHaskellDepends = [ base Cabal process PyF ]; libraryHaskellDepends = [ - aeson array base blaze-html blaze-markup directory file-embed - filepath generic-lens lens mtl scientific string-interpolate - template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory file-embed filepath generic-lens lens mtl PyF + regex-compat scientific template-haskell text yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson aeson-pretty array base blaze-html blaze-markup directory - file-embed filepath generic-lens lens mtl optparse-applicative - scientific string-interpolate template-haskell text yaml + aeson aeson-pretty array base blaze-html blaze-markup bytestring + cereal directory file-embed filepath generic-lens lens mtl + optparse-applicative PyF regex-compat scientific template-haskell + text with-utf8 yaml ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base blaze-html blaze-markup directory doctest-parallel - file-embed filepath generic-lens hspec hspec-discover lens mtl - QuickCheck scientific string-interpolate template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory doctest-parallel file-embed filepath generic-lens hspec + hspec-discover lens mtl PyF QuickCheck regex-compat scientific + template-haskell text with-utf8 yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; @@ -100421,23 +100476,6 @@ self: { }) {}; "equational-reasoning" = callPackage - ({ mkDerivation, base, containers, template-haskell, th-desugar - , void - }: - mkDerivation { - pname = "equational-reasoning"; - version = "0.7.0.2"; - sha256 = "18pmg7c103yprldbzh0c3wz2mbiidi14ildymsfggnxica6w05qg"; - revision = "1"; - editedCabalFile = "0qqswv42lwkv6y4hssniv4my9l9kxyvh84b2gmyqky1ijcny5y6k"; - libraryHaskellDepends = [ - base containers template-haskell th-desugar void - ]; - description = "Proof assistant for Haskell using DataKinds & PolyKinds"; - license = lib.licenses.bsd3; - }) {}; - - "equational-reasoning_0_7_0_3" = callPackage ({ mkDerivation, base, containers, template-haskell, th-desugar , void }: @@ -100452,7 +100490,6 @@ self: { ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "equational-reasoning-induction" = callPackage @@ -100547,8 +100584,8 @@ self: { }: mkDerivation { pname = "erebos"; - version = "0.1.3"; - sha256 = "1zlvaf33w1xc6cg6xklws510inh8lnyn5hfmqgl43hs7rhy4qj96"; + version = "0.1.4"; + sha256 = "1qrc5kycmirbwzjajv6rvlj43wnhixqa2z2lbj0hx55l28626vzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103623,6 +103660,28 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "exon_1_7_0_0" = callPackage + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell + }: + mkDerivation { + pname = "exon"; + version = "1.7.0.0"; + sha256 = "1i45lxdp6g94cxcx64jipxdpvza2qpz5m3z2h499xwljgyzyj3vy"; + revision = "1"; + editedCabalFile = "1b7vdc8fdck4rfpg046gakry9kwxwmz9d9zwg8racfpw5qls6y27"; + libraryHaskellDepends = [ + base ghc incipit-base parsec template-haskell + ]; + testHaskellDepends = [ + base hedgehog incipit-base tasty tasty-hedgehog template-haskell + ]; + benchmarkHaskellDepends = [ base criterion incipit-base ]; + description = "Customizable quasiquote interpolation"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "exotic-list-monads" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , QuickCheck @@ -104421,8 +104480,8 @@ self: { pname = "extensions"; version = "0.1.0.2"; sha256 = "1ra1qfrsc3icv6lgm06pgrhv77shwb8r7ci2whgnj3hs692ld7gd"; - revision = "3"; - editedCabalFile = "0ajnch6ykri1xl091yh48m8hf572d2i1aw34r5z9s9rk6bj7xxi4"; + revision = "4"; + editedCabalFile = "0aw558iz7xf3sd2n36rp3x4vi6w0cv1r4xx0kz8hkv0w1aay0vh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105098,20 +105157,21 @@ self: { "faktory" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base , bytestring, crypton-connection, cryptonite, errors, hspec - , markdown-unlit, megaparsec, memory, mtl, network, random - , safe-exceptions, scanner, semigroups, text, time, unix - , unordered-containers + , markdown-unlit, megaparsec, memory, microlens, mtl, network + , random, resource-pool, safe-exceptions, scanner, semigroups, text + , time, unix, unliftio, unordered-containers }: mkDerivation { pname = "faktory"; - version = "1.1.2.7"; - sha256 = "057rrfrfxa5xsv9pqy3jsx5gzrg0lwcx50w0hlwvkgpzlxnfch30"; + version = "1.1.3.0"; + sha256 = "02csx7s9d6aa41blrlk4c580f5cy3psrsmc2yr86q7pxfb25mh5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring crypton-connection cryptonite - errors megaparsec memory mtl network random safe-exceptions scanner - semigroups text time unix unordered-containers + errors megaparsec memory microlens mtl network random resource-pool + safe-exceptions scanner semigroups text time unix unliftio + unordered-containers ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ @@ -105187,8 +105247,8 @@ self: { pname = "falsify"; version = "0.2.0"; sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; - revision = "2"; - editedCabalFile = "1cr3lx1i89jb9sx4pqlgnb03gdav28hhn0i7prv63kjyzjn10p82"; + revision = "3"; + editedCabalFile = "0wpdv7xjf2q8wk3zql5y73ly4mky14m9rc4ql4g82x7biabnm7xg"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -105358,26 +105418,6 @@ self: { }) {}; "fast-logger" = callPackage - ({ mkDerivation, array, async, auto-update, base, bytestring - , directory, easy-file, filepath, hspec, hspec-discover, stm, text - , unix-compat, unix-time - }: - mkDerivation { - pname = "fast-logger"; - version = "3.2.2"; - sha256 = "1pdg8jc8qalwz0rrbdb0rdgq5d00j8s3bldnbdkgwc6iqagvwnsp"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath stm - text unix-compat unix-time - ]; - testHaskellDepends = [ async base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "fast-logger_3_2_3" = callPackage ({ mkDerivation, array, async, auto-update, base, bytestring , directory, easy-file, filepath, hspec, hspec-discover, stm, text , unix-compat, unix-time @@ -105394,7 +105434,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -106525,18 +106564,18 @@ self: { "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, bytestring, cached-json-file , directory, extra, filepath, http-client, http-directory - , regex-compat, simple-cmd, simple-cmd-args, text, time + , regex-compat, simple-cmd, simple-cmd-args, time }: mkDerivation { pname = "fedora-repoquery"; - version = "0.3.2"; - sha256 = "16qlplbxw3ipxgahvkn40i9mbpsmaprnjf42xmww6hiyp5iliwrv"; + version = "0.4"; + sha256 = "11lxxg7mxy3bx707yl8j3qgk48jsgc16wdndpp7j21c2sjg68skk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bodhi bytestring cached-json-file directory extra filepath http-client http-directory regex-compat simple-cmd simple-cmd-args - text time + time ]; testHaskellDepends = [ base simple-cmd ]; description = "Fedora repoquery tool"; @@ -108115,6 +108154,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fin_0_3_1" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, hashable + , inspection-testing, QuickCheck, some, tagged, universe-base + }: + mkDerivation { + pname = "fin"; + version = "0.3.1"; + sha256 = "1y98g48dr046d1v300aj10dq5mrn79yj769gcld01834xi0ng010"; + libraryHaskellDepends = [ + base boring dec deepseq hashable QuickCheck some universe-base + ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fin-int" = callPackage ({ mkDerivation, attenuation, base, data-default-class, deepseq , portray, portray-diff, QuickCheck, sint @@ -109302,8 +109358,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "1"; - editedCabalFile = "1a2qja90bqm6zwfsi6z22zm74rb3sah37j4qlz4lx08zns92bdir"; + revision = "2"; + editedCabalFile = "1byq496k06whqxdiaa7s3f4hh8mbawm6i0a9pgkbj239y14c3qpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -109616,6 +109672,8 @@ self: { pname = "flay"; version = "0.4"; sha256 = "1vqkjjf2bzmi489wsx23ryyplbg26q9qrzb98dz80j5b5rj3xzq1"; + revision = "1"; + editedCabalFile = "0xidxbyal19npq6j7cr92prm61m6w4mdqd8zvvli54h40xd2kg21"; libraryHaskellDepends = [ base constraints transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; description = "Work generically on your datatype without knowing its shape nor its contents"; @@ -109624,6 +109682,22 @@ self: { broken = true; }) {}; + "flay_0_5" = callPackage + ({ mkDerivation, base, constraints, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "flay"; + version = "0.5"; + sha256 = "1kab09h2zxxdl11x1j6cc3qkgpx2x5zwsx76chm4rydxr4j95d4d"; + libraryHaskellDepends = [ base constraints transformers ]; + testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; + description = "Generic programming for higher-kinded types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "flexible-defaults" = callPackage ({ mkDerivation, base, containers, template-haskell, th-extras , transformers @@ -109978,18 +110052,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; - version = "2.0.0.4"; - sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_5" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; @@ -109999,7 +110061,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -111182,8 +111243,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "12"; - editedCabalFile = "0rpr0j150584h4l8mn3ziq4r055w0n24sxai20b3iqhkrd10vmk1"; + revision = "13"; + editedCabalFile = "07p1rlal8fjbyd4hm0p3a3cp3b67a86qdls88yl3f0xcgrnxxmkq"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -111383,8 +111444,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "2"; - editedCabalFile = "1wm2zqhdzx5qawlqm74kpfivfhp3bmlagxc63xz7vm4pr17cisyq"; + revision = "3"; + editedCabalFile = "0lh9dgi3m75078ijvc7s4c1bd1nr1l3v4w81l2455m6gydwsrrkd"; libraryHaskellDepends = [ aeson base containers mtl text ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; @@ -111983,35 +112044,33 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_15_0_0" = callPackage + "fourmolu_0_16_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, deepseq, Diff, directory - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, scientific, syb - , temporary, text, th-env, yaml + , bytestring, Cabal-syntax, choice, containers, deepseq, Diff + , directory, file-embed, filepath, ghc-lib-parser, hspec + , hspec-discover, hspec-megaparsec, megaparsec, MemoTrie, mtl + , optparse-applicative, path, path-io, pretty, process, QuickCheck + , scientific, syb, temporary, terminal-size, text, th-env, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.15.0.0"; - sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; - revision = "1"; - editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + version = "0.16.2.0"; + sha256 = "1vbqzljpqgabdcx282mh95q8kdap3pckfxzw03nhhinmh6hv31xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary bytestring Cabal-syntax - containers deepseq Diff directory file-embed filepath - ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + choice containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text ]; executableHaskellDepends = [ base Cabal-syntax containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml + optparse-applicative terminal-size text th-env yaml ]; testHaskellDepends = [ - base bytestring Cabal-syntax containers Diff directory filepath - ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io - pretty process QuickCheck temporary text yaml + base bytestring Cabal-syntax choice containers Diff directory + filepath ghc-lib-parser hspec hspec-megaparsec megaparsec path + path-io pretty process QuickCheck temporary text yaml ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -112028,6 +112087,8 @@ self: { pname = "fp-ieee"; version = "0.1.0.4"; sha256 = "1zba050nwsf2iidxklibndja5kmszc5k7jmimchszrnc821d0cqg"; + revision = "1"; + editedCabalFile = "0bryqkf0h9a102bk7albf4pd1mjgs2l2wa6jc96sqly75ddr4d06"; libraryHaskellDepends = [ base ghc-bignum integer-logarithms ]; testHaskellDepends = [ base doctest hspec hspec-core integer-logarithms QuickCheck random @@ -112397,14 +112458,12 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, annotated-exception, autodocodec - , autodocodec-openapi3, aws-xray-client-persistent - , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring + , autodocodec-openapi3, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers , cookie, datadog, directory, doctest, dotenv, ekg-core, envparse , errors, exceptions, extra, faktory, filepath, Glob, hashable , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent - , hs-opentelemetry-instrumentation-wai - , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec + , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec , hspec-core, hspec-expectations-json, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, hw-kafka-client, immortal, lens @@ -112415,22 +112474,21 @@ self: { , QuickCheck, resource-pool, resourcet, retry, safe, scientist , semigroupoids, serialise, template-haskell, text, time , transformers, transformers-base, typed-process, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core, yesod-test, zlib + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test, zlib }: mkDerivation { pname = "freckle-app"; - version = "1.15.4.0"; - sha256 = "0vrc34946jh37g4mbydwdj40nj6b1mlhrdq3ipn3lbjzvxapmb4d"; + version = "1.18.0.0"; + sha256 = "0djg319wkwrsqf27jnv5cvlbywzr26rm6036mwafn5kz5r0alwda"; libraryHaskellDepends = [ - aeson annotated-exception autodocodec autodocodec-openapi3 - aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo - bugsnag bytestring case-insensitive cassava conduit conduit-extra - containers cookie datadog directory doctest dotenv ekg-core - envparse errors exceptions extra faktory filepath Glob hashable - hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent - hs-opentelemetry-instrumentation-wai - hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec + aeson annotated-exception autodocodec autodocodec-openapi3 base + bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit + conduit-extra containers cookie datadog directory doctest dotenv + ekg-core envparse errors exceptions extra faktory filepath Glob + hashable hs-opentelemetry-api + hs-opentelemetry-instrumentation-persistent + hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types hw-kafka-client immortal lens memcache monad-control monad-logger @@ -112439,16 +112497,15 @@ self: { persistent-postgresql postgresql-simple primitive pureMD5 QuickCheck resource-pool resourcet retry safe scientist semigroupoids serialise template-haskell text time transformers - transformers-base typed-process unliftio unliftio-core - unordered-containers vector wai wai-extra yaml yesod-core - yesod-test + transformers-base typed-process unliftio unordered-containers + vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ - aeson base Blammo bugsnag bytestring cassava conduit errors hspec - hspec-expectations-json hspec-expectations-lifted http-types lens - lens-aeson memcache monad-validate mtl nonempty-containers - postgresql-simple QuickCheck text time unordered-containers vector - wai wai-extra zlib + aeson base Blammo bugsnag bytestring cassava conduit errors + hs-opentelemetry-api hspec hspec-expectations-json + hspec-expectations-lifted http-types lens lens-aeson memcache + monad-validate mtl nonempty-containers postgresql-simple QuickCheck + text time unordered-containers vector wai wai-extra zlib ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -112602,6 +112659,25 @@ self: { mainProgram = "free-er-examples"; }) {}; + "free-foil" = callPackage + ({ mkDerivation, array, base, bifunctors, containers, deepseq + , doctest-parallel, template-haskell, text + }: + mkDerivation { + pname = "free-foil"; + version = "0.0.3"; + sha256 = "0gafhqwdzz8zqyfiw50w5zkyg5989hzqlcdq2lgqcqpzvhjg9x1r"; + libraryHaskellDepends = [ + array base bifunctors containers deepseq template-haskell text + ]; + testHaskellDepends = [ + array base bifunctors containers deepseq doctest-parallel + template-haskell text + ]; + description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; + license = lib.licenses.bsd3; + }) {}; + "free-functors" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant , derive-lifted-instances, profunctors, template-haskell @@ -113862,21 +113938,20 @@ self: { }) {}; "ftdi" = callPackage - ({ mkDerivation, async, base, base-unicode-symbols, bytestring - , generic-random, QuickCheck, random, tagged, test-framework + ({ mkDerivation, async, base, bytestring, generic-random + , QuickCheck, random, tagged, test-framework , test-framework-quickcheck2, transformers, usb, vector }: mkDerivation { pname = "ftdi"; - version = "0.3.0.2"; - sha256 = "0ybx59gs54nk5swh8c2yzcn7mxsm02qp7rwaj51y38p4yzajcw9x"; + version = "0.3.0.3"; + sha256 = "11xgscqdg1nbfr49b7dxjlzh2w8iw0dzyp4f16jlrajyxvw8fjq5"; libraryHaskellDepends = [ - async base base-unicode-symbols bytestring transformers usb vector + async base bytestring transformers usb vector ]; testHaskellDepends = [ - base base-unicode-symbols bytestring generic-random QuickCheck - random tagged test-framework test-framework-quickcheck2 - transformers usb vector + base bytestring generic-random QuickCheck random tagged + test-framework test-framework-quickcheck2 transformers usb vector ]; description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; @@ -114879,6 +114954,8 @@ self: { pname = "fusion-plugin"; version = "0.2.7"; sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; + revision = "2"; + editedCabalFile = "1sk3rz7nwqb9608c78izj8ql3k7dsxy02j8alxsgbwb3kisa673l"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers @@ -114914,8 +114991,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.16"; - sha256 = "0yvn01d5mvahp26vhqil7m900didh5hqc2gaxa1wjg1bn0lz99ah"; + version = "0.25.17"; + sha256 = "05qmsg901d10v2fibh18jy5f84i8ickx5rfx00akw4kyr7myf9fk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115752,6 +115829,8 @@ self: { pname = "gargoyle"; version = "0.1.2.0"; sha256 = "1jj1pgzikg2zw5zmkjn9kh45as5fh0ifi3kragizbbly8qy60nwl"; + revision = "1"; + editedCabalFile = "0ysxnkhymkfwkfjd7i0ys68qmcfqjm57bswi410rcfz61ania45x"; libraryHaskellDepends = [ base directory filelock filepath network process unix ]; @@ -115768,6 +115847,8 @@ self: { pname = "gargoyle-postgresql"; version = "0.2.0.2"; sha256 = "1l1p51wp8s52bpy6ac1zw1d1x0sk97bi9g77p43610386cq3dlpl"; + revision = "2"; + editedCabalFile = "0g1piy0dmfy3j8q2c6831pml84w3w79df16qm3ibdydagzs6p8xq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115789,8 +115870,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.1"; - sha256 = "0ipx0zh8j1k6w71h6zkhdf1xkjhid90q4yiy5mwypyywwwwbwjdv"; + version = "0.1.0.2"; + sha256 = "0dp9zj5fh6w336iykm07q11zfhi3pk9yq9yr2xsp386wjkqs17dq"; libraryHaskellDepends = [ base bytestring directory gargoyle gargoyle-postgresql gargoyle-postgresql-nix postgresql-simple resource-pool @@ -115808,6 +115889,8 @@ self: { pname = "gargoyle-postgresql-nix"; version = "0.3.0.1"; sha256 = "0fspvwgvs2mcg7hlivmjsw92phmxpjzjls23psvnl600nk7pnij8"; + revision = "2"; + editedCabalFile = "1c5f4bkwv4mh2fbfz90rsdiq51c2zzg6nk64byhgvl8ax74iijip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115858,12 +115941,17 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers, mtl, QuickCheck }: + ({ mkDerivation, adjunctions, base, binary, constraints, containers + , distributive, mtl, QuickCheck + }: mkDerivation { pname = "gasp"; - version = "1.3.0.0"; - sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg"; - libraryHaskellDepends = [ base binary containers mtl QuickCheck ]; + version = "1.4.0.0"; + sha256 = "17rg4dn163is2c5llwx6575fa5cr4i85rj3nxcylji5qgvmacwws"; + libraryHaskellDepends = [ + adjunctions base binary constraints containers distributive mtl + QuickCheck + ]; description = "A framework of algebraic classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -116502,6 +116590,8 @@ self: { pname = "gemini-router"; version = "0.1.2.0"; sha256 = "12b5zvs1npqc47jy04dbs2mqy2n7m0pn83ndz0wb4c1x1qygp7sj"; + revision = "1"; + editedCabalFile = "0wlzl52x65mg3an0phmp6a9d0dbcyv6vvvc941xfrmx2jydq8v78"; libraryHaskellDepends = [ base gemini-server HsOpenSSL network-uri transformers ]; @@ -116518,8 +116608,8 @@ self: { pname = "gemini-server"; version = "0.3.0.0"; sha256 = "0s9h0lzxz5yjvz8rzw9mx9dba21171960waaqikj2qbbja0iq3k3"; - revision = "1"; - editedCabalFile = "151ghd56sa5c95vxb7hacgmykg7y30086w84c61x5y18njnzyqw6"; + revision = "3"; + editedCabalFile = "1lg561xjfsa5q5gayipzr4ggragv2nv80i3bg1psg5n8ryijdpdm"; libraryHaskellDepends = [ base bytestring hslogger HsOpenSSL network network-run network-uri text utf8-string @@ -116539,8 +116629,8 @@ self: { pname = "gemini-textboard"; version = "0.2.0.1"; sha256 = "1yvizcxafq943q9fbz08mq2x50dw9ykdz5vy6hr6ps2g47j4wfa0"; - revision = "1"; - editedCabalFile = "0ppmyz8a03ccdp97s3c1y6zmpvd1whzdjmn30qx8jw6iky8whwjs"; + revision = "2"; + editedCabalFile = "1pl0k7skmf3yp2f8mscmfynhkis6dn6hb94qg26kxyr7jpwbcsb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116921,12 +117011,12 @@ self: { }) {}; "generic-data-functions" = callPackage - ({ mkDerivation, base, contravariant, text }: + ({ mkDerivation, base, contravariant }: mkDerivation { pname = "generic-data-functions"; - version = "0.5.1"; - sha256 = "1yw9v9s9nsz492d6v4sfi0s9nm3mq2kvxn4q9y01s7fwabdijpk1"; - libraryHaskellDepends = [ base contravariant text ]; + version = "0.6.0"; + sha256 = "1d4rl7bb7prpvisx4w4azg5rck1kz9g87svzackjfqjpnx56ma3g"; + libraryHaskellDepends = [ base contravariant ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -117097,10 +117187,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-lens-lite"; - version = "0.1"; - sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "6"; - editedCabalFile = "0db0lbdq3iqgq42bj6q5qn4az8szwjyhq93f32zmcj1n4mrpxdj9"; + version = "0.1.1"; + sha256 = "1ldc13g7l5jjgca80c2hymkbgq9pf8b5j4x3dr83kz6wq2p76q12"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -117206,10 +117294,8 @@ self: { ({ mkDerivation, base, generic-lens-lite, optics-core }: mkDerivation { pname = "generic-optics-lite"; - version = "0.1"; - sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "6"; - editedCabalFile = "17yqzcdlm3g5mc8rjjqp98ykj8rj1c46c0vcqk23pwgffpac5d25"; + version = "0.1.1"; + sha256 = "1dd2dw72fyyimnyq8bw57k7lbh0lnjipvk08dyj87h357ykjv3ql"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -119477,8 +119563,8 @@ self: { pname = "ghc-events"; version = "0.19.0.1"; sha256 = "1rliryx527ph1csyq8d5np1g8yfwhmsarspqnl7lp9d9nf0jkbn1"; - revision = "1"; - editedCabalFile = "09arkxfmi64nxr3r7qd0fwikp29qrl4rahf0zwwhhlqrz9n6npzv"; + revision = "2"; + editedCabalFile = "1p41rdbxh23465qqkv6h1sydgxbqwrcyi85xzlyjc2xg0m9ic15s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119662,12 +119748,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_9_0_0" = callPackage + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.9.0.0"; - sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + version = "1.10.0.0"; + sha256 = "14jwkx0q2bidcv5ss7zmkvl41z264k7siy9fh7py27h7azb539v0"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -119856,6 +119942,8 @@ self: { pname = "ghc-internal"; version = "9.1001.0"; sha256 = "0z38v4gnyis99r3rli2g3dyg948d98lhd1ylz5irbghnvrn8myhl"; + revision = "1"; + editedCabalFile = "1rx55yc51xaarcyj8mgrdn6pmr8ri2n962h813dy5vc1pj49g8yz"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -120632,13 +120720,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_11_0" = callPackage + "ghc-syntax-highlighter_0_0_12_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.11.0"; - sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; + version = "0.0.12.0"; + sha256 = "0q3lql4ykfha4p5s5dxgf2p9jrim1g14wl0yh6l80y28ls94b7d9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -120725,8 +120813,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.8"; - sha256 = "0gljssyq1ahgl65vnqqa5s1vglzdisx8wp5p2hwh09diwa2ms9mw"; + version = "1.9"; + sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120807,8 +120895,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.5"; - sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; + version = "0.4.6"; + sha256 = "1a8zf8zbknsllmwsgid8q3p669r72iy3g4i89ngyv0hvanghdz2v"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -120847,18 +120935,6 @@ self: { }) {}; "ghc-trace-events" = callPackage - ({ mkDerivation, base, bytestring, tasty-bench, text }: - mkDerivation { - pname = "ghc-trace-events"; - version = "0.1.2.8"; - sha256 = "1qmfywqjwbnmhjs2q2nndvdfhigjhq5ma86s882ffcz3rawxv5wi"; - libraryHaskellDepends = [ base bytestring text ]; - benchmarkHaskellDepends = [ base bytestring tasty-bench ]; - description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-trace-events_0_1_2_9" = callPackage ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; @@ -120868,21 +120944,22 @@ self: { benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-bignum, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, tasty, tasty-hunit, transformers + , ghc-typelits-natnormalise, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.6"; - sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; + version = "0.4.7"; + sha256 = "0kacdhzqv7x7f44icxfd54cbad05d9pg8bdsziy657y5m8awnf13"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise transformers + ghc-typelits-knownnat ghc-typelits-natnormalise template-haskell + transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty @@ -120899,8 +120976,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.10"; - sha256 = "03rg0p1grmxxzr9w0bgczavnqhvg2jivq8cafqsvqrsrmiacip8d"; + version = "0.7.12"; + sha256 = "0r2jaqa1667maskpvyx10nr33xypabp1navfh7f0rb2fmxxl3j9z"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -120919,10 +120996,11 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.9"; - sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; + version = "0.7.10"; + sha256 = "04q47qdlgry0as8fb441g1dhk8712nhjcmkkgvr4440grr14f4vv"; libraryHaskellDepends = [ - base containers ghc ghc-bignum ghc-tcplugins-extra transformers + base containers ghc ghc-bignum ghc-tcplugins-extra template-haskell + transformers ]; testHaskellDepends = [ base ghc-prim tasty tasty-hunit template-haskell @@ -120939,8 +121017,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.7.3.0"; - sha256 = "146xlp596ymsz1wrx2am62fy1v1gq7v6qzbx6qmj5dgxph0h4w6x"; + version = "0.7.4.0"; + sha256 = "1kas8w67hnrcqrywnqc1w0ls4varj5357nfirdr2r2f12zar6q45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121208,20 +121286,19 @@ self: { , cryptohash-sha1, data-default, deepseq, dependent-map , dependent-sum, Diff, directory, dlist, enummapset, exceptions , extra, filepath, fingertree, focus, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-paths, ghc-trace-events, gitrev, Glob - , haddock-library, hashable, hie-bios, hie-compat, hiedb, hls-graph - , hls-plugin-api, implicit-hie, lens, list-t, lsp, lsp-test - , lsp-types, mtl, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, random, regex-tdfa - , row-types, safe-exceptions, sorted-list, sqlite-simple, stm - , stm-containers, syb, tasty-hunit, text, text-rope, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , vector + , ghc-trace-events, gitrev, Glob, haddock-library, hashable + , hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , implicit-hie, lens, list-t, lsp, lsp-types, mtl, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, random, regex-tdfa, safe-exceptions + , sorted-list, sqlite-simple, stm, stm-containers, syb, text + , text-rope, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "ghcide"; - version = "2.8.0.0"; - sha256 = "1mjqbh7dmgx9q90pqs6qyqy0mgxj9vcwn5ww6hqcw9i2p847mvgy"; + version = "2.9.0.0"; + sha256 = "18g70rjpkrvc433y2fd2wd6fgcwvxj1gy12h1ajr1dn28ys4847k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121229,20 +121306,18 @@ self: { case-insensitive co-log-core containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc - ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob - haddock-library hashable hie-bios hie-compat hiedb hls-graph - hls-plugin-api implicit-hie lens list-t lsp lsp-test lsp-types mtl - opentelemetry optparse-applicative parallel prettyprinter - prettyprinter-ansi-terminal random regex-tdfa row-types - safe-exceptions sorted-list sqlite-simple stm stm-containers syb - tasty-hunit text text-rope time transformers unix unliftio + ghc-boot ghc-boot-th ghc-trace-events Glob haddock-library hashable + hie-bios hie-compat hiedb hls-graph hls-plugin-api implicit-hie + lens list-t lsp lsp-types mtl opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal random + regex-tdfa safe-exceptions sorted-list sqlite-simple stm + stm-containers syb text text-rope time transformers unix unliftio unliftio-core unordered-containers vector ]; executableHaskellDepends = [ base data-default extra gitrev hls-plugin-api lsp lsp-types optparse-applicative ]; - doHaddock = false; description = "The core of an IDE"; license = lib.licenses.asl20; }) {}; @@ -121341,8 +121416,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.8.0.1"; - sha256 = "1cx9jqpbr6b30qckp2zpsfk3swa58snjb79pq0l6485nvrxa9mls"; + version = "0.8.0.2"; + sha256 = "1p78m70jr1bc7c9xh316ib8ldpsk4nzjjz56sax5ygwz4513kc87"; description = "base library for GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121386,8 +121461,10 @@ self: { }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.9.1"; - sha256 = "0fjf0l1yaml24ipdxc72fscn1f8az663yx31rwxhq6kj2p7j1jg1"; + version = "0.9.9.2"; + sha256 = "05risvf43x3rvh4ln1mi0jhkf13dpl3j2sxdn8ph5lidiwm0brf2"; + revision = "1"; + editedCabalFile = "11cvqicf9jmcmxc37i8l6vgh1vb501y2xhlqhwhcfinhj07ffs8i"; libraryHaskellDepends = [ base containers ghcjs-dom-jsaddle text transformers ]; @@ -121422,8 +121499,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-javascript"; - version = "0.9.9.1"; - sha256 = "0im7wn7bn43rhkblh0wn9angadbdvywsalfz0adr9pkwv6hvc8qs"; + version = "0.9.9.2"; + sha256 = "19011y6rnaa6mcch64gxpi1gzv6yp8ma2nxi6k6wp6myyfia57wh"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121767,8 +121844,8 @@ self: { }: mkDerivation { pname = "gi-adwaita"; - version = "1.0.6"; - sha256 = "0d5qswxbr8hl0mykjifgxivcbv55viva0gfw5zmgmswkp7my56q2"; + version = "1.0.7"; + sha256 = "16hqnb3a92b10svghgic65grs14mjx0idx2nc8d9lz4y41z27kbz"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -121803,6 +121880,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_28" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.28"; + sha256 = "0dkzchgsbb7f4b4p56ni4s1vmpp7ln722djcbcp5zazqbd0s9vfd"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-ayatana-appindicator3" = callPackage ({ mkDerivation, ayatana-appindicator3, base, bytestring, Cabal , containers, gi-gdk, gi-gobject, gi-gtk, haskell-gi @@ -121810,8 +121907,8 @@ self: { }: mkDerivation { pname = "gi-ayatana-appindicator3"; - version = "0.1.0"; - sha256 = "0ds1d21r2fhc92iznc02gnm6xfgj6hx63iz04bvvpbld6s6xislr"; + version = "0.1.1"; + sha256 = "1n6lf59l63yjj0q4q4gxnq3b6s8myxyqyhgpdjkszvpbym6mdb98"; setupHaskellDepends = [ base Cabal gi-gdk gi-gobject gi-gtk haskell-gi ]; @@ -121849,6 +121946,30 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.30"; + sha256 = "0s0ych0fxnfaqg2q2ndfp2zj01sya0j888snd2rdbaiikxy0kvsq"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -121907,8 +122028,8 @@ self: { }: mkDerivation { pname = "gi-clutter"; - version = "1.0.5"; - sha256 = "05yavg91cfm3da3b9gf9c5yis6c6jv1zcqa6y0wdyyghlzagyix7"; + version = "1.0.6"; + sha256 = "01q4549k57xv5vin82mcysmm9gwar0a2ak0c180ndkqcddkpkq22"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-cogl gi-gio gi-glib gi-gobject gi-json gi-pango haskell-gi @@ -121932,8 +122053,8 @@ self: { }: mkDerivation { pname = "gi-cogl"; - version = "1.0.5"; - sha256 = "04ji6w2xvy6pcbqgnqm1f2wsyv1za1m7b8wyg9vnbdf4hiwl8mzl"; + version = "1.0.6"; + sha256 = "0mq6g6x1znc9b3kjkzcchmc7lr7vf77s49gwi67h3r3nqm90c5c9"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -121951,8 +122072,8 @@ self: { }: mkDerivation { pname = "gi-coglpango"; - version = "1.0.5"; - sha256 = "0zbp7s1kn5xds521wmgxmqiahccbdz0sc54rgmprs8ak2bf3d68p"; + version = "1.0.6"; + sha256 = "1hafha7qbzsq9jh8by730c0lcspdr5wwj4a4w3sg9bbm2290nb4i"; setupHaskellDepends = [ base Cabal gi-cogl gi-glib gi-gobject gi-pango gi-pangocairo haskell-gi @@ -121969,6 +122090,30 @@ self: { broken = true; }) {cogl-pango = null;}; + "gi-dazzle" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango + , haskell-gi, haskell-gi-base, haskell-gi-overloading, libdazzle + , text, transformers + }: + mkDerivation { + pname = "gi-dazzle"; + version = "1.0.2"; + sha256 = "0q2062bld81mq33b32hn2hx644sb4si36n2phs0s8xddijzxiag6"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdazzle ]; + description = "libdazzle bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) libdazzle;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -121989,6 +122134,27 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenu_0_4_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.14"; + sha256 = "16pkj1sdkv5567yvbbgyfwncjs1k9wcj97n61mxk2aaqn5zasp2x"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdbusmenu ]; + description = "Dbusmenu bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk @@ -122014,6 +122180,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-dbusmenugtk3_0_4_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu-gtk3, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.15"; + sha256 = "05i72iqv7x9r673d4b4q523q8py0652s79radclqg5maiy40ivfb"; + setupHaskellDepends = [ + base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-gtk haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; + description = "DbusmenuGtk bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-freetype2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, freetype , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122033,6 +122225,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) freetype;}; + "gi-freetype2_2_0_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, freetype + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-freetype2"; + version = "2.0.5"; + sha256 = "115yjlhb507wp21hcngygr0mrq4vdpnbx24gyfd5wwba9ny38a9j"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ freetype ]; + description = "freetype2 bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) freetype;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -122057,7 +122269,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_7" = callPackage + "gi-gdk_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122065,8 +122277,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.7"; - sha256 = "1ll3rl6ypcbgnfh3xxfwfswqpmbxgmk628lkkj5h8f9is2fwl067"; + version = "4.0.8"; + sha256 = "1izl25parszwm9nayn0w9zvmic9bsfcfl1jiasnj11pmzzllyryc"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -122103,6 +122315,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkpixbuf_2_0_32" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf + , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.32"; + sha256 = "1yxsrhxv5ndj60bv6djnhbmyh3a6ahmdkyfw5xbr3wy8hh9vc7l3"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gmodule gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-pixbuf ]; + description = "GdkPixbuf bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -122125,15 +122359,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_7" = callPackage + "gi-gdkx11_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.7"; - sha256 = "0hym8rfa9ynihgvvk83npdd29vsbfajnsn824ybighczg73491dh"; + version = "4.0.8"; + sha256 = "0sfgym80d10nn4p91595xa89fnxvzhm1a1abdv89yw5dq4y5hih8"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -122156,8 +122390,8 @@ self: { }: mkDerivation { pname = "gi-ges"; - version = "1.0.4"; - sha256 = "1g3kc51g1imln821scx19plankk01af1c82mvyxjz09bfvc8mwv9"; + version = "1.0.5"; + sha256 = "0hmbpmwda8ijmfmgjxy9s6fvn3akz08lrzh082nv39bsba2wbgj8"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject gi-gst gi-gstpbutils gi-gstvideo haskell-gi @@ -122180,8 +122414,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.14"; - sha256 = "0zn41wapf9iq9fiyifvd0d9ykylcxfl583whadvbwd750knq9j97"; + version = "1.0.15"; + sha256 = "02xibi58zh56j3ji9pkm0nhyc4z4jvlvkpfhaqz6dymp9b4g139p"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122216,6 +122450,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_33" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.33"; + sha256 = "14b1hsawkpx0351286bhk54p8f79m1h1vvwqwnsybvsnr3kzgcql"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gio-hs-list-model" = callPackage ({ mkDerivation, base, containers, gi-gio, gi-gobject , haskell-gi-base @@ -122240,8 +122494,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.28"; - sha256 = "1bgpl4mmlvq7xa3ar94wx4n1vlcj93s3q772ixp73zmy8izngnci"; + version = "1.0.29"; + sha256 = "19p3zpfpcj3z9d97jpkkr8n5wj1yhp9gry0rwp5csqdvz5h3n5i8"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122271,6 +122525,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.30"; + sha256 = "1l9lh3rkf4z6mw16g3ghrzsipbn4iv7jrqwcnv0mg12sa5y4slbp"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gmodule" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122290,6 +122564,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gmodule_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gmodule"; + version = "2.0.6"; + sha256 = "1q4a71fimdgrdfzpxf63fkjya2n624b2kyadrcpn17518hhagk7l"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GModule bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122309,6 +122603,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_31" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.31"; + sha256 = "1vhdbvcr33gi2cvf31q1zbgkd0gpgcrwnqi59ylrsw6xmblndhdh"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene, haskell-gi, haskell-gi-base @@ -122328,6 +122642,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) graphene;}; + "gi-graphene_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.8"; + sha256 = "189fsk72m3v7qbwyn75vradvi3y9vrbjlg95dbr65k2mm1if2n9k"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene ]; + description = "Graphene bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) graphene;}; + "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-graphene, gi-pango @@ -122336,8 +122670,8 @@ self: { }: mkDerivation { pname = "gi-gsk"; - version = "4.0.7"; - sha256 = "1mqfhgg1gp33aw3vyg9bpkl7b57apgrv6r3pdwjr2fysmjmi58cl"; + version = "4.0.8"; + sha256 = "0akmlbjapiqnn4lfh4z5b95w8ck2jlrp7abqahaxdcbj3d2kcpb4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-graphene gi-pango haskell-gi @@ -122359,8 +122693,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.29"; - sha256 = "1cfyrvkgdhdpgmpxl5dg9s5slz3pqbg9gb9dp1alzjjf8n1fg39h"; + version = "1.0.30"; + sha256 = "07nkn14qsfjgv6ks2aac9zpvn6h81xk42bd2h8k6f0cv4hwjwb7k"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122378,8 +122712,8 @@ self: { }: mkDerivation { pname = "gi-gstapp"; - version = "1.0.28"; - sha256 = "1vm95fih31bn4d86rfqnp39xdiq0n4gwzc0j9dv71cdkz6fzswmb"; + version = "1.0.29"; + sha256 = "1yyvakxwd38201w2bb4in5c9y1dc03ss7a0q13wb0dzlfq0dpmal"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122401,8 +122735,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.27"; - sha256 = "0d094gzgb13dsfshwib648szq66ylw86sw0sir03q17pf4c3bjia"; + version = "1.0.28"; + sha256 = "0ximxmlm7zy8n4h7wfx0vvicvq9gfx5567dk36n3xbql2al3q426"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122422,8 +122756,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.28"; - sha256 = "0m55wv5696kqyvirm00ns0wkh2sxw06xrik54j0gg393nxn8s458"; + version = "1.0.29"; + sha256 = "00ppi41zs5acl7rxd48clzvyg3g22biwphyg4s5gw35jyr5fyplr"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -122444,8 +122778,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.27"; - sha256 = "15vw2x296jmcmby4r9mx065ikqimy20ac0ilwbj7xdx75kmjxxic"; + version = "1.0.28"; + sha256 = "1ibcpyax0l408f4vn119b3jvkvgz6wzj6xcg0dyl60pjjh1bg2r3"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -122468,8 +122802,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.27"; - sha256 = "09mzk3q1ci4mr3bm88y9bkp7q4v3hf575d84hr579l40i1q2mkb4"; + version = "1.0.28"; + sha256 = "1rf97va4rrlkziivsmbrpgkl0049i123fizb4iz3s5863z2vpp9q"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122491,8 +122825,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.28"; - sha256 = "05pm8iyv0dxj031079w3aaws7yi560kz0iyry1pz2qsih9ps0igr"; + version = "1.0.29"; + sha256 = "07g38fn00i1z7fnzb276z892q2rig4wbw9m3x1q5dg5fc0yr2s5r"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122529,7 +122863,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_8" = callPackage + "gi-gtk_4_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -122537,8 +122871,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.8"; - sha256 = "1gqyvd2d60xdbgia065dmg7sswfc20b6h97zxq7s6f7r6lphzg2r"; + version = "4.0.9"; + sha256 = "0pccbinm41shskr9l20m42mdvn2v11nylpwq2r4yz30lkpw401if"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -122626,8 +122960,8 @@ self: { }: mkDerivation { pname = "gi-gtk-layer-shell"; - version = "0.1.5"; - sha256 = "10bsb2njsfzgp7qail359hab7kza1qn2lnhdwnj7mbahacx024jq"; + version = "0.1.6"; + sha256 = "164k9r4k5fgkgahwvfyq6p1l566w31ijc1i1h95r549pkm21fi2c"; setupHaskellDepends = [ base Cabal gi-gdk gi-gtk haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdk gi-gtk haskell-gi haskell-gi-base @@ -122713,7 +123047,7 @@ self: { broken = true; }) {inherit (pkgs) gtksourceview3;}; - "gi-gtksource_5_0_0" = callPackage + "gi-gtksource_5_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base @@ -122721,8 +123055,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "5.0.0"; - sha256 = "0yfwms2qzb994q8c48nnm0gfxz315jk0yvd45ss3p1j5idq4b5pp"; + version = "5.0.1"; + sha256 = "0s5xc3d7i2a4ysa2m5kd9qsr2g78yiqj4rfjy06n0kqsmymprvj2"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122747,8 +123081,8 @@ self: { }: mkDerivation { pname = "gi-handy"; - version = "1.0.4"; - sha256 = "0hahypvzd1h6fvlb2dh5p9wjgsmwi3j6zsn5l699d0w00yf8s5i5"; + version = "1.0.5"; + sha256 = "1a3x7w3142bj12qvfi51697ralnaqdxrlxbkjjcmhfvvdv5c4brz"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122784,6 +123118,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) harfbuzz;}; + "gi-harfbuzz_0_0_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 + , gi-glib, gi-gobject, harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-harfbuzz"; + version = "0.0.10"; + sha256 = "1b7mmva40a3j1qm2155sy106wwrklj2p5fjwdzlkma8bnr6r2mqx"; + setupHaskellDepends = [ + base Cabal gi-freetype2 gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-freetype2 gi-glib gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ harfbuzz ]; + description = "HarfBuzz bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) harfbuzz;}; + "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -122791,8 +123147,8 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.7"; - sha256 = "08rd0kkkxaixi9z0ll5k94yinfflmzlwba8f9cizn0y4gqjpcqks"; + version = "1.5.8"; + sha256 = "1fp5ngdp4b4fl98qrpi9wqyndaqxca6pxqg5by6zqvz8rf43jcqd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122828,15 +123184,15 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_6_0_3" = callPackage + "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , javascriptcoregtk, text, transformers }: mkDerivation { pname = "gi-javascriptcore"; - version = "6.0.3"; - sha256 = "09pycpf8h7zzwl0ml7zkgv15v0ia37c067f21zwzbmmqir8fnhwx"; + version = "6.0.4"; + sha256 = "095my50hg37g92f77336z56zc4axgf70fwqvabs0rysp39f1qnk0"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122856,8 +123212,8 @@ self: { }: mkDerivation { pname = "gi-json"; - version = "1.0.5"; - sha256 = "0iqv6w7af40hlr4bf8qqm2wd5ppd94978ak0mqxx5h132sn8w5kg"; + version = "1.0.6"; + sha256 = "1n212yyv1yz0l90w9as6pq6xjqxnjdg08ns8l274m3ddrpcdjhny"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122870,6 +123226,27 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) json-glib;}; + "gi-keybinder" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, keybinder, text, transformers + }: + mkDerivation { + pname = "gi-keybinder"; + version = "0.3.3"; + sha256 = "0cl0j6w75kqs50vrbf62v3vqrzylf4w2w5b6n381ic25xjv13f5p"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ keybinder ]; + description = "Libkeybinder bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) keybinder;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -122877,8 +123254,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.27"; - sha256 = "02x4qqs0cbw04v1bbidq0pv8pn7qclg0ybi8c0rcvvsyrld8rml4"; + version = "0.7.28"; + sha256 = "1sph16xhvyyfp81b2njz99crzwqas8njn6h0ma7hbi068jmnj7nq"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -122898,8 +123275,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.18"; - sha256 = "0zkj48sarz1nddq18pc9k1v45cq3sgvr93yh677szrbp797qchis"; + version = "1.0.19"; + sha256 = "0gy3m1s0q70ny1xiqa4jqv4svxhg454bhx04z29vrpc2921b2kkd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122938,6 +123315,32 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers, gi-gio + , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.30"; + sha256 = "1kp3jnnjik1caiax3j548aypn77qzi1l8r9b2zki95s2yg5rpv9p"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject gi-harfbuzz haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject gi-harfbuzz + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-gio, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -122946,8 +123349,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.30"; - sha256 = "1sr42xj76485hjf4xzsf6kf01bbydg4b4ba4pzmn6x2wl4q739lx"; + version = "1.0.31"; + sha256 = "1kns0ywh540rwvmvw1wq3afmzlfygi59pn1zq2km693qv992vz1x"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject gi-pango haskell-gi ]; @@ -122972,8 +123375,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.29"; - sha256 = "0lznz54jkln93p43vv7n67kq2ldjky7g8ig8na4nq9nj3q8fwmj1"; + version = "0.18.30"; + sha256 = "1amw3kzyicw6c6z9gy6via54kigrgx09ivvzf0niccbvjgp7db9q"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122994,8 +123397,8 @@ self: { }: mkDerivation { pname = "gi-rsvg"; - version = "2.0.5"; - sha256 = "1w4mliz1fna8cb1qf8ivbjmbrcqlnd4wq8ncsjkhiz8ncpxxwaqj"; + version = "2.0.6"; + sha256 = "0v0184nd1q0hy8r0gvkfngrp2h512g9qglzw2van9lds6xzpwzy6"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject haskell-gi @@ -123017,8 +123420,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.17"; - sha256 = "1s5nv3q6b91fipzxmri4gc8pss9dwwm7svv26km7b99w4bd3k4qf"; + version = "0.0.18"; + sha256 = "0z4knqmhcicqnmamzibl1xwarjl7y1da0127jg7s1n7a780dgnd5"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123052,15 +123455,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsoup;}; - "gi-soup_3_0_2" = callPackage + "gi-soup_3_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers }: mkDerivation { pname = "gi-soup"; - version = "3.0.2"; - sha256 = "07mwdvbw634fp3x1b7xc6ndh96w4ydx14habpy9gysk0a728sskz"; + version = "3.0.3"; + sha256 = "154iw6689b9vhh9y82r3vc86lnvvzy1rvzadzsrp23c043gibg17"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123081,8 +123484,8 @@ self: { }: mkDerivation { pname = "gi-vips"; - version = "8.0.4"; - sha256 = "0wsa81n9mpcx2yr536jaw9wnnhk3fy22z1fb3dy3d5fsl7164bdq"; + version = "8.0.5"; + sha256 = "07747sr630461d2k44yf2ns7jr6f02c5y7gjg69wcmw7g03gjhfw"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -123118,6 +123521,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {vte_291 = pkgs.vte;}; + "gi-vte_2_91_33" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers, vte_291 + }: + mkDerivation { + pname = "gi-vte"; + version = "2.91.33"; + sha256 = "0w24xl9i0mfw9jvihi8kbmz65s5g81f33l9sa2hk8cvm0w7s3x8p"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ vte_291 ]; + description = "Vte bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {vte_291 = pkgs.vte;}; + "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk @@ -123126,8 +123555,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "6.0.2"; - sha256 = "00js1737ck6qyz1lkizif84qyqwq7638wdgznrdn6g4yw2a4hd4k"; + version = "6.0.3"; + sha256 = "00nzd9qzbiwrv2511z0cv4wka3haxfxry89i068qh9g08ly7jzca"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123168,6 +123597,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2_4_0_31" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-webkit2"; + version = "4.0.31"; + sha256 = "1zfnhw3qly3jv3xlmrqnqxdxpr376hh8g66px1wfp9dpf4rb5kfm"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-javascriptcore gi-soup haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "WebKit2 bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup @@ -123176,8 +123631,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.30"; - sha256 = "027jmj0igs5dh7mdap033jxnzpwk6rsp9rhx6y52kjxgcnf97r5x"; + version = "4.0.31"; + sha256 = "0bs0fdphpncsmqpqm369ldqw3k2bhnyizblbjjb73rkcpphvimjh"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123203,8 +123658,8 @@ self: { }: mkDerivation { pname = "gi-webkitwebprocessextension"; - version = "6.0.2"; - sha256 = "0xvryk8kln1c0ka6jncfixm2ycbpnlayx6c8s5pbbcwrnhsj1afz"; + version = "6.0.3"; + sha256 = "0zmpv5vq8nnvcrb46jqq5xnrcw7rqwkh09rgzf7dhfnn6qngify4"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123229,8 +123684,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.14"; - sha256 = "13jwqssb3rmaliph73gc9c69wp2sm3k5flxbaj7ld61zzgzm4p0b"; + version = "3.0.15"; + sha256 = "0p0rb9xr6jz68pnir0qj6ci5sbkq1lysgv5zr3jzvjisw56fvqay"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi @@ -123265,6 +123720,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.xorg) libX11;}; + "gi-xlib_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, libX11, text + , transformers + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.14"; + sha256 = "0xzxvf88qgglmjakqsn01gi9z84mg6qw4dx16wi931zjibfmmhlg"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libX11 ]; + description = "xlib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.xorg) libX11;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -123618,8 +124093,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240430"; - sha256 = "1p32fccxgk6nkp187cazc8cs0fmb92l7v0bdqipihj9wpw8xr4s0"; + version = "10.20240531"; + sha256 = "0fbjxvi72lhk0hwdqwwnhdwi94bff7pn4fzyclmhq55860p8ssna"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -124153,8 +124628,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "4"; - editedCabalFile = "0lk7dhwgcgjxrryvag1qwnpb6ds5cmrcwj755n5f60nz4hm0hvqs"; + revision = "5"; + editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -124245,30 +124720,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; - version = "2.0.0.10"; - sha256 = "1zsp4zab202jh11aaxpg6a59dh4paaqagi446qnwd2f503430zsc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_11" = callPackage ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers @@ -124286,7 +124737,6 @@ self: { executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -124314,6 +124764,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-rest_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, crypton + , http-client, http-client-tls, http-types, jose-jwt, mtl + , scientific, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , text, time, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.2.1"; + sha256 = "1d7jiidqaz1z07gdn6gka8cmp8jdn0v21ppbivxc8718vj5pq5xf"; + libraryHaskellDepends = [ + aeson base bytestring crypton http-client http-client-tls + http-types jose-jwt mtl scientific text time transformers unliftio + unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring crypton http-types mtl tasty + tasty-golden tasty-hunit tasty-quickcheck text + ]; + description = "Query the GitHub REST API programmatically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, cryptohash, Diff, directory @@ -131116,10 +131590,8 @@ self: { }: mkDerivation { pname = "grisette"; - version = "0.5.0.1"; - sha256 = "0wrvasr5kbz27ddwlmpxwzda4ya5phyn21hwi2ci7xgcfb0q3szh"; - revision = "2"; - editedCabalFile = "0sihj9hivxc3w3fr8yc8bp6wnphjspvm1fwgzx3iimsw26vb21cd"; + version = "0.6.0.0"; + sha256 = "12ylz5dbiwrp7zdvmdf95nwzrs9hvknn8bi5adhw54b65924qjrg"; libraryHaskellDepends = [ array async base bytestring deepseq generic-deriving hashable hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv @@ -134513,8 +134985,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "3"; - editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp"; + revision = "5"; + editedCabalFile = "1gi861bwyizq164pl2ikqr3zmklifndizlr5hn1ly0zq58ram3yi"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -135108,10 +135580,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.2.0"; - sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; - revision = "6"; - editedCabalFile = "1pdasij9bz7pzfb9f3lvvixzch7ac3xhqqx5cd3wjl40annawsaw"; + version = "4.16.2.1"; + sha256 = "1xcw8pcw9h82hxdlpp8z0ma2a1ssa5x2m32vizxh2a2pm5l1d3a7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135324,10 +135794,8 @@ self: { }: mkDerivation { pname = "hakyll-convert"; - version = "0.3.0.4"; - sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "8"; - editedCabalFile = "1fwjxmdfq4wlwi77pmvvfydi0si8cbv4ygdrkbanl4d90scr2rn0"; + version = "0.3.0.5"; + sha256 = "0xnv0dxfajk4jl0d1a33cjpca21wnrvvm1194jxar58gqp9i0hr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137818,6 +138286,17 @@ self: { mainProgram = "hascal"; }) {}; + "hascalam" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hascalam"; + version = "0.1.1.1"; + sha256 = "1gpm73qgclh7x9fzq7pf6il5hbb4way3g2ap44xwp120cmr4wknq"; + libraryHaskellDepends = [ base ]; + description = "Haskell to and from Scalameta"; + license = lib.licenses.mit; + }) {}; + "hascar" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, binary, bytestring , conduit, containers, cryptohash, directory, exceptions, filepath @@ -138114,6 +138593,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_4_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.4.6.0"; + sha256 = "1jvqnzammb6gn13b9inlq5hhf8njphsvsl5ickby7j9g3mx2lr9l"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath ghc-bignum ghc-prim + os-string text + ]; + testHaskellDepends = [ + base bytestring filepath ghc-prim HUnit os-string primitive + QuickCheck random tasty tasty-hunit tasty-quickcheck text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -139415,8 +139916,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.8"; - sha256 = "15ibhysm9q94jrbxgby4kpmm1wh1yx2f1y0wcqfz958jqza77733"; + version = "0.26.9"; + sha256 = "1p6z9r5bajx90v4zf2z0gh156y4xi8p7kgfb2cgx1ckflk8d7nna"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -139433,8 +139934,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.4"; - sha256 = "1c5i9nwf0ldgjyqm8qir5fs66d5pkyl9ajq77rcxy5bc7r7kbyws"; + version = "0.26.5"; + sha256 = "1malx9z9scw1dx8g33z6ix1chri6fzc1sr9mz7db2x7f6i472s0w"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -139583,19 +140084,19 @@ self: { "haskell-language-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, apply-refact, array, async - , base, bytestring, Cabal-syntax, containers, data-default, deepseq - , Diff, directory, dlist, enummapset, extra, filepath, floskell - , foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th + , base, binary, bytestring, Cabal-syntax, containers, data-default + , deepseq, Diff, directory, dlist, enummapset, extra, filepath + , floskell, foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th , ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex, ghcide - , ghcide-bench, githash, hashable, hie-bios, hie-compat, hiedb - , hlint, hls-graph, hls-plugin-api, hls-test-utils, hp2pretty - , implicit-hie, lens, lens-aeson, list-t, lsp, lsp-test, lsp-types - , megaparsec, mod, monoid-subclasses, mtl, network-uri - , optparse-applicative, optparse-simple, ormolu, parser-combinators - , prettyprinter, process, process-extras, QuickCheck, random - , refact, regex-applicative, regex-tdfa, retrie, row-types - , safe-exceptions, semigroupoids, shake, shake-bench, sqlite-simple - , stan, stm, stm-containers, stylish-haskell, syb, tasty + , githash, hashable, hie-bios, hie-compat, hiedb, hlint, hls-graph + , hls-plugin-api, hls-test-utils, hp2pretty, implicit-hie, lens + , lens-aeson, list-t, lsp, lsp-test, lsp-types, megaparsec, mod + , monoid-subclasses, mtl, network-uri, optparse-applicative + , optparse-simple, ormolu, parser-combinators, prettyprinter + , process, process-extras, QuickCheck, random, refact + , regex-applicative, regex-tdfa, retrie, row-types, safe-exceptions + , semigroupoids, shake, shake-bench, sqlite-simple, stan, stm + , stm-containers, stylish-haskell, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, temporary, text, text-rope, time , transformers, trial, unix, unliftio, unliftio-core @@ -139603,46 +140104,47 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.8.0.0"; - sha256 = "0nzqwm913s0d1m5irq4b65d2bl83qr916x44c9x35m7x04d78hrm"; + version = "2.9.0.0"; + sha256 = "171wn5nv42h00f2l6mcmdhf4vybmifkdk2ycz0v02vksd99h42fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty apply-refact array base bytestring Cabal-syntax - containers data-default deepseq Diff directory dlist extra filepath - floskell foldl fourmolu fuzzy ghc ghc-boot ghc-boot-th - ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide githash - hashable hie-bios hie-compat hiedb hlint hls-graph hls-plugin-api - lens lsp lsp-types megaparsec mod mtl optparse-applicative - optparse-simple ormolu parser-combinators prettyprinter process - process-extras refact regex-applicative regex-tdfa retrie row-types - safe-exceptions semigroupoids sqlite-simple stan stm stm-containers + aeson aeson-pretty apply-refact array async base binary bytestring + Cabal-syntax containers data-default deepseq Diff directory dlist + extra filepath floskell foldl fourmolu fuzzy ghc ghc-boot + ghc-boot-th ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide + githash hashable hie-bios hie-compat hiedb hlint hls-graph + hls-plugin-api hls-test-utils lens lsp lsp-test lsp-types + megaparsec mod mtl optparse-applicative optparse-simple ormolu + parser-combinators prettyprinter process process-extras refact + regex-applicative regex-tdfa retrie row-types safe-exceptions + semigroupoids shake sqlite-simple stan stm stm-containers stylish-haskell syb template-haskell temporary text text-rope time transformers trial unliftio unliftio-core unordered-containers - vector + vector yaml ]; executableHaskellDepends = [ - base containers data-default directory extra filepath ghcide - hie-bios hls-plugin-api lsp lsp-types prettyprinter text - transformers unix unliftio-core + aeson base bytestring containers data-default directory extra + filepath ghcide hie-bios hls-graph hls-plugin-api hls-test-utils + lens lsp lsp-test lsp-types optparse-applicative prettyprinter + process safe-exceptions shake tasty-hunit text transformers unix + unliftio-core ]; testHaskellDepends = [ - aeson async base bytestring Cabal-syntax containers data-default - deepseq directory enummapset extra filepath fuzzy ghcide hashable + aeson base bytestring Cabal-syntax containers data-default deepseq + directory enummapset extra filepath fuzzy ghcide hashable hls-plugin-api hls-test-utils lens list-t lsp lsp-test lsp-types monoid-subclasses mtl network-uri ormolu parser-combinators process - QuickCheck random regex-tdfa row-types shake sqlite-simple stm - stm-containers tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text text-rope transformers - unordered-containers vector + QuickCheck random regex-tdfa shake sqlite-simple stm stm-containers + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-rerun text text-rope transformers unordered-containers vector ]; testToolDepends = [ fourmolu ghcide implicit-hie ormolu ]; benchmarkHaskellDepends = [ aeson base containers data-default directory extra filepath - ghcide-bench hls-plugin-api lens lens-aeson shake shake-bench text - yaml + hls-plugin-api lens lens-aeson shake shake-bench text yaml ]; - benchmarkToolDepends = [ ghcide-bench hp2pretty ]; + benchmarkToolDepends = [ hp2pretty ]; doHaddock = false; description = "LSP server for GHC"; license = lib.licenses.asl20; @@ -140342,25 +140844,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, tasty, tasty-hunit, template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.13"; - sha256 = "09f0lad023zylkxidsz0nv532h44mh0b1505rvs3ypaq2v4q20pa"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit - template-haskell - ]; - description = "Parse source to template-haskell abstract syntax"; - license = lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_14" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans }: @@ -140377,7 +140860,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -140908,8 +141390,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3.3"; - sha256 = "06hh9lpib410spa65c2qva714v8ci07jdckhn9p38r9002ps8fp3"; + version = "1.4.0.0"; + sha256 = "0h8kb7l6qdph6qnsb4ki873ahdr3ncv19ckiyp2q7v2lchz0sxki"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141878,7 +142360,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "haskoin-node_1_1_0" = callPackage + "haskoin-node_1_1_3" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -141888,8 +142370,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "1.1.0"; - sha256 = "14sar39d3kjwv41mfwcywk9yv9vw4qx0x41dxfad9r565lhw59y2"; + version = "1.1.3"; + sha256 = "1bsbnfyk7abcgm9czcn0r2fiimiy7r6h9mxqbv464dpchgnnp9iy"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -141971,8 +142453,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.5"; - sha256 = "0p6cbvw2d6xskzm7wcgp6b2dzirnd38r64mvdp0njy2s1prlf92n"; + version = "1.5.11"; + sha256 = "0dfy2glrk6lc14m31nv5x80fkgzn3hlzyw0kw1yhpyidk5fg10vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142874,6 +143356,25 @@ self: { broken = true; }) {}; + "hasmtlib" = callPackage + ({ mkDerivation, attoparsec, base, bitvec, bytestring, containers + , data-default, dependent-map, finite-typelits, lens, mtl + , smtlib-backends, smtlib-backends-process, some, text, utf8-string + , vector-sized + }: + mkDerivation { + pname = "hasmtlib"; + version = "1.1.0"; + sha256 = "04cai30751i10rwhc944c0b3fw1niid7pwjjjh7825k5mvq2dwf6"; + libraryHaskellDepends = [ + attoparsec base bitvec bytestring containers data-default + dependent-map finite-typelits lens mtl smtlib-backends + smtlib-backends-process some text utf8-string vector-sized + ]; + description = "A monad for interfacing with external SMT solvers"; + license = lib.licenses.gpl3Only; + }) {}; + "haspara" = callPackage ({ mkDerivation, aeson, base, containers, data-default, doctest , exceptions, hashable, hspec, megaparsec, mtl, refined @@ -143636,20 +144137,19 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-transaction_1_1_1" = callPackage + "hasql-transaction_1_1_1_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rerebase - , transformers + , contravariant, hasql, mtl, rerebase, transformers }: mkDerivation { pname = "hasql-transaction"; - version = "1.1.1"; - sha256 = "1fwk6ngwwpv992lbndxjbjzh7zvz3szijdcw4nnaahpf1w7iw96p"; + version = "1.1.1.1"; + sha256 = "0piinjmnfjl1khwbydqxam0sbzd0vsygfgz1iil52sfcfkl57a7b"; libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers + base bytestring bytestring-tree-builder contravariant hasql mtl + transformers ]; - testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + testHaskellDepends = [ async hasql rerebase ]; description = "Composable abstraction over retryable transactions for Hasql"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -144229,8 +144729,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.4.0.0"; - sha256 = "1vah61fs047h9v0c8z6ka0lcckhcsjrjxqcck0jipcppzpg68inw"; + version = "2.5.1.0"; + sha256 = "15psynsr61ahcmmm06lcprl47l271nqw2h0kwkahs6jy00l7ymhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145420,6 +145920,38 @@ self: { broken = true; }) {}; + "hdmenu" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, bytestring-lexing + , containers, directory, double-conversion, hspec + , optparse-applicative, posix-paths, process, process-extras + , QuickCheck, text, tomland, unix, utf8-string + }: + mkDerivation { + pname = "hdmenu"; + version = "0.3.0"; + sha256 = "0n2mikqhrlsb79g2pdiryl3ynsy9vkcpg9fgrx0szqwqba1ckmqh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + executableHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + testHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion hspec optparse-applicative posix-paths process + process-extras QuickCheck text tomland unix utf8-string + ]; + description = "A small wrapper around dmenu"; + license = lib.licenses.gpl3Only; + mainProgram = "hdmenu"; + }) {}; + "hdo" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad , data-default, free, http-conduit, iproute, lens, mtl, network-uri @@ -145616,6 +146148,8 @@ self: { pname = "heap"; version = "1.0.4"; sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4"; + revision = "1"; + editedCabalFile = "010mvg5syk0iprrin4kmqf21dmabyncmz1b65w5p05j9f4w22jfj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -145992,8 +146526,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; - revision = "5"; - editedCabalFile = "1majbvnqywyqfzm7qm7bhwmfzi3jamiz7d5ql4yvzsix8wg4rbag"; + revision = "8"; + editedCabalFile = "062nz959mb96gphk769kwym10xn4r7c7gdvibi8xjl9rmcsanq4q"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -146309,6 +146843,17 @@ self: { broken = true; }) {}; + "hedis-effectful" = callPackage + ({ mkDerivation, base, effectful-core, hedis }: + mkDerivation { + pname = "hedis-effectful"; + version = "1.0.0.0"; + sha256 = "0l9jiyns9d6zw65cb0ragb038aw0ma1q1a87s55xz7z1367wmj0r"; + libraryHaskellDepends = [ base effectful-core hedis ]; + description = "Adaptation of the hedis library for the effectful ecosystem"; + license = lib.licenses.bsd3; + }) {}; + "hedis-envy" = callPackage ({ mkDerivation, base, envy, hedis, scientific, time }: mkDerivation { @@ -147182,12 +147727,13 @@ self: { ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, boost, bytestring, Cabal , cabal-pkg-config-version-hook, cachix, cachix-api, conduit - , conduit-extra, containers, directory, dlist, exceptions, filepath - , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core - , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec - , hspec-discover, http-client, http-client-tls, http-conduit, HUnit - , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async - , lifted-base, monad-control, mtl, network, network-uri, nix + , conduit-extra, containers, directory, dlist, exceptions + , file-embed, filepath, hercules-ci-api, hercules-ci-api-agent + , hercules-ci-api-core, hercules-ci-cnix-expr + , hercules-ci-cnix-store, hostname, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, HUnit, inline-c + , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base + , monad-control, mtl, network, network-uri, nix , optparse-applicative, process, process-extras, profunctors , protolude, QuickCheck, safe-exceptions, scientific, servant , servant-auth-client, servant-client, servant-client-core, stm @@ -147198,15 +147744,14 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.3"; - sha256 = "1gfvlr37zzwnwnlixndwi9955c1n4yn67ffhif70d06bpjvh037k"; + version = "0.10.4"; + sha256 = "1bslpq4x0kp6k5x7jgcv8hkigp64p5gjgq6d3g60ig0pd35ribwd"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson async base binary binary-conduit bytestring conduit - containers directory dlist exceptions filepath + containers directory dlist exceptions file-embed filepath hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store katip lens lens-aeson lifted-async lifted-base monad-control mtl network network-uri process @@ -147397,9 +147942,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.6.3"; - sha256 = "1mwsdc8xdf8c9cpzkvhg6z450d4n6s1ijraznzzvkgh0zwqggddq"; - enableSeparateDataOutput = true; + version = "0.3.6.4"; + sha256 = "0l5d4mirf8843svhamq2zwga46y0a4wr1myi3g46l92spljwribc"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson base bytestring conduit containers directory exceptions @@ -148017,8 +148561,8 @@ self: { pname = "hex-text"; version = "0.1.0.9"; sha256 = "1dzv1jpjga4nsrxbwrh5nhnzv5f0mnl5i8da0blqc73vavsjhny5"; - revision = "1"; - editedCabalFile = "1r6lh44n7x6s1fk7nlqzychspi3647wsd0avraxlzqs32xslxgq1"; + revision = "2"; + editedCabalFile = "1ym53q8zpnl5vh049z4lki7l8154fbfvizrc5sf6wra5vqgvys35"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring hspec text @@ -149075,14 +149619,14 @@ self: { "hgraph" = callPackage ({ mkDerivation, array, base, clock, containers, happy-dot, HUnit - , linear, mtl, random, transformers + , linear, mtl, random, say, transformers }: mkDerivation { pname = "hgraph"; - version = "1.2.0.1"; - sha256 = "0zdjnkisk1m5z8yz6r3sdprxxbikqffjx4aqw3qarafqb46kr9mv"; + version = "1.10.0.0"; + sha256 = "0689z5dy5zifpqdvhfarc96l386zfin6xgpgxkgj92dc4ps6wb9h"; libraryHaskellDepends = [ - array base containers happy-dot linear mtl random transformers + array base containers happy-dot linear mtl random say transformers ]; testHaskellDepends = [ base containers HUnit transformers ]; benchmarkHaskellDepends = [ @@ -149516,8 +150060,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.6.0.0"; - sha256 = "1yz04cy981c1gpwcp758hhy1nlmavb9yciyp0mwcjamcazpqx562"; + version = "0.6.0.1"; + sha256 = "0pvbxjhwqd7abvb5j23ynlg0rsqc09c0vq915drb52cilbs46fcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151032,8 +151576,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.7.0"; - sha256 = "15dhr9xszg64kdswywc8pd8kfawq02mcarhh4lyq21g9cynvbk6g"; + version = "0.7.2"; + sha256 = "0n3sc5v8a7df4p4p4ch13alkv877djhbqz9qk3pb9pqvyhxy3xg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151367,8 +151911,8 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.4.4"; - sha256 = "03vz4f7jjklbjsmh17kljnnbpk5m5a0r1q67g1r23vhpx2dkk7vk"; + version = "0.4.5"; + sha256 = "1fw32ik8j72kykq7cwjgp9gajssbk24ybkx0ly5wvyav429b11lz"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151381,6 +151925,28 @@ self: { mainProgram = "hkgr"; }) {}; + "hkgr_0_4_6" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd, simple-cmd-args, simple-prompt + , typed-process, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.4.6"; + sha256 = "1qhj3rfmdvc93m0zs38sw21lrnhk8vkrns0ca6dva0nsfi6fi5n9"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal simple-cmd + simple-cmd-args simple-prompt typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hkgr"; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -151533,7 +152099,7 @@ self: { ]; }) {}; - "hledger_1_33_1" = callPackage + "hledger_1_34" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -151544,10 +152110,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.33.1"; - sha256 = "14vx74c1lj4kj81p9qrdi9ln8fs15dk3xz0yy3aaq7xp979jj21f"; - revision = "1"; - editedCabalFile = "1bbh8vbc8n539manidahnkqvskg4wzmf6y00f8wxga80dm5djadl"; + version = "1.34"; + sha256 = "08ygx4aavimxzmyvb9303xds455vs72jvkbrj41nca8357118j3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151719,6 +152283,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; + revision = "1"; + editedCabalFile = "1jx773cqq676yvzibp7nzdpmas8i7ahx8j6kfc1sfipk37vz2q0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151750,8 +152316,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "3"; - editedCabalFile = "0yywynp3yrdssh2vr7jwp0izr890hfn9kjy6cl9ad8mx1qfyg771"; + revision = "4"; + editedCabalFile = "0b1dvr9kyzhm8zf60xvqf2hkad8w6m14fr2prm0fry8lq79gc515"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151823,7 +152389,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_33_1" = callPackage + "hledger-lib_1_34" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -151836,10 +152402,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.33.1"; - sha256 = "12l3c6ixmfb65c566vgrfksggrpgab11f1v658dk5gy482p994vb"; - revision = "1"; - editedCabalFile = "1wkp0lyihjqc7figv29sw37g7d6i7zwzddi8jvjqpbpcffrcj81r"; + version = "1.34"; + sha256 = "0789zyz5lbd67mphr8qq8wryni6dkf3759ah9fb7cm2wr5wwvd85"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -151945,26 +152509,25 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_33_1" = callPackage + "hledger-ui_1_34" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath - , fsnotify, hledger, hledger-lib, megaparsec, microlens + , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens , microlens-platform, mtl, process, safe, split, text, text-zipper , time, transformers, unix, vector, vty, vty-crossplatform }: mkDerivation { pname = "hledger-ui"; - version = "1.33.1"; - sha256 = "1x05jdm6aargcnghvmdayzacigc8is5ra8xpnava499kwqk5x66i"; - revision = "1"; - editedCabalFile = "0q29ix824in8mwdr6mg13b7hrzpv55mkrfwm5r84jsv1mxlbslvp"; + version = "1.34"; + sha256 = "0w80bl6m98hsjzdpj5vjd768qs32vf8vdqzg6srh2z3pl36pjiki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async base brick cmdargs containers data-default - directory doclayout extra filepath fsnotify hledger hledger-lib - megaparsec microlens microlens-platform mtl process safe split text - text-zipper time transformers unix vector vty vty-crossplatform + directory doclayout extra filepath fsnotify githash hledger + hledger-lib megaparsec microlens microlens-platform mtl process + safe split text text-zipper time transformers unix vector vty + vty-crossplatform ]; executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; @@ -152031,34 +152594,32 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_33_1" = callPackage + "hledger-web_1_34" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory - , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, http-types, megaparsec, mtl, network, safe - , shakespeare, template-haskell, text, time, transformers + , extra, filepath, githash, hjsmin, hledger, hledger-lib, hspec + , http-client, http-conduit, http-types, megaparsec, mtl, network + , safe, shakespeare, template-haskell, text, time, transformers , unix-compat, unordered-containers, utf8-string, wai, wai-cors , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core , yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.33.1"; - sha256 = "1f5xk0s93n2r8ar0l3hxfxxvi5gbb2sn1fhlg8mvkjbh93krywqr"; - revision = "1"; - editedCabalFile = "040sls51agm49s2p9wdpq5vly3d210dib87q312dlk6238p7hap5"; + version = "1.34"; + sha256 = "1h39gjpdddnyryig4713pq9ipixzavr0mb7wlmzr5sbzqmnshbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64 blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra - containers data-default Decimal directory extra filepath hjsmin - hledger hledger-lib hspec http-client http-conduit http-types - megaparsec mtl network safe shakespeare template-haskell text time - transformers unix-compat unordered-containers utf8-string wai - wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static yesod-test + containers data-default Decimal directory extra filepath githash + hjsmin hledger hledger-lib hspec http-client http-conduit + http-types megaparsec mtl network safe shakespeare template-haskell + text time transformers unix-compat unordered-containers utf8-string + wai wai-cors wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static yesod-test ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -152799,8 +153360,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.8.0.0"; - sha256 = "0s8igxwbg7r0yjz6975vz7zw4yj9ik8733p0n7zcyvcv87ankxkd"; + version = "2.9.0.0"; + sha256 = "19ifqsw6bfqy969icbgyl46ss178wjn37dfhrh6ch3k6pa3lz73l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -152926,29 +153487,29 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, co-log-core, containers, criterion - , data-default, deepseq, dependent-map, dependent-sum, Diff, dlist - , extra, filepath, ghc, hashable, hls-graph, hw-fingertree, lens - , lens-aeson, lsp, lsp-types, megaparsec, mtl, opentelemetry - , optparse-applicative, prettyprinter, random, random-fu - , regex-tdfa, row-types, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, co-log-core, containers + , criterion, data-default, deepseq, dependent-map, dependent-sum + , Diff, dlist, extra, filepath, ghc, hashable, hls-graph + , hw-fingertree, lens, lens-aeson, lsp, lsp-types, megaparsec, mtl + , opentelemetry, optparse-applicative, prettyprinter, random + , random-fu, regex-tdfa, stm, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unliftio, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "2.8.0.0"; - sha256 = "0s5jywzafd1dyhya4n80w1i7si4br7wmxwp6q3f11f787qqbv5xs"; + version = "2.9.0.0"; + sha256 = "0s0yd66cbazifxqqsyw05rdwc88kbx9q434ihlzgw72mkn0pvcm0"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph hw-fingertree lens lens-aeson lsp megaparsec mtl opentelemetry - optparse-applicative prettyprinter regex-tdfa row-types stm text - time transformers unix unliftio unordered-containers + optparse-applicative prettyprinter regex-tdfa stm text time + transformers unix unliftio unordered-containers ]; testHaskellDepends = [ - base containers data-default lens lsp-types tasty tasty-hunit - tasty-quickcheck tasty-rerun text + aeson base bytestring containers data-default lens lsp-types tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ base criterion deepseq lsp-types random random-fu @@ -153236,19 +153797,19 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, extra, filepath, ghcide, hls-plugin-api - , lens, lsp-test, lsp-types, row-types, safe-exceptions, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun - , temporary, text + , lens, lsp, lsp-test, lsp-types, neat-interpolation + , safe-exceptions, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-rerun, temporary, text, text-rope }: mkDerivation { pname = "hls-test-utils"; - version = "2.8.0.0"; - sha256 = "1fk6n88g9z4yihvimzwi0bnmysr77qv3zdlcpr62lczl8pvm89d2"; + version = "2.9.0.0"; + sha256 = "0xj7hfpa6yl4v0ysbd7abkpax5y4hj0pfhzb40wp0qp5x6prsgw7"; libraryHaskellDepends = [ aeson async base bytestring containers data-default directory extra - filepath ghcide hls-plugin-api lens lsp-test lsp-types row-types - safe-exceptions tasty tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text + filepath ghcide hls-plugin-api lens lsp lsp-test lsp-types + neat-interpolation safe-exceptions tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text text-rope ]; description = "Utilities used in the tests of Haskell Language Server"; license = lib.licenses.asl20; @@ -154312,7 +154873,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_13_1" = callPackage + "hoauth2_2_14_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, crypton, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -154320,8 +154881,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.13.1"; - sha256 = "0m6bn52j2425km0h6mx8zbmc3rbwdj0ar08jy9m96v5hwzdfch4i"; + version = "2.14.0"; + sha256 = "1gbdb01iinhcfc91iw2ld4lpvmpcvy6d9r1zl5a58jg16z5v6j8k"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers crypton data-default exceptions http-conduit http-types memory microlens text @@ -154342,8 +154903,8 @@ self: { }: mkDerivation { pname = "hoauth2-demo"; - version = "1.11.0"; - sha256 = "12vxm1kfdbhvsagmqslr4wph9ji49gcakkvcqdx84d5y6ywd05wh"; + version = "1.12.0"; + sha256 = "03nsjqpaz3b5809rhjc1bqjm84w8srfcbn6ncj42w6g74hb3lmab"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154367,8 +154928,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.7.1"; - sha256 = "0222kkbnw4fpzyr0f3pls19bnlgs89yal3ffw85x6qdrg2lqk006"; + version = "0.8.0"; + sha256 = "11y4lbp81spa7wky834l7i0fkqq3b529zn7divz5x9ar0jnnpnaj"; libraryHaskellDepends = [ aeson base bytestring containers crypton hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl text time transformers @@ -154389,8 +154950,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.7.0"; - sha256 = "02gdx3ry1f61czc37r84z1qz25ybvgm6p88li03iyl87ihajymw4"; + version = "0.8.0"; + sha256 = "1b9sjwirkjwl3w54y9pq4i07xp3spsm7zxknf9xilw4jgg9mmncz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154411,8 +154972,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.7.0"; - sha256 = "1jv87hlz22jvyq5z2ax3jc4g3if0ap1j8g4hxxc62skx1d7jp99x"; + version = "0.8.0"; + sha256 = "0w7fa1gyslng19sxk3xnvy1bvy0r2gannypvlv9hi86hinwx525j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155663,8 +156224,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.8.0"; - sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; + version = "0.9.0"; + sha256 = "0fxj2w762zdl3lzknpglmlwm3dgxsaw8vrljm73fb3gcscj9flbc"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -155679,8 +156240,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.8.0"; - sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; + version = "0.9.0"; + sha256 = "16pa8w05fa11xl7cv3gz36j5xk8rxsi341a1wgm513m0ghqxyaqw"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -155697,8 +156258,8 @@ self: { }: mkDerivation { pname = "hoppy-runtime"; - version = "0.8.0"; - sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; + version = "0.9.0"; + sha256 = "0ndabz5yb98d7xpjsgsvqvvaslvsg3pcmd1ms9n93lsx4xv4xkpx"; libraryHaskellDepends = [ base Cabal containers directory filepath hoppy-generator ]; @@ -155711,8 +156272,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.8.0"; - sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; + version = "0.9.0"; + sha256 = "1vgpdkmy2pzfj2gl10pdc45i80d73vgi5mhcd82if1rgc4zvqjas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -156122,6 +156683,8 @@ self: { pname = "hourglass"; version = "0.2.12"; sha256 = "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4"; + revision = "1"; + editedCabalFile = "0yc9k9lrx6z5r52mk3hra4v74ksk590d89lrj934bj1hrnv6ri45"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time @@ -156344,6 +156907,46 @@ self: { mainProgram = "hpack"; }) {}; + "hpack_0_36_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, crypton, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.36.1"; + sha256 = "1n02wkkhgqwh7im33b2158h9ha0yglzmqv05fd0igmm4mfly05db"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery mtl pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -156655,14 +157258,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_6_0_0" = callPackage + "hpc-codecov_0_6_1_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.6.0.0"; - sha256 = "1if8nmqv6pcv92ww8ncaxkvaawdr9shmsdsnr9xvzfmhqjq83q7w"; + version = "0.6.1.0"; + sha256 = "1f4zbqbd78qavz3ggxjs1fp1bcp0a764mi2ykimdl4bl0y701xmb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157104,8 +157707,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.6.2"; - sha256 = "118758mwqwf22i5y7iawqqwibyljfn5cxlx6hjbz1xgxcvchvm65"; + version = "0.6.3"; + sha256 = "0x7qiwmh5aqix0an24qm9z1580v6c8q59mq7i6nzchm0bk7nj3py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158613,6 +159216,7 @@ self: { description = "A library for Passbook pass creation & signing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "hs-popen" = callPackage @@ -160287,6 +160891,85 @@ self: { broken = true; }) {}; + "hsec-core" = callPackage + ({ mkDerivation, base, Cabal-syntax, cvss, osv, pandoc-types, safe + , tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "hsec-core"; + version = "0.1.0.0"; + sha256 = "0yf6vdv1v3r52i92pcjh7jpnxwxlax9vpchy0f2ixs0ddgsk6v83"; + libraryHaskellDepends = [ + base Cabal-syntax cvss osv pandoc-types safe text time + ]; + testHaskellDepends = [ base cvss tasty tasty-hunit text ]; + description = "Core package representing Haskell advisories"; + license = lib.licenses.bsd3; + }) {}; + + "hsec-sync" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra, feed + , filepath, hsec-core, http-client, lens, optparse-applicative + , process, tasty, tasty-hunit, temporary, text, time, transformers + , wreq + }: + mkDerivation { + pname = "hsec-sync"; + version = "0.1.0.0"; + sha256 = "0svk3rvsf6svhy2vqr5bpxxgngjmxb9zxwj9ljx4n56yq2gvqdp9"; + revision = "1"; + editedCabalFile = "1xk4f5yh720d16gxark20cbdywg9jrlrhd20x153a74p2gka44rm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory extra feed filepath hsec-core http-client lens + process text time transformers wreq + ]; + executableHaskellDepends = [ + aeson base bytestring filepath optparse-applicative text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary text + time + ]; + description = "Synchronize with the Haskell security advisory database"; + license = lib.licenses.bsd3; + mainProgram = "hsec-sync"; + }) {}; + + "hsec-tools" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , Cabal-syntax, commonmark, commonmark-pandoc, containers, cvss + , directory, extra, feed, filepath, hsec-core, lucid, mtl + , optparse-applicative, osv, pandoc-types, parsec, pathwalk + , pretty-simple, process, safe, tasty, tasty-golden, tasty-hunit + , text, time, toml-parser, validation-selective + }: + mkDerivation { + pname = "hsec-tools"; + version = "0.1.0.0"; + sha256 = "1q48ygbw463jm77cv3sznbncr496rqzqrablj02s1vdwihkv3h86"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base Cabal-syntax commonmark commonmark-pandoc containers + cvss directory extra feed filepath hsec-core lucid mtl osv + pandoc-types parsec pathwalk process safe text time toml-parser + validation-selective + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal-syntax filepath hsec-core + optparse-applicative text validation-selective + ]; + testHaskellDepends = [ + aeson-pretty base Cabal-syntax cvss directory hsec-core + pretty-simple tasty tasty-golden tasty-hunit text time + ]; + description = "Tools for working with the Haskell security advisory database"; + license = lib.licenses.bsd3; + mainProgram = "hsec-tools"; + }) {}; + "hsemail" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { @@ -160320,8 +161003,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.3.1"; - sha256 = "0vcrh15p479x7yl4npr85wqalgkzs76h4smqwlsrp9m4w4lgaskz"; + version = "0.1.3.2"; + sha256 = "19qkaavyankx5lmrf03n108d7hyfj7ls1hkxcgdp7jnf7wrwkpdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161019,8 +161702,8 @@ self: { }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.1.1"; - sha256 = "051rvq7x8cnby0fv14i9qy0j1d46rkmwbx5b09nqgb51i03wsivf"; + version = "1.1.1.2"; + sha256 = "1bgs6p20maqdwmqjv8nqsmlk63sjhb54icqs7d1kxsk8k9hh65qg"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua text @@ -161055,8 +161738,8 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "1.1.1"; - sha256 = "0adjxcyxb8xc98jj2r6xhbswqkqvs4c40sn4m9gl0bkjhh0nk57q"; + version = "1.1.2"; + sha256 = "1pi1yp5ch83b74diimbrq09gd9wq8cjpxwjzv9jvchf2xrz8winl"; libraryHaskellDepends = [ base directory exceptions hslua-core hslua-marshalling hslua-packaging temporary text @@ -161590,8 +162273,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.11.8"; - sha256 = "1w0ryyr9h1f87jgz56yl09x3yvd9zm2w1bj70k5p6pzdyz984cjr"; + version = "2.11.9"; + sha256 = "16rh30v2mx01yi72k8kiwmwgnv98xv59d9n6ap8jpyn7p96nmsir"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -161605,8 +162288,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.8"; - sha256 = "02hhmxgd4vz5jakp3nd6cwslh8qmqnlg6j3fq7my8lbdim95wnf6"; + version = "2.11.9"; + sha256 = "1hzv4q63yd60kypnil3hmsf8v92ig2ankafhavd0jf5hgdjd2wnk"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -161711,8 +162394,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.8"; - sha256 = "18zaiac5s830q01hq9ai67z5sk0ilvhz471vxabraif3rznrsmla"; + version = "2.11.9"; + sha256 = "0qzzwyx71741v53qd9pah5bqq8md3mj0l6ykaw3d4816c2np5wdi"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -161779,8 +162462,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.11.8"; - sha256 = "0s81mjb7an628c0gr3g74navnxzfahdl92zixdgys2is5rbd6yqf"; + version = "2.11.9"; + sha256 = "054l0k6rn7n1mm3ivhvv00zmqdkdnrp91h5l2wy6sbibrvrl8rhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -161895,6 +162578,8 @@ self: { pname = "hspec-expectations-pretty-diff"; version = "0.7.2.6"; sha256 = "0wksgvdj50yc3p4bg3wmacf2w75v7p8nlq1g33z5amrwllig6m49"; + revision = "1"; + editedCabalFile = "161n217lg9r8sw3gd654ri7dr2h27hkvcbpjbf38sl44j3zha17d"; libraryHaskellDepends = [ ansi-terminal base Diff hscolour HUnit nicify-lib text unicode-show ]; @@ -162036,21 +162721,23 @@ self: { }) {}; "hspec-junit-formatter" = callPackage - ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, iso8601-time, markdown-unlit - , temporary, text, time, xml-conduit, xml-types + ({ mkDerivation, array, base, conduit, containers, directory + , exceptions, filepath, hspec, hspec-api, hspec-core, hspec-golden + , iso8601-time, markdown-unlit, regex-base, regex-tdfa, temporary + , text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.2"; - sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g"; + version = "1.1.2.0"; + sha256 = "0r2kk4qh1m6pbjwwv5vak0xhn45bxa83cyr2dhzh2n0skm9gqrks"; libraryHaskellDepends = [ - base conduit containers directory exceptions filepath hspec-core - iso8601-time text time xml-conduit xml-types + array base conduit containers directory exceptions filepath + hspec-api hspec-core iso8601-time regex-base regex-tdfa text time + xml-conduit xml-types ]; testHaskellDepends = [ - base containers filepath hspec markdown-unlit temporary text - xml-conduit + base containers filepath hspec hspec-golden markdown-unlit + temporary text xml-conduit ]; testToolDepends = [ markdown-unlit ]; description = "A JUnit XML runner/formatter for hspec"; @@ -162148,8 +162835,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.8"; - sha256 = "0diwxrp6rkf0pchfnfhc5xdbhv9arbbmpgl8hyw5afbfmqjsd4kv"; + version = "2.11.9"; + sha256 = "09cl2dknj548zzmdfx1pyd27jywgcr4000hf1rscn85b4r2riymm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162539,6 +163226,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-yesod" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie + , exceptions, 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, yesod-test + }: + mkDerivation { + pname = "hspec-yesod"; + version = "0.1.0"; + sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie exceptions hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + yesod-test + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form yesod-test + ]; + description = "A variation of yesod-test that follows hspec idioms more closely"; + license = lib.licenses.mit; + }) {}; + "hspec2" = callPackage ({ mkDerivation, base, hspec, hspec-discover }: mkDerivation { @@ -162605,8 +163320,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.5.2.0"; - sha256 = "05fkyvb9h5hnv44nkk7ykhmhcajfc393rmn2a7dzqqgam44wpydl"; + version = "0.5.4.0"; + sha256 = "01y4jgbhvis0aa2imc1is62zcgwkqysz2v8vvld0y5c92j0f3y6s"; libraryHaskellDepends = [ base containers extra hashable matrix numeric-prelude text unordered-containers @@ -164273,7 +164988,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http-api-data_0_6" = callPackage + "http-api-data_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, cookie, hashable , hspec, hspec-discover, http-types, HUnit, QuickCheck , quickcheck-instances, tagged, text, text-iso8601, time-compat @@ -164281,10 +164996,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.6"; - sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; - revision = "1"; - editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; + version = "0.6.1"; + sha256 = "1kz3qjjazl61q7iad6q67zdsm2gynsjdfcn34rzmybjhq27wylas"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -165287,8 +166000,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.6.0.2"; - sha256 = "13ln90didwh4r0jb77i05csmimrl9p1mv71c7ygz9bi3zk8mvl7l"; + version = "0.6.0.3"; + sha256 = "0bixa4grhg7f0xxlr70aj96rqd5p33kipsf5jmcp3jz00mj178wg"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive conduit conduit-extra containers http-client http-types network resourcet @@ -165332,8 +166045,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.0.0"; - sha256 = "04wi14c0hy2dpzazv6v49100dc4r16rzkii14625xkijcgjlcx7w"; + version = "0.1.1"; + sha256 = "04z0as2f8l24bry99bdslcl0kyzfzh9fp095a5r3piyzicjqzg36"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -165563,7 +166276,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_2_1" = callPackage + "http2_5_2_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -165574,8 +166287,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.2.1"; - sha256 = "0qgyykw866m06d8br6ppwwq3dxzm028gssjq402qfs46axxkxzdf"; + version = "5.2.5"; + sha256 = "0v8k69l8my8l291vhvf004wn5xd79zgfpvyvmak3dibvrr5pj4as"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165615,6 +166328,7 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "http2-client-exe" = callPackage @@ -165719,8 +166433,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.11"; - sha256 = "1vi55fk0n168j42n83mdiifqksh7d2fq3pyg3fq06b7bj1597khm"; + version = "0.3.0"; + sha256 = "0daf7fnnhx8zd3zqacx3zbd89zm7sg87vggw93n9cy2hms6dr40k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165743,8 +166457,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.11"; - sha256 = "1z3hqalylraxmx18h82gljpbaslzd8mz2ndv8g15mhfac6jjz4rd"; + version = "0.0.13"; + sha256 = "1d6mjncmh4d1x9a5sss9jnyjzqkr95afpli0v7jaz3nayvx5r34h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167578,21 +168292,22 @@ self: { }) {}; "hw-polysemy" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, contravariant - , Diff, directory, filepath, generic-lens, ghc-prim, lens, network - , polysemy, polysemy-log, polysemy-plugin, polysemy-time, process - , resourcet, stm, tasty, tasty-discover, tasty-hedgehog, temporary - , text, time, unliftio, yaml + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , contravariant, Diff, directory, exceptions, filepath + , generic-lens, ghc-prim, lens, network, polysemy, polysemy-log + , polysemy-plugin, polysemy-time, process, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, temporary, text, time + , transformers, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.4.2"; - sha256 = "1czisgq8yv8gmr9ixs72y7yfajs95333698blfnj2ipngcmkrh09"; + version = "0.2.8.0"; + sha256 = "0qy7n9i012q5f0hbpphhaqb2alqn5nnwk6rbrcwm6bmbinkgi5xq"; libraryHaskellDepends = [ - aeson async base bytestring contravariant Diff directory filepath - generic-lens ghc-prim lens network polysemy polysemy-log - polysemy-plugin polysemy-time process resourcet stm temporary text - time unliftio yaml + aeson aeson-pretty async base bytestring contravariant Diff + directory exceptions filepath generic-lens ghc-prim lens network + polysemy polysemy-log polysemy-plugin polysemy-time process + resourcet stm temporary text time transformers unliftio yaml ]; testHaskellDepends = [ base filepath polysemy polysemy-log polysemy-plugin tasty @@ -169011,32 +169726,40 @@ self: { }) {}; "hyperbole" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-api-data, http-types, network - , string-conversions, string-interpolate, text, wai - , wai-middleware-static, wai-websockets, warp, web-view, websockets + ({ mkDerivation, base, bytestring, casing, containers, cookie + , effectful, file-embed, http-api-data, http-types, network + , string-conversions, string-interpolate, sydtest, sydtest-discover + , text, wai, wai-middleware-static, wai-websockets, warp, web-view + , websockets }: mkDerivation { pname = "hyperbole"; - version = "0.2.0"; - sha256 = "04b9mgcd06dh8v1ki06dbgx9ak070p5h5pb5njyg99s8cykdip5r"; + version = "0.3.6"; + sha256 = "0s3hsr6yhsqxayl22bafgrgan2jrjyg2027qj35gvxr20z1vsg12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-websockets warp web-view websockets ]; executableHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-middleware-static wai-websockets warp web-view websockets ]; - description = "Web Framework inspired by HTMX"; + testHaskellDepends = [ + base bytestring casing containers cookie effectful file-embed + http-api-data http-types network string-conversions + string-interpolate sydtest text wai wai-websockets warp web-view + websockets + ]; + testToolDepends = [ sydtest-discover ]; + description = "Interactive HTML apps using type-safe serverside Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; + mainProgram = "examples"; }) {}; "hyperdrive" = callPackage @@ -170754,6 +171477,7 @@ self: { ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "ihs" = callPackage @@ -171716,8 +172440,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.9.0.1"; - sha256 = "0zalzp5p59cqz3zky1y0xvw5g44z386z5smffmzhx1gjk6v0b3pk"; + version = "0.10.0.0"; + sha256 = "0464gn50ayfd61n2xzcdrg36vmzls3j6bi2w7113iqzbl8q8gz6j"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -172193,17 +172917,6 @@ self: { }) {}; "indexed-traversable" = callPackage - ({ mkDerivation, array, base, containers, transformers }: - mkDerivation { - pname = "indexed-traversable"; - version = "0.1.3"; - sha256 = "1nak3bq3yzai8b38mflmpsbirx8d6v29zcj9m193m3ppnrgr4chx"; - libraryHaskellDepends = [ array base containers transformers ]; - description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable_0_1_4" = callPackage ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "indexed-traversable"; @@ -172212,34 +172925,9 @@ self: { libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indexed-traversable-instances" = callPackage - ({ mkDerivation, base, containers, indexed-traversable, OneTuple - , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "indexed-traversable-instances"; - version = "0.1.1.2"; - sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; - revision = "2"; - editedCabalFile = "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"; - libraryHaskellDepends = [ - base indexed-traversable OneTuple tagged unordered-containers - vector - ]; - testHaskellDepends = [ - base containers indexed-traversable OneTuple QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable-instances_0_1_2" = callPackage ({ mkDerivation, base, containers, indexed-traversable, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck , transformers, unordered-containers, vector @@ -172259,7 +172947,6 @@ self: { ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indextype" = callPackage @@ -172667,6 +173354,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Inflections library for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "inflist" = callPackage @@ -174785,6 +175473,8 @@ self: { pname = "io-classes-mtl"; version = "0.1.2.0"; sha256 = "06lcz96rja31hk3229zxz9ip45c2xqr563kv66jc2f9zyjy7z8s7"; + revision = "1"; + editedCabalFile = "055spdxxq97dg60pbdz3ldc7zzdb8b0cf3frpagbz98cvx5mxfsf"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -175947,6 +176637,8 @@ self: { pname = "iso-deriving"; version = "0.0.8"; sha256 = "1w9fvnyanzmxs7yab9qhf3k9qy1lik7y5y5gzfv3jrxzwm0hivbi"; + revision = "1"; + editedCabalFile = "1psk0w6y8vcy1kgzvasffzkdd412ky7svwslaycj0r8y47mghw7a"; libraryHaskellDepends = [ base mtl profunctors ]; testHaskellDepends = [ base mtl ]; description = "Deriving via arbitrary isomorphisms"; @@ -176001,8 +176693,8 @@ self: { }: mkDerivation { pname = "iso8601-duration"; - version = "0.1.1.0"; - sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + version = "0.1.2.0"; + sha256 = "1hzzcgc1k3dn4l5yxzqq9d62n2hfkrcg0ag14dly7ak3gx9l8l3n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-lexing time ]; @@ -177027,24 +177719,22 @@ self: { "jacinda" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, deepseq, directory, filepath, happy, microlens - , microlens-mtl, mtl, optparse-applicative, prettyprinter - , recursion, regex-rure, silently, split, tasty, tasty-hunit, text - , transformers, vector + , criterion, deepseq, directory, filepath, happy, lazy-csv + , microlens, microlens-mtl, mtl, optparse-applicative + , prettyprinter, regex-rure, silently, split, tasty, tasty-hunit + , text, transformers, vector }: mkDerivation { pname = "jacinda"; - version = "3.0.2.0"; - sha256 = "0b18681ggx6syfix318j1wlycz3fm9g4r6p1vgqgfgxgv8kmyw9w"; - revision = "2"; - editedCabalFile = "12dnkgsf44wfcizdyd5z2l4hh4wg97cd816l909r9q70z2hszqpp"; + version = "3.1.1.1"; + sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath - microlens microlens-mtl mtl prettyprinter recursion regex-rure - split text transformers vector + lazy-csv microlens microlens-mtl mtl prettyprinter regex-rure split + text transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; @@ -177110,22 +177800,23 @@ self: { "jackpolynomials" = callPackage ({ mkDerivation, array, base, combinat, containers, extra, hspray - , hypergeomatrix, ilist, lens, miniterion, numeric-prelude, tasty - , tasty-hunit, unordered-containers + , hypergeomatrix, ilist, lens, matrix, miniterion, numeric-prelude + , tasty, tasty-hunit, unordered-containers, vector }: mkDerivation { pname = "jackpolynomials"; - version = "1.4.1.0"; - sha256 = "153y4p18a5bz803il9v7nacsqki4mw1szw0pdx5qk9jyh9vnalkb"; + version = "1.4.4.0"; + sha256 = "1hrslf2x4dn7i2k9nh59p6kizw7mp9w6v59cj6nalp6amib9hsqg"; libraryHaskellDepends = [ - array base combinat containers extra hspray ilist lens - numeric-prelude unordered-containers + array base combinat containers extra hspray ilist lens matrix + numeric-prelude unordered-containers vector ]; testHaskellDepends = [ - base combinat containers hspray hypergeomatrix tasty tasty-hunit + base combinat containers hspray hypergeomatrix matrix + numeric-prelude tasty tasty-hunit unordered-containers ]; benchmarkHaskellDepends = [ base hspray miniterion ]; - description = "Jack, zonal, Schur and skew Schur polynomials"; + description = "Jack, zonal, Schur, and Hall-Littlewood polynomials"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -178072,6 +178763,24 @@ self: { broken = true; }) {inherit (pkgs) jdk;}; + "job" = callPackage + ({ mkDerivation, async, base, containers, hashable, mmzk-typeid + , random, resourcet, resourcet-extra, safe-exceptions, stm, time + , transformers + }: + mkDerivation { + pname = "job"; + version = "0.1.1"; + sha256 = "1zvsi7j9fv1wb6jam2gpzyh4ry2fbii5fdqfk2wdj8i266ggh27l"; + libraryHaskellDepends = [ + async base containers hashable mmzk-typeid resourcet + resourcet-extra safe-exceptions stm time transformers + ]; + testHaskellDepends = [ base random resourcet time ]; + description = "Job queue"; + license = lib.licenses.asl20; + }) {}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -178617,8 +179326,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.9.0"; - sha256 = "0vpd76wicdvybbvrj1v28mxkyagrisijfl0821wkv35k0lls4m9a"; + version = "0.9.9.2"; + sha256 = "0xifxq1mfx1wxcsy23h9lsq8qpnccrzq6v9qk7zfnj43ljfv9mav"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -178636,8 +179345,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.9.0"; - sha256 = "0i2abhhfcg9dy767hx9h6si83syhxpnk7cgihadh2l3l7p4ykbgr"; + version = "0.9.9.2"; + sha256 = "1g34xam06kyvdr3dfmwrc0ybysj4kd2cyip0348kpf72yvbn5caf"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -178652,8 +179361,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.9.1"; - sha256 = "0gpr98p6wsj32vp029mdliclkkk5rf2bg6mv1jbkncskrvn40aqg"; + version = "0.9.9.2"; + sha256 = "0f2c95hagrabyb8s5bdyn1x6sbg5dzvzp23qhmyygi9cgp89nmf4"; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers ]; @@ -178690,8 +179399,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.9.0"; - sha256 = "0kl296fw3f1fis4fzq9i4q23r0lgxil9bil2alfwnkv6yixj0mhs"; + version = "0.9.9.2"; + sha256 = "0pcswpx37i5gl70n75dlmqb57asya0ikjwyigklv6974yy9ryc9q"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -179105,25 +179814,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "2.0.0.11"; - sha256 = "0i8xandvxrh6almz70vkj8hln77j4mnbndy7izqknhzmbxk7ns4q"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_12" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -179137,7 +179827,6 @@ self: { testHaskellDepends = [ base bytestring filepath hspec ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -179534,8 +180223,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.4.0.0"; - sha256 = "07484bh8f9cnv60h5g0h1mgpic105cwq9v3m4pww57m8wg28a0sk"; + version = "0.5.0.0"; + sha256 = "1jdr9l8jvy4r11z6qxpicyafs48z792qkl24r20hddggq0kiac8z"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -179555,8 +180244,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.1"; - sha256 = "0gqlkb3zbkb46lf2bqa65ikj231qyi7kq59hys6vv3y13w3yq2ck"; + version = "0.4.0.2"; + sha256 = "1l49x5bzqra0s2xpf8azbq07kkj9zkqj0qya83bgyg1wrsnv0ivl"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -179568,22 +180257,23 @@ self: { "json-spec-elm-servant" = callPackage ({ mkDerivation, aeson, base, binary, bound, bytestring, containers - , cookie, directory, elm-syntax, hspec, http-types, json-spec - , json-spec-elm, mtl, prettyprinter, process, servant, text, time - , unordered-containers, uuid + , cookie, directory, elm-syntax, filepath, hspec, http-types + , json-spec, json-spec-elm, mtl, prettyprinter, process, servant + , text, time, unordered-containers, uuid }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.0.1"; - sha256 = "0smg0sx4mybfqycz99xpax3ia5qiwa17p14k87xmp793m6yyj2iq"; + version = "0.4.1.0"; + sha256 = "1l4gx5s8knf1f2s22qn4p8gnr8hbgys1b1pbcsmg0dvsac785871"; libraryHaskellDepends = [ - base bound containers elm-syntax http-types json-spec json-spec-elm - mtl servant text + base bound containers directory elm-syntax filepath http-types + json-spec json-spec-elm mtl prettyprinter process servant text + unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers cookie directory elm-syntax - hspec json-spec prettyprinter process servant text time - unordered-containers uuid + aeson base binary bound bytestring containers cookie directory + elm-syntax filepath hspec http-types json-spec json-spec-elm mtl + prettyprinter process servant text time unordered-containers uuid ]; description = "Generated elm code for servant APIs"; license = lib.licenses.mit; @@ -179596,8 +180286,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.0.0"; - sha256 = "1wpf1lzpljczcxq0ml6yikh2xiysd1c5nl9zbscy3bsdcw1vwbgf"; + version = "0.3.1.0"; + sha256 = "0zypr3lxyqaywml7bkkvp00x4a6l4r8wggsplafvcvlanyz7b23i"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -181457,27 +182147,6 @@ self: { }) {}; "katip-wai" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, clock, containers - , hspec, hspec-discover, http-client, http-types, katip, network - , stm, text, uuid, wai, warp - }: - mkDerivation { - pname = "katip-wai"; - version = "0.1.2.3"; - sha256 = "1b6rz18jcpxjhckpkknhj760np7xlml10hyfnk891agpgmlsii15"; - libraryHaskellDepends = [ - aeson base bytestring clock http-types katip network text uuid wai - ]; - testHaskellDepends = [ - aeson async base bytestring containers hspec http-client http-types - katip stm text uuid wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "WAI middleware for logging request and response info through katip"; - license = lib.licenses.bsd3; - }) {}; - - "katip-wai_0_1_2_4" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , hspec, hspec-discover, http-client, http-types, katip, network , stm, text, uuid, wai, warp @@ -181496,7 +182165,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "WAI middleware for logging request and response info through katip"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katt" = callPackage @@ -181765,6 +182433,29 @@ self: { broken = true; }) {}; + "kdt_0_2_6" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , deepseq-generics, heap, mersenne-random-pure64, MonadRandom + , QuickCheck + }: + mkDerivation { + pname = "kdt"; + version = "0.2.6"; + sha256 = "055chna3q37986mds4f4gdp8ydnw7vviikrmihnf1q4savq14iv1"; + libraryHaskellDepends = [ base deepseq deepseq-generics heap ]; + testHaskellDepends = [ + base containers deepseq deepseq-generics QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics heap mersenne-random-pure64 + MonadRandom QuickCheck + ]; + description = "Fast and flexible k-d trees for various types of point queries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "keccak" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances @@ -182381,8 +183072,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.13"; - sha256 = "0r2kskw5hpl9pkfl4r8c2p5wkzhy922rl8l7fla017iw3h1v6y8s"; + version = "0.2.0.14"; + sha256 = "056pvzywdwgya6i43i05kq81r0f91y6cxa0lmx825dzkfm7x7851"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -182496,6 +183187,47 @@ self: { mainProgram = "keter"; }) {}; + "keter_2_1_6" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base + , blaze-builder, bytestring, case-insensitive, conduit + , conduit-extra, containers, directory, fast-logger, filepath + , fsnotify, http-client, http-conduit, http-reverse-proxy + , http-types, HUnit, indexed-traversable, lens, lifted-base + , monad-logger, mtl, network, optparse-applicative, process, random + , regex-tdfa, stm, tar, tasty, tasty-hunit, template-haskell, text + , time, tls, tls-session-manager, transformers, unix, unix-compat + , unliftio-core, unordered-containers, vector, wai, wai-app-static + , wai-extra, warp, warp-tls, wreq, yaml, zlib + }: + mkDerivation { + pname = "keter"; + version = "2.1.6"; + sha256 = "0qvvisccf3w35lq4856z3ppsmf44xf9bzfc2x46p96r8k1irgfg8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async attoparsec base blaze-builder bytestring + case-insensitive conduit conduit-extra containers directory + fast-logger filepath fsnotify http-client http-conduit + http-reverse-proxy http-types indexed-traversable lifted-base + monad-logger mtl network optparse-applicative process random + regex-tdfa stm tar template-haskell text time tls + tls-session-manager transformers unix unix-compat unliftio-core + unordered-containers vector wai wai-app-static wai-extra warp + warp-tls yaml zlib + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit http-client http-conduit http-types HUnit + lens monad-logger mtl stm tasty tasty-hunit transformers unix wai + warp wreq + ]; + description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "keter"; + }) {}; + "keuringsdienst" = callPackage ({ mkDerivation, aeson, base, containers, HUnit, text }: mkDerivation { @@ -184219,18 +184951,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "2.0.0.7"; - sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_8" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -184240,7 +184960,6 @@ self: { testHaskellDepends = [ base hspec servant text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -185537,8 +186256,8 @@ self: { pname = "language-c-quote"; version = "0.13.0.1"; sha256 = "0ik16ng210fa0l93bgiwpw9m1krcw23530fvv5agl9j1b71qaxm0"; - revision = "1"; - editedCabalFile = "0skpnzjdrfadd1b835q5ic7pvl0znx1mkyxkimy99zm474rn3dzj"; + revision = "2"; + editedCabalFile = "0zjc91j2s5l7arpzk46554sgcdhrl68ni7r04p1nlqkqbgzwyb8a"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -185677,8 +186396,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.3.0"; - sha256 = "18idkxx2mh62qfymqwbfmzf3k0zvx3wgijk73iqpfbw43wqn99ls"; + version = "1.4.3.1"; + sha256 = "03fj2ddrim37kcqbixjdypawn6v4i4vy3qjrcqy78amymvc9br2m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185937,8 +186656,8 @@ self: { pname = "language-gemini"; version = "0.1.0.1"; sha256 = "1vnl280ld0wazffzx19an5d6gybx4396z57idcfvdvzkap97qbh9"; - revision = "1"; - editedCabalFile = "0a3ah5y4nadgdy7jhaa8yswm0hcwq8mzvy25nr1z02garkx8382f"; + revision = "2"; + editedCabalFile = "0z1i9i3w6ymlhaa4r8fs6iks94rwx25zwwrk1gkyczhv1ah1vaqi"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; @@ -186796,37 +187515,6 @@ self: { }) {}; "lapack" = callPackage - ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms - , comfort-array, comfort-array-shape, comfort-blas, data-ref - , deepseq, doctest-exitcode-stdio, guarded-allocation, hyper - , lapack-ffi, lazyio, monoid-transformer, netlib-ffi, non-empty - , QuickCheck, quickcheck-transformer, random, semigroups, Stream - , tagged, text, tfp, transformers, unique-logic-tf, utility-ht - }: - mkDerivation { - pname = "lapack"; - version = "0.5.1.1"; - sha256 = "1fcg43anw1ig861f20p7654gf8g4i2yb2rnld3q22gyi6s5bmi75"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blas-ffi blaze-html boxes comfort-array comfort-array-shape - comfort-blas deepseq guarded-allocation hyper lapack-ffi lazyio - netlib-ffi non-empty semigroups Stream tagged text tfp transformers - utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms comfort-array comfort-array-shape data-ref - doctest-exitcode-stdio monoid-transformer netlib-ffi non-empty - QuickCheck quickcheck-transformer random semigroups tfp - transformers unique-logic-tf utility-ht - ]; - description = "Numerical Linear Algebra using LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "lapack_0_5_2" = callPackage ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, comfort-array-shape, comfort-blas, containers , data-ref, deepseq, doctest-exitcode-stdio, guarded-allocation @@ -186855,7 +187543,6 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -187333,32 +188020,6 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , integer-logarithms, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, transformers, universe-base - , universe-reverse-instances, unordered-containers - }: - mkDerivation { - pname = "lattices"; - version = "2.2"; - sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; - revision = "1"; - editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; - libraryHaskellDepends = [ - base base-compat containers deepseq hashable integer-logarithms - QuickCheck tagged transformers universe-base - universe-reverse-instances unordered-containers - ]; - testHaskellDepends = [ - base base-compat containers QuickCheck quickcheck-instances tasty - tasty-quickcheck transformers universe-base - universe-reverse-instances unordered-containers - ]; - description = "Fine-grained library for constructing and manipulating lattices"; - license = lib.licenses.bsd3; - }) {}; - - "lattices_2_2_1" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances, tagged , tasty, tasty-quickcheck, transformers, universe-base @@ -187380,7 +188041,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "launchdarkly-server-sdk" = callPackage @@ -187624,19 +188284,19 @@ self: { }) {}; "layers-game" = callPackage - ({ mkDerivation, base, cmdargs, composition, data-lens, Gamgine - , GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show + ({ mkDerivation, base, cmdargs, composition, data-lens-light + , Gamgine, GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show }: mkDerivation { pname = "layers-game"; - version = "0.7.0"; - sha256 = "1v55940lpp9p67nnnqslzz175cbzs7sfdyinxws9dhwmjvpm4ix8"; + version = "0.8.0"; + sha256 = "17chcw2m3xrn2wmls5k9m2mkdwjqbqphsipbgihskbsq6jmplyc9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl - OpenGLRaw pretty-show + base cmdargs composition data-lens-light Gamgine GLFW-b ListZipper + mtl OpenGLRaw pretty-show ]; description = "A prototypical 2d platform game"; license = lib.licenses.bsd3; @@ -188057,16 +188717,16 @@ self: { "ldap-client" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , connection, containers, fail, hspec, network, process, semigroups - , stm, text + , containers, crypton-connection, fail, hspec, network, process + , semigroups, stm, text }: mkDerivation { pname = "ldap-client"; - version = "0.4.2"; - sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; + version = "0.4.3"; + sha256 = "15cid7mnfn6ykh4vhhqbs652sng12430ccdabf6kcc0236ghicrd"; libraryHaskellDepends = [ - asn1-encoding asn1-types async base bytestring connection - containers fail network semigroups stm text + asn1-encoding asn1-types async base bytestring containers + crypton-connection fail network semigroups stm text ]; testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; @@ -189772,8 +190432,8 @@ self: { ({ mkDerivation, base, deepseq, hashable, tasty, tasty-hunit }: mkDerivation { pname = "libBF"; - version = "0.6.7"; - sha256 = "0kdazhqxn3wr6mi20qwlkn6n5vl9sviij0p141svs77zpc3cxk09"; + version = "0.6.8"; + sha256 = "02lfs9l5qx0xgcy997c31kkmldy26442ahbwiaap9ri85w9j306r"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A binding to the libBF library"; @@ -190278,8 +190938,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.10.0.0"; - sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh"; + version = "0.10.0.1"; + sha256 = "0ca3ispg92aj49fjzg5ykv7ggvdzb8lsvrh8rfh6fbnivqyzqn56"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network safe-exceptions text time utf8-string @@ -190667,6 +191327,18 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "libssh" = callPackage + ({ mkDerivation, base, bytestring, libssh }: + mkDerivation { + pname = "libssh"; + version = "0.1.0.0"; + sha256 = "17i6yqa9705wv91q3y2li3zaan1kc71c9nmfgmz1k0zhq172z36n"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libssh ]; + description = "libssh bindings"; + license = lib.licenses.mit; + }) {inherit (pkgs) libssh;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -191873,8 +192545,8 @@ self: { pname = "linear-generics"; version = "0.2.3"; sha256 = "0093ywl8s8k92b50li28gcmqc616f6l7jkv7vslkvqzn42yrvbq2"; - revision = "1"; - editedCabalFile = "1ky9dhc0bjymw12wpjcv12drbfz7955f1nchgcs3l0ghv8vyvy3x"; + revision = "2"; + editedCabalFile = "0qicg4wh00zph3dih63rkx97fbda4kdyp78xnra0589ry9axbxry"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -193172,23 +193844,6 @@ self: { }) {}; "list-shuffle" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "list-shuffle"; - version = "1.0.0"; - sha256 = "03qvms9z3jrcz1lswb6kzyk8bw9gafmkz5yil7vi3jirhxxq7491"; - libraryHaskellDepends = [ base primitive random ]; - testHaskellDepends = [ base hedgehog random ]; - benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; - description = "List shuffling and sampling"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "list-shuffle_1_0_0_1" = callPackage ({ mkDerivation, base, deepseq, hedgehog, primitive, random , tasty-bench }: @@ -193335,19 +193990,6 @@ self: { }) {}; "list-transformer" = callPackage - ({ mkDerivation, base, doctest, mmorph, mtl }: - mkDerivation { - pname = "list-transformer"; - version = "1.1.0"; - sha256 = "061a2cnlv335ski627zrdfk8nd110wpiawclq5nwa3sx0l92xsrx"; - libraryHaskellDepends = [ base mmorph mtl ]; - testHaskellDepends = [ base doctest ]; - description = "List monad transformer"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "list-transformer_1_1_1" = callPackage ({ mkDerivation, base, doctest, mmorph, mtl }: mkDerivation { pname = "list-transformer"; @@ -193357,7 +193999,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "List monad transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -193600,8 +194241,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "7"; - editedCabalFile = "0w03xl8i6j47li8cp0issjf6k2n5kwkhp461pp5spsw0hkb4gl3i"; + revision = "8"; + editedCabalFile = "0wg9kshyn0s8f65pchyl69i97qdk39lr8fzp9c4zb7d2lv1cgn8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195162,6 +195803,8 @@ self: { pname = "logging-effect"; version = "1.4.0"; sha256 = "0ff794800pn4gxdig85nr2svajph01rdg3sm0vjpfa71q67wlq0q"; + revision = "1"; + editedCabalFile = "0yjlwlc4rybygpbksclid3wskp5ng8gwwwrh8frq6vl08d1rwmf7"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -196468,28 +197111,25 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_2_6_0_0" = callPackage + "lsp_2_7_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , extra, filepath, hashable, hspec, hspec-discover, lens - , lens-aeson, lsp-types, mtl, prettyprinter, random, sorted-list - , stm, text, text-rope, transformers, unliftio, unliftio-core - , unordered-containers, uuid + , lens-aeson, lsp-types, mtl, prettyprinter, sorted-list, stm, text + , text-rope, transformers, unliftio, unliftio-core + , unordered-containers }: mkDerivation { pname = "lsp"; - version = "2.6.0.0"; - sha256 = "1wimb5y1757l8k1kinlv1y43n7kmjzdh18gayarfm32dsmllahi5"; - revision = "1"; - editedCabalFile = "1p9lvb18m69jdz99d8bn59h2dn3gwalnf4j0sf7j1p2cj9yv8srm"; + version = "2.7.0.0"; + sha256 = "1vxyl3p4b4nskl4icvw5087683lbr5zjj64wwmckw3l2hgvqwr6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers data-default directory exceptions extra filepath hashable lens - lens-aeson lsp-types mtl prettyprinter random sorted-list stm text + lens-aeson lsp-types mtl prettyprinter sorted-list stm text text-rope transformers unliftio unliftio-core unordered-containers - uuid ]; testHaskellDepends = [ base containers hspec sorted-list text text-rope @@ -196560,7 +197200,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_17_0_2" = callPackage + "lsp-test_0_17_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob @@ -196569,10 +197209,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.17.0.2"; - sha256 = "1nyqv66rqs316dx1yl1n3ydcxl1lkdvxri8chgvw88c67p84ss45"; - revision = "1"; - editedCabalFile = "04pr949939z5wpi5ir4pjks8zx1r99pgrb4f7wxqpm1g0l25vzgx"; + version = "0.17.1.0"; + sha256 = "1yirmmb4nich63mgxhs51ib5gbp42qi6dmycl38rw4x7lclf82nx"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory @@ -196664,20 +197302,18 @@ self: { mainProgram = "generator"; }) {}; - "lsp-types_2_2_0_0" = callPackage + "lsp-types_2_3_0_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath - , generic-arbitrary, hashable, hspec, hspec-discover + , generic-arbitrary, hashable, hspec, hspec-discover, hspec-golden , indexed-traversable, indexed-traversable-instances, lens, mod , mtl, network-uri, prettyprinter, QuickCheck, quickcheck-instances , regex, row-types, safe, some, template-haskell, text, witherable }: mkDerivation { pname = "lsp-types"; - version = "2.2.0.0"; - sha256 = "0h3mdnilhk6mg4vnhmnynq18vhj9kfbw5k9bsqa7mrgr8rjsy7jy"; - revision = "1"; - editedCabalFile = "05rz0q5w8ijac7ciia06lcdim6lycq3y5ni5kl7fbjhp39z9l11g"; + version = "2.3.0.0"; + sha256 = "1w5yrcya1yhdg0f4j4yiy0a1lx2ivyjabzkm814ncgs8g99pb8vs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196692,8 +197328,8 @@ self: { witherable ]; testHaskellDepends = [ - aeson base filepath hspec lens network-uri QuickCheck - quickcheck-instances text + aeson base filepath hspec hspec-golden lens network-uri + prettyprinter QuickCheck quickcheck-instances text ]; testToolDepends = [ hspec-discover ]; doHaddock = false; @@ -197127,8 +197763,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.7.1.1"; - sha256 = "16yijfnbm58cw8b2bfx10xnn55z96xjdhjd488a76ypcfl2qzfrd"; + version = "0.7.2.0"; + sha256 = "166a6sfwsgmppi8d07xbfrazschfb01qa1nml8vnn5vvj8sxv1z8"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -197293,6 +197929,24 @@ self: { license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; + "lukko_0_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, filepath, singleton-bool + , tasty, tasty-expected-failure, tasty-hunit, temporary + }: + mkDerivation { + pname = "lukko"; + version = "0.1.2"; + sha256 = "0vcqds8ihpjw6zv5rxdzzykh05wayx376wvz77s63d15ls56zn3j"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base bytestring filepath singleton-bool tasty + tasty-expected-failure tasty-hunit temporary + ]; + description = "File locking"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + "lumberjack" = callPackage ({ mkDerivation, base, contravariant, exceptions, mtl , prettyprinter, prettyprinter-ansi-terminal, text, time @@ -197694,19 +198348,17 @@ self: { }) {}; "lzma" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, xz + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, xz }: mkDerivation { pname = "lzma"; - version = "0.0.1.0"; - sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; - revision = "1"; - editedCabalFile = "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"; + version = "0.0.1.1"; + sha256 = "1wfwxa927607kfqy9qs8lxm11gngl3ikwwwm0d7i3km2j612g9c0"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; @@ -198675,8 +199327,8 @@ self: { pname = "mainland-pretty"; version = "0.7.1"; sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; - revision = "3"; - editedCabalFile = "0wspwmy0wi1fcyw8czgkr03iyq73gg4i0x6ckjbhxq7qb3r62q8v"; + revision = "4"; + editedCabalFile = "1prij4hi17mmx3b3ws533ps5c0p6qn07qi0hxlk8qx5rqyww6y1w"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -199569,34 +200221,6 @@ self: { }) {}; "mappings" = callPackage - ({ mkDerivation, base, cond, containers, formatting, hspec - , hspec-discover, indexed-traversable, partialord - }: - mkDerivation { - pname = "mappings"; - version = "0.3.0.0"; - sha256 = "0ljjai9b46d6gsd1w99daincnvs0ckbx81z3y2z1sljn7nay88np"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - executableHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - testHaskellDepends = [ - base cond containers formatting hspec indexed-traversable - partialord - ]; - testToolDepends = [ hspec-discover ]; - description = "Types which represent functions k -> v"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "view"; - broken = true; - }) {}; - - "mappings_0_3_1_0" = callPackage ({ mkDerivation, base, cond, containers, formatting, hspec , hspec-discover, indexed-traversable, partialord }: @@ -200386,6 +201010,22 @@ self: { mainProgram = "mastermind"; }) {}; + "matcha" = callPackage + ({ mkDerivation, base, http-api-data, http-types, text, wai }: + mkDerivation { + pname = "matcha"; + version = "0.0.0.1"; + sha256 = "15s031ks4ih6ic2mvhx8dfcnkg0x3yaz347gyxbbrywjkn0826sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base http-api-data http-types text wai ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A micro web framework based on pattern matching"; + license = lib.licenses.bsd3; + mainProgram = "matcha-exe"; + }) {}; + "matchable" = callPackage ({ mkDerivation, base, containers, hashable, hspec, tagged , unordered-containers, vector @@ -204884,6 +205524,7 @@ self: { ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "minions" = callPackage @@ -205010,12 +205651,12 @@ self: { ({ mkDerivation, base, deepseq, directory, tasty, tasty-hunit }: mkDerivation { pname = "miniterion"; - version = "0.1.1.0"; - sha256 = "0byjlkmi6hr5wpqfbcmqyz7yzcs5nw7gc3x3878a32f9jz92a8jr"; + version = "0.1.1.1"; + sha256 = "1gz00kydz4zdmd0cvfjk1s68mvcmrcdp7h6y4vhp2whqcaiyyppl"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base directory tasty tasty-hunit ]; benchmarkHaskellDepends = [ base ]; - description = "Simple and lightweight benchmark utilities"; + description = "Simple and lightweight benchmarking utilities"; license = lib.licenses.mit; }) {}; @@ -205714,6 +206355,7 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmark-cli" = callPackage @@ -205755,6 +206397,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmorph_1_1_3" = callPackage @@ -206094,8 +206737,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.6.0.1"; - sha256 = "0dcwa97whwwk267cvbmvixya465v7hyc45i0s1jvgxqjhmpy3p6d"; + version = "0.6.3.0"; + sha256 = "02sycvlvwrlx2lvsisldp4vxs6adiq414ihv1cjbxwm6i7z0avb4"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -206104,7 +206747,7 @@ self: { aeson array base binary bytestring containers entropy hashable hspec random text time uuid uuid-types ]; - description = "A TypeID implementation for Haskell"; + description = "A TypeID and UUIDv7 implementation for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -206332,8 +206975,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; - revision = "1"; - editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; + revision = "2"; + editedCabalFile = "1wr2c7rymb3xbs9vzkhk7xz2msh74riqx2clyfm78wpfbdzga0xa"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -206897,8 +207540,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.3.0.1"; - sha256 = "1dlafvvf087l9afdyvwl9zhza9ycccgd30jgd2230ak30hwbvgmk"; + version = "1.3.0.2"; + sha256 = "0w25h6dal72p9y2wn639095g6h78a0sv2p7qbvxsf4rybdwd7j65"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206983,24 +207626,6 @@ self: { }) {}; "monad-chronicle" = callPackage - ({ mkDerivation, base, data-default-class, mtl, semigroupoids - , these, transformers, transformers-compat - }: - mkDerivation { - pname = "monad-chronicle"; - version = "1.0.1"; - sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "3"; - editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; - libraryHaskellDepends = [ - base data-default-class mtl semigroupoids these transformers - transformers-compat - ]; - description = "These as a transformer, ChronicleT"; - license = lib.licenses.bsd3; - }) {}; - - "monad-chronicle_1_0_2" = callPackage ({ mkDerivation, base, data-default-class, mtl, semigroupoids , these, transformers, transformers-compat }: @@ -207014,7 +207639,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monad-classes" = callPackage @@ -207943,6 +208567,29 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "monad-schedule_0_2" = callPackage + ({ mkDerivation, base, free, generic-arbitrary, HUnit, operational + , QuickCheck, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, time-domain, transformers + }: + mkDerivation { + pname = "monad-schedule"; + version = "0.2"; + sha256 = "1cwypy31hn49afq7dr8ahvw687j97xyjg8l8g30ss379g3fm3y2k"; + libraryHaskellDepends = [ + base free operational stm time-domain transformers + ]; + testHaskellDepends = [ + base free generic-arbitrary HUnit operational QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + time-domain transformers + ]; + description = "A new, simple, composable concurrency abstraction"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "monad-skeleton" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208372,8 +209019,8 @@ self: { }: mkDerivation { pname = "monadic-bang"; - version = "0.2.1.0"; - sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; + version = "0.2.2.1"; + sha256 = "1map2ywq3inzqki6fkw8f5frx85cic1c06ccyy3p0laahlz8i1z8"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; @@ -208998,27 +209645,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, primes, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "1.2.5"; - sha256 = "17i07i5z4jhk7w35123hkikrl81v7vnp4qd8plci90vfix53z5aa"; - libraryHaskellDepends = [ - base bytestring commutative-semigroups containers primes text - vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_2_5_1" = callPackage ({ mkDerivation, base, bytestring, commutative-semigroups , containers, primes, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, vector @@ -209037,7 +209663,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -209058,10 +209683,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.6.4.0"; - sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; - revision = "2"; - editedCabalFile = "0k0pi43km8v25rz61zqfw958djbxrrjb1a2idkpj92klbjsr49dd"; + version = "0.6.5.0"; + sha256 = "008icgq7704pk301s6224k24iy3n60h0jvkkqgq61fi2fbbdy5r7"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -209748,8 +210371,8 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , morpheus-graphql-app, morpheus-graphql-code-gen + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, morpheus-graphql-app, morpheus-graphql-code-gen , morpheus-graphql-core, morpheus-graphql-server , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl , relude, tasty, tasty-hunit, template-haskell, text, transformers @@ -209757,21 +210380,22 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.3"; - sha256 = "04qah7565dzq7v4q43zjz8778pdn5jwnway5rvz4kkibcrscfagn"; + version = "0.28.1"; + sha256 = "0i4ax49plhms3rxb4b8p5w97r01i8baqjjnkzg0if0xsvsp1hs3s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server mtl relude template-haskell text - transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server mtl relude + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server morpheus-graphql-subscriptions - morpheus-graphql-tests mtl relude tasty tasty-hunit - template-haskell text transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server + morpheus-graphql-subscriptions morpheus-graphql-tests mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; @@ -209805,6 +210429,35 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_28_1" = callPackage + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, directory, hashable, megaparsec + , morpheus-graphql-core, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.28.1"; + sha256 = "1fdxz6fny43nrb2cfd57br61v0kc9ijl039p8951xbv3b2c8fjrh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers hashable + megaparsec morpheus-graphql-core mtl relude scientific + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers directory + hashable megaparsec morpheus-graphql-core morpheus-graphql-tests + mtl relude scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -209859,6 +210512,38 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, modern-uri, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell + , text, transformers, unliftio-core, unordered-containers + , websockets, wuss + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.28.1"; + sha256 = "18kifpxqbnvbw4842d1v1wgfsjic0w91rc2ly02kgj302a2lhgp0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req + template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req tasty + tasty-hunit template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-code-gen" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils @@ -209868,8 +210553,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.3"; - sha256 = "1rmxcr17xjx99aam048a4sqlwlnxjk41hx8fnb363ljid74vrcrb"; + version = "0.28.1"; + sha256 = "0nlqhfb5h6rhkg7f85cz8q6jskijqf1ddqic5hcfd5d8myfh6xkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209909,6 +210594,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "morpheus-graphql-code-gen-utils_0_28_1" = callPackage + ({ mkDerivation, base, bytestring, containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen-utils"; + version = "0.28.1"; + sha256 = "0ficavdkml1cbw9rkdgljpgcfsx819116djc86fbdhxglaz1afpd"; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core mtl prettyprinter + relude template-haskell text unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude @@ -209935,6 +210638,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.28.1"; + sha256 = "0z47wcqhpm2mz0v5168s9pd03f40as1kl8mnyvzp29c15wf2qmay"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-server" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core @@ -209962,6 +210692,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-server_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-server"; + version = "0.28.1"; + sha256 = "1pghahv73d8cjqmxi7xndlq8g68f0ap5gn3yk9ww25zjp8vwwsgw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers @@ -209980,6 +210738,25 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app + , morpheus-graphql-core, mtl, relude, text, transformers + , unliftio-core, unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.28.1"; + sha256 = "10bvy586a0ldyfld2xhzprsrgd7rdvcwpcnbg460l0hqmzgpkcr2"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers @@ -209996,6 +210773,23 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-tests_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.28.1"; + sha256 = "161qazf4g7plkx68rnf56sjzrdx5j9k31kdwpynmpb117ylvvrmf"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -212349,8 +213143,8 @@ self: { pname = "multipart"; version = "0.2.1"; sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; - revision = "1"; - editedCabalFile = "03gaapwnvn843hpm5qwdci9df1wf383msd42p8w9ghilpfjj4qy9"; + revision = "2"; + editedCabalFile = "0nansxxrd6153bwwm825iarsxqgyhx924spvx5rrd2i1spp0972m"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; license = lib.licenses.bsd3; @@ -214990,8 +215784,8 @@ self: { }: mkDerivation { pname = "national-australia-bank"; - version = "0.0.8"; - sha256 = "1z4bdd8xwxivb4n07jxgk905r8vk1zhg9ik6k3rqqd5rlc0xa0di"; + version = "0.0.11"; + sha256 = "1bhnzsbxcl6mrcka9vibclria5650hnsrlyj21yfbww55klg6nh8"; libraryHaskellDepends = [ base bytestring containers digit directory filepath lens mtl parsec sv time transformers utf8-string validation @@ -216134,24 +216928,6 @@ self: { }) {}; "netlib-ffi" = callPackage - ({ mkDerivation, base, guarded-allocation, storable-complex - , transformers - }: - mkDerivation { - pname = "netlib-ffi"; - version = "0.1.1"; - sha256 = "0irf5gc9kw3pjb339nrzylr1ldz8fhgmpkji26dm3w18vkwic411"; - revision = "1"; - editedCabalFile = "0q5psp0gi0il6yz99sxmq7x3m7axwzh2qbimcvqbw623zbzgycyg"; - libraryHaskellDepends = [ - base guarded-allocation storable-complex transformers - ]; - description = "Helper modules for FFI to BLAS and LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "netlib-ffi_0_1_2" = callPackage ({ mkDerivation, base, deepseq, guarded-allocation , storable-complex, transformers }: @@ -216164,7 +216940,6 @@ self: { ]; description = "Helper modules for FFI to BLAS and LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -216651,8 +217426,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "1.0.0.0"; - sha256 = "00h1qwnk2clybf06d172pjmf87qb7jwsdn2l1a08hszq1pxyb9ch"; + version = "1.0.0.1"; + sha256 = "0mnyl7rsy30n21kn8h6v1lz73figc1d7b6bljvcas63izymjy8wq"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -217267,6 +218042,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-run_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, network, time-manager }: + mkDerivation { + pname = "network-run"; + version = "0.3.1"; + sha256 = "0bi7iqlcziw12amqwcirm7jmi007yl4z4xq8zjzp5i989aan0yq9"; + libraryHaskellDepends = [ base bytestring network time-manager ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-server" = callPackage ({ mkDerivation, base, network, unix }: mkDerivation { @@ -217445,6 +218232,8 @@ self: { pname = "network-transport"; version = "0.5.7"; sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7"; + revision = "1"; + editedCabalFile = "1z9k8i5j01ajhashmy1kkwq6bqcwvi48j6d3n57i4bglfdz8s31z"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -218276,8 +219065,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.10"; - sha256 = "15hd1hknhkcpg8x8h7fb6azcgazyxbxggsxrqm441a80yvphq81s"; + version = "1.7.10.1"; + sha256 = "1gzyygw3l434s7kb5iqj6maxrwrnlx5fw1jiir14zdq6p3vafnp8"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -218350,15 +219139,15 @@ self: { }) {}; "ngx-export-tools" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe + ({ mkDerivation, aeson, base, binary, bytestring, ngx-export , template-haskell }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.4"; - sha256 = "12qryvxkz8mjbpyrvmp7k3jh0zdf6f92a09jdhca8c2x7qdi3xn8"; + version = "1.2.4.1"; + sha256 = "120jk2d2yip9vd4r0s9b7z7ykh67i921svspn2kc7v5vwx95xn3w"; libraryHaskellDepends = [ - aeson base binary bytestring ngx-export safe template-haskell + aeson base binary bytestring ngx-export template-haskell ]; description = "Extra tools for Nginx Haskell module"; license = lib.licenses.bsd3; @@ -218887,8 +219676,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.7.0.0"; - sha256 = "03qh3691242n0yza6mk66d2l3gmhipfh1pk04qb4fzm9mhb472ps"; + version = "0.7.0.1"; + sha256 = "1b6wl253ffzs81w65is76cgijp47pg7mmyc83kjgc08irz98hi0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222458,10 +223247,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.7"; - sha256 = "1nywxada76zqzraadwbmz3v6dpwbd997393ksrprci5n6myrakng"; - revision = "1"; - editedCabalFile = "1fxg13qd5rniidin08yjywgfk8dvwfc3y5n582z3x0x86b2ifxy6"; + version = "1.0.8"; + sha256 = "1bimn9jq8nw152jgb4la1cczz6c9ij8hf2xjg59z6inq4ssgyjl9"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -222507,8 +223294,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.3.0"; - sha256 = "07a64p1b0yzx3wmxycifimjqvnfx9gpk6n3wl6rzgncl1fgf89h0"; + version = "1.4.0"; + sha256 = "096p2xx99d00p0qnrclnwdb4dq5wp1i2idz7wj1g7ccz3h26rm2z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -222530,8 +223317,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.3.0"; - sha256 = "0p3cwyrrjm56x3a8myfp1wlm7xy2j1d06y80arij8cl5cki95kwy"; + version = "1.4.0"; + sha256 = "03bbdqq69jqxfdaihykxxds4vcfvc6bydwkyz8zsanvsi5ifwza5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring filepath IfElse mtl ogma-extra @@ -222553,8 +223340,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.3.0"; - sha256 = "1pvnqcgi00v93jkzqxg770y2n0zbq53b0shi783apz9cjxm5a329"; + version = "1.4.0"; + sha256 = "1lg9xph8hsb9jfxvyka6hqb9n9ijw4da29girjf6y16cf7ras3j0"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -222571,8 +223358,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.3.0"; - sha256 = "0g1z3yh4x9p0iinc39ip1nm9s4d21nwc7gzss81vvc5f2m8hdqbg"; + version = "1.4.0"; + sha256 = "0bvsm9d65akrv67n9l9j0j0b6bpxddhj2fgzp4jrjw07dcqsfwpi"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222590,8 +223377,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.3.0"; - sha256 = "18zv608mb3ifs14m3lmsc644cc2qhj9f0gjxgc85m2wq82blsxpb"; + version = "1.4.0"; + sha256 = "1n2i2zxcci5ys0z00h28ndqyl7ay0i200y5krxnarwy5b28xcjnf"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222607,8 +223394,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.3.0"; - sha256 = "1d9grndx0774rz64x7g8hi9bz80ddayclzianyql0jzyw61ps70s"; + version = "1.4.0"; + sha256 = "16ybs7c1404c1hsmrimqs9lx0m5d24kvqjd99ljmk4vw4hb686if"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -222662,8 +223449,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.3.0"; - sha256 = "04w0fayj6hbqciw4fqn481gwlj34sq3r9i09zcqh2m455mybalyc"; + version = "1.4.0"; + sha256 = "0xrdnbsdm2a06r3n7i19bb9dcgssgb9fcly5c7rx7p4744lli3as"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -222679,8 +223466,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.3.0"; - sha256 = "06hb9gxqg81gw5sqzsi966fk9yxhv9q7pclnwhjlaaya3jav3xx2"; + version = "1.4.0"; + sha256 = "1f2afvxdjgkgdc64w0f455fb4r9w43nbsjjm4q2s4lhqhrf7qqa9"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222696,8 +223483,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.3.0"; - sha256 = "01vph8dwqf0sw2bn3frik3s2jwnpap1nlkpl8jnk91q2xjc4zhfs"; + version = "1.4.0"; + sha256 = "01lgymsrvkh75jjssxbn5wzw3d51fpc27ngf6pfmrkbd7fx39287"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -222948,8 +223735,8 @@ self: { }: mkDerivation { pname = "om-fail"; - version = "0.1.0.2"; - sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6"; + version = "0.1.0.4"; + sha256 = "0nf4hdx8a2invk0wjq3ryk8l5psl8jjkixskadmk8zd8r06mf3ky"; libraryHaskellDepends = [ base monad-logger safe-exceptions transformers ]; @@ -222987,8 +223774,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.0.7"; - sha256 = "0lmca3l4pbhkrxfqwhvw4x6ds6bxml70agi73f5q509iwi3997ni"; + version = "0.3.1.0"; + sha256 = "1whs8v3m4ldxlw7as3jnw9snk3jx0biqkid2rr63c0kkxazlxjpp"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -223587,37 +224374,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.10.3.0"; - sha256 = "1zq2d8rb1zwrvg0civh2a6r01nv1v2ini9rykf63px00srs98p67"; - revision = "1"; - editedCabalFile = "1wd2jgvrlbnma5z3zxa709svcm06clhx8gh9gs1jxscdd6lr6sh7"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_10_3_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -223629,6 +224385,8 @@ self: { pname = "opaleye"; version = "0.10.3.1"; sha256 = "1cv9p6kpb5i4x9bc8ak9vyfvhnqmycf8gbhaf4f6xb6rzwvllvd9"; + revision = "1"; + editedCabalFile = "192hpyb8a0vs7w4l0rq2j2ahqjip5m85w2ic63pn5sskmqcpaxb3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -223644,7 +224402,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -224077,8 +224834,8 @@ self: { pname = "openapi3"; version = "3.2.4"; sha256 = "182bl4z9npcci85771adg7iar1377b5clgzs6wya04j79d391jyv"; - revision = "1"; - editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk"; + revision = "2"; + editedCabalFile = "1y7is2q6jfq1k35swnw9yv2h122pd5f6zchxl8zah0laafkm03vq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -224152,8 +224909,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.2.2.0"; - sha256 = "0h50q77p60dpngm1bxwk8i5lvw05idcsl2jgsv6kq14jpsc65ajq"; + version = "0.2.2.1"; + sha256 = "0m64pi32003k2y8sh4i6ls23np5bjq23imwng8bh4qx77f4d3r8x"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKLCAF TKMath @@ -224760,16 +225517,17 @@ self: { "opentelemetry-plugin" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , hs-opentelemetry-api, hs-opentelemetry-propagator-w3c - , hs-opentelemetry-sdk, mwc-random, text, unordered-containers + , hs-opentelemetry-sdk, mwc-random, stm, stm-containers, text + , transformers, unordered-containers }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.0.0"; - sha256 = "10j37spgz06xa7n16bbqx9zwhh9yc7avbhmwlvhraikpcjfmz7j9"; + version = "1.1.0"; + sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api - hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random - text unordered-containers + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm + stm-containers text transformers unordered-containers ]; description = "GHC plugin for open telemetry"; license = lib.licenses.bsd3; @@ -225272,6 +226030,8 @@ self: { pname = "oplang"; version = "0.5.0.0"; sha256 = "0psk8jyxdhx2spzrx6k3hka7pyb2mhhsdwwk1g4bzgd3hmxnhh5l"; + revision = "1"; + editedCabalFile = "043mxfr8yjhqzagaydyx0l9q326zpjfzji1l4k6vfdv745ibnd68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226050,17 +226810,6 @@ self: { }) {}; "ordered-containers" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "ordered-containers"; - version = "0.2.3"; - sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; - libraryHaskellDepends = [ base containers ]; - description = "Set- and Map-like types that remember the order elements were inserted"; - license = lib.licenses.bsd3; - }) {}; - - "ordered-containers_0_2_4" = callPackage ({ mkDerivation, base, containers, hashable }: mkDerivation { pname = "ordered-containers"; @@ -226069,7 +226818,6 @@ self: { libraryHaskellDepends = [ base containers hashable ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ordering-duplicates" = callPackage @@ -226477,34 +227225,32 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_7_4_0" = callPackage + "ormolu_0_7_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring - , Cabal-syntax, containers, deepseq, Diff, directory, file-embed - , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , QuickCheck, syb, temporary, text, th-env + , Cabal-syntax, choice, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.7.4.0"; - sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; - revision = "1"; - editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + version = "0.7.7.0"; + sha256 = "1069j7cldvqqazmfrpfc6wy816227c5vz7fbq860yfb5h9ycv5ns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base binary bytestring Cabal-syntax containers - deepseq Diff directory file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text + ansi-terminal array base binary bytestring Cabal-syntax choice + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl syb text ]; executableHaskellDepends = [ base Cabal-syntax containers directory filepath ghc-lib-parser optparse-applicative text th-env ]; testHaskellDepends = [ - base Cabal-syntax containers directory filepath ghc-lib-parser - hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary - text + base Cabal-syntax choice containers directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -226647,8 +227393,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.2.2"; - sha256 = "0715lza6wr1gbsvv6a5xkcag38msqms4m6g8bkj5wz90axv0vk1z"; + version = "2.0.3"; + sha256 = "1sk1l3103f4w646lj47yyzxm8pzrk1xl6w9z3n8249h0z6wqiczn"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -226811,6 +227557,19 @@ self: { mainProgram = "ostree-pin"; }) {}; + "osv" = callPackage + ({ mkDerivation, aeson, base, cvss, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "osv"; + version = "0.1.0.0"; + sha256 = "11w2x76ifx4sf6z5gz116pky4w4qv3l8nj2z57x61802l9ckrlqd"; + libraryHaskellDepends = [ aeson base cvss text time ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Open Source Vulnerability format"; + license = lib.licenses.bsd3; + }) {}; + "osx-ar" = callPackage ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { @@ -227227,8 +227986,8 @@ self: { pname = "package-version"; version = "0.3"; sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "3"; - editedCabalFile = "1cdrarcrf4rdzjvilr0nwwbavwmkv0kc3wq0qhca55710j4kxk5d"; + revision = "4"; + editedCabalFile = "08pjfpib8g8ci9d9p3461bg37k64f0360cx35v4i8lqj8ny69xvh"; libraryHaskellDepends = [ base bytestring deepseq prettyprinter safe-exceptions template-haskell text @@ -229184,6 +229943,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; + revision = "1"; + editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230585,8 +231346,8 @@ self: { }: mkDerivation { pname = "parser-unbiased-choice-monad-embedding"; - version = "0.0.0.4"; - sha256 = "1gp44c30xj37kym32j7vkl103ks0arb13xjrsar1zmlzzafa9fhz"; + version = "0.0.1.0"; + sha256 = "1q7bxrhqflg79b2r04vkgb02m2n4p071qi7ia4jb6qvpy5vg0z6w"; libraryHaskellDepends = [ base containers Earley srcloc ]; testHaskellDepends = [ base doctest lexer-applicative regex-applicative @@ -230874,6 +231635,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "partial-isomorphisms_0_2_4_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "partial-isomorphisms"; + version = "0.2.4.0"; + sha256 = "0f4lm8f3k76dxanarw1qvdl5b769jvqj9cr6bb7l3f151sabqkv4"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Partial isomorphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-lens" = callPackage ({ mkDerivation, base, comonad-transformers, data-lens , transformers @@ -231118,6 +231891,8 @@ self: { pname = "password"; version = "3.0.4.0"; sha256 = "0dn1qvf25kf5rwifp615wcqm8lh566knvw5mjhr4s8gwsymjdpsk"; + revision = "1"; + editedCabalFile = "0dsc1c97kvqrwyvgaxr88c8r07slbb899pf71m7mwlmiqlz9vhli"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -231348,8 +232123,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "2"; - editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; + revision = "3"; + editedCabalFile = "1y3fv802jvnrc08qpmh4vvk2h83lbdkv12g6rckhcl4ppgrzc5lz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231494,28 +232269,6 @@ self: { }) {}; "path-io" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.8.1"; - sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; - revision = "1"; - editedCabalFile = "092gf9fk6f2h5apv2lgqww49gbqjljz70nz6yp7c1l6rhkmcnxaz"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions filepath hspec path transformers - unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = lib.licenses.bsd3; - }) {}; - - "path-io_1_8_2" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: @@ -231530,7 +232283,6 @@ self: { testHaskellDepends = [ base exceptions hspec path unix-compat ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "path-like" = callPackage @@ -231735,27 +232487,6 @@ self: { }) {}; "patrol" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-client, http-types - , network-uri, text, time, uuid - }: - mkDerivation { - pname = "patrol"; - version = "1.0.0.7"; - sha256 = "139zkmwclm2yigb6081b6zgiqirv9jwcxshx3kigf00vy4wb32z6"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-client http-types network-uri text time uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions hspec - http-client http-types network-uri text time uuid - ]; - description = "Sentry SDK"; - license = lib.licenses.mit; - }) {}; - - "patrol_1_0_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, exceptions, hspec, http-client, http-types , network-uri, text, time, uuid @@ -231774,7 +232505,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "patronscraper" = callPackage @@ -232242,6 +232972,7 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A regexp (regex) library on top of pcre-light you can actually use"; license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "pcre-less" = callPackage @@ -232433,27 +233164,6 @@ self: { }) {}; "pdf-toolbox-content" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , containers, hspec, io-streams, pdf-toolbox-core, scientific, text - , vector - }: - mkDerivation { - pname = "pdf-toolbox-content"; - version = "0.1.1"; - sha256 = "0bdcakhmazxim5npqkb13lh0b65p1xqv2a05c61zv0g64n1d6k5f"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring containers io-streams - pdf-toolbox-core scientific text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers hspec io-streams - pdf-toolbox-core - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-content_0_1_2" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , containers, hspec, io-streams, pdf-toolbox-core, scientific, text , vector @@ -232472,7 +233182,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -232483,10 +233192,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.1.1"; - sha256 = "1d5bk7qbcgz99xa61xi17z0hgr3w2by3d5mr2vgd0hpcdi5ygskz"; - revision = "1"; - editedCabalFile = "1h5nh360zaql29lw3mcykip7bvnnjjcxmpaaz3s842a227m9wflz"; + version = "0.1.3"; + sha256 = "1pvwilidzg9mb95g6bl0dlaygxq1yjxay6n5a907wxga54kj29w3"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 containers crypto-api cryptohash hashable io-streams scientific @@ -232500,30 +233207,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pdf-toolbox-core_0_1_2" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , cipher-aes, cipher-rc4, containers, crypto-api, cryptohash - , hashable, hspec, io-streams, scientific, unordered-containers - , vector - }: - mkDerivation { - pname = "pdf-toolbox-core"; - version = "0.1.2"; - sha256 = "0i1078lj7q0xm52bnxnhhi8wdgnbwh029423g6hm9mj815lq825n"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 - containers crypto-api cryptohash hashable io-streams scientific - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hspec io-streams unordered-containers - vector - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pdf-toolbox-document" = callPackage ({ mkDerivation, base, bytestring, containers, directory, hspec , io-streams, pdf-toolbox-content, pdf-toolbox-core, text @@ -232531,8 +233214,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.1.2"; - sha256 = "172vxsv541hsdkk08rsr21rwdrcxwmf4pwjmgsq2rjwj4ba4723y"; + version = "0.1.4"; + sha256 = "1lnh6mafrld72wbsgvar4q2i3qlp3c32ipqab2d1bhm18kg8lvzy"; libraryHaskellDepends = [ base bytestring containers io-streams pdf-toolbox-content pdf-toolbox-core text unordered-containers vector @@ -232545,28 +233228,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pdf-toolbox-document_0_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hspec - , io-streams, pdf-toolbox-content, pdf-toolbox-core, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pdf-toolbox-document"; - version = "0.1.3"; - sha256 = "1yywab2xzp69k59636b63akb6nc4g9ql58qj11wkrdsvwvcv9lbb"; - libraryHaskellDepends = [ - base bytestring containers io-streams pdf-toolbox-content - pdf-toolbox-core text unordered-containers vector - ]; - testHaskellDepends = [ - base directory hspec io-streams pdf-toolbox-core - unordered-containers - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pdf-toolbox-viewer" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, directory , filepath, gtk, io-streams, pdf-toolbox-content @@ -233279,10 +233940,8 @@ self: { }: mkDerivation { pname = "perfect-vector-shuffle"; - version = "0.1.1.1"; - sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "5"; - editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; + version = "0.1.1.2"; + sha256 = "0xc75pf21jbc0q49vcr82p50gbfhqfhxq2z96mr3p42grhs0rwr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236652,8 +237311,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.1.0"; - sha256 = "1a2ajm4g3ii4cz6wz6w1rcgpaaznxjv6qwjxy84jsq6s5krczkb0"; + version = "0.1.2.0"; + sha256 = "1wgjiqfv56iaqzv6brp0c8ni13zvn8sgx6iifm5zzlq3p20q62cm"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -239960,10 +240619,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.3"; - sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; - revision = "1"; - editedCabalFile = "0a4m860wgk2wx55x93xia9dx29bj27f1dkvcz1q7b0jgjyvffc58"; + version = "1.9.2.0"; + sha256 = "1qwy6a59jdlzc2y7f422yvlwvd9spsgbbpm2r7jcasgxiwq3fkr0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -240055,8 +240712,8 @@ self: { }: mkDerivation { pname = "polysemy-blockfrost"; - version = "0.1.1.0"; - sha256 = "0vix900hxi9rns556l2nk0hmmbcshac8b028m9pxk9ybax2w3bqq"; + version = "0.1.2.0"; + sha256 = "0xwyay52brdipkp7xy3ypk9a6vgglln5biw5qzlp61czls7qf6qk"; libraryHaskellDepends = [ base blockfrost-api blockfrost-client polysemy polysemy-plugin text ]; @@ -240093,8 +240750,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.6.0.2"; - sha256 = "1d53m5i0v1g5c66wvy8ji7gmw0vzz9qh57hf0wx44kk45myva4ad"; + version = "0.7.0.0"; + sha256 = "1x91x960zzpwlscx7mkxfqq5jvd01gkzn66zdza1z0jjrbvkda34"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; @@ -240107,22 +240764,21 @@ self: { }) {}; "polysemy-conc" = callPackage - ({ mkDerivation, async, base, containers, hedgehog, incipit-core - , polysemy, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, stm, stm-chans, tasty, tasty-hedgehog, time - , torsor, unagi-chan, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, polysemy + , polysemy-plugin, polysemy-resume, polysemy-test, polysemy-time + , stm, stm-chans, tasty, tasty-hedgehog, time, torsor, unagi-chan }: mkDerivation { pname = "polysemy-conc"; - version = "0.13.0.1"; - sha256 = "15blkrrh27wadi746qn590agsp0xqrxd6cnvzr9wkfkvv9hcizvj"; + version = "0.14.1.0"; + sha256 = "19m7hnx6f53dzkvj8gkbdds9qs1zfrbzy34iznigksmzyhhsjim4"; libraryHaskellDepends = [ - async base containers incipit-core polysemy polysemy-resume - polysemy-time stm stm-chans torsor unagi-chan unix + async base incipit-core polysemy polysemy-resume polysemy-time stm + stm-chans torsor unagi-chan ]; testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin - polysemy-test polysemy-time stm tasty tasty-hedgehog time unix + polysemy-test polysemy-time tasty tasty-hedgehog time torsor ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; @@ -240325,8 +240981,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.10.0.1"; - sha256 = "0wm7qzwaqyhrmwpxvshi5168sbzyb8vya1fmi58jz3plmyz9drws"; + version = "0.11.0.0"; + sha256 = "03vbnvbpz3cn88mp2sgdxn2w63ciz26g6y948wszd21srrcix62i"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -240372,8 +241028,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.10.0.1"; - sha256 = "1srydqn5snp8lqdvwixkh956isl58172syvk2k020knwji5qgw9z"; + version = "0.11.0.0"; + sha256 = "00wsqawnclvqw9mi8yh9i607kjgg8vr8rz7fvrzjmdn13xrpy301"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -240528,24 +241184,25 @@ self: { }) {}; "polysemy-process" = callPackage - ({ mkDerivation, base, incipit-core, path, path-io, polysemy - , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, posix-pty, process, stm-chans, tasty - , tasty-expected-failure, typed-process, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, path, path-io + , polysemy, polysemy-conc, polysemy-plugin, polysemy-resume + , polysemy-test, polysemy-time, posix-pty, process, stm-chans + , tasty, tasty-expected-failure, tasty-hedgehog, typed-process + , unix }: mkDerivation { pname = "polysemy-process"; - version = "0.13.0.1"; - sha256 = "05n7k3jlssa448ixmxc9fmyb1szwfs9pcmvfg2ya40f2p5p8blkx"; + version = "0.14.1.0"; + sha256 = "15jg25chgy92q4k1xl3ndyn3mzc8gkh305zgihzci2lapn55q6cz"; libraryHaskellDepends = [ - base incipit-core path path-io polysemy polysemy-conc + async base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans typed-process unix ]; testHaskellDepends = [ - base incipit-core polysemy polysemy-conc polysemy-plugin - polysemy-resume polysemy-test polysemy-time tasty - tasty-expected-failure typed-process + async base hedgehog incipit-core polysemy polysemy-conc + polysemy-plugin polysemy-resume polysemy-test polysemy-time tasty + tasty-expected-failure tasty-hedgehog typed-process unix ]; description = "Polysemy effects for system processes"; license = "BSD-2-Clause-Patent"; @@ -240600,8 +241257,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.8.0.1"; - sha256 = "03qw5aivq39vjg88liz57pgw6frr68kx2lb8bfqxyjsf4anzg8nq"; + version = "0.9.0.0"; + sha256 = "1qzpj01pnzi8fapjjrvifkn7v8mw76xz3vfnd9yisxn2xpvgm85h"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -240668,8 +241325,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.9.0.0"; - sha256 = "09aysv1l95q3mx70n0bcnsanrvlynlnz2zl2zg6v2a8vdhnkw7s7"; + version = "0.10.0.0"; + sha256 = "037bjfl0my8hbhmv5nhlv8bmhxdyk16ql9n5bzw03aqkm7pc7p6k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty @@ -240690,8 +241347,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.6.0.2"; - sha256 = "1zg0xyhp7zn9hl76zag097cpdzs38iap3zkc3bpy5amkkbw05kax"; + version = "0.7.0.0"; + sha256 = "0yjv0dz6l1a81jl7x6z4sff22qx68cf2vy0fld8v66wppfrpq199"; libraryHaskellDepends = [ aeson base incipit-core template-haskell time torsor ]; @@ -241051,14 +241708,64 @@ self: { license = lib.licenses.bsd3; }) {}; + "pontarius-xmpp_0_5_7_0" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary + , bytestring, Cabal, conduit, containers, criterion, crypto-api + , cryptohash, cryptohash-cryptoapi, crypton-x509-system + , data-default, dns, exceptions, generic-arbitrary, hslogger, hspec + , hspec-expectations, iproute, lens, lens-family, lifted-base, mtl + , network, profunctors, pureMD5, QuickCheck, quickcheck-instances + , random, ranges, resourcet, smallcheck, split, stm, stringprep + , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, tls, transformers, unbounded-delays, void + , xml-conduit, xml-picklers, xml-types + }: + mkDerivation { + pname = "pontarius-xmpp"; + version = "0.5.7.0"; + sha256 = "0v1dvps1rz1mkxanx9wnhjqkyzk9qg9b40zcgy2ckz3wyc8362mj"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + testHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring Cabal + conduit containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions generic-arbitrary + hslogger hspec hspec-expectations iproute lens lens-family + lifted-base mtl network profunctors pureMD5 QuickCheck + quickcheck-instances random ranges resourcet smallcheck split stm + stringprep tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th + template-haskell text tls transformers unbounded-delays void + xml-conduit xml-picklers xml-types + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers criterion crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + description = "An XMPP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pontarius-xmpp-extras" = callPackage ({ mkDerivation, base, data-default, pontarius-xmpp, text, time , xml-types }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.9"; - sha256 = "1pbwbhymdfqcpmpgcx1473fqaygr9mchlpqhr4i7hqbvhndwvqnl"; + version = "0.1.0.10"; + sha256 = "132b3vr9y9q3xclclaa9n57y66qrh77ajpfz3vnx0r4p2yl2xy38"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -243284,8 +243991,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.2"; - sha256 = "1pf57anqc7f90p6rhnlz78asm0xpj1wgh0642zb7g98pyxr1qx7g"; + version = "0.4.4"; + sha256 = "0vg2s1afrjj25wrw7ss0ni12ildqdwp9zr83a2gg4mkb02p3sk2z"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text @@ -246549,8 +247256,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "0.9.9"; - sha256 = "07d3jr66gk48l4cmy2acigi61zwxn1pa6gg09lxazi5c8ii6zhzf"; + version = "1.0.0"; + sha256 = "05b1akwvxh30nh8z7c4b89w0nbzwqfxizr24i4q93dzh5h12w83b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246574,10 +247281,10 @@ self: { hashable haskeline http-api-data http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel parser-combinators path-pieces - prettyprinter random scientific scotty semigroups stm - stm-containers template-haskell temporary text time transformers - unordered-containers uuid vector wai wai-websockets warp warp-tls - websockets winery + prettyprinter random recursion-schemes scientific scotty semigroups + stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector wai wai-websockets + warp warp-tls websockets winery ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -246585,9 +247292,10 @@ self: { data-interval deepseq deepseq-generics directory filepath gnuplot hashable haskeline http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel - parser-combinators prettyprinter random scientific semigroups stm - stm-containers temporary text time transformers - unordered-containers uuid vector wai warp websockets winery + parser-combinators prettyprinter random recursion-schemes + scientific semigroups stm stm-containers temporary text time + transformers unordered-containers uuid vector wai warp websockets + winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -247050,13 +247758,14 @@ self: { }) {}; "propeller" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "propeller"; - version = "0.1.0.0"; - sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x"; - libraryHaskellDepends = [ base ]; - description = "A Simple Propagator Library"; + version = "0.2.0.0"; + sha256 = "19mx2y5ba8jzgjn8g0basdpwpy4sv8y90m6cjy4z353wfyspjxxs"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers ]; + description = "A Propagator Library"; license = lib.licenses.bsd3; }) {}; @@ -247552,8 +248261,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.2"; - sha256 = "0ly8nc5z6ri1bj5l8h0r23kwsjr0m7nrwbyzxscp5q4880rqx492"; + version = "1.4.3"; + sha256 = "0gsb0qzxpgpy64jmx2fsbb7cjzixpfsqb2zjws62kg89sgkid8vz"; libraryHaskellDepends = [ base bytestring cereal containers deepseq hashable parameterized primitive QuickCheck safe template-haskell text text-short @@ -249244,8 +249953,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.4.0.0"; - sha256 = "0b5si5c6mhs4a9845qjl0svlgwb7vc0mzr9br20027f44l49dpzl"; + version = "0.4.0.1"; + sha256 = "00kdmw6had2nhhfrlja9zklvn965khbxbiwcx05zzirfdph8szkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249261,6 +249970,7 @@ self: { description = "Send push notifications to mobile iOS devices"; license = lib.licenses.bsd3; mainProgram = "sendapn"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "push-notify-ccs" = callPackage @@ -250721,8 +251431,8 @@ self: { pname = "queues"; version = "1.0.0"; sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr"; - revision = "1"; - editedCabalFile = "1bjjbpx4zm3rkkrpd7sh7ji65g84a6vi34skxkg18zhqcyj3d7wv"; + revision = "2"; + editedCabalFile = "08nksja87alndilff5pgvz6kb8m1kj1fkk00xz67p2cml981r2q7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hedgehog ]; benchmarkHaskellDepends = [ base containers tasty-bench ]; @@ -250739,6 +251449,8 @@ self: { pname = "quibble-core"; version = "0.1.0.1"; sha256 = "108cqh3xzl73ijh7fg91cyw0lpn2svm13l8nn922ab9401jy9x8c"; + revision = "1"; + editedCabalFile = "0kfb3714jq791riywhh0nbixzjj7nkpl2y0w8c1cy5hhx2q1jigy"; libraryHaskellDepends = [ base bytestring containers mono-traversable optics-core text text-conversions time uuid @@ -250762,10 +251474,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.20"; - sha256 = "0zzpdb07xrgx3bcvnfmn778yamk6q86lqmj1ir1h3g82gcknzfxm"; - revision = "1"; - editedCabalFile = "0nnl78qiczrsqzjhfvwc89m6v1kyvaysph5v1m9bi37ainvy8222"; + version = "0.1.22"; + sha256 = "1lnfqsfigzrh0saixava2645nixjwdf26mxl914hm63jqk8hxfma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250994,28 +251704,6 @@ self: { }) {}; "quickcheck-groups" = callPackage - ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids - }: - mkDerivation { - pname = "quickcheck-groups"; - version = "0.0.1.2"; - sha256 = "0pv1j93g4cmfsh4yijrcc7qgrkggk92jmhl1qjj83yzszm4fb80p"; - libraryHaskellDepends = [ - base groups pretty-show QuickCheck quickcheck-classes - quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base groups hspec QuickCheck quickcheck-classes - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing group class instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-groups_0_0_1_3" = callPackage ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show , QuickCheck, quickcheck-classes, semigroupoids }: @@ -251033,7 +251721,6 @@ self: { doHaddock = false; description = "Testing group class instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-higherorder" = callPackage @@ -251089,6 +251776,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.31"; sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; + revision = "1"; + editedCabalFile = "1l92l30ghks35wr4im54h44ipw8ddwh3jsinl5snmy2jgv3jaz89"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -251124,6 +251813,8 @@ self: { pname = "quickcheck-lockstep"; version = "0.5.0"; sha256 = "0ap8qgv33a6rwvvplmmf2hh68hk257l0maznkvlmi7cds6z90bk4"; + revision = "1"; + editedCabalFile = "19iqirk5k92l8k04clppvv84i0z9kfvbffk0jwvljs4jn35qx5mq"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -251137,31 +251828,6 @@ self: { }) {}; "quickcheck-monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, hspec, hspec-discover, monoid-subclasses, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids, text, vector - }: - mkDerivation { - pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.3"; - sha256 = "0z7i93f9r6f0c8xvyja8v4gwm4ydhymir9lzncails53v2aw1g71"; - libraryHaskellDepends = [ - base containers monoid-subclasses pretty-show QuickCheck - quickcheck-classes quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base bytestring commutative-semigroups containers hspec - monoid-subclasses QuickCheck quickcheck-classes - quickcheck-instances text vector - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing monoid subclass instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-monoid-subclasses_0_3_0_4" = callPackage ({ mkDerivation, base, bytestring, commutative-semigroups , containers, hspec, hspec-discover, monoid-subclasses, pretty-show , QuickCheck, quickcheck-classes, quickcheck-instances @@ -251184,7 +251850,6 @@ self: { doHaddock = false; description = "Testing monoid subclass instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-poly" = callPackage @@ -251403,27 +252068,27 @@ self: { broken = true; }) {}; - "quickcheck-state-machine_0_9_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, base, base-compat - , bifunctors, bytestring, containers, directory, doctest - , exceptions, filelock, filepath, generics-sop, graphviz, hashable - , hashtables, http-client, MemoTrie, monad-logger, mtl, network - , persistent, persistent-postgresql, persistent-sqlite - , postgresql-simple, pretty, pretty-show, process, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , servant-client, servant-server, sop-core, split, stm, strict - , string-conversions, tasty, tasty-hunit, tasty-quickcheck, text - , time, unliftio, unliftio-core, vector, warp + "quickcheck-state-machine_0_10_0" = callPackage + ({ mkDerivation, array, base, base-compat, bifunctors, bytestring + , containers, directory, doctest, exceptions, filelock, filepath + , generics-sop, graphviz, hashable, hashtables, http-client + , MemoTrie, monad-logger, mtl, network, persistent + , persistent-postgresql, persistent-sqlite, postgresql-simple + , pretty, pretty-show, prettyprinter, prettyprinter-ansi-terminal + , process, QuickCheck, quickcheck-instances, random, resource-pool + , resourcet, servant-client, servant-server, sop-core, split, stm + , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck + , text, time, unliftio, unliftio-core, vector, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.9.0"; - sha256 = "1b0zsnrr57wymc203rnmidyy5czvcfip5x9jn8vk3m581yl2ljfs"; + version = "0.10.0"; + sha256 = "09xm7lc24ps4il2x5gbl01643zp5j26ps6r2jxw05n8859flp4lq"; libraryHaskellDepends = [ - ansi-wl-pprint base base-compat bytestring containers directory - exceptions filepath generics-sop graphviz MemoTrie mtl pretty - pretty-show QuickCheck random sop-core split text time unliftio - vector + base base-compat bytestring containers directory exceptions + filepath generics-sop graphviz MemoTrie mtl pretty pretty-show + prettyprinter prettyprinter-ansi-terminal QuickCheck random + sop-core split text time unliftio vector ]; testHaskellDepends = [ array base bifunctors bytestring containers directory doctest @@ -252258,8 +252923,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.9"; - sha256 = "11xacqd1xcbpb34h04ch7zz1bsal90zk4h6fvgqb7a8fj094ci2v"; + version = "0.3.10"; + sha256 = "08gpnkb1nj11rhqybgcfcnglf9h271r1hpgsqv9ljzzyc0d67bkp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252684,14 +253349,31 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "ral_0_2_2" = callPackage + ({ mkDerivation, adjunctions, base, bin, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable, QuickCheck + , semigroupoids, vector + }: + mkDerivation { + pname = "ral"; + version = "0.2.2"; + sha256 = "1c301l9mcq86wkgb4x8vhjrzb0nmv75dsixg5bgmwqp8rbh0xis6"; + libraryHaskellDepends = [ + adjunctions base bin boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Random access lists"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ral-lens" = callPackage ({ mkDerivation, base, bin, fin, lens, ral }: mkDerivation { pname = "ral-lens"; - version = "0.2"; - sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "4"; - editedCabalFile = "03wb2rwsh3qwb91iv8ydpbpk74ixfw3krw67dwh4l29057c4p31g"; + version = "0.2.1"; + sha256 = "04i3mq49y3swvzyzhjzjgalwwbgn29vjwkqda7b8hs33wxaza7d6"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -252701,10 +253383,8 @@ self: { ({ mkDerivation, base, bin, fin, optics-core, ral }: mkDerivation { pname = "ral-optics"; - version = "0.2"; - sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "4"; - editedCabalFile = "17vp96nsgf74b275547mgbwyc858lffy53fggs8nf1b8637mnjvs"; + version = "0.2.1"; + sha256 = "117nwsw8h167fi1x416xifa4pq9ihvasj9144cdg4mmk2ly9br2n"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -252762,18 +253442,6 @@ self: { }) {}; "rampart" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "rampart"; - version = "2.0.0.7"; - sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_8" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; @@ -252783,7 +253451,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -253384,28 +254051,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, data-functor-logistic - , distributive, doctest, markdown-unlit, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.5.3"; - sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base data-functor-logistic distributive template-haskell - transformers - ]; - testHaskellDepends = [ - base data-functor-logistic distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = lib.licenses.bsd3; - }) {}; - - "rank2classes_1_5_3_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, data-functor-logistic , distributive, doctest, markdown-unlit, tasty, tasty-hunit , template-haskell, transformers @@ -253425,7 +254070,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rapid" = callPackage @@ -253728,27 +254372,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; - version = "2.0.0.11"; - sha256 = "1v396lxy4xm5ydsxd7c0hpzglysarzp4s872pdiygbfyz0hayhbg"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_12" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, uuid @@ -253764,25 +254387,9 @@ self: { testHaskellDepends = [ base filepath hspec ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "2.0.0.6"; - sha256 = "01i4k821s10216flhcbcvv7jb1rzn6cqacj10j578l4761h0acz6"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_7" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -253795,7 +254402,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -253984,6 +254590,7 @@ self: { ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "raven-haskell-scotty" = callPackage @@ -255148,8 +255755,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.2"; - sha256 = "0vkdkyrlmja0aa8h4q04p3rlzvcd0lb4pr07f191dbnd7siwk9dw"; + version = "0.1.0.3"; + sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -255322,6 +255929,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_21" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.21"; + sha256 = "079cj1bz2wclzz7169hcxb7psyz75a69rdpq532ib38lr22m7fih"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -255638,8 +256267,8 @@ self: { }: mkDerivation { pname = "recover-rtti"; - version = "0.4.3"; - sha256 = "044qrvq4js03w916d9imyjbq4x0dwwm68d56l0fjsjzzvzin76v7"; + version = "0.5.0"; + sha256 = "17jx201m9x14d624agxx96wkscmlppilmdsjwnh9p930504f66mp"; libraryHaskellDepends = [ aeson base bytestring containers ghc-heap ghc-prim mtl primitive sop-core stm text unordered-containers vector @@ -255670,10 +256299,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.2.5"; - sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; - revision = "1"; - editedCabalFile = "0rz78i40nsk3jywkdssqhla8vpbyhrdd95js5ncxwc0p6s5xp4h9"; + version = "5.2.3"; + sha256 = "020fk7s4dzim3957h8447mi3jp95k25zrac86dcaavldxjy88kiv"; libraryHaskellDepends = [ base comonad containers data-fix free template-haskell th-abstraction transformers @@ -256294,6 +256921,20 @@ self: { license = lib.licenses.mit; }) {}; + "reference-counting" = callPackage + ({ mkDerivation, atomic-counter, base, containers, linear-base }: + mkDerivation { + pname = "reference-counting"; + version = "0.1.0.0"; + sha256 = "1q0nnm4x1nw6hzymzaxg6rvsd9nwqnmxwrwmwphfa37lz4mcn2lr"; + libraryHaskellDepends = [ + atomic-counter base containers linear-base + ]; + testHaskellDepends = [ base linear-base ]; + description = "A reference counting library to alias linear resources"; + license = lib.licenses.bsd3; + }) {}; + "references" = callPackage ({ mkDerivation, array, base, containers, directory, either , filepath, HUnit, instance-control, lens, mtl, template-haskell @@ -257264,8 +257905,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.5.2.0"; - sha256 = "0aszgik0iir6f0n9zzak7w8s7cpc6sh77f5nbkgdyqswscnsfacq"; + version = "0.5.2.1"; + sha256 = "1hfvs6igpavzr6cd4mc7asxj2iwhcjzi7mc4fbfwnq1jmll9xp37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259908,6 +260549,8 @@ self: { pname = "req"; version = "3.13.2"; sha256 = "1pmhfn4rq4n5r2jmml8bj287iaipfl576s0csl4yaf31j0ll1gjv"; + revision = "4"; + editedCabalFile = "1zgxl5w68pplz3s9m9q7jjrcyijyzqlb7xgx1j7pqs57lyr9hsxd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -259928,6 +260571,40 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "req_3_13_3" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, containers, crypton-connection + , data-default-class, exceptions, hspec, hspec-core, hspec-discover + , http-api-data, http-client, http-client-tls, http-types + , modern-uri, monad-control, mtl, QuickCheck, retry + , template-haskell, text, time, transformers, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "req"; + version = "3.13.3"; + sha256 = "162hqajwdnkpl0hylkzf33jxh68nyq1bnsyp3wi6h394phrgniy3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive containers crypton-connection data-default-class + exceptions http-api-data http-client http-client-tls http-types + modern-uri monad-control mtl retry template-haskell text + transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-api-data http-client http-types modern-uri + QuickCheck retry template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , hspec-discover, http-client, req, temporary, weigh @@ -260131,14 +260808,26 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_21" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.21"; + sha256 = "0rpsc746vd5yqc6rii6dx38pbcx3w3xv7ghcqlz1nb7yzkj4yi6d"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show }: mkDerivation { pname = "rerefined"; - version = "0.4.0"; - sha256 = "1x7k3s45k9g7g62y5spg52m64fjqxa4bh6dy6d71p6fa2qyhxf2b"; + version = "0.5.1"; + sha256 = "0n775yxclxpnw0nf6g0ai6pdmckvw5v8rw03fss51mq1y9xw8dcg"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show @@ -261641,8 +262330,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "1.3"; - sha256 = "0n6pa29sxkr1vchyayr8sq8akc5jpr8kbn9l2dr9k24y9x55m8jr"; + version = "1.4.0.1"; + sha256 = "1878fwyvghm0k9ayba88abyf7ca9abgzc03290ldkzwbn2kg5gwg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ automaton base containers deepseq free mmorph monad-schedule @@ -261666,20 +262355,20 @@ self: { }) {}; "rhine-bayes" = callPackage - ({ mkDerivation, base, dunai, log-domain, mmorph, monad-bayes + ({ mkDerivation, automaton, base, log-domain, mmorph, monad-bayes , rhine, rhine-gloss, time, transformers }: mkDerivation { pname = "rhine-bayes"; - version = "1.2"; - sha256 = "0zffcvhx2bh1wcbizbjvy1gpcn4l8yjzppi54dcl9zxkpdbap5hb"; + version = "1.4.0.1"; + sha256 = "1qkk7sn4zgvm817iii1g930w593wwpcm2anrpml29zj9wznllbj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dunai log-domain monad-bayes rhine transformers + automaton base log-domain mmorph monad-bayes rhine transformers ]; executableHaskellDepends = [ - base dunai log-domain mmorph monad-bayes rhine rhine-gloss time + automaton base log-domain mmorph monad-bayes rhine rhine-gloss time transformers ]; description = "monad-bayes backend for Rhine"; @@ -261694,8 +262383,8 @@ self: { }: mkDerivation { pname = "rhine-gloss"; - version = "1.3"; - sha256 = "1x21mjaiy4adfph7wk85xh3fv037zvfgzmh8ng2bima4i1brn11h"; + version = "1.4.0.1"; + sha256 = "02yrmkl1zl3kys0jzkgz23ah8jwqilbkpijsh4fk8cv16ar9nmgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261715,8 +262404,8 @@ self: { }: mkDerivation { pname = "rhine-terminal"; - version = "1.3"; - sha256 = "0jafqyg7ipfhnxwk4k9q6r3w72amrx9ir0w4r3mfzjq1bxgclzxr"; + version = "1.4.0.1"; + sha256 = "1rzs3mcq489kky55m0cljflqcaw53mzrg0ysnf4snpi41vmp3gh6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262055,17 +262744,17 @@ self: { "richenv" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover - , QuickCheck, quickcheck-instances, text, unordered-containers - , yaml + , HsYAML, HsYAML-aeson, QuickCheck, quickcheck-instances, text + , unordered-containers }: mkDerivation { pname = "richenv"; - version = "0.1.0.1"; - sha256 = "0jpj1xgwgw8lvah2jkmhvwiyx47n57bvayn5msyhqvrjsbdk90yk"; + version = "0.1.0.2"; + sha256 = "0yxl6cnhg7n29f93mj4a5wkp1v1i2y38824n2bg8b64ik1hlg876"; libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances text - unordered-containers yaml + aeson base bytestring hspec HsYAML HsYAML-aeson QuickCheck + quickcheck-instances text unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Rich environment variable setup for Haskell"; @@ -262942,26 +263631,6 @@ self: { }) {}; "roc-id" = callPackage - ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text - , vector-sized - }: - mkDerivation { - pname = "roc-id"; - version = "0.2.0.2"; - sha256 = "1sx66ixilvfzwnic16balzfdynpc891b3lj8gsyp9xd6z059pa61"; - libraryHaskellDepends = [ - base MonadRandom Only text vector-sized - ]; - testHaskellDepends = [ - base hspec MonadRandom Only QuickCheck text vector-sized - ]; - description = "Implementation of the ROC (Taiwan) National ID standard"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "roc-id_0_2_0_3" = callPackage ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text , vector-sized }: @@ -263778,6 +264447,8 @@ self: { pname = "rounded-hw"; version = "0.4.0"; sha256 = "1844qb2nsv25ix41jkrcr0n08wa4zsnrn7wpxxavnabi4j7mf8yz"; + revision = "1"; + editedCabalFile = "1h2cxi47xmpmq5bdfd6jq3pag6sg7rqw3qw6577smjzrpydb67l5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base deepseq fp-ieee primitive tagged vector @@ -265650,8 +266321,10 @@ self: { ({ mkDerivation, base, template-haskell, th-abstraction }: mkDerivation { pname = "safe-wild-cards"; - version = "1.0.0.1"; - sha256 = "0kvr91ygb6wjr27scmvjazcbvv2y2kvs0mp8pjqv570wwsi593cy"; + version = "1.0.0.2"; + sha256 = "1b249139ymylvyxzkn0nk7hqgcmxz89mbgs5zc6f7l17gd7iqvap"; + revision = "1"; + editedCabalFile = "0v52sndb7d27w7ad20rfi26qn1fmc0rm5jygxh4zyiwrckrj0nkc"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base ]; description = "Use RecordWildCards safely"; @@ -266056,18 +266729,6 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; - version = "2.0.0.4"; - sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_5" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; @@ -266077,7 +266738,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -266635,6 +267295,8 @@ self: { pname = "sasha"; version = "0.2"; sha256 = "1z99hdbn94ngfinijgsd5x4lllwpyxc8jkf67lk0f6p12jfq7qv0"; + revision = "1"; + editedCabalFile = "0k3c54jajid7ggrm87xa0fvh11zjmhy2qn6lply1nykjhip9q1qn"; libraryHaskellDepends = [ base bytestring containers lattices QuickCheck template-haskell th-letrec wide-word word8set @@ -266996,7 +267658,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_0_0" = callPackage + "sbp_6_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -267005,8 +267667,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.0.0"; - sha256 = "0g6s3ga93y2khs8mvjrqk3v7wzgfjg9y2g6clz0ng57129n579lp"; + version = "6.0.1"; + sha256 = "12q23hdj8xddq9kq73nqf50qwdazqlv6xrb0dyxs5xg3kvlpccwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267163,8 +267825,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.8.2"; - sha256 = "1i1v8jhb2ms41ij1hj5bx9bhn8ig9rl45jn493i61ykv7md3i2m5"; + version = "9.10.1"; + sha256 = "0rdz2a6y23m2h9dcxg4bxl3sqd0q81gd6krflcjhgbhjrbqkjwcx"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -267555,8 +268217,8 @@ self: { }: mkDerivation { pname = "scc"; - version = "0.8.3.1"; - sha256 = "1l89lq20khi3fysbvfxjzchbdw9civz1kj85fyjf8wcm3s3cq34l"; + version = "0.8.4"; + sha256 = "017swv1mvwq05c8fvbqsnbr9xikga4sp9ngmzckggvpbqx5vxd3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268294,8 +268956,8 @@ self: { pname = "scotty"; version = "0.22"; sha256 = "075qnj3s1ddq337qcbrgwsc12rgjm1g5p755iaf67k824p0rifff"; - revision = "1"; - editedCabalFile = "1xx6rq7w2zzim2s8q1gj1z7amgd0jsn3l3rv0pdnh0z5cxw5ydhj"; + revision = "2"; + editedCabalFile = "1m3qvb5q6yigw6ijxnp6h66rmyqg54619hb240s7cqc9qjrrkixk"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive cookie data-default-class exceptions http-types monad-control mtl network @@ -270149,8 +270811,8 @@ self: { pname = "semaphore-compat"; version = "1.0.0"; sha256 = "1qnrdqayrdazmsflh37p1igd25nh1cfgn4k1v3jwwb0w0amnyvhw"; - revision = "2"; - editedCabalFile = "17abqbz6swzwilbfiv6rr6p8j81w4x9hr5vmx5pa6284liv61xx8"; + revision = "3"; + editedCabalFile = "0m8qiy2kkw2w7c0jxii0l513457s1y9zvl6p1c4yzf3jxy623r9d"; libraryHaskellDepends = [ base exceptions unix ]; description = "Cross-platform abstraction for system semaphores"; license = lib.licenses.bsd3; @@ -270207,26 +270869,6 @@ self: { }) {}; "semialign" = callPackage - ({ mkDerivation, base, containers, hashable, indexed-traversable - , indexed-traversable-instances, semigroupoids, tagged, these - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "semialign"; - version = "1.3"; - sha256 = "0v657hpbngbwygpmqz47dw7nwn5cbilf0khjdka8sjjqkwql73k2"; - revision = "1"; - editedCabalFile = "08sjh4vpkjc4mibrb34kn6rim7cbnsm57h383ycm5c6nl5ffzsbv"; - libraryHaskellDepends = [ - base containers hashable indexed-traversable - indexed-traversable-instances semigroupoids tagged these - transformers unordered-containers vector - ]; - description = "Align and Zip type-classes from the common Semialign ancestor"; - license = lib.licenses.bsd3; - }) {}; - - "semialign_1_3_1" = callPackage ({ mkDerivation, base, containers, hashable, indexed-traversable , indexed-traversable-instances, semigroupoids, tagged, these , transformers, unordered-containers, vector @@ -270242,7 +270884,6 @@ self: { ]; description = "Align and Zip type-classes from the common Semialign ancestor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "semialign-extras" = callPackage @@ -270478,8 +271119,8 @@ self: { pname = "semirings"; version = "0.6"; sha256 = "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr"; - revision = "1"; - editedCabalFile = "1c06yhfa053sv3rfz0d72a33l5qb0xmj1b3hy2z7pzxrcay6g1yc"; + revision = "2"; + editedCabalFile = "1km8k2j0b7ym1c6gp8m4rx5y1vh8n27ff1w4l2g6865z0fg1d56l"; libraryHaskellDepends = [ base base-compat-batteries containers hashable unordered-containers ]; @@ -270487,6 +271128,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "semirings_0_7" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "semirings"; + version = "0.7"; + sha256 = "1rjxzs1ypgn50nkniln5bbjkxfphs48y0jvf8b3y4v8r4bi0mj4g"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "two monoids as one, in holy haskimony"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text @@ -270527,8 +271183,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.11.5"; - sha256 = "0b0rzry82yyy96kb9aywlggna721bhzvx8af5s6say6ssm7hwsad"; + version = "0.7.11.6"; + sha256 = "07927m3d1v3w28yhiad6gfkkrbm31c1f9zz98yx5hbi4qspxvri9"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -270921,6 +271577,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "seqn" = callPackage + ({ mkDerivation, base, deepseq, indexed-traversable, primitive + , QuickCheck, quickcheck-classes-base, samsort, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "seqn"; + version = "0.1.0.0"; + sha256 = "1j42p3dkzrs57a7lszlh61s9d9h117l8wxcf1ya25kszs0an7r8r"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive samsort transformers + ]; + testHaskellDepends = [ + base indexed-traversable QuickCheck quickcheck-classes-base tasty + tasty-quickcheck transformers + ]; + description = "Sequences and measured sequences"; + license = lib.licenses.bsd3; + }) {}; + "sequence" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, transformers @@ -271144,8 +271820,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "2"; - editedCabalFile = "1y21m10vx4k75x0im5448pl5mhl772hz1hfk47ryb3whz1l6d9vf"; + revision = "3"; + editedCabalFile = "0msmv6shqxpfl8vz46mw4vj398h1fvjgrfv0s4dcsmfql44m1zz3"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -273060,8 +273736,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "6"; - editedCabalFile = "03sx2hc8kds5yx62zivhc0nj3hd0g0clcrdbccbx1hfnr7bs8ddx"; + revision = "7"; + editedCabalFile = "148mx2hi46l5mdlgikfgilwl3lrvbhqd651qxiky58nr32m07gk0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -276176,6 +276852,17 @@ self: { license = lib.licenses.mit; }) {}; + "shamochu" = callPackage + ({ mkDerivation, base, containers, vector }: + mkDerivation { + pname = "shamochu"; + version = "0.1.0.0"; + sha256 = "0k5sn1jmwk2a1c3xj83lr4pjf1b40kk10gs9x0addywbrfbjwh2p"; + libraryHaskellDepends = [ base containers vector ]; + description = "“Shuffle and merge overlapping chunks” lossless compression"; + license = lib.licenses.bsd3; + }) {}; + "shana" = callPackage ({ mkDerivation, base, directory, regex-posix }: mkDerivation { @@ -278547,12 +279234,14 @@ self: { }) {}; "simple-prompt" = callPackage - ({ mkDerivation, base, exceptions, extra, haskeline, time }: + ({ mkDerivation, base, exceptions, extra, haskeline, safe, time }: mkDerivation { pname = "simple-prompt"; - version = "0.2.2"; - sha256 = "1m8q7jqmdsz3nmsb86i9wy94pxypz172ragx9qfy2v5v0pmc8mww"; - libraryHaskellDepends = [ base exceptions extra haskeline time ]; + version = "0.2.3"; + sha256 = "1ijnfrb6jxrwaj9fnva6mj55a998ld5nwqaxk1x23z57b5wnkacc"; + libraryHaskellDepends = [ + base exceptions extra haskeline safe time + ]; description = "Simple commandline text prompt functions"; license = lib.licenses.bsd3; }) {}; @@ -279248,6 +279937,17 @@ self: { broken = true; }) {}; + "singleraeh" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleraeh"; + version = "0.4.0"; + sha256 = "1ajb4s4b3qqaaylzaipby6c3vgvj7p99ycrvcl6wv3pvq32q4z6s"; + libraryHaskellDepends = [ base ]; + description = "raehik's singletons"; + license = lib.licenses.mit; + }) {}; + "singlethongs" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -279266,10 +279966,8 @@ self: { ({ mkDerivation, base, boring, dec, deepseq, some }: mkDerivation { pname = "singleton-bool"; - version = "0.1.7"; - sha256 = "16xj7d3qnd8nhk66kxm5c145l1060m9yz2yc9y47wsf3hriijb8w"; - revision = "1"; - editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c"; + version = "0.1.8"; + sha256 = "0wql2gdy93f62ghv93xcqjm6ajs5glyz8si605wrll9vp79g66r6"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -279381,8 +280079,8 @@ self: { }: mkDerivation { pname = "singletons-presburger"; - version = "0.7.3.0"; - sha256 = "00dbagcga3pkbss4asa383vabb42yprv29fp6sqq5drkw6pja32v"; + version = "0.7.4.0"; + sha256 = "1c58ckqnhqsmshdc9fmjd5y0x63i3q1jajj8v9cacybhi8krl0sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279696,6 +280394,8 @@ self: { pname = "size-based"; version = "0.1.3.2"; sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + revision = "1"; + editedCabalFile = "1h4ig2pqw5spg5mdgwd73q4banvk3kyk7q76pkhy8n0mnwpa51ck"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -279713,8 +280413,8 @@ self: { }: mkDerivation { pname = "sized"; - version = "1.1.0.1"; - sha256 = "0ncgzl6qif9zs78d4hp7vmghv99mx3vvydn3ls37k1fvqqpwz2z9"; + version = "1.1.0.2"; + sha256 = "0644x908zr74bj98apbyr6368lmr9vya7hh6iyykswi6afh7967l"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens @@ -280033,8 +280733,8 @@ self: { pname = "skew-list"; version = "0.1"; sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; - revision = "2"; - editedCabalFile = "1khmbbfd6f531vmlngcqramazayc2sqvm3j9xwmz1zjxscmvwhsg"; + revision = "3"; + editedCabalFile = "1d44sp9hcf5p72f6km47q5hy2v0xw7slrcbkb6dkvh4mv5cga8iw"; libraryHaskellDepends = [ base deepseq hashable indexed-traversable QuickCheck strict ]; @@ -280344,6 +281044,37 @@ self: { broken = true; }) {ghc-binary = null;}; + "slab" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, blaze-svg + , bytestring, containers, directory, filepath, fsnotify, Glob + , hspec, lens, megaparsec, optparse-applicative, parser-combinators + , pretty-simple, prettyprinter, process, protolude, QuickCheck + , servant, servant-blaze, servant-server, tasty, tasty-silver, text + , transformers, vector, wai, wai-app-static, warp + }: + mkDerivation { + pname = "slab"; + version = "0.0.1.0"; + sha256 = "1yvbh3s579gd6xh8vl9kmyg51jlf8qc2ix94zkcc70q6kfhvp1j0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup blaze-svg bytestring containers + directory filepath fsnotify Glob megaparsec optparse-applicative + parser-combinators pretty-simple prettyprinter process protolude + servant servant-blaze servant-server text transformers vector wai + wai-app-static warp + ]; + executableHaskellDepends = [ base optparse-applicative protolude ]; + testHaskellDepends = [ + base filepath Glob hspec lens optparse-applicative pretty-simple + process protolude QuickCheck tasty tasty-silver text + ]; + description = "A programmable markup language to generate HTML"; + license = lib.licenses.bsd2; + mainProgram = "slab"; + }) {}; + "slack" = callPackage ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl , old-locale, text, time, transformers @@ -280826,8 +281557,8 @@ self: { }: mkDerivation { pname = "slugify"; - version = "0.1.0.1"; - sha256 = "1h5lbp33hd10lr2d5cplac7515aphyd56jyj3wlzw5pg3sih8qvv"; + version = "0.1.0.2"; + sha256 = "1188b76jk05ri3qgiz7g1zxn82sqv7dixxqzh2cx5kl8crk78ivn"; libraryHaskellDepends = [ base text unicode-transforms ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -281502,10 +282233,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "smtlib-backends"; - version = "0.3"; - sha256 = "13pyic8zq0dv7w529pciw0zfpzx63mrf3bq5nillsswbk0czv0qw"; - revision = "2"; - editedCabalFile = "1g2pfmdmqkf3agxnzirgpp9sibjz5m89pjnx7f1i98znk6nswix9"; + version = "0.4"; + sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -281519,8 +282248,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; - revision = "2"; - editedCabalFile = "09hszx3ba4d5x11sdv8fagb0nkg1m0q32wc264x5x0pnsv9k3wfa"; + revision = "3"; + editedCabalFile = "1kc9643lrpz8yxcnda54kb2cakxcmbdaxszkhadjmz7in7xv1xi6"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -281540,8 +282269,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "1"; - editedCabalFile = "0imbf9cgp1imqqj5iryg7k2my4690rwixhl4j3s3a6w54n0zs0sd"; + revision = "2"; + editedCabalFile = "1c7xag17kfvzlz7w8sd9f8nwj3znmfbwlp0049byr9nlmv1nq7lr"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -281555,6 +282284,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3.1"; sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy"; + revision = "1"; + editedCabalFile = "18rj2yj3w4cqdirycxavfhwhaalg8v4qjacs25iy3c1qmm3jwrvb"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -281654,20 +282385,21 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, crypton-connection, cryptonite, filepath, memory - , mime-mail, network, network-bsd, text + , bytestring, crypton-connection, cryptonite, data-default-class + , filepath, memory, mime-mail, network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.4.0.0"; - sha256 = "0j95vvk2hh1vp4lv59gppfnpavy3mlz4bzlr6l29glz53lmc8bn5"; + version = "0.4.0.1"; + sha256 = "0ynirlf98hpyh2gxxl86ikwwkxc495x3kmg8dfqnifm8ysymia9p"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring - crypton-connection cryptonite filepath memory mime-mail network - network-bsd text + crypton-connection cryptonite data-default-class filepath memory + mime-mail network network-bsd text ]; description = "Simple email sending via SMTP"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "smtp-mail-ng" = callPackage @@ -281873,8 +282605,8 @@ self: { pname = "snap"; version = "1.1.3.3"; sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; - revision = "1"; - editedCabalFile = "06f9xcj6s7ci01v5gkrd1qhrhnnpwijiac83m6nhjpsisx1d11g3"; + revision = "2"; + editedCabalFile = "01j7lzpdyj5lqqacb9sz6q1nfdscz798sqb0nv3hycbvayi7xiqv"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring cereal clientsession configurator containers directory directory-tree @@ -283178,6 +283910,8 @@ self: { pname = "snappy-c"; version = "0.1.1"; sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; + revision = "1"; + editedCabalFile = "1jcsfn3i7qj21n8vpznjs1g9yways15cr3wf4762alq9ghfal4xi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287313,20 +288047,20 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_1" = callPackage + "stack-all_0_6_3" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd - , simple-cmd-args, text + , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.1"; - sha256 = "0k5gvvl9vh7znscf5b4d3bpsr1mhz58pmh7ny1fdm9p08n3i8dlz"; + version = "0.6.3"; + sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base cached-json-file config-ini directory extra filepath - http-query process simple-cmd simple-cmd-args text + http-query process simple-cmd simple-cmd-args text yaml ]; description = "CLI tool for building over Stackage major versions"; license = lib.licenses.bsd3; @@ -288246,8 +288980,8 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.2.1"; - sha256 = "1v1f2a1j7dfi9yxkcm6q9jh4bv9yh2yndj7k5dj2fa889pgq134r"; + version = "0.1.3.0"; + sha256 = "1ah330fmhhqwd603gn3r30d838xig9ipk15is6f1334rdw92893i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288550,8 +289284,8 @@ self: { pname = "statestack"; version = "0.3.1.1"; sha256 = "1747qzaj3xqc90fj4ddch3ra5kj52rfd1dn7a8c6fkdk68q76mfd"; - revision = "2"; - editedCabalFile = "1k60fkszxxyya6amqyjkz5dsxri3c07kgdr6mb1hw4b3dnvq6gwa"; + revision = "3"; + editedCabalFile = "0v43wd19i2pj8f4skxvxjap1rs0jxfwjicpyd9vgdfqji6jaj7a7"; libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; @@ -288969,8 +289703,8 @@ self: { }: mkDerivation { pname = "statsd-rupp"; - version = "0.4.0.4"; - sha256 = "1y1c7ln8fany6inshxkmz6dz2g9wpcrrijkgqgfabhvg8nqqgi9w"; + version = "0.5.0.0"; + sha256 = "0clvpmg50p0f1ny9zz5q1niad1ahnkv0dqyphkyrc2snxh896avp"; libraryHaskellDepends = [ base bytestring network unliftio unordered-containers vector ]; @@ -291557,20 +292291,6 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; - version = "0.1.7.4"; - sha256 = "0jncppjyzg64d5qxban713z9mxzdky9zlldnnw029l7d1y3yv3x1"; - libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; - description = "Strict linked list"; - license = lib.licenses.mit; - }) {}; - - "strict-list_0_1_7_5" = callPackage ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids , tasty, tasty-quickcheck }: @@ -291582,7 +292302,6 @@ self: { testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Strict linked list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strict-mvar" = callPackage @@ -291626,18 +292345,6 @@ self: { }) {}; "strict-tuple" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; - version = "0.1.5.3"; - sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5_4" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; @@ -291647,7 +292354,6 @@ self: { testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -291758,6 +292464,19 @@ self: { broken = true; }) {}; + "string-class_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, tagged, text }: + mkDerivation { + pname = "string-class"; + version = "0.1.7.2"; + sha256 = "0wi9kkvwf3j77i3z81ijc16pjrn3jwjr6fs8hk78qwf9bklwg3jl"; + libraryHaskellDepends = [ base bytestring tagged text ]; + description = "String class library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "string-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -291980,6 +292699,7 @@ self: { description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; mainProgram = "hstrrand"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "string-similarity" = callPackage @@ -292206,6 +292926,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-core" = callPackage @@ -292358,6 +293079,7 @@ self: { ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-tests" = callPackage @@ -292426,23 +293148,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "6.0.0.11"; - sha256 = "1ddqkyqxbls5slg6gkj7rpvxac104q9haqpc7agggnglznrsc9p5"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_12" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, template-haskell, text , time, transformers @@ -292457,7 +293162,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -292517,20 +293221,20 @@ self: { }) {}; "strongweak" = callPackage - ({ mkDerivation, base, either, generic-random, hspec - , hspec-discover, QuickCheck, quickcheck-instances, rerefined, text + ({ mkDerivation, base, generic-random, hspec, hspec-discover + , QuickCheck, quickcheck-instances, rerefined, text , text-builder-linear, vector, vector-sized }: mkDerivation { pname = "strongweak"; - version = "0.7.0"; - sha256 = "0gy6y2dlk2zy7dizyccjb77wf8dzyjx5qi1rxg7xajagpm5nxpzw"; + version = "0.8.0"; + sha256 = "1nws2lkbjfr11jx5ns8qmmik63n158n4abdb1bgmkzkby8621f08"; libraryHaskellDepends = [ - base either rerefined text text-builder-linear vector vector-sized + base rerefined text text-builder-linear vector vector-sized ]; testHaskellDepends = [ - base either generic-random hspec QuickCheck quickcheck-instances - rerefined text text-builder-linear vector vector-sized + base generic-random hspec QuickCheck quickcheck-instances rerefined + text text-builder-linear vector vector-sized ]; testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; @@ -293119,8 +293823,8 @@ self: { }: mkDerivation { pname = "subcategories"; - version = "0.2.1.0"; - sha256 = "18bvpib34nc60s7hkg1c6ypyn26k90gwdsydcrld65a29ddf615a"; + version = "0.2.1.1"; + sha256 = "14n1f28wbk0jczig211jj4181ljnczy18hy5pi1y1c6pmbj9mxci"; libraryHaskellDepends = [ base containers data-default foldl hashable mono-traversable pointed primitive reflection semialign template-haskell text these @@ -294281,8 +294985,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "3.8.3"; - sha256 = "0483mpcinsq06jahk58811r8l4bk6ajp6hilvs0sgc0543p4jj6i"; + version = "3.9"; + sha256 = "1iyj0g9plzvih50j9sx41dpksj4avllr9csf8sp577zrq334r1l1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295940,13 +296644,19 @@ self: { }) {}; "symparsec" = callPackage - ({ mkDerivation, base, defun-core, type-spec }: + ({ mkDerivation, base, defun-core, singleraeh, type-level-show + , type-spec + }: mkDerivation { pname = "symparsec"; - version = "0.4.0"; - sha256 = "0ap3j2163vqpr27rij8ld3m6jyd7jnbndx8s7ix6xzjyhdijmkjw"; - libraryHaskellDepends = [ base defun-core ]; - testHaskellDepends = [ base defun-core type-spec ]; + version = "1.1.1"; + sha256 = "0v22lqpb61788s3vpvd9pcdf5cyrz09myzykz3mfi6xfd2dsjby3"; + libraryHaskellDepends = [ + base defun-core singleraeh type-level-show + ]; + testHaskellDepends = [ + base defun-core singleraeh type-level-show type-spec + ]; description = "Type level string parser combinators"; license = lib.licenses.mit; }) {}; @@ -296948,6 +297658,27 @@ self: { mainProgram = "systemstats"; }) {}; + "systranything" = callPackage + ({ mkDerivation, aeson, base, bytestring, extra + , gi-ayatana-appindicator3, gi-gdk, gi-glib, gi-gobject, gi-gtk + , optparse-applicative, text, typed-process, unliftio, yaml + }: + mkDerivation { + pname = "systranything"; + version = "0.1.0.0"; + sha256 = "1p6y9hvkn12n1dwnkwij2qjjdvhzqwq9sxqmlzrkclbmkmivcanj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring extra gi-ayatana-appindicator3 gi-gdk gi-glib + gi-gobject gi-gtk optparse-applicative text typed-process unliftio + yaml + ]; + description = "Let you put anything in the system tray"; + license = lib.licenses.mit; + mainProgram = "systranything"; + }) {}; + "syz" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -298360,15 +299091,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "tar_0_6_2_0" = callPackage + "tar_0_6_3_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, file-embed, filepath, os-string, QuickCheck, tasty , tasty-bench, tasty-quickcheck, temporary, time, transformers }: mkDerivation { pname = "tar"; - version = "0.6.2.0"; - sha256 = "160rxxaxq7aiz9zca7hxa5abllzqmb77rzp9hmzgxmlynn11xih8"; + version = "0.6.3.0"; + sha256 = "05387za01dssa2nhgqcsshwpxakfk4djad39dm0j99f8xq7ndfsh"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath os-string time transformers @@ -298790,34 +299521,6 @@ self: { }) {}; "tasty-autocollect" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , explainable-predicates, filepath, ghc, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, transformers - , typed-process - }: - mkDerivation { - pname = "tasty-autocollect"; - version = "0.4.2"; - sha256 = "021yrrw53k8bppqpqqiny0gwbphhwq76g08m3d2ycfn57f9hxnbs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath ghc tasty - tasty-expected-failure template-haskell text transformers - ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ - base bytestring containers directory explainable-predicates - filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary - text typed-process - ]; - description = "Autocollection of tasty tests"; - license = lib.licenses.bsd3; - mainProgram = "tasty-autocollect"; - }) {}; - - "tasty-autocollect_0_4_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory , explainable-predicates, filepath, ghc, tasty , tasty-expected-failure, tasty-golden, tasty-hunit @@ -298842,7 +299545,6 @@ self: { ]; description = "Autocollection of tasty tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "tasty-autocollect"; }) {}; @@ -299101,8 +299803,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "3"; - editedCabalFile = "1ij1h7kdbg4bd93fl9991b39xn1rkawshsh3hgbz3j2inmnljx2w"; + revision = "4"; + editedCabalFile = "1qibqxwh3f0c2n7fcj2dni12mhixfwbywli6qrqii6wi7n325gd9"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -300308,6 +301010,8 @@ self: { pname = "teeth"; version = "0.2.0.2"; sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c"; + revision = "1"; + editedCabalFile = "0g8z22ppi6p6cm11a444kr7dfk60fbxs8lbar9ssw7lfbd8738h9"; libraryHaskellDepends = [ base ]; description = "Dental data types"; license = lib.licenses.mit; @@ -300430,8 +301134,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.0"; - sha256 = "0kzn0zhnq4g3l85jbdfz420449aamv5kah3qdk05ysmx2msd4s66"; + version = "7.4"; + sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -300454,8 +301158,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.13"; - sha256 = "0gf272hhfavx5lki7dlxcn760gjk613md391nvmxnmnvyhs6g5rz"; + version = "0.14.1"; + sha256 = "0v025wkhjnxjqzisj3x1gfv1qk9c17j2czdf0iv5fsxdkz2vc949"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -300863,26 +301567,27 @@ self: { "templatise" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, directory , exceptions, extra, filepath, hspec, http-client, http-conduit - , mtl, network-uri, optparse-applicative, parsec, process, tasty - , tasty-golden, tasty-hspec, temporary, text, time + , MissingH, monad-logger, mtl, network-uri, optparse-applicative + , parsec, process, regex-tdfa, tasty, tasty-golden, tasty-hspec + , temporary, text, time }: mkDerivation { pname = "templatise"; - version = "0.1.2.0"; - sha256 = "0plgfhvdhs8bwyldcc84scmaw7cw1rva7m3rxx14jn3dhc2k65qj"; + version = "0.1.5.0"; + sha256 = "092vbmng2jpcb2vc9bqg2gm132zrvi3b9qh7lfw6d1as9qf8f43v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal-syntax exceptions extra filepath http-client - http-conduit mtl network-uri optparse-applicative parsec process - text time + http-conduit monad-logger mtl network-uri optparse-applicative + parsec process regex-tdfa text time ]; - executableHaskellDepends = [ base filepath optparse-applicative ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal-syntax directory filepath hspec mtl - network-uri optparse-applicative process tasty tasty-golden - tasty-hspec temporary text time + base bytestring Cabal-syntax directory filepath hspec MissingH + monad-logger mtl network-uri optparse-applicative process tasty + tasty-golden tasty-hspec temporary text time ]; doHaddock = false; description = "You can use template.hs to create a new Haskell GitHub repository."; @@ -301444,6 +302149,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "tensort" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle + , time + }: + mkDerivation { + pname = "tensort"; + version = "0.2.0.3"; + sha256 = "0qkm7iy00z13drs1f3fd3zl6cc45c7s2k8pn6ya7pmpji424dwiw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl random random-shuffle ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ base mtl QuickCheck ]; + description = "Tunable sorting for responsive robustness and beyond!"; + license = lib.licenses.mit; + mainProgram = "tensort"; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -301935,8 +302658,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "11"; - editedCabalFile = "1p0a12cf6h2wfhrym8zl1iv0isg5mxs3ydzp770q6ahkm4lqsfz6"; + revision = "12"; + editedCabalFile = "16g2xbsmyjal05xka6ib0vca8bjnspsin4aph1xjgqvnma6jv9lz"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -302904,6 +303627,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_4_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes + , quickcheck-instances, rerebase, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.4.3"; + sha256 = "1hsr4yp79lva57nkjcm5iqpphfdxq53gzjj4wx0smn6yvry1anpy"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class QuickCheck + quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat quickcheck-classes quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench , tasty-quickcheck, text @@ -303155,32 +303902,6 @@ self: { }) {inherit (pkgs) icu;}; "text-iso8601" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base - , integer-conversion, QuickCheck, quickcheck-instances, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, time - , time-compat - }: - mkDerivation { - pname = "text-iso8601"; - version = "0.1"; - sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; - revision = "1"; - editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; - libraryHaskellDepends = [ - base integer-conversion text time time-compat - ]; - testHaskellDepends = [ - base QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text time-compat - ]; - benchmarkHaskellDepends = [ - attoparsec attoparsec-iso8601 base tasty-bench text time-compat - ]; - description = "Converting time to and from ISO 8601 text"; - license = lib.licenses.bsd3; - }) {}; - - "text-iso8601_0_1_1" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base , integer-conversion, QuickCheck, quickcheck-instances, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, time @@ -303202,7 +303923,6 @@ self: { ]; description = "Converting time to and from ISO 8601 text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-json-qq" = callPackage @@ -303351,8 +304071,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "3"; - editedCabalFile = "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"; + revision = "4"; + editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -304178,6 +304898,8 @@ self: { pname = "th-deepstrict"; version = "0.1.1.0"; sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; + revision = "1"; + editedCabalFile = "0fip82wksknywr9wqmwsyf7847j5abhsqpbhbv8l9hlfhz6889d9"; libraryHaskellDepends = [ base containers mtl template-haskell th-abstraction th-orphans ]; @@ -304448,6 +305170,8 @@ self: { pname = "th-letrec"; version = "0.1.1"; sha256 = "0z4zh9lnp60nih7dwy697jbnk19f1h3ypazw23jbf0z93f7d90b6"; + revision = "1"; + editedCabalFile = "1zghhmlqzz5lfq8zbbxnbyl9naf9ixjpawi6l00z2b31l0wspfsr"; libraryHaskellDepends = [ base codet containers some template-haskell transformers ]; @@ -304909,19 +305633,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, assoc, base, binary, deepseq, hashable }: - mkDerivation { - pname = "these"; - version = "1.2"; - sha256 = "1f6lmjmy3yl1d2ycfsfk7q4sd0m3zrrap2plc11pd47pnxs73vd8"; - revision = "1"; - editedCabalFile = "0vpcgbyrykzzyycwda8k6dcjvjcncrwlish4gkw2i80wi7v247h1"; - libraryHaskellDepends = [ assoc base binary deepseq hashable ]; - description = "An either-or-both data type"; - license = lib.licenses.bsd3; - }) {}; - - "these_1_2_1" = callPackage ({ mkDerivation, assoc, base, binary, deepseq, hashable }: mkDerivation { pname = "these"; @@ -304930,23 +305641,9 @@ self: { libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-lens" = callPackage - ({ mkDerivation, base, lens, these }: - mkDerivation { - pname = "these-lens"; - version = "1.0.1.3"; - sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; - revision = "1"; - editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; - libraryHaskellDepends = [ base lens these ]; - description = "Lenses for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-lens_1_0_2" = callPackage ({ mkDerivation, base, lens, these }: mkDerivation { pname = "these-lens"; @@ -304955,23 +305652,9 @@ self: { libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-optics" = callPackage - ({ mkDerivation, base, optics-core, these }: - mkDerivation { - pname = "these-optics"; - version = "1.0.1.2"; - sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; - revision = "3"; - editedCabalFile = "0srsap1s1vi96xbw9vzpk14jyxajqlpmwn1bw190qjqnilxkqg48"; - libraryHaskellDepends = [ base optics-core these ]; - description = "Optics for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-optics_1_0_2" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { pname = "these-optics"; @@ -304980,7 +305663,6 @@ self: { libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -305360,6 +306042,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.1"; sha256 = "199jpgzmjlraspazaq9crv1zl92xmi8k2fif5kvznzpjvl4b1k1k"; + revision = "1"; + editedCabalFile = "1y0kc86hry2n2d5xrgly5y2zax52q4jjgl7j0984znqdmqk6b8jb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -306736,21 +307420,6 @@ self: { }) {}; "timer-wheel" = callPackage - ({ mkDerivation, atomic-primops, base, ki, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "timer-wheel"; - version = "1.0.0"; - sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; - libraryHaskellDepends = [ atomic-primops base ki primitive ]; - testHaskellDepends = [ base ki random ]; - benchmarkHaskellDepends = [ base ki random tasty-bench ]; - description = "A timer wheel"; - license = lib.licenses.bsd3; - }) {}; - - "timer-wheel_1_0_0_1" = callPackage ({ mkDerivation, atomic-primops, base, ki, primitive, random , tasty-bench }: @@ -306763,7 +307432,6 @@ self: { benchmarkHaskellDepends = [ base ki random tasty-bench ]; description = "A timer wheel"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timerep" = callPackage @@ -306907,8 +307575,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "timestats"; - version = "0.1.3"; - sha256 = "11qif48pc5fisighqw5c7iq9asbfzpnx2w6wxasw0gfpwmphcwyf"; + version = "0.2.0"; + sha256 = "085jbizsxn7hxn8i8621gbyss924qzysc56c81lg13xng7s8b3f3"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "A library for profiling time in Haskell applications"; @@ -307148,6 +307816,18 @@ self: { broken = true; }) {}; + "tinyapp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tinyapp"; + version = "0.1.0.2"; + sha256 = "1xsh0fv5zmcpgcm5xq3xap5fx9y1v8z14pdqa9xsy7v509g4c8l1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Library to build tiny apps in Haskell"; + license = lib.licenses.mit; + }) {}; + "tinyfiledialogs" = callPackage ({ mkDerivation, base, c2hs, text }: mkDerivation { @@ -307649,7 +308329,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_2_0_5" = callPackage + "tls_2_0_6" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -307658,10 +308338,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.0.5"; - sha256 = "1qgwgbhp19a28ibb73h1ahkrwsjnv3hndfj3bsp9fb1s4856vn6z"; - revision = "1"; - editedCabalFile = "0717sfkj6jzpnp0r5013m3z6s25fnnrcd07lfdlpzxhs5fdjnk36"; + version = "2.0.6"; + sha256 = "07cznhk0jf2ffkpmq3q9iz9r4zcls8rkh32s3qqwaahp8lnvmsm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307730,6 +308408,8 @@ self: { pname = "tls-session-manager"; version = "0.0.4"; sha256 = "134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s"; + revision = "1"; + editedCabalFile = "1pg11vlx2hjy3qf73x8wd8jfabm94mng09gny2zn5jv9z3amw8l1"; libraryHaskellDepends = [ auto-update base basement bytestring clock memory psqueues tls ]; @@ -307879,7 +308559,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_7_0_0" = callPackage + "tmp-proc_0_7_1_0" = callPackage ({ mkDerivation, async, base, bytestring, crypton-connection , crypton-x509-system, data-default, directory, filepath, fmt , hspec, http-client, http-client-tls, http-types, mtl, mustache @@ -307888,8 +308568,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.0.0"; - sha256 = "1vfaid9x5mcnn2r1h7a788rxrgds631adwzhmhn6fqzivysmqk6g"; + version = "0.7.1.0"; + sha256 = "0l7grkyl0n1h6nbhfi8ivn3wxdkjzhhwfnbxrlbvf2pbiidgj6bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -308561,17 +309241,15 @@ self: { license = lib.licenses.isc; }) {}; - "toml-parser_2_0_0_0" = callPackage + "toml-parser_2_0_1_0" = callPackage ({ mkDerivation, alex, array, base, containers, happy, hspec , hspec-discover, markdown-unlit, prettyprinter, template-haskell , text, time, transformers }: mkDerivation { pname = "toml-parser"; - version = "2.0.0.0"; - sha256 = "1nvrmlgmdvm7p16fywds4wnpyavyq7sk0p3zlqy9dci33qb3kzc7"; - revision = "2"; - editedCabalFile = "027xradr3xivfb68nljplrj6qr8kr32k0ifdl8bwki442rkbhfqv"; + version = "2.0.1.0"; + sha256 = "1qcpcrcalds3a2gdx83iynpj3hvkg6hbyza8al0f7jdsg9r6sdh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308653,20 +309331,18 @@ self: { "tomland" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec - , megaparsec, mtl, parser-combinators, text, time, transformers + , megaparsec, mtl, parser-combinators, text, time , unordered-containers, validation-selective }: mkDerivation { pname = "tomland"; - version = "1.3.3.2"; - sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "5"; - editedCabalFile = "1y42r0wkzjnjinld9jh01gjxs9mw8qv200nq4dj6prp5d2rbgdd3"; + version = "1.3.3.3"; + sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers + parser-combinators text time unordered-containers validation-selective ]; testHaskellDepends = [ @@ -309000,17 +309676,13 @@ self: { }) {}; "topaz" = callPackage - ({ mkDerivation, aeson, base, binary, hashable, quantification - , vector - }: + ({ mkDerivation, base, binary, hashable, quantification, vector }: mkDerivation { pname = "topaz"; - version = "0.7.0"; - sha256 = "18l900v86m4dil4bvr6wcwqinbzls85fqz5bc5vvqhkx8vgglm7j"; - revision = "1"; - editedCabalFile = "0cpcngy2qc7bxxr8m01v0kyq4nx2jvb2p69dfzkjn0m3hcw58fig"; + version = "0.8.0.1"; + sha256 = "0dmv98miak251gps6cbpnax49rm3dq250g45kx45g6g54hx0dc3m"; libraryHaskellDepends = [ - aeson base binary hashable quantification vector + base binary hashable quantification vector ]; description = "Extensible records library"; license = lib.licenses.bsd3; @@ -309021,8 +309693,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.7.0"; - sha256 = "1jrqna3lxjxsiqxb6ybwm7kl59r3948lqhqb8l5xv9v5r38vzr6d"; + version = "1.0.8.0"; + sha256 = "0cqa5dwsc95hvixbxfmjqrp1lrjfzcgx01z3mkm062ybb4smk5k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -309055,18 +309727,12 @@ self: { }) {}; "topograph" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , vector - }: + ({ mkDerivation, base, base-orphans, containers, vector }: mkDerivation { pname = "topograph"; - version = "1.0.0.2"; - sha256 = "08fpwaf6341gaf7niwss08zlfyf8nvfrc4343zlkhscb19l4b7ni"; - revision = "2"; - editedCabalFile = "1l98l1rky1y9npckf40d3dizy27xh4byqkfz419n1d6ks8fi15w6"; - libraryHaskellDepends = [ - base base-compat base-orphans containers vector - ]; + version = "1.0.1"; + sha256 = "02nywgf9k20lx75cq8y3kpqv4q7zzpkvszyxnzml2x1b1ybb1blm"; + libraryHaskellDepends = [ base base-orphans containers vector ]; description = "Directed acyclic graphs"; license = lib.licenses.bsd3; }) {}; @@ -310583,6 +311249,35 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , bytestring, containers, criterion, deepseq, Diff, hashable + , parsec, parsers, pretty, primitive, QuickCheck, scientific + , semialign, strict, tagged, tasty, tasty-golden, tasty-quickcheck + , text, these, time, trifecta, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3.1"; + sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base bytestring containers + deepseq hashable parsec parsers pretty primitive QuickCheck + scientific semialign strict tagged text these time + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base parsec primitive QuickCheck + tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -312234,8 +312929,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; - revision = "2"; - editedCabalFile = "14jnb2vyq0nx4cp4c97xflzg7z9xw1avg2d27c1d1cnqg28pd4an"; + revision = "3"; + editedCabalFile = "19i3n3hd2a0rkdz1ikwdgwhg4ds5pcfah25vgk0jnmwf71h0qwbm"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -313542,12 +314237,12 @@ self: { }) {}; "type-level-show" = callPackage - ({ mkDerivation, base, defun-core }: + ({ mkDerivation, base, defun-core, singleraeh }: mkDerivation { pname = "type-level-show"; - version = "0.1.1"; - sha256 = "150k54mf15pj2jghhvr76y9yvljn4q25vrg3zwmvbn93gd1zhy20"; - libraryHaskellDepends = [ base defun-core ]; + version = "0.3.0"; + sha256 = "09yxl90lzrscpb7wwaq3bchhf6qq0hj1pnxzkynkalcpdbac2d1m"; + libraryHaskellDepends = [ base defun-core singleraeh ]; description = "Utilities for writing Show-like type families"; license = lib.licenses.mit; }) {}; @@ -313603,6 +314298,8 @@ self: { pname = "type-natural"; version = "1.3.0.1"; sha256 = "0n07bcz5hi4l2a2lvgqkns4b158nsw10f1m7ij1vagwwvzsl0msf"; + revision = "1"; + editedCabalFile = "037mnys2dmkff7m52wqmr0x0sc2s9ld4iid00rf0482d7gz72wlm"; libraryHaskellDepends = [ base constraints equational-reasoning ghc ghc-typelits-knownnat ghc-typelits-natnormalise ghc-typelits-presburger @@ -314467,6 +315164,7 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "types-compat" = callPackage @@ -316060,6 +316758,8 @@ self: { pname = "unicode-collation"; version = "0.1.3.6"; sha256 = "0c1s1n4cqhjibiv05h5qfl4cg4h11ny4jay0gqnqg36z9kb66hfn"; + revision = "1"; + editedCabalFile = "01s776d2bifbvpy0mvpbc7yf748j5j2x4hf2fz6bzxm1rrlzrxmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -316116,6 +316816,17 @@ self: { broken = true; }) {}; + "unicode-data-parser" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unicode-data-parser"; + version = "0.3.0.2"; + sha256 = "1zz5n9x4pn1whyam0kkbsml8iawk1savzp7xc7idvripdm61dd31"; + libraryHaskellDepends = [ base bytestring ]; + description = "Parsers for Unicode Character Database (UCD) files"; + license = lib.licenses.bsd3; + }) {}; + "unicode-data-scripts" = callPackage ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench , unicode-data @@ -317667,8 +318378,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.12"; - sha256 = "1qlpmwd43kaybbq7vaa1wnbay575qwj4r7xynafixa6bwnc759ah"; + version = "0.4.15"; + sha256 = "0rkjjwbw4s1k13f0syy409yiqj7v9x8ghi209j3lxkh1xq9caq17"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring hspec old-locale old-time QuickCheck @@ -317848,8 +318559,8 @@ self: { pname = "unliftio-core"; version = "0.2.1.0"; sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; - revision = "3"; - editedCabalFile = "1ph6pfz8rj697wg0p8df6l4slj9708l8q951vpxpn3qfn8rhd018"; + revision = "4"; + editedCabalFile = "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -319221,8 +319932,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.7"; - sha256 = "12ijma954vss6a2nicq17q5pz3l7qjgh1f6s8lcrrxcf8vc10m1c"; + version = "0.1.3.8"; + sha256 = "1cwjz221ij395z9nsi71dl9gsgp9cmz0x65b7v7f21qziw54vwqq"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -319586,10 +320297,12 @@ self: { pname = "utxorpc"; version = "0.0.5.1"; sha256 = "1k46h256vdzwqbg7g44la8k41rlwwa4xjpzl1506zr3dsxvjgab2"; + revision = "4"; + editedCabalFile = "0sz7igbax3gd3cciygy5avwp9bhm26vrn98i05zxw1a78b47py98"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; - description = "A gRPC interface for UTxO Blockchains"; + description = "Generated code for a gRPC interface for UTxO Blockchains"; license = lib.licenses.asl20; }) {}; @@ -319631,8 +320344,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.2.0"; - sha256 = "1sbbyhf4av2vrqnz2g7gzm0q28bchw2jqnyqr42az7jddki9r93l"; + version = "0.0.3.0"; + sha256 = "0a56c871ypq0rfjl8lc5xxzx0vqggx74anxkbymvrad7h0bhsjyz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -320974,8 +321687,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "6"; - editedCabalFile = "10l6j8hdfraxfnzqq0l01y546q7rqgv95bci71gfs7lm15vnw2d3"; + revision = "7"; + editedCabalFile = "0jbbjmh3h9pkj1mfafysny20ynfl58ifchizn13dkqvclpkr770h"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -321278,14 +321991,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "vec_0_5_1" = callPackage + ({ mkDerivation, adjunctions, base, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable + , inspection-testing, QuickCheck, semigroupoids, tagged + , transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.5.1"; + sha256 = "0rswq31fjsqzzq88b920hz0j8v0rdjhb04v4fr10cdqbnxaqglb0"; + libraryHaskellDepends = [ + adjunctions base boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids transformers + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vec-lens" = callPackage ({ mkDerivation, base, fin, lens, vec }: mkDerivation { pname = "vec-lens"; - version = "0.4"; - sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "4"; - editedCabalFile = "1mh9wswfvcxw7656qqpggykndcpc5jsc5i0wxrnlzyg0ijh22qcs"; + version = "0.4.1"; + sha256 = "1llppbk2qdkymgy66w5dl2w7x3r70mf5rqzp6ppllvzhjm7fg9vw"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -321295,10 +322027,8 @@ self: { ({ mkDerivation, base, fin, optics-core, vec }: mkDerivation { pname = "vec-optics"; - version = "0.4"; - sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "4"; - editedCabalFile = "0szgvkhqnn2igjzvm86fbiqpybfjwl5n2dscr614bda6yhqlvk00"; + version = "0.4.1"; + sha256 = "1s0q34r54bsj43lzzzg9wcssc2lcgqgvx556xzdkyhs69rcc3r11"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -321384,10 +322114,10 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.9.0.1"; - sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "3"; - editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; + version = "0.9.0.2"; + sha256 = "0fi5gahk5spqy9jz6alvhp3sligyq9n1ib1w3mw48jbkp060vvl2"; + revision = "1"; + editedCabalFile = "11vfdv6d1dhcb6bkl4x0z22bni9gsl1qrq3r0wb4bj9ncb7nfqk3"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -322017,8 +322747,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.4.0.0"; - sha256 = "0sjwgcvymyl74hgfc93l6nj5422d044dkj02mlzvrcfdqhicz96d"; + version = "0.4.0.1"; + sha256 = "17sfx8jn8kd6r2ik3iad3zzrpxr7qp4h8aka0jag78h0cpnapz3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -322348,8 +323078,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.6"; - sha256 = "0w73gcg2yyrx5b6msynmpa05q2q1n4qaa59n0l21glz28k7lzyma"; + version = "6.0.7"; + sha256 = "1gn2xjgsgvjh0sav16kjmldviy1fbib6jlfd25c879a2a631b5p0"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators template-haskell text @@ -324120,37 +324850,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, hspec-discover - , http-types, HUnit, iproute, network, resourcet, streaming-commons - , temporary, text, time, transformers, unix, vault, wai, wai-logger - , warp, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.1.14"; - sha256 = "1db4iz6ls98n2y08fcb53gip0kf2sagvk1a82xzl25nf14dza12p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - warp word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie directory fast-logger - hspec http-types HUnit iproute resourcet temporary text time wai - warp word8 zlib - ]; - testToolDepends = [ hspec-discover ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_15" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, directory, fast-logger, hspec, hspec-discover @@ -324179,7 +324878,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -324282,8 +324980,8 @@ self: { ({ mkDerivation, base, bytestring, fcgi, wai, wai-extra }: mkDerivation { pname = "wai-handler-fastcgi"; - version = "3.0.0.2"; - sha256 = "1pvkykviql5qp8jvgy5d9abc8vkakmbw0bgmnsg53rna1zfvlmdm"; + version = "3.0.0.3"; + sha256 = "15z9zmlm8svak0gqcw4p0yx1q4dr7wqsn24a2zfzacihfi47pkva"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; librarySystemDepends = [ fcgi ]; description = "Wai handler to fastcgi"; @@ -324326,6 +325024,8 @@ self: { pname = "wai-handler-launch"; version = "3.0.3.1"; sha256 = "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m"; + revision = "1"; + editedCabalFile = "1jp1lngryrg4v84q4q6c5g7h93kasdk3bgp4x0miivvx8s8iibs6"; libraryHaskellDepends = [ async base bytestring http-types process streaming-commons transformers wai warp @@ -324370,6 +325070,8 @@ self: { pname = "wai-handler-webkit"; version = "3.0.0.3"; sha256 = "10sr9xgd95ncwczbmchaf2qjyadqchm566r3zhqc3bwgsydrsq08"; + revision = "1"; + editedCabalFile = "073p8nar10pv1p1k7ryjv38404wdmhzpv3llql034r6bhdplc5gr"; libraryHaskellDepends = [ base wai warp ]; libraryPkgconfigDepends = [ QtWebKit ]; description = "Turn WAI applications into standalone GUIs using QtWebkit"; @@ -326415,8 +327117,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.2.2.0"; - sha256 = "1il6s1mg9k9dhqcwj49a88p0z9zbwi65b2lvsg199rn6klv1jn36"; + version = "0.2.2.1"; + sha256 = "02kp3wdq3m9vdcxhjl20wb3rzjlb3qnci0qr9y1v9fkg2i290cxa"; libraryHaskellDepends = [ base filepath lattices lens linear opencascade-hs primitive resourcet @@ -326432,8 +327134,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.2.2.0"; - sha256 = "0gy9iza13l03h381sm4riccjpn3zbpgy60d6fqhbj5rw1qisad2x"; + version = "0.2.2.1"; + sha256 = "120m6dxb451vh1j2rzyr8gp6az24b4da32d22cdszds9xabd65lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -326472,6 +327174,8 @@ self: { pname = "wave"; version = "0.2.1"; sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; + revision = "1"; + editedCabalFile = "1j6ycd1v6c5khkmybzss2vbfm93n28dh1ah8sipqqpd94yqwvdiz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ @@ -326864,8 +327568,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.15"; - sha256 = "1kmyhyc3c9b2k0678q8yhd52x51jz153i8180a16ig05w6clc4xx"; + version = "0.27.16"; + sha256 = "1643hr3fblf8m41961swkxch784max6xn49x0a0pnrxkv5y8brnq"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -326881,8 +327585,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.4.4"; - sha256 = "0sbw93flmhbwdg1lag5jm7qi8nh5fy4k3anxijzf1472y6kqncrp"; + version = "0.28.4.5"; + sha256 = "1jgpmm6s1n87p005ib9pjlc9b9xc3gn85ir6qhaak2s94l3nylrk"; libraryHaskellDepends = [ base boomerang mtl parsec text web-routes ]; @@ -326895,8 +327599,8 @@ self: { ({ mkDerivation, base, parsec, text, web-routes }: mkDerivation { pname = "web-routes-generics"; - version = "0.1.0.1"; - sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy"; + version = "0.1.0.2"; + sha256 = "1ld1kqs8qf6550p0n8vw5l676xj18sb78dzpgr74fcqjc6cbnc3v"; libraryHaskellDepends = [ base parsec text web-routes ]; description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; @@ -326976,8 +327680,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.8.1"; - sha256 = "0sv8ya7s70zlfr9qhavpb9i0q3l5arcarsxgb20w6cbghfj67kh5"; + version = "0.22.8.2"; + sha256 = "11ps9cn5qz46w0i69znqb03fc6ljrwrn9y1cq0j1dsy7rjkqhgxm"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -327037,33 +327741,26 @@ self: { }) {}; "web-view" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-types, string-interpolate, sydtest - , sydtest-discover, text, wai, warp + ({ mkDerivation, base, bytestring, casing, containers + , effectful-core, file-embed, http-types, string-interpolate + , sydtest, sydtest-discover, text }: mkDerivation { pname = "web-view"; - version = "0.3.1"; - sha256 = "1c27zmyx4n66gj1nlwnllk2c4vzmcb9xqjgadca12zql1vk69fv8"; - isLibrary = true; - isExecutable = true; + version = "0.4.0"; + sha256 = "1dy9qpscj1r6g35n11qyk7fd4nkhbxp0ism8cqhgm2gwmhc2yn56"; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate text - ]; - executableHaskellDepends = [ - base bytestring casing containers effectful file-embed http-types - string-interpolate text wai warp + base bytestring casing containers effectful-core file-embed + http-types string-interpolate text ]; testHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate sydtest text + base bytestring casing containers effectful-core file-embed + http-types string-interpolate sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; broken = true; }) {}; @@ -327670,8 +328367,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.2.0"; - sha256 = "03qp9x4f1hkv6swlrwp6kay104alapqqn5wvswykw6ji1wja0wj2"; + version = "1.3.0"; + sha256 = "1d16dvb76rjnpbapzp2m8g04wijyh6xzi8pcf03ymbll78x438w6"; libraryHaskellDepends = [ arrows base binary bytestring case-insensitive cookie http-api-data http-media http-types jose network tagged template-haskell text wai @@ -327683,15 +328380,16 @@ self: { "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core + , insert-ordered-containers, lens, mtl, openapi3, text + , webgear-core }: mkDerivation { pname = "webgear-openapi"; - version = "1.2.0"; - sha256 = "0ym3jvkww6qf5nkrhb7wqp8maw6d03yc6835wp8wva8cj5cf9hy1"; + version = "1.3.0"; + sha256 = "1278dkhrckz9m8qjmqjfc2bxgnq4wsmrnyjkf24ci5lvxvrz3y9f"; libraryHaskellDepends = [ arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core + mtl openapi3 text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327706,8 +328404,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.2.0"; - sha256 = "1pc46dcx3jndc1jaf1bbbhs1z20hvspkiq86y3b60i2vpcbdhwn0"; + version = "1.3.0"; + sha256 = "1s3iwzkb29g2zlkszarm27mlcwbszjwmmdzrb5ciqgz3l8pijyrx"; libraryHaskellDepends = [ aeson arrows base base64-bytestring binary bytestring cookie http-api-data http-media http-types jose monad-time mtl resourcet @@ -327724,15 +328422,16 @@ self: { "webgear-swagger" = callPackage ({ mkDerivation, arrows, base, http-types - , insert-ordered-containers, lens, swagger2, text, webgear-core + , insert-ordered-containers, lens, mtl, swagger2, text + , webgear-core }: mkDerivation { pname = "webgear-swagger"; - version = "1.2.0"; - sha256 = "1l1cgixhh8b7myypbr9anv6zbckh9x4h3a5lrwv7znh616n9440a"; + version = "1.3.0"; + sha256 = "1p10wn5jgfyqcysa14sx6lmirc4irl1nls5mblav50yr9a5ilipc"; libraryHaskellDepends = [ - arrows base http-types insert-ordered-containers lens swagger2 text - webgear-core + arrows base http-types insert-ordered-containers lens mtl swagger2 + text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327744,8 +328443,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.2.0"; - sha256 = "1a40blmnwx1xia8r6dhk710mabxnqf31cqh0rhjzjlwsv96rsk9a"; + version = "1.3.0"; + sha256 = "1vz7ycl2kppiwqp23z2dg6binc3azb8p5r17hir00zr4i8jhl88m"; libraryHaskellDepends = [ base bytestring file-embed http-types text wai-app-static webgear-core @@ -328710,12 +329409,12 @@ self: { }) {}; "wherefrom-compat" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc-heap, tasty, tasty-hunit }: mkDerivation { pname = "wherefrom-compat"; - version = "0.1.1.0"; - sha256 = "14vzbm6skahqas3qflrw368d6llbq59fcxm31s9wj7fbmb239v3d"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0sy2kyp0sz0vkirlxvyc1s5szhx1f6a8zn0sysl2vbgk0yis3b0d"; + libraryHaskellDepends = [ base ghc-heap ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A compatibility layer for GHC's 'wherefrom' function"; license = lib.licenses.bsd2; @@ -328859,6 +329558,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; + revision = "1"; + editedCabalFile = "10vrpakwm81fldr8d1yynd316db8811hv90mkkscky3a5j1qrka7"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -329302,25 +330003,6 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; - version = "1.2.1.0"; - sha256 = "0kwg2qdjl3hfg3y7qi8lqsnrvfc80w1mkkwi4ikay8mzkp61snb3"; - 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; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, tagged , template-haskell, text, time, transformers }: @@ -329336,7 +330018,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -330065,8 +330746,8 @@ self: { }: mkDerivation { pname = "word8set"; - version = "0.1.1"; - sha256 = "106sp0qqywfm43c4lriyvfaxzgn03z6m2krarysvp9ff0q3j2nhi"; + version = "0.1.2"; + sha256 = "0jbr571rxw0vxxc95568kdxrw9d0kk6np9wrwjd6rj6ybh532zr7"; libraryHaskellDepends = [ base deepseq lattices QuickCheck template-haskell wide-word ]; @@ -331290,21 +331971,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, crypton-connection, exceptions - , network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "2.0.1.8"; - sha256 = "1pdh44r11yxyjgyb8la28crsm7sk09fshmqcgxyxczwfjsa85dpk"; - libraryHaskellDepends = [ - base bytestring crypton-connection exceptions network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - }) {}; - - "wuss_2_0_1_9" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, data-default , exceptions, network, websockets }: @@ -331318,7 +331984,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wx" = callPackage @@ -331586,19 +332251,21 @@ self: { "x509-ocsp" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , cryptohash-sha1, crypton-x509, HUnit, pem + , cryptohash-sha1, crypton-x509, crypton-x509-validation, HUnit + , pem }: mkDerivation { pname = "x509-ocsp"; - version = "0.2.0.0"; - sha256 = "0vfk58yyk08w1752addpp4s2bn4d9395k7ajd5jal6wab400qgk6"; + version = "0.3.0.0"; + sha256 = "0ipp8xcb4q41mwxszprw2q12g24p9wi6j2z3p5zrw2kf6lfv72lp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring cryptohash-sha1 crypton-x509 ]; testHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypton-x509 HUnit pem + asn1-encoding asn1-types base bytestring crypton-x509 + crypton-x509-validation HUnit pem ]; description = "Basic X509 OCSP implementation"; license = lib.licenses.bsd3; @@ -335023,8 +335690,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.8"; - sha256 = "0bsah360hxb1w9b1ypmgcdr1lb2wi4pzlbvgd106kqslkfyk942x"; + version = "0.14.9"; + sha256 = "19d53gl477ik0zb8fxq5irvjddgg7n2hjrg4j0x36pvsq3sy2zz9"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339476,16 +340143,17 @@ self: { "zeugma" = callPackage ({ mkDerivation, base, chronos, hedgehog, incipit, polysemy - , polysemy-chronos, polysemy-test, tasty, tasty-expected-failure - , tasty-hedgehog + , polysemy-chronos, polysemy-process, polysemy-test, tasty + , tasty-expected-failure, tasty-hedgehog }: mkDerivation { pname = "zeugma"; - version = "0.9.0.1"; - sha256 = "1idiinilcxw97fff6yq59a4472y8qy7b28gx2nnzsi6ajq9azazk"; + version = "0.10.0.0"; + sha256 = "0q1q3hhj8lf10zbb34rx317h2pr6hp8807p2zsi4n7xdgi6qjz3s"; libraryHaskellDepends = [ base chronos hedgehog incipit polysemy polysemy-chronos - polysemy-test tasty tasty-expected-failure tasty-hedgehog + polysemy-process polysemy-test tasty tasty-expected-failure + tasty-hedgehog ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -339684,10 +340352,8 @@ self: { }: mkDerivation { pname = "zinza"; - version = "0.2"; - sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "7"; - editedCabalFile = "192d8y4wh1xaylmfzwcjfck3hcyzbz5726zfp25rkc5jv5mp7p4s"; + version = "0.2.1"; + sha256 = "1k4k2yvijg0vwp3ykp9l77n3qdpivikqxx78ilvk6nx6w9sj58c8"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -339746,6 +340412,38 @@ self: { description = "Operations on zip archives"; license = lib.licenses.bsd3; mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; + }) {}; + + "zip_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "zip"; + version = "2.1.0"; + sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base unix + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist filepath hspec + QuickCheck temporary text time + ]; + description = "Operations on zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "zip-archive" = callPackage @@ -340315,8 +341013,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.6.1"; - sha256 = "1lkmkv03k6icd85jbrv8rzwr1kl8v496m86kyc7sy773vlslkds1"; + version = "0.2.7.0"; + sha256 = "1lwkifawn33c005lwqrr0hyisvs5p37kl03j0vab8qhpz9wbnydk"; libraryHaskellDepends = [ base bytestring exceptions Z-Data ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; @@ -340331,8 +341029,8 @@ self: { pname = "zot"; version = "0.0.3"; sha256 = "0cibi8zm9v8vi4i2xdm4kpk1v2kc0sh0fc5ylsn78gwyjcdhkaf8"; - revision = "1"; - editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm"; + revision = "2"; + editedCabalFile = "1vfwh6rpr76wbjd8hwn575yycmz2bjj9pbjbh64lmfq116nfk63l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; From a034c0b57a59e9379f67e78c09596d42f2eaa176 Mon Sep 17 00:00:00 2001 From: ners Date: Sat, 22 Jun 2024 14:11:29 +0200 Subject: [PATCH 010/562] haskellPackages.lsp-client: unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ebc065df7ef4..0442b3d5589d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3601,7 +3601,6 @@ broken-packages: - L-seed # failure in job https://hydra.nixos.org/build/233222324 at 2023-09-02 - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 - - lsp-client # failure in job https://hydra.nixos.org/build/233219871 at 2023-09-02 - ltext # failure in job https://hydra.nixos.org/build/255686825 at 2024-04-16 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 From af26d6bcabd5fb4c2f604ce5d5a994ee5343d501 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Jun 2024 14:35:20 +0200 Subject: [PATCH 011/562] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 4 ---- pkgs/development/haskell-modules/hackage-packages.nix | 6 ------ 2 files changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 02e2d5954d20..1bdcfa3ba776 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1469,7 +1469,6 @@ dont-distribute-packages: - funnyprint - funsat - fwgl-glfw - - fwgl-javascript - fxpak - g2 - g2q @@ -2224,7 +2223,6 @@ dont-distribute-packages: - hsx-xhtml - hsyslog-tcp - html-kure - - html-parse-util - html2hamlet - htoml-parse - htsn-import @@ -2486,7 +2484,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -3903,7 +3900,6 @@ dont-distribute-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - tateti-tateti - tbox - tccli diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 97e3fa89ed28..be47bde92de9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115433,7 +115433,6 @@ self: { ]; description = "FWGL GHCJS backend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fx" = callPackage @@ -164612,7 +164611,6 @@ self: { libraryHaskellDepends = [ attoparsec base html-parse text ]; description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.slotThe ]; }) {}; @@ -184761,7 +184759,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "kyotocabinet" = callPackage @@ -197159,8 +197156,6 @@ self: { ]; description = "Haskell library for Language Server Protocol clients"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lsp-test" = callPackage @@ -300379,7 +300374,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-tap" = callPackage From a1c4ac8972690e359de541ff8fe7d8edf86372fe Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Jun 2024 14:52:05 +0200 Subject: [PATCH 012/562] haskellPackages: Fix eval errors --- .../haskell-modules/configuration-common.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1efb46422a3..8a0720b6d828 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1864,8 +1864,6 @@ self: super: { # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475 reflex = doJailbreak (dontCheck super.reflex); - # 2024-03-02: hspec <2.11, primitive <0.8 - https://github.com/reflex-frp/reflex-vty/pull/80 - reflex-vty = assert super.reflex-vty.version == "0.5.2.0"; doJailbreak super.reflex-vty; # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33 reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci; @@ -2292,12 +2290,12 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - gi-gtk_4 = self.gi-gtk_4_0_8; - gi-gtk_4_0_8 = doDistribute (super.gi-gtk_4_0_8.override { + gi-gtk_4 = self.gi-gtk_4_0_9; + gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override { gi-gdk = self.gi-gdk_4; }); - gi-gdk_4 = self.gi-gdk_4_0_7; - gi-gdk_4_0_7 = doDistribute super.gi-gdk_4_0_7; + gi-gdk_4 = self.gi-gdk_4_0_8; + gi-gdk_4_0_8 = doDistribute super.gi-gdk_4_0_8; # GSK is only used for GTK 4. gi-gsk = super.gi-gsk.override { gi-gdk = self.gi-gdk_4; @@ -3014,7 +3012,7 @@ self: super: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; }) super.kmonad; - ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-syntax-highlighter_0_0_12_0 = super.ghc-syntax-highlighter_0_0_12_0.overrideScope(self: super: { ghc-lib-parser = self.ghc-lib-parser_9_10_1_20240511; }); From 7af87f035ea084da0817eeb242f2c48a61d5df79 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 11:48:31 +0200 Subject: [PATCH 013/562] haskell.packages.ghc98.aeson: Fix eval --- .../development/haskell-modules/configuration-ghc-9.8.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 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 c8750bc22631..3c2e58c5aed6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -57,9 +57,9 @@ self: super: { ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; - # TODO: remove when aeson updates or launches a revision - # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 - aeson = doJailbreak (doDistribute self.aeson_2_2_2_0); + # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable + # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f + aeson = doJailbreak (doDistribute self.aeson_2_2_3_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; From 102aadf228e633e6b33036bfcb4906d55d061188 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 13:10:27 +0200 Subject: [PATCH 014/562] haskellPackages.hourglass: Fix build and harmonize overrides --- .../haskell-modules/configuration-common.nix | 14 ++++++++++++++ .../configuration-ghc-9.2.x.nix | 3 --- .../configuration-ghc-9.4.x.nix | 3 --- .../configuration-ghc-9.6.x.nix | 19 ------------------- .../configuration-ghc-9.8.x.nix | 1 - 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8a0720b6d828..fb316fbbb0fd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -246,6 +246,20 @@ self: super: { }; }) super.leveldb-haskell; + # 2024-06-23: Hourglass is archived and had its last commit 6 years ago. + # Patch is needed to add support for time 1.10, which is only used in the tests + # https://github.com/vincenthz/hs-hourglass/pull/56 + # Jailbreak is needed because a hackage revision added the (correct) time <1.10 bound. + hourglass = doJailbreak + (appendPatches [ + (pkgs.fetchpatch { + name = "hourglass-pr-56.patch"; + url = + "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; + sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; + }) + ] super.hourglass); + # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # store. Testing is done upstream. diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index bcafc8c3fb78..516c3caaa08f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -101,9 +101,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # Needs to match ghc version ghc-tags = doDistribute self.ghc-tags_1_5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 94cf15df5dff..9969456cee09 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -78,9 +78,6 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 4edc24f10add..20af8f508b32 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -89,25 +89,6 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; - # - # Too strict bounds, waiting on Hackage release in nixpkgs - # - - # - # Compilation failure workarounds - # - - # Add support for time 1.10 - # https://github.com/vincenthz/hs-hourglass/pull/56 - hourglass = appendPatches [ - (pkgs.fetchpatch { - name = "hourglass-pr-56.patch"; - url = - "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; - sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; - }) - ] (super.hourglass); - # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; 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 3c2e58c5aed6..c4904bd60b4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -119,7 +119,6 @@ self: super: { # unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20 lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.* - hourglass = dontCheck super.hourglass; # umaintained, test suite doesn't compile anymore bsb-http-chunked = dontCheck super.bsb-http-chunked; # umaintained, test suite doesn't compile anymore pcre-heavy = dontCheck super.pcre-heavy; # GHC warnings cause the tests to fail From fab7b5e371ed4e67c1aed2c438fbada733bf3031 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 13:41:07 +0200 Subject: [PATCH 015/562] haskellPackages.crypton-x509: Drop obsolete patch --- .../haskell-modules/configuration-common.nix | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb316fbbb0fd..9f973b6902cc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2051,28 +2051,6 @@ self: super: { # test suite doesn't compile anymore due to changed hunit/tasty APIs fullstop = dontCheck super.fullstop; - crypton-x509 = - lib.pipe - super.crypton-x509 - [ - # Mistype in a dependency in a test. - # https://github.com/kazu-yamamoto/crypton-certificate/pull/3 - (appendPatch - (fetchpatch { - name = "crypton-x509-rename-dep.patch"; - url = "https://github.com/kazu-yamamoto/crypton-certificate/commit/5281ff115a18621407b41f9560fd6cd65c602fcc.patch"; - hash = "sha256-pLzuq+baSDn+MWhtYIIBOrE1Js+tp3UsaEZy5MhWAjY="; - relative = "x509"; - }) - ) - # There is a revision in crypton-x509, so the above patch won't - # apply because of line endings in revised .cabal files. - (overrideCabal { - editedCabalFile = null; - revision = null; - }) - ]; - # * doctests don't work without cabal # https://github.com/noinia/hgeometry/issues/132 # * Too strict version bound on vector-builder From b9520475dc18628c95698f99da2abc0c8c91bf69 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 13:44:29 +0200 Subject: [PATCH 016/562] all-cabal-hashes: 2024-06-21T20:16:00Z -> 2024-06-23T10:38:31Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 3ebc8c86903d..ff9684910bd3 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "dedf3d10eddcac8df226ecb1597ac081155da8cd", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dedf3d10eddcac8df226ecb1597ac081155da8cd.tar.gz", - "sha256": "0p7bqrwkx8b1ww00zrrxzlbvvimbrdl9gj0llzbjkc15f06kcsa4", - "msg": "Update from Hackage at 2024-06-21T20:16:00Z" + "commit": "f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e.tar.gz", + "sha256": "01fnkg977fi44v0scijgrp3hq3yrqzw5k8i326a9pz8j6r676iim", + "msg": "Update from Hackage at 2024-06-23T10:38:31Z" } From 0395915443ea6db9ec43026aef0e1272815bd4bd Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 13:48:04 +0200 Subject: [PATCH 017/562] 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 | 126 +++++++++++++----- 1 file changed, 93 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be47bde92de9..9dc33bd74992 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -47571,8 +47571,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.8"; - sha256 = "06wnlshgf2anp3xg3vf0cz6lxjn0rpfvnjfn568dj007km8y2n9p"; + version = "0.14.9"; + sha256 = "10xcl4nms1bcfni9z7mqirf6ifii99y6yb16r2pwrfs20vnhwx7w"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -57184,6 +57184,8 @@ self: { pname = "bytestring-lexing"; version = "0.5.0.12"; sha256 = "09g5x7jwz9kby578rlj8c6f6zi0pzs169rsqd1vsn3q9gimkpj3j"; + revision = "1"; + editedCabalFile = "0zpqxy4n8mkf6ccmc3jb6ggrqmw9csh1nj08wwq196np28jsbkdv"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-quickcheck tasty-smallcheck @@ -88856,8 +88858,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.3"; sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l"; - revision = "1"; - editedCabalFile = "1w1jksdpfra1x76r3dz8lkcbg661ccgi0pwag7kgdi9nj62ahmyh"; + revision = "2"; + editedCabalFile = "1v8djd4qndmkl8lc966pkh9gbgb8rkwqg2395xad6i03gqxvl55d"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -95061,8 +95063,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.12.3"; - sha256 = "10262cqc6ynbpvqpa3ijfacwyid4fxqxks6rm68brmqrzdqyh6wk"; + version = "0.13.0"; + sha256 = "1zbdl440xgb9s6nkqxg7fa2pc7m75w0bbndlfks4jqr1jq9f4hfh"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95095,8 +95097,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.12.3"; - sha256 = "0whmsiixv1iid1cd3faz0zib8hv4v09yclq6a7ypz4zyvjyk0szh"; + version = "0.13.0"; + sha256 = "14ckh9bshfjcinj637cmbfq6jx85ga0z98v3sqm66jw84zdqr4sy"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -122446,15 +122448,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; - "gi-gio_2_0_33" = callPackage + "gi-gio_2_0_34" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.33"; - sha256 = "14b1hsawkpx0351286bhk54p8f79m1h1vvwqwnsybvsnr3kzgcql"; + version = "2.0.34"; + sha256 = "0y01d4758lx6qchwgvqzjwgj00r3fqwpwxjm80wq7gdh0nnwwaz3"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -131433,6 +131435,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grfn" = callPackage + ({ mkDerivation, arithmoi, async, base, hspec, hspec-core + , monad-loops, parallel, parallel-io, primes, protolude, QuickCheck + , random, tasty, tasty-bench, text, time, unamb + }: + mkDerivation { + pname = "grfn"; + version = "1.0.0.1"; + sha256 = "1g9f2i50ap1bdcih2r1n6y32pqiv0i8cyw3zzmzvv61q97xrfwjb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + arithmoi async base monad-loops parallel parallel-io protolude + random text unamb + ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ + base hspec hspec-core primes QuickCheck text + ]; + benchmarkHaskellDepends = [ base tasty tasty-bench ]; + description = "Uniformly-random pre-factored numbers (Kalai)"; + license = lib.licenses.bsd3; + mainProgram = "grfn-exe"; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -139925,6 +139952,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_26_10" = 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.10"; + sha256 = "1njgrs1rqngw128z8dvc69l3v9bpr4apa153anmg1cjv8ji91rqm"; + 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; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -166039,8 +166089,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.1.1"; - sha256 = "04z0as2f8l24bry99bdslcl0kyzfzh9fp095a5r3piyzicjqzg36"; + version = "0.1.2"; + sha256 = "1xrlglwsjpyhpxkxchx3kgysm39a8c7bddvps0n71ax75px2laq9"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -168288,19 +168338,19 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , contravariant, Diff, directory, exceptions, filepath - , generic-lens, ghc-prim, lens, network, polysemy, polysemy-log - , polysemy-plugin, polysemy-time, process, resourcet, stm, tasty - , tasty-discover, tasty-hedgehog, temporary, text, time + , generic-lens, ghc-prim, lens, mtl, network, polysemy + , polysemy-log, polysemy-plugin, polysemy-time, process, resourcet + , stm, tasty, tasty-discover, tasty-hedgehog, temporary, text, time , transformers, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.8.0"; - sha256 = "0qy7n9i012q5f0hbpphhaqb2alqn5nnwk6rbrcwm6bmbinkgi5xq"; + version = "0.2.10.0"; + sha256 = "1fqykjvknsl5m67szyzy9jg9z1q9abvl5jk6d7m51ml9i6zj7vxz"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring contravariant Diff - directory exceptions filepath generic-lens ghc-prim lens network - polysemy polysemy-log polysemy-plugin polysemy-time process + directory exceptions filepath generic-lens ghc-prim lens mtl + network polysemy polysemy-log polysemy-plugin polysemy-time process resourcet stm temporary text time transformers unliftio yaml ]; testHaskellDepends = [ @@ -294942,8 +294992,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "8"; - editedCabalFile = "0h6bymf2him9shr8sfhw4h61ysp7hkzk0y1jwyv13d5l84yzi52g"; + revision = "9"; + editedCabalFile = "0ca6bgv5xrk6pz12j35jv1gbp06z6kk7fs7nc1bwjjxy6c6x4vm5"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -299447,16 +299497,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "tasty_1_5" = callPackage + "tasty_1_5_1" = callPackage ({ mkDerivation, ansi-terminal, base, containers , optparse-applicative, stm, tagged, transformers, unix }: mkDerivation { pname = "tasty"; - version = "1.5"; - sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; - revision = "2"; - editedCabalFile = "0jr6a6klg08x9pqmap3h3ys5dhda0w92ysbnsvvi81vrzxzz98wd"; + version = "1.5.1"; + sha256 = "1pb14rp2y87nbgwy3pkyhm69ly53knnnahidrihdd1nd378svpl9"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -299937,6 +299985,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-hunit_0_10_2" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.2"; + sha256 = "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -300242,20 +300302,20 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-quickcheck_0_10_3" = callPackage + "tasty-quickcheck_0_11" = callPackage ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck , random, tagged, tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.10.3"; - sha256 = "02lw6gk83b6wc9dwd3shin58zqy9isgx4zh7z0whs0wkzwzkpyyg"; - revision = "2"; - editedCabalFile = "0j2g1cngc5xk190jsm2k7kh25y1afmbr37abi09wvlyq8ja4n59r"; + version = "0.11"; + sha256 = "07liq4wjz7wad8xwgwb5x9ijl8626cfd9f5gb37mjqc23ab268lx"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + testHaskellDepends = [ + base pcre-light QuickCheck tasty tasty-hunit + ]; description = "QuickCheck support for the Tasty test framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; From b9e4759dcda0e7245f145c590ccae31a0ac4e792 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 13:48:09 +0200 Subject: [PATCH 018/562] haskellPackages: Fix whitespace --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f973b6902cc..f20f9cba34b6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -250,7 +250,7 @@ self: super: { # Patch is needed to add support for time 1.10, which is only used in the tests # https://github.com/vincenthz/hs-hourglass/pull/56 # Jailbreak is needed because a hackage revision added the (correct) time <1.10 bound. - hourglass = doJailbreak + hourglass = doJailbreak (appendPatches [ (pkgs.fetchpatch { name = "hourglass-pr-56.patch"; From cccf2b33fe3bd39d82ed90da0bc8b2da794a2916 Mon Sep 17 00:00:00 2001 From: hellwolf Date: Tue, 26 Mar 2024 13:29:45 +0200 Subject: [PATCH 019/562] haskellPackages.hevm: fix ghc96 build --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f973b6902cc..0c0b9cbc4c9b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2840,6 +2840,21 @@ self: super: { # base <4.14 decimal-literals = doJailbreak super.decimal-literals; + # 2024-06-22: hevm ghc96 fixes + hevm = lib.pipe super.hevm [ + (appendPatch (fetchpatch { + url = "https://github.com/ethereum/hevm/compare/02c072f...hellwolf:hevm:c29d3a7.patch"; + hash = "sha256-cL26HD77vXsiKqo5G6PXgK0q19MUGMwaNium5x93CBI="; + })) + (overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/^ *brick .*,/brick,/' hevm.cabal + sed -i 's/^ *vty .*,/vty,/' hevm.cabal + ''; + })) + doJailbreak + ]; + # multiple bounds too strict snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; From ef7f682c9569df67e852f7fb699e4895a0a2af8e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 19:09:26 +0200 Subject: [PATCH 020/562] haskellPackages.fourmolu: Cleanup overrides --- .../configuration-ghc-9.8.x.nix | 4 +- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/configuration-nix.nix | 6 +-- .../haskell-modules/hackage-packages.nix | 37 ------------------- 4 files changed, 4 insertions(+), 44 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 c4904bd60b4a..ae8aa37a720c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -63,8 +63,8 @@ self: super: { attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; - ormolu = self.ormolu_0_7_4_0; - fourmolu = self.fourmolu_0_15_0_0; + ormolu = self.ormolu_0_7_7_0; + fourmolu = self.fourmolu_0_16_2_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc102cb88861..e3845b8c16f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -99,7 +99,6 @@ extra-packages: - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 706bd2dfecf2..d6f3a25cab8a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1202,12 +1202,10 @@ self: super: builtins.intersectAttrs super { { fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; - fourmolu_0_15_0_0 = fourmoluTestFix super.fourmolu_0_15_0_0; + fourmolu_0_16_2_0 = fourmoluTestFix super.fourmolu_0_16_2_0; }) fourmolu - fourmolu_0_14_1_0 - fourmolu_0_15_0_0 + fourmolu_0_16_2_0 ; # Test suite needs to execute 'disco' binary diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9dc33bd74992..0f081d7bda66 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111972,43 +111972,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_11_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, Diff, directory, dlist - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, temporary, text - , th-env, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.11.0.0"; - sha256 = "1hs743r2saqzk4sbwqpyw8k62jhlrc914gizcw5yp0r1gpq83idr"; - revision = "2"; - editedCabalFile = "1gjmdwcm10d178bg468xzzg9b0fc4saxi2fhdc771rqaggd1rxg1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary bytestring Cabal-syntax - containers Diff directory dlist file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml - ]; - testHaskellDepends = [ - base Cabal-syntax containers Diff directory filepath ghc-lib-parser - hspec hspec-megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory From 236e21cee2cbdee3f477ff98cb5f5453f05dfe3d Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 21:33:13 +0200 Subject: [PATCH 021/562] haskellPackages.cabal-gild: Fix override --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d9a83b5991d3..97d71a4ec3d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3121,7 +3121,7 @@ self: super: { cornelis = dontCheck super.cornelis; cabal-gild = super.cabal-gild.overrideScope (self: super: { - tasty = super.tasty_1_5; + tasty = super.tasty_1_5_1; tasty-quickcheck = super.tasty-quickcheck_0_10_3; }); From 196acc5f76fe5e3ac21a35f32bc1945c09064e9e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 21:53:52 +0200 Subject: [PATCH 022/562] haskellPackages.cabal-gild: Fix eval --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 97d71a4ec3d1..743accb77f31 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3122,7 +3122,7 @@ self: super: { cabal-gild = super.cabal-gild.overrideScope (self: super: { tasty = super.tasty_1_5_1; - tasty-quickcheck = super.tasty-quickcheck_0_10_3; + tasty-quickcheck = super.tasty-quickcheck_0_11; }); # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 From b8011c83eb07af83df9d3998544bb4bed2b152d8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 23 Jun 2024 22:34:55 +0200 Subject: [PATCH 023/562] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 10 ++++++---- pkgs/development/haskell-modules/hackage-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 1bdcfa3ba776..8b3a4a46f548 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -611,7 +611,7 @@ dont-distribute-packages: - bamstats - barley - base32-bytestring - - base_4_20_0_0 + - base_4_20_0_1 - baserock-schema - basic - batchd @@ -632,7 +632,6 @@ dont-distribute-packages: - bearriver - beautifHOL - bech32-th - - bech32-th_1_1_7 - bein - belka - bff @@ -1176,6 +1175,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora + - dl-fedora_1_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1963,7 +1963,7 @@ dont-distribute-packages: - haskoin-bitcoind - haskoin-crypto - haskoin-node - - haskoin-node_1_1_0 + - haskoin-node_1_1_3 - haskoin-protocol - haskoin-script - haskoon @@ -1984,6 +1984,7 @@ dont-distribute-packages: - haskus-web - haslo - hasloGUI + - hasmtlib - hasql-cursor-query - hasql-postgres - hasql-postgres-options @@ -2396,6 +2397,7 @@ dont-distribute-packages: - jespresso - jmacro-rpc-happstack - jmacro-rpc-snap + - job - jobs-ui - join - jordan-openapi @@ -2536,7 +2538,6 @@ dont-distribute-packages: - layouting - lazy-hash-cache - lda - - ldap-client - ldap-client-og - ldap-scim-bridge - ldapply @@ -3871,6 +3872,7 @@ dont-distribute-packages: - syslog - systemd-api - systemstats + - systranything - t3-client - ta - tag-stream diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0f081d7bda66..e07e8d1a1c28 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -143381,6 +143381,7 @@ self: { ]; description = "A monad for interfacing with external SMT solvers"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "haspara" = callPackage @@ -178785,6 +178786,7 @@ self: { testHaskellDepends = [ base random resourcet time ]; description = "Job queue"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "jobqueue" = callPackage @@ -188736,7 +188738,6 @@ self: { testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ldap-client-og" = callPackage @@ -297676,6 +297677,7 @@ self: { ]; description = "Let you put anything in the system tray"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "systranything"; }) {}; From c66cab93ce90caf75a5f15aef2690dd8c2da1879 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 24 Jun 2024 09:20:12 +0200 Subject: [PATCH 024/562] haskellPackages.hevm: Unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0442b3d5589d..096c5151739d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2503,7 +2503,6 @@ broken-packages: - heterogeneous-list-literals # failure in job https://hydra.nixos.org/build/233212297 at 2023-09-02 - hetris # failure in job https://hydra.nixos.org/build/233256814 at 2023-09-02 - heukarya # failure in job https://hydra.nixos.org/build/233247440 at 2023-09-02 - - hevm # failure in job https://hydra.nixos.org/build/254311642 at 2024-03-31 - HExcel # failure in job https://hydra.nixos.org/build/233211971 at 2023-09-02 - hexchat # failure in job https://hydra.nixos.org/build/233234161 at 2023-09-02 - hexif # failure in job https://hydra.nixos.org/build/233245470 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e07e8d1a1c28..5aef784d8ab5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -148507,10 +148507,8 @@ self: { doHaddock = false; description = "Symbolic EVM Evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; - broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) libff; inherit (pkgs) secp256k1;}; From 5f1eda14639d88c78c2eb9ff304d2ed463fd0bce Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 24 Jun 2024 22:26:51 +0100 Subject: [PATCH 025/562] haskellPackages.argon2: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 743accb77f31..603bba311adf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3140,4 +3140,10 @@ self: super: { hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs="; }) super.proto3-wire; + argon2 = appendPatch (fetchpatch { + # https://github.com/haskell-hvr/argon2/pull/20 + url = "https://github.com/haskell-hvr/argon2/commit/f7cc92f18e233e6b1dabf1798dd099e17b6a81a1.patch"; + hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0="; + }) (doJailbreak super.argon2); # Unmaintained + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 096c5151739d..fa1f7c70aff5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -224,7 +224,6 @@ broken-packages: - archnews # failure in job https://hydra.nixos.org/build/233192480 at 2023-09-02 - arena # failure in job https://hydra.nixos.org/build/233252500 at 2023-09-02 - argo # failure in job https://hydra.nixos.org/build/233216252 at 2023-09-02 - - argon2 # failure in job https://hydra.nixos.org/build/233207704 at 2023-09-02 - argparser # failure in job https://hydra.nixos.org/build/233222416 at 2023-09-02 - arguedit # failure in job https://hydra.nixos.org/build/233211367 at 2023-09-02 - arion # failure in job https://hydra.nixos.org/build/233254120 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 8b3a4a46f548..578da2a5b2b3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2466,7 +2466,6 @@ dont-distribute-packages: - kevin - key-vault - keyring - - keysafe - keystore - keyvaluehash - keyword-args diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5aef784d8ab5..fff6431ea04d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -39746,8 +39746,6 @@ self: { ]; description = "Memory-hard password hash and proof-of-work function"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "argparser" = callPackage @@ -183520,7 +183518,6 @@ self: { ]; description = "back up a secret key securely to the cloud"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "keysafe"; }) {}; From 141358a69b82ad66b9956296d28451b4866f88d5 Mon Sep 17 00:00:00 2001 From: Cody Schafer Date: Mon, 24 Jun 2024 01:01:40 -0400 Subject: [PATCH 026/562] lighthouse: 4.6.0 -> 5.2.0 `Cargo.lock` is updated from the v5.2.0 tag with the patches applied. `use-c-kzg-from-crates-io.patch` is dropped because upstream uses a crates.io version of `c-kzg`. Changelogs since 4.6.0: - [v5.2.0](https://github.com/sigp/lighthouse/releases/tag/v5.2.0) - [v5.1.3](https://github.com/sigp/lighthouse/releases/tag/v5.1.3) - [v5.1.2](https://github.com/sigp/lighthouse/releases/tag/v5.1.2) - [v5.1.1](https://github.com/sigp/lighthouse/releases/tag/v5.1.1) - [v5.1.0](https://github.com/sigp/lighthouse/releases/tag/v5.1.0) - [v5.0.0](https://github.com/sigp/lighthouse/releases/tag/v5.0.0) Closes #320853 --- .../blockchains/lighthouse/Cargo.lock | 2589 ++++++++++------- .../blockchains/lighthouse/default.nix | 11 +- .../lighthouse/fix-dep-lazy_static.patch | 11 + .../lighthouse/use-c-kzg-from-crates-io.patch | 11 - .../lighthouse/use-system-sqlite.patch | 6 +- 5 files changed, 1534 insertions(+), 1094 deletions(-) create mode 100644 pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch delete mode 100644 pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch diff --git a/pkgs/applications/blockchains/lighthouse/Cargo.lock b/pkgs/applications/blockchains/lighthouse/Cargo.lock index 6d76f7aef763..1da30b0b94ac 100644 --- a/pkgs/applications/blockchains/lighthouse/Cargo.lock +++ b/pkgs/applications/blockchains/lighthouse/Cargo.lock @@ -30,10 +30,7 @@ dependencies = [ "filesystem", "safe_arith", "sensitive_url", - "serde", - "serde_json", "slashing_protection", - "slog", "slot_clock", "tempfile", "tokio", @@ -62,9 +59,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -115,9 +112,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -145,18 +142,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead 0.5.2", - "aes 0.8.3", + "aes 0.8.4", "cipher 0.4.4", "ctr 0.9.2", - "ghash 0.5.0", + "ghash 0.5.1", "subtle", ] [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -166,23 +163,107 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] -name = "amcl" -version = "0.3.0" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" +name = "alloy-consensus" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-eips", + "alloy-network", + "alloy-primitives", + "alloy-rlp", +] + +[[package]] +name = "alloy-eips" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", + "thiserror", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-network" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-primitives" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d34d8de81e23b6d909c094e23b3d357e01ca36b78a8c5424c501eedbe86f0" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "hex-literal", + "itoa", + "k256 0.13.3", + "keccak-asm", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b155716bab55763c95ba212806cf43d05bcc70e5f35b02bad20cf5ec7fe11fed" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8037e03c7f462a063f28daec9fda285a9a89da003c552f8637a80b9c8fd96241" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "android-tzdata" @@ -200,19 +281,65 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anes" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ - "winapi", + "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.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +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 = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" @@ -225,9 +352,148 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "archery" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a8da9bc4c4053ee067669762bcaeea6e241841295a2b6c948312dad6ef4cc02" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.0", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint", + "num-traits", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "arrayref" @@ -243,9 +509,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -259,25 +525,25 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "synstructure", ] [[package]] name = "asn1-rs-impl" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -299,9 +565,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock", "cfg-if", @@ -310,7 +576,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.30", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -329,13 +595,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -346,7 +612,20 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version", + "rustc_version 0.4.0", +] + +[[package]] +name = "asynchronous-codec" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" +dependencies = [ + "bytes", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", ] [[package]] @@ -362,25 +641,13 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "attohttpc" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" -dependencies = [ - "http 0.2.11", - "log", - "url", - "wildmatch", -] - [[package]] name = "attohttpc" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http 0.2.11", + "http 0.2.12", "log", "url", ] @@ -398,36 +665,35 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", "bytes", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.1.0", + "hyper 1.3.1", "hyper-util", "itoa", "matchit", @@ -440,7 +706,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -457,13 +723,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -471,9 +737,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -514,6 +780,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -536,7 +808,6 @@ dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", "execution_layer", - "exit-future", "fork_choice", "futures", "genesis", @@ -546,13 +817,14 @@ dependencies = [ "kzg", "lazy_static", "lighthouse_metrics", + "lighthouse_version", "logging", "lru", "maplit", "merkle_proof", "oneshot_broadcast", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proto_array", "rand", "rayon", @@ -583,7 +855,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "4.6.0" +version = "5.2.0" dependencies = [ "beacon_chain", "clap", @@ -593,19 +865,15 @@ dependencies = [ "dirs", "environment", "eth2_config", - "eth2_network_config", "execution_layer", - "futures", "genesis", "hex", "http_api", - "hyper 1.1.0", + "hyper 1.3.1", "lighthouse_network", - "lighthouse_version", "monitoring_api", "node_test_rig", "sensitive_url", - "serde", "serde_json", "slasher", "slog", @@ -620,25 +888,22 @@ dependencies = [ name = "beacon_processor" version = "0.1.0" dependencies = [ - "derivative", - "ethereum_ssz", "fnv", "futures", - "hex", "itertools", "lazy_static", "lighthouse_metrics", "lighthouse_network", "logging", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "slog", "slot_clock", "strum", "task_executor", "tokio", - "tokio-util 0.6.10", + "tokio-util", "types", ] @@ -671,28 +936,20 @@ dependencies = [ ] [[package]] -name = "bindgen" -version = "0.66.1" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", - "which", + "bit-vec", ] +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -701,9 +958,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -774,7 +1031,6 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "hex", - "milagro_bls", "rand", "serde", "tree_hash", @@ -805,7 +1061,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "4.6.0" +version = "5.2.0" dependencies = [ "beacon_node", "clap", @@ -817,12 +1073,9 @@ dependencies = [ "log", "logging", "serde", - "serde_json", - "serde_yaml", "slog", "slog-async", "slog-scope", - "slog-stdlog", "slog-term", "tokio", "types", @@ -836,9 +1089,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] @@ -852,14 +1105,13 @@ dependencies = [ "reqwest", "sensitive_url", "serde", - "serde_json", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -875,9 +1127,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -905,17 +1157,15 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.4.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32700dc7904064bb64e857d38a1766607372928e2466ee5f02a869829b3297d7" +checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" dependencies = [ - "bindgen 0.66.1", "blst", "cc", "glob", "hex", "libc", - "serde", ] [[package]] @@ -935,18 +1185,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -959,7 +1209,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -973,12 +1223,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -996,6 +1247,12 @@ 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 = "chacha20" version = "0.9.1" @@ -1022,14 +1279,41 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", ] [[package]] @@ -1054,9 +1338,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "f803f94ecf597339c7a34eed2036ef83f86aaba937f001f7c5b5e251f043f1f9" dependencies = [ "glob", "libc", @@ -1065,19 +1349,32 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "clap_builder", ] +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + [[package]] name = "clap_utils" version = "0.1.0" @@ -1107,19 +1404,18 @@ dependencies = [ "eth1", "eth2", "eth2_config", + "ethereum_ssz", "execution_layer", + "futures", "genesis", "http_api", "http_metrics", "lazy_static", "lighthouse_metrics", "lighthouse_network", - "logging", "monitoring_api", "network", - "num_cpus", "operation_pool", - "parking_lot 0.12.1", "sensitive_url", "serde", "serde_yaml", @@ -1145,6 +1441,12 @@ dependencies = [ "cc", ] +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + [[package]] name = "compare_fields" version = "0.2.0" @@ -1163,13 +1465,26 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-hex" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +dependencies = [ + "cfg-if", + "cpufeatures", + "hex", + "proptest", + "serde", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -1224,33 +1539,33 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "criterion" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "atty", + "anes", "cast", + "ciborium", "clap", "criterion-plot", - "csv", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -1259,9 +1574,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", "itertools", @@ -1269,9 +1584,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1297,9 +1612,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1362,27 +1677,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.7.0" @@ -1412,27 +1706,27 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.3.0", - "rustc_version", + "platforms 3.4.0", + "rustc_version 0.4.0", "subtle", "zeroize", ] @@ -1445,7 +1739,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1504,16 +1798,22 @@ dependencies = [ ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "dary_heap" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1521,9 +1821,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1539,12 +1839,9 @@ dependencies = [ "clap_utils", "environment", "hex", - "logging", "slog", - "sloggers", "store", "strum", - "tempfile", "types", ] @@ -1561,7 +1858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" dependencies = [ "futures", - "tokio-util 0.7.10", + "tokio-util", ] [[package]] @@ -1590,9 +1887,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1601,9 +1898,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.2.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ "asn1-rs", "displaydoc", @@ -1641,7 +1938,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1653,17 +1950,17 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", ] [[package]] name = "diesel" -version = "2.1.4" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" +checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "diesel_derives", "itoa", @@ -1673,14 +1970,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1700,7 +1997,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1776,8 +2073,9 @@ dependencies = [ [[package]] name = "discv5" -version = "0.4.0" -source = "git+https://github.com/sigp/discv5?rev=e30a2c31b7ac0c57876458b971164654dfa4513b#e30a2c31b7ac0c57876458b971164654dfa4513b" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac33cb3f99889a57e56a8c6ccb77aaf0cfc7787602b7af09783f736d77314e1" dependencies = [ "aes 0.7.5", "aes-gcm 0.9.2", @@ -1812,7 +2110,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1845,7 +2143,7 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der 0.7.9", "digest 0.10.7", "elliptic-curve 0.13.8", "rfc6979 0.4.0", @@ -1865,9 +2163,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1884,13 +2182,11 @@ version = "0.2.0" dependencies = [ "beacon_chain", "bls", - "cached_tree_hash", "compare_fields", "compare_fields_derive", "derivative", "eth2_network_config", "ethereum-types 0.14.1", - "ethereum_serde_utils", "ethereum_ssz", "ethereum_ssz_derive", "execution_layer", @@ -1906,7 +2202,6 @@ dependencies = [ "serde_yaml", "snap", "state_processing", - "store", "swap_or_not_shuffle", "tree_hash", "tree_hash_derive", @@ -1915,9 +2210,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -1960,9 +2255,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1992,10 +2287,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -2025,10 +2320,10 @@ dependencies = [ name = "environment" version = "0.1.2" dependencies = [ + "async-channel", "ctrlc", "eth2_config", "eth2_network_config", - "exit-future", "futures", "logging", "serde", @@ -2059,9 +2354,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2088,15 +2383,12 @@ dependencies = [ "ethereum_ssz_derive", "execution_layer", "futures", - "hex", "lazy_static", "lighthouse_metrics", "merkle_proof", - "parking_lot 0.12.1", - "reqwest", + "parking_lot 0.12.3", "sensitive_url", "serde", - "serde_json", "serde_yaml", "slog", "sloggers", @@ -2138,7 +2430,6 @@ dependencies = [ "libsecp256k1", "lighthouse_network", "mediatype", - "mime", "pretty_reqwest_error", "procfs", "proto_array", @@ -2152,7 +2443,6 @@ dependencies = [ "ssz_types", "store", "tokio", - "tree_hash", "types", ] @@ -2224,7 +2514,6 @@ dependencies = [ "pretty_reqwest_error", "reqwest", "sensitive_url", - "serde_json", "serde_yaml", "sha2 0.9.9", "slog", @@ -2352,13 +2641,13 @@ dependencies = [ [[package]] name = "ethereum_hashing" -version = "1.0.0-beta.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233dc6f434ce680dbabf4451ee3380cec46cb3c45d66660445a435619710dd35" +checksum = "6ea7b408432c13f71af01197b1d3d0069c48a27bfcfbe72a81fc346e47f6defb" dependencies = [ "cpufeatures", "lazy_static", - "ring 0.16.20", + "ring 0.17.8", "sha2 0.10.8", ] @@ -2502,7 +2791,7 @@ dependencies = [ "getrandom", "hashers", "hex", - "http 0.2.11", + "http 0.2.12", "once_cell", "parking_lot 0.11.2", "pin-project", @@ -2552,12 +2841,11 @@ dependencies = [ name = "execution_engine_integration" version = "0.1.0" dependencies = [ + "async-channel", "deposit_contract", - "environment", "ethers-core", "ethers-providers", "execution_layer", - "exit-future", "fork_choice", "futures", "hex", @@ -2576,8 +2864,9 @@ dependencies = [ name = "execution_layer" version = "0.1.0" dependencies = [ + "alloy-consensus", + "alloy-rlp", "arc-swap", - "async-trait", "builder_client", "bytes", "environment", @@ -2586,9 +2875,7 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "ethers-core", - "exit-future", "fork_choice", - "futures", "hash-db", "hash256-std-hasher", "hex", @@ -2597,8 +2884,9 @@ dependencies = [ "kzg", "lazy_static", "lighthouse_metrics", + "lighthouse_version", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_reqwest_error", "rand", "reqwest", @@ -2623,20 +2911,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "exit-future" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" -dependencies = [ - "futures", -] - [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -2656,9 +2935,30 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "fdlimit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" +dependencies = [ + "libc", + "thiserror", +] [[package]] name = "ff" @@ -2688,9 +2988,9 @@ checksum = "ec54ac60a7f2ee9a97cad9946f9bf629a3bc6a7ae59e68983dc9318f5a54b81a" [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -2699,7 +2999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -2710,12 +3010,6 @@ dependencies = [ "windows-acl", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - [[package]] name = "fixed-hash" version = "0.7.0" @@ -2743,9 +3037,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -2837,7 +3131,8 @@ dependencies = [ [[package]] name = "futures-bounded" version = "0.2.3" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173" dependencies = [ "futures-timer", "futures-util", @@ -2879,9 +3174,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "futures-core", "pin-project-lite", @@ -2895,17 +3190,18 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "futures-rustls" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.21.10", + "rustls 0.23.8", + "rustls-pki-types", ] [[package]] @@ -2933,9 +3229,9 @@ dependencies = [ [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -2998,9 +3294,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3021,19 +3317,19 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", - "polyval 0.6.1", + "polyval 0.6.2", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git-version" @@ -3052,7 +3348,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -3061,6 +3357,36 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gossipsub" +version = "0.5.0" +dependencies = [ + "async-channel", + "asynchronous-codec 0.7.0", + "base64 0.21.7", + "byteorder", + "bytes", + "either", + "fnv", + "futures", + "futures-ticker", + "futures-timer", + "getrandom", + "hex_fmt", + "libp2p", + "prometheus-client", + "quick-protobuf", + "quick-protobuf-codec 0.3.1", + "quickcheck", + "rand", + "regex", + "serde", + "sha2 0.10.8", + "tracing", + "void", + "web-time", +] + [[package]] name = "group" version = "0.12.1" @@ -3085,47 +3411,32 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util 0.7.10", + "tokio-util", "tracing", ] [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hash-db" @@ -3150,9 +3461,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -3173,7 +3484,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3185,7 +3496,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -3197,7 +3508,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -3206,6 +3517,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -3217,15 +3534,24 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hex_fmt" @@ -3235,9 +3561,9 @@ checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ "async-trait", "cfg-if", @@ -3250,7 +3576,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.5", + "socket2 0.5.7", "thiserror", "tinyvec", "tokio", @@ -3260,9 +3586,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -3270,7 +3596,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "resolv-conf", "smallvec", @@ -3328,15 +3654,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -3350,9 +3667,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -3361,9 +3678,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3377,7 +3694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -3388,18 +3705,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "futures-util", - "http 1.0.0", + "futures-core", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -3430,7 +3747,7 @@ dependencies = [ "lru", "network", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proto_array", "safe_arith", "sensitive_url", @@ -3500,14 +3817,14 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", - "http 0.2.11", + "h2", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3516,20 +3833,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -3540,9 +3857,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper 0.14.28", - "rustls 0.21.10", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -3562,27 +3879,24 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", - "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", - "hyper 1.1.0", + "hyper 1.3.1", "pin-project-lite", - "socket2 0.5.5", "tokio", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3627,17 +3941,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi", -] - [[package]] name = "if-addrs" version = "0.10.2" @@ -3648,16 +3951,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "if-addrs-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "if-watch" version = "3.2.0" @@ -3668,7 +3961,7 @@ dependencies = [ "core-foundation", "fnv", "futures", - "if-addrs 0.10.2", + "if-addrs", "ipnet", "log", "rtnetlink", @@ -3677,19 +3970,6 @@ dependencies = [ "windows", ] -[[package]] -name = "igd" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556b5a75cd4adb7c4ea21c64af1c48cefb2ce7d43dc4352c720a1fe47c21f355" -dependencies = [ - "attohttpc 0.16.3", - "log", - "rand", - "url", - "xmltree", -] - [[package]] name = "igd-next" version = "0.14.3" @@ -3697,10 +3977,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" dependencies = [ "async-trait", - "attohttpc 0.24.1", + "attohttpc", "bytes", "futures", - "http 0.2.11", + "http 0.2.12", "hyper 0.14.28", "log", "rand", @@ -3724,7 +4004,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.9", + "parity-scale-codec 3.6.12", ] [[package]] @@ -3783,12 +4063,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3802,9 +4082,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -3818,7 +4098,7 @@ version = "0.2.0" dependencies = [ "bytes", "hex", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -3836,7 +4116,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3847,8 +4127,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", - "widestring 1.0.2", + "socket2 0.5.7", + "widestring 1.1.0", "windows-sys 0.48.0", "winreg", ] @@ -3859,6 +4139,23 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[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 = "itertools" version = "0.10.5" @@ -3870,9 +4167,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jemalloc-ctl" @@ -3907,18 +4204,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3973,6 +4270,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "keccak-hash" version = "0.10.0" @@ -4016,7 +4323,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lcli" -version = "4.6.0" +version = "5.2.0" dependencies = [ "account_utils", "beacon_chain", @@ -4024,25 +4331,20 @@ dependencies = [ "clap", "clap_utils", "deposit_contract", - "directory", "env_logger 0.9.3", "environment", - "eth1_test_rig", "eth2", "eth2_network_config", "eth2_wallet", "ethereum_hashing", "ethereum_ssz", "execution_layer", - "genesis", "hex", - "int_to_bytes", "lighthouse_network", "lighthouse_version", "log", "malloc_utils", "rayon", - "sensitive_url", "serde", "serde_json", "serde_yaml", @@ -4079,38 +4381,42 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" -version = "1.4.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ + "core2", + "hashbrown 0.14.5", "rle-decode-fast", ] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -4130,14 +4436,15 @@ dependencies = [ "indexmap 1.9.3", "libc", "mdbx-sys", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "thiserror", ] [[package]] name = "libp2p" -version = "0.54.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681fb3f183edfbedd7a57d32ebe5dcdc0b9f94061185acf3c30249349cc6fc99" dependencies = [ "bytes", "either", @@ -4149,7 +4456,6 @@ dependencies = [ "libp2p-connection-limits", "libp2p-core", "libp2p-dns", - "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", "libp2p-mdns", @@ -4170,7 +4476,8 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" version = "0.3.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4181,7 +4488,8 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" version = "0.3.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4192,7 +4500,8 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.41.2" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05" dependencies = [ "either", "fnv", @@ -4204,7 +4513,7 @@ dependencies = [ "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", "rand", @@ -4219,56 +4528,26 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.41.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d17cbcf7160ff35c3e8e560de4a068fe9d6cb777ea72840e48eb76ff9576c4b6" dependencies = [ "async-trait", "futures", "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "smallvec", "tracing", ] -[[package]] -name = "libp2p-gossipsub" -version = "0.46.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" -dependencies = [ - "async-channel", - "asynchronous-codec", - "base64 0.21.7", - "byteorder", - "bytes", - "either", - "fnv", - "futures", - "futures-ticker", - "futures-timer", - "getrandom", - "hex_fmt", - "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "prometheus-client", - "quick-protobuf", - "quick-protobuf-codec", - "rand", - "regex", - "sha2 0.10.8", - "smallvec", - "tracing", - "void", -] - [[package]] name = "libp2p-identify" -version = "0.44.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d635ebea5ca0c3c3e77d414ae9b67eccf2a822be06091b9c1a0d13029a1e2f" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.7.0", "either", "futures", "futures-bounded", @@ -4278,7 +4557,7 @@ dependencies = [ "libp2p-swarm", "lru", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.3.1", "smallvec", "thiserror", "tracing", @@ -4292,7 +4571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "asn1_der", - "bs58 0.5.0", + "bs58 0.5.1", "ed25519-dalek", "hkdf", "libsecp256k1", @@ -4311,7 +4590,8 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.45.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49007d9a339b3e1d7eeebc4d67c05dbf23d300b7d091193ec2d3f26802d7faf2" dependencies = [ "data-encoding", "futures", @@ -4322,7 +4602,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tracing", "void", @@ -4331,12 +4611,12 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.14.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" dependencies = [ "futures", "instant", "libp2p-core", - "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", "libp2p-swarm", @@ -4347,27 +4627,29 @@ dependencies = [ [[package]] name = "libp2p-mplex" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e895765e27e30217b25f7cb7ac4686dad1ff80bf2fdeffd1d898566900a924" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.2", "bytes", "futures", "libp2p-core", "libp2p-identity", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "smallvec", "tracing", - "unsigned-varint 0.8.0", + "unsigned-varint 0.7.2", ] [[package]] name = "libp2p-noise" version = "0.44.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecd0545ce077f6ea5434bcb76e8d0fe942693b4380aaad0d34a358c2bd05793" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.7.0", "bytes", "curve25519-dalek", "futures", @@ -4390,22 +4672,24 @@ dependencies = [ [[package]] name = "libp2p-plaintext" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67330af40b67217e746d42551913cfb7ad04c74fa300fb329660a56318590b3f" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.2", "bytes", "futures", "libp2p-core", "libp2p-identity", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.2.0", "tracing", ] [[package]] name = "libp2p-quic" -version = "0.10.2" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" dependencies = [ "bytes", "futures", @@ -4414,12 +4698,12 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quinn", "rand", - "ring 0.16.20", - "rustls 0.21.10", - "socket2 0.5.5", + "ring 0.17.8", + "rustls 0.23.8", + "socket2 0.5.7", "thiserror", "tokio", "tracing", @@ -4427,8 +4711,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.45.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" dependencies = [ "either", "fnv", @@ -4438,6 +4723,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", + "lru", "multistream-select", "once_cell", "rand", @@ -4449,19 +4735,21 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.34.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5daceb9dd908417b6dfcfe8e94098bc4aac54500c282e78120b885dadc09b999" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "libp2p-tcp" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2460fc2748919adff99ecbc1aab296e4579e41f374fb164149bd2c9e529d4c" dependencies = [ "futures", "futures-timer", @@ -4469,23 +4757,24 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tracing", ] [[package]] name = "libp2p-tls" -version = "0.3.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2" dependencies = [ "futures", "futures-rustls", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.16.20", - "rustls 0.21.10", + "ring 0.17.8", + "rustls 0.23.8", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -4494,8 +4783,9 @@ dependencies = [ [[package]] name = "libp2p-upnp" -version = "0.2.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccf04b0e3ff3de52d07d5fd6c3b061d0e7f908ffc683c32d9638caedce86fc8" dependencies = [ "futures", "futures-timer", @@ -4510,7 +4800,8 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.45.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200cbe50349a44760927d50b431d77bed79b9c0a3959de1af8d24a63434b71e5" dependencies = [ "either", "futures", @@ -4518,18 +4809,17 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.1", + "yamux 0.13.2", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -4586,15 +4876,16 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ + "cc", "pkg-config", "vcpkg", ] [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "pkg-config", @@ -4603,7 +4894,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "4.6.0" +version = "5.2.0" dependencies = [ "account_manager", "account_utils", @@ -4634,10 +4925,8 @@ dependencies = [ "slasher", "slashing_protection", "slog", - "sloggers", "task_executor", "tempfile", - "tracing-subscriber", "types", "unused_port", "validator_client", @@ -4657,16 +4946,19 @@ dependencies = [ name = "lighthouse_network" version = "0.2.0" dependencies = [ + "async-channel", + "bytes", "delay_map", "directory", "dirs", "discv5", + "either", "error-chain", "ethereum_ssz", "ethereum_ssz_derive", - "exit-future", "fnv", "futures", + "gossipsub", "hex", "lazy_static", "libp2p", @@ -4675,7 +4967,7 @@ dependencies = [ "lighthouse_version", "lru", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client", "quickcheck", "quickcheck_macros", @@ -4696,11 +4988,9 @@ dependencies = [ "tiny-keccak", "tokio", "tokio-io-timeout", - "tokio-util 0.6.10", - "tree_hash", - "tree_hash_derive", + "tokio-util", "types", - "unsigned-varint 0.6.0", + "unsigned-varint 0.8.0", "unused_port", "void", ] @@ -4728,9 +5018,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lmdb-rkv" @@ -4755,9 +5045,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4773,9 +5063,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logging" @@ -4784,11 +5074,10 @@ dependencies = [ "chrono", "lazy_static", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "serde_json", "slog", - "slog-async", "slog-term", "sloggers", "take_mut", @@ -4802,11 +5091,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -4844,7 +5133,7 @@ dependencies = [ "lazy_static", "libc", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -4895,7 +5184,7 @@ name = "mdbx-sys" version = "0.11.6-4" source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" dependencies = [ - "bindgen 0.59.2", + "bindgen", "cc", "cmake", "libc", @@ -4903,21 +5192,21 @@ dependencies = [ [[package]] name = "mediatype" -version = "0.19.17" +version = "0.19.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a018c36a54f4e12c30464bbc59311f85d3f6f4d6c1b4fa4ea9db2b174ddefc" +checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -4979,15 +5268,26 @@ dependencies = [ ] [[package]] -name = "milagro_bls" -version = "1.5.1" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" +name = "milhouse" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3826d3602a3674b07e080ce1982350e454ec253d73f156bd927ac1b652293f4d" dependencies = [ - "amcl", - "hex", - "lazy_static", - "rand", - "zeroize", + "arbitrary", + "derivative", + "ethereum-types 0.14.1", + "ethereum_hashing", + "ethereum_ssz", + "ethereum_ssz_derive", + "itertools", + "parking_lot 0.12.3", + "rayon", + "serde", + "smallvec", + "tree_hash", + "triomphe", + "typenum", + "vec_map", ] [[package]] @@ -5014,18 +5314,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -5034,9 +5334,9 @@ dependencies = [ [[package]] name = "mock_instant" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" +checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" [[package]] name = "monitoring_api" @@ -5106,23 +5406,23 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.13.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ "bytes", "futures", + "log", "pin-project", "smallvec", - "tracing", - "unsigned-varint 0.8.0", + "unsigned-varint 0.7.2", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -5189,9 +5489,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -5204,34 +5504,31 @@ dependencies = [ name = "network" version = "0.2.0" dependencies = [ + "anyhow", + "async-channel", "beacon_chain", "beacon_processor", "delay_map", "derivative", - "environment", "error-chain", "eth2", - "ethereum-types 0.14.1", "ethereum_ssz", "execution_layer", - "exit-future", "fnv", "futures", "genesis", + "gossipsub", "hex", - "if-addrs 0.6.7", - "igd", + "igd-next", "itertools", "lazy_static", "lighthouse_metrics", "lighthouse_network", "logging", - "lru", "lru_cache", "matches", - "num_cpus", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rlp", "slog", @@ -5246,7 +5543,6 @@ dependencies = [ "task_executor", "tokio", "tokio-stream", - "tokio-util 0.6.10", "types", ] @@ -5263,12 +5559,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -5325,11 +5622,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -5353,20 +5649,25 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -5375,11 +5676,12 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -5388,33 +5690,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" dependencies = [ "asn1-rs", ] @@ -5429,7 +5722,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" name = "oneshot_broadcast" version = "0.1.0" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -5440,9 +5733,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open-fastrlp" @@ -5471,11 +5764,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -5492,7 +5785,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -5503,18 +5796,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -5536,7 +5829,7 @@ dependencies = [ "lazy_static", "lighthouse_metrics", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", "serde", @@ -5580,15 +5873,15 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.9", + "parity-scale-codec-derive 3.6.12", "serde", ] @@ -5606,11 +5899,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5635,12 +5928,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -5659,15 +5952,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -5683,9 +5976,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -5725,11 +6018,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -5748,6 +6041,17 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + [[package]] name = "pharos" version = "0.5.3" @@ -5755,7 +6059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -5778,29 +6082,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -5824,15 +6128,15 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.9", "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" @@ -5842,15 +6146,15 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -5861,29 +6165,30 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "3.3.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -5913,9 +6218,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -5981,16 +6286,6 @@ dependencies = [ "sensitive_url", ] -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.48", -] - [[package]] name = "primeorder" version = "0.13.6" @@ -6039,42 +6334,18 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -6096,28 +6367,28 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "protobuf", "thiserror", ] [[package]] name = "prometheus-client" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510c4f1c9d81d556458f94c98f857748130ea9737bbd6053da497503b26ea63c" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -6129,7 +6400,27 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", +] + +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.5.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.3", + "rusty-fork", + "tempfile", + "unarray", ] [[package]] @@ -6187,10 +6478,24 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" -version = "0.3.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.2", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick-protobuf-codec" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474" +dependencies = [ + "asynchronous-codec 0.7.0", "bytes", "quick-protobuf", "thiserror", @@ -6221,9 +6526,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" dependencies = [ "bytes", "futures-io", @@ -6231,7 +6536,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.8", "thiserror", "tokio", "tracing", @@ -6239,15 +6544,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" dependencies = [ "bytes", "rand", - "ring 0.16.20", + "ring 0.17.8", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.8", "slab", "thiserror", "tinyvec", @@ -6256,22 +6561,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" dependencies = [ - "bytes", "libc", - "socket2 0.5.5", + "once_cell", + "socket2 0.5.7", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6283,7 +6588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scheduled-thread-pool", ] @@ -6350,9 +6655,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -6374,7 +6679,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ - "pem 3.0.3", + "pem 3.0.4", "ring 0.16.20", "time", "yasna", @@ -6399,10 +6704,19 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -6411,14 +6725,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -6432,13 +6746,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -6449,23 +6763,23 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", - "http 0.2.11", + "h2", + "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "hyper-rustls", @@ -6478,16 +6792,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-util 0.7.10", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -6546,16 +6861,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6595,6 +6911,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "rpds" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ef5140bcb576bfd6d56cd2de709a7d17851ac1f3805e67fe9d99e42a11821f" +dependencies = [ + "archery", +] + [[package]] name = "rtnetlink" version = "0.10.1" @@ -6610,6 +6935,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "ruint" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp", + "num-bigint", + "num-traits", + "parity-scale-codec 3.6.12", + "primitive-types 0.12.2", + "proptest", + "rand", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" + [[package]] name = "rusqlite" version = "0.28.0" @@ -6626,9 +6981,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -6642,13 +6997,22 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver", + "semver 1.0.23", ] [[package]] @@ -6676,39 +7040,53 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki 0.101.7", "sct", ] [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -6724,19 +7102,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -6744,31 +7122,44 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] [[package]] name = "rw-stream-sink" version = "0.4.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" dependencies = [ "futures", "pin-project", @@ -6777,9 +7168,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arith" @@ -6805,23 +7196,23 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", "derive_more", - "parity-scale-codec 3.6.9", + "parity-scale-codec 3.6.12", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6842,7 +7233,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -6875,7 +7266,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -6900,7 +7291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.9", "generic-array", "pkcs8 0.10.2", "subtle", @@ -6909,11 +7300,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6922,9 +7313,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -6932,13 +7323,31 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "send_wrapper" version = "0.6.0" @@ -6955,9 +7364,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -6972,32 +7381,22 @@ dependencies = [ "serde_urlencoded", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -7006,9 +7405,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -7016,20 +7415,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -7070,11 +7469,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.30" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -7138,6 +7537,16 @@ dependencies = [ "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" +dependencies = [ + "cc", + "cfg-if", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -7155,9 +7564,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -7200,14 +7609,14 @@ version = "0.2.0" dependencies = [ "clap", "env_logger 0.9.3", - "eth1", - "eth1_test_rig", + "eth2_network_config", "execution_layer", "futures", "node_test_rig", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rayon", "sensitive_url", + "serde_json", "tokio", "types", ] @@ -7245,13 +7654,12 @@ dependencies = [ "logging", "lru", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", "safe_arith", "serde", "slog", - "sloggers", "strum", "tempfile", "tree_hash", @@ -7361,11 +7769,11 @@ dependencies = [ [[package]] name = "slog-term" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" +checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" dependencies = [ - "atty", + "is-terminal", "slog", "term", "thread_local", @@ -7374,9 +7782,9 @@ dependencies = [ [[package]] name = "sloggers" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0a4d8569a69ee56f277bffc2f6eee637b98ed468448e8a5a84fa63efe4de9d" +checksum = "75062c2738b82cd45ae633623caae3393f43eb00aada1dc2d3ebe88db6b0db9b" dependencies = [ "chrono", "libc", @@ -7402,15 +7810,15 @@ version = "0.2.0" dependencies = [ "lazy_static", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "types", ] [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snap" @@ -7420,17 +7828,17 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm 0.10.3", "blake2", "chacha20poly1305", "curve25519-dalek", "rand_core", - "ring 0.17.7", - "rustc_version", + "ring 0.17.8", + "rustc_version 0.4.0", "sha2 0.10.8", "subtle", ] @@ -7447,12 +7855,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7484,14 +7892,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.9", ] [[package]] name = "ssz_types" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382939886cb24ee8ac885d09116a60f6262d827c7a9e36012b4f6d3d0116d0b3" +checksum = "625b20de2d4b3891e6972f4ce5061cb11bd52b3479270c4b177c134b571194a9" dependencies = [ "arbitrary", "derivative", @@ -7505,6 +7913,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "state_processing" version = "0.2.0" @@ -7564,7 +7978,7 @@ dependencies = [ "leveldb", "lighthouse_metrics", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "slog", "sloggers", @@ -7576,27 +7990,27 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[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 = "strum" version = "0.24.1" @@ -7612,7 +8026,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -7627,9 +8041,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "superstruct" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b9e5728aa1a87141cefd4e7509903fc01fa0dcb108022b1e841a67c5159fc5" +checksum = "6f4e1f478a7728f8855d7e620e9a152cf8932c6614f86564c886f9b8141f3201" dependencies = [ "darling", "itertools", @@ -7661,9 +8075,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -7677,15 +8091,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "synstructure" -version = "0.12.6" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.66", ] [[package]] @@ -7729,9 +8148,8 @@ name = "system_health" version = "0.1.0" dependencies = [ "lighthouse_network", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", - "serde_json", "sysinfo", "types", ] @@ -7765,10 +8183,11 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" name = "task_executor" version = "0.1.0" dependencies = [ - "exit-future", + "async-channel", "futures", "lazy_static", "lighthouse_metrics", + "logging", "slog", "sloggers", "tokio", @@ -7776,14 +8195,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -7807,6 +8225,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.34", + "windows-sys 0.48.0", +] + [[package]] name = "test-test_logger" version = "0.1.0" @@ -7840,40 +8268,31 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -7890,14 +8309,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", - "libc", - "num_threads", + "num-conv", "powerfmt", "serde", "time-core", @@ -7912,10 +8330,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -7985,9 +8404,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -7996,7 +8415,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -8019,7 +8438,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -8045,16 +8464,16 @@ dependencies = [ "futures-channel", "futures-util", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "percent-encoding", "phf", "pin-project-lite", "postgres-protocol", "postgres-types", "rand", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", - "tokio-util 0.7.10", + "tokio-util", "whoami", ] @@ -8064,7 +8483,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] @@ -8074,54 +8493,38 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.6.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "log", "pin-project-lite", "slab", "tokio", ] -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - [[package]] name = "toml" version = "0.5.11" @@ -8145,9 +8548,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -8158,7 +8561,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -8167,11 +8570,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -8236,7 +8639,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -8309,9 +8712,9 @@ dependencies = [ [[package]] name = "tree_hash" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c998ac5fe2b07c025444bdd522e6258110b63861c6698eedc610c071980238d" +checksum = "134d6b24a5b829f30b5ee7de05ba7384557f5f6b00e29409cdf2392f93201bfa" dependencies = [ "ethereum-types 0.14.1", "ethereum_hashing", @@ -8320,9 +8723,9 @@ dependencies = [ [[package]] name = "tree_hash_derive" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84303a9c7cda5f085a3ed9cd241d1e95e04d88aab1d679b02f212e653537ba86" +checksum = "9ce7bccc538359a213436af7bc95804bdbf1c2a21d80e22953cbe9e096837ff1" dependencies = [ "darling", "quote", @@ -8339,6 +8742,16 @@ dependencies = [ "rlp", ] +[[package]] +name = "triomphe" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" +dependencies = [ + "serde", + "stable_deref_trait", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -8378,12 +8791,14 @@ dependencies = [ "maplit", "merkle_proof", "metastruct", - "parking_lot 0.12.1", + "milhouse", + "parking_lot 0.12.3", "paste", "rand", "rand_xorshift", "rayon", "regex", + "rpds", "rusqlite", "safe_arith", "serde", @@ -8393,7 +8808,6 @@ dependencies = [ "smallvec", "ssz_types", "state_processing", - "strum", "superstruct", "swap_or_not_shuffle", "tempfile", @@ -8403,6 +8817,12 @@ dependencies = [ "tree_hash_derive", ] +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + [[package]] name = "uint" version = "0.9.5" @@ -8416,6 +8836,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unescape" version = "0.1.0" @@ -8445,18 +8871,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-width" -version = "0.1.11" +name = "unicode-properties" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-xid" @@ -8486,25 +8912,19 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - -[[package]] -name = "unsigned-varint" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" -dependencies = [ - "bytes", - "tokio-util 0.6.10", -] +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsigned-varint" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" +dependencies = [ + "asynchronous-codec 0.6.2", + "bytes", +] [[package]] name = "unsigned-varint" @@ -8512,8 +8932,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" dependencies = [ - "asynchronous-codec", "bytes", + "tokio-util", ] [[package]] @@ -8534,7 +8954,7 @@ version = "0.1.0" dependencies = [ "lazy_static", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -8548,6 +8968,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -8574,11 +9000,11 @@ dependencies = [ "eth2", "eth2_keystore", "ethereum_serde_utils", - "exit-future", + "fdlimit", "filesystem", "futures", "hex", - "hyper 1.1.0", + "hyper 1.3.1", "itertools", "lazy_static", "libsecp256k1", @@ -8588,7 +9014,7 @@ dependencies = [ "logging", "malloc_utils", "monitoring_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "reqwest", "ring 0.16.20", @@ -8637,12 +9063,10 @@ name = "validator_manager" version = "0.1.0" dependencies = [ "account_utils", - "bls", "clap", "clap_utils", "environment", "eth2", - "eth2_keystore", "eth2_network_config", "eth2_wallet", "ethereum_serde_utils", @@ -8688,10 +9112,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] -name = "walkdir" -version = "2.4.0" +name = "wait-timeout" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -8708,28 +9141,29 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" -source = "git+https://github.com/seanmonstar/warp.git#7b07043cee0ca24e912155db4e8f6d9ab7c049ed" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "hyper 0.14.28", "log", "mime", "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 2.0.0", + "rustls-pemfile 2.1.2", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-rustls 0.25.0", - "tokio-util 0.7.10", + "tokio-util", "tower-service", "tracing", ] @@ -8739,6 +9173,7 @@ name = "warp_utils" version = "0.1.0" dependencies = [ "beacon_chain", + "bytes", "eth2", "headers", "lazy_static", @@ -8746,6 +9181,7 @@ dependencies = [ "safe_arith", "serde", "serde_array_query", + "serde_json", "state_processing", "tokio", "types", @@ -8759,10 +9195,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.90" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -8770,24 +9212,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -8797,9 +9239,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8807,28 +9249,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -8860,15 +9302,14 @@ dependencies = [ "beacon_chain", "beacon_node", "bls", - "byteorder", "clap", + "clap_utils", "diesel", "diesel_migrations", "env_logger 0.9.3", "eth2", - "hex", "http_api", - "hyper 1.1.0", + "hyper 1.3.1", "log", "logging", "network", @@ -8889,9 +9330,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -8902,13 +9353,13 @@ name = "web3signer_tests" version = "0.1.0" dependencies = [ "account_utils", + "async-channel", "environment", "eth2_keystore", "eth2_network_config", - "exit-future", "futures", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "reqwest", "serde", "serde_json", @@ -8925,29 +9376,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.30", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -8959,15 +9399,9 @@ checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" [[package]] name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "wildmatch" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -8987,11 +9421,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -9037,7 +9471,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -9064,7 +9498,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -9099,17 +9533,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "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]] @@ -9126,9 +9561,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -9144,9 +9579,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -9162,9 +9597,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +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" @@ -9180,9 +9621,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -9198,9 +9639,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -9216,9 +9657,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -9234,15 +9675,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -9268,7 +9709,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version", + "rustc_version 0.4.0", "send_wrapper", "thiserror", "wasm-bindgen", @@ -9293,9 +9734,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -9305,9 +9746,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ "asn1-rs", "data-encoding", @@ -9322,9 +9763,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmltree" @@ -9336,12 +9777,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "498f4d102a79ea1c9d4dd27573c0fc96ad74c023e8da38484e47883076da25fb" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] @@ -9353,7 +9796,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", @@ -9361,15 +9804,15 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002" +checksum = "5f97202f6b125031b95d83e01dc57292b529384f80bfae4677e4bbc10178cf72" dependencies = [ "futures", "instant", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", @@ -9386,29 +9829,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -9421,7 +9864,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -9430,7 +9873,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.8.3", + "aes 0.8.4", "byteorder", "bzip2", "constant_time_eq", @@ -9465,9 +9908,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index b348233d312d..b3f13ac48b8d 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "4.6.0"; + version = "5.2.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -33,12 +33,12 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-uMrVnVvYXcY2Axn3ycsf+Pwur3HYGoOYjjUkGS5c3l4="; + hash = "sha256-kruHYFPQ9H9HtEjzscQOyghPSpx++wNbHDYOVo0qtjY="; }; patches = [ ./use-system-sqlite.patch - ./use-c-kzg-from-crates-io.patch + ./fix-dep-lazy_static.patch ]; postPatch = '' @@ -48,12 +48,9 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "amcl-0.3.0" = "sha256-kc8k/ls4W0TwFBsRcyyotyz8ZBEjsZXHeJnJtsnW/LM="; - "discv5-0.4.0" = "sha256-GKAk9Du6fy0ldeBEwPueDbVPhyNxdKNROKpMJvR/OTc="; - "futures-bounded-0.2.3" = "sha256-/LbD+je9P1lPnXMJVDqRQHJziQPXPvSDmQadTfsQ5I8="; + "alloy-consensus-0.1.0" = "sha256-y5AIZN4d7Vm2dVa3jd0e6zXwC8hzPyOv0h5+W/Az3rs="; "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q="; "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk="; - "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE="; }; }; diff --git a/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch b/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch new file mode 100644 index 000000000000..bc0b4b51a10d --- /dev/null +++ b/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch @@ -0,0 +1,11 @@ +diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml +index fe966f4a9..f4153fec2 100644 +--- a/common/lighthouse_metrics/Cargo.toml ++++ b/common/lighthouse_metrics/Cargo.toml +@@ -8,3 +8,6 @@ edition = { workspace = true } + + [dependencies] + prometheus = "0.13.0" ++ ++[dev-dependencies] ++lazy_static.workspace = true diff --git a/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch b/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch deleted file mode 100644 index b6cb1768636a..000000000000 --- a/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/crypto/kzg/Cargo.toml b/crypto/kzg/Cargo.toml -index 7b70166f9..857fa4ee1 100644 ---- a/crypto/kzg/Cargo.toml -+++ b/crypto/kzg/Cargo.toml -@@ -16,4 +16,4 @@ serde = { workspace = true } - ethereum_serde_utils = { workspace = true } - hex = { workspace = true } - ethereum_hashing = { workspace = true } --c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "748283cced543c486145d5f3f38684becdfe3e1b"} -\ No newline at end of file -+c-kzg = "0.4.0" diff --git a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch index 88025059662e..28abf3b119de 100644 --- a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch +++ b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch @@ -1,11 +1,11 @@ diff --git a/Cargo.toml b/Cargo.toml -index ca55d00d4..76514b545 100644 +index b942d1719..da6f245c5 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -139,7 +139,7 @@ rayon = "1.7" - regex = "1" +@@ -148,7 +148,7 @@ regex = "1" reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] } ring = "0.16" + rpds = "0.11" -rusqlite = { version = "0.28", features = ["bundled"] } +rusqlite = { version = "0.28" } serde = { version = "1", features = ["derive"] } From 64e884c3a1a35d29aa82ea3e24382efe450cc16d Mon Sep 17 00:00:00 2001 From: Cody Schafer Date: Sun, 16 Jun 2024 03:13:38 -0400 Subject: [PATCH 027/562] nixos/lighthouse: update networks for 5.2.0 This list matches the networks supported by lighthouse 5.2.0 --- nixos/modules/services/blockchain/ethereum/lighthouse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index dcf56e187eae..a5ace1a9450f 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -192,7 +192,7 @@ in { }; network = mkOption { - type = types.enum [ "mainnet" "prater" "goerli" "gnosis" "kiln" "ropsten" "sepolia" ]; + type = types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ]; default = "mainnet"; description = '' The network to connect to. Mainnet is the default ethereum network. From 7828cfd939a4521ad8a6019ee0476d41d921bf14 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:39:30 -0400 Subject: [PATCH 028/562] spot: migrate to by-name --- .../audio/spot/default.nix => by-name/sp/spot/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/spot/default.nix => by-name/sp/spot/package.nix} (100%) diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/by-name/sp/spot/package.nix similarity index 100% rename from pkgs/applications/audio/spot/default.nix rename to pkgs/by-name/sp/spot/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b24e0955a7c5..c6504895a46e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31522,8 +31522,6 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spot = callPackage ../applications/audio/spot { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd { From dcd96f460247de8ef79797b11c0f009a27638f70 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:39:47 -0400 Subject: [PATCH 029/562] spot: format with nixfmt --- pkgs/by-name/sp/spot/package.nix | 45 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 183aae58d167..ddf9a1673caf 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, gettext -, desktop-file-utils -, cargo -, rustPlatform -, rustc -, pkg-config -, glib -, libadwaita -, libhandy -, gtk4 -, openssl -, alsa-lib -, libpulseaudio -, wrapGAppsHook4 -, blueprint-compiler -, gst_all_1 +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + meson, + ninja, + gettext, + desktop-file-utils, + cargo, + rustPlatform, + rustc, + pkg-config, + glib, + libadwaita, + libhandy, + gtk4, + openssl, + alsa-lib, + libpulseaudio, + wrapGAppsHook4, + blueprint-compiler, + gst_all_1, }: stdenv.mkDerivation rec { From 4a67d03c1d72d576d78efb5e00127ecd02d82765 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:40:00 -0400 Subject: [PATCH 030/562] spot: adopt --- pkgs/by-name/sp/spot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index ddf9a1673caf..77cabcc19634 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { mainProgram = "spot"; homepage = "https://github.com/xou816/spot"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.linux; }; } From c90d50992ee037c77aa0964c07af95aea9384c9d Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 28 Jun 2024 10:23:54 +0200 Subject: [PATCH 031/562] ngrok: 3.9.0 -> 3.10.1 --- pkgs/tools/networking/ngrok/versions.json | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index 81791bcb7f83..b9a285a13e55 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/4eyRd2Y9zhP/ngrok-v3-3.9.0-linux-386", - "sha256": "6b8b66e5608355dcf913e927a4641821867ecc177d8dce3d0153638748cf305b", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/9uULeng4k9u/ngrok-v3-3.10.1-linux-386", + "sha256": "806700e4c1aa5d6cb10d2ef1ed8079a2e2e8e6d1198f313b0df389589356fcf7", + "version": "3.10.1" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/2d3ZAS5cS1y/ngrok-v3-3.9.0-linux-amd64", - "sha256": "4b149cb7aa4aa97836b663aab205f2707c2b4309779d07cec593d66c1bd5eafa", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/81d5kzodW8G/ngrok-v3-3.10.1-linux-amd64", + "sha256": "d23ed659469e6f58ed0c34bdbc9846744df908c960f1b1e576cf147345f5e833", + "version": "3.10.1" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/jwEoHhyU22A/ngrok-v3-3.9.0-linux-arm", - "sha256": "d4080caaf7d178c9c04ab26826d9dd190e2c94679aba6ac68afcc9066d1b4eb8", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/8iFd8QPGgx1/ngrok-v3-3.10.1-linux-arm", + "sha256": "36dd1a3893552218f21e118902ae3dabbc43a7f2de1d78937e304893d970377b", + "version": "3.10.1" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/dCoWhZwgRB3/ngrok-v3-3.9.0-linux-arm64", - "sha256": "363c6757ccf511579ed0215b3e9ce723e0bc728d26981ee9c77ceda94d626603", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/c2kv1gi2bti/ngrok-v3-3.10.1-linux-arm64", + "sha256": "86ecd3f4e43c1631a8332a9ee7d629073a7d7bf7412d2d60e1f390f7b2d30bc1", + "version": "3.10.1" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/n7RJLYWCbkH/ngrok-v3-3.9.0-darwin-amd64", - "sha256": "29d699bca2cac98964ebb4f49573c5b5f005d2db1f182d6fc34d98ebc675df6c", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/44qfe6kGiDc/ngrok-v3-3.10.1-darwin-amd64", + "sha256": "fb0676289962f1310d8902e9c42d2d2ad1d653138e00490209bd422471888429", + "version": "3.10.1" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/h74Tf9SEyC4/ngrok-v3-3.9.0-darwin-arm64", - "sha256": "134a4b69f53731b6fac0a60ee2c7eef9450b966dd51b895c10fc5705a4211a55", - "version": "3.9.0" + "url": "https://bin.equinox.io/a/9EoBqwofoME/ngrok-v3-3.10.1-darwin-arm64", + "sha256": "8cee685b259bf32088acee05d6388b912fb10a8e3ba5d99569066ebdad5d5a6f", + "version": "3.10.1" } } From b32e7f6e7cc41110afab57f58af9f9b1344fb033 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 28 Jun 2024 17:41:10 +0800 Subject: [PATCH 032/562] haskellPackages.arbtt: Build and install manpages Resolves #323030 --- .../haskell-modules/configuration-nix.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d6f3a25cab8a..acd5278d7eb7 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -242,6 +242,19 @@ self: super: builtins.intersectAttrs super { cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; arbtt = overrideCabal (drv: { + buildTools = drv.buildTools or [] ++ [ + pkgs.buildPackages.installShellFiles + pkgs.buildPackages.libxslt + ]; + postBuild = '' + xsl=${pkgs.buildPackages.docbook_xsl}/share/xml/docbook-xsl + make -C doc man XSLTPROC_MAN_STYLESHEET=$xsl/manpages/profile-docbook.xsl + ''; + postInstall = '' + for f in doc/man/man[1-9]/*; do + installManPage $f + done + ''; # The test suite needs the packages's executables in $PATH to succeed. preCheck = '' for i in $PWD/dist/build/*; do From 05ee9f4268204d90f9ed1a4aef7071591443a4b3 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 28 Jun 2024 16:15:18 +0000 Subject: [PATCH 033/562] wootility: Revamp --- pkgs/tools/misc/wootility/default.nix | 28 ++++++++++++--------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index c5477bb83844..7a6343470f4a 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -1,20 +1,20 @@ { appimageTools , fetchurl , lib -, xorg -, udev -, wooting-udev-rules , makeWrapper }: -appimageTools.wrapType2 rec { +let pname = "wootility"; version = "4.6.20"; - src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk="; }; +in + +appimageTools.wrapType2 { + inherit pname version src; extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; @@ -34,20 +34,16 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiPkgs = extraPkgs; - extraPkgs = - pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ - udev - wooting-udev-rules - xorg.libxkbfile - ]); + extraPkgs = pkgs: with pkgs; ([ + xorg.libxkbfile + ]); - meta = with lib; { + meta = { homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - maintainers = with maintainers; [ davidtwco sodiboo ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ davidtwco sodiboo ]; mainProgram = "wootility"; }; } From 94644ca8aacba4770862554f1eb949c57fc62f9b Mon Sep 17 00:00:00 2001 From: Finn Landweber Date: Fri, 28 Jun 2024 18:39:06 +0200 Subject: [PATCH 034/562] myrescue: add myrescue-bitmap2ppm, myrescue-stat --- pkgs/by-name/my/myrescue/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/my/myrescue/package.nix b/pkgs/by-name/my/myrescue/package.nix index 1f47499c55bb..975599c219f8 100644 --- a/pkgs/by-name/my/myrescue/package.nix +++ b/pkgs/by-name/my/myrescue/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 myrescue -t $out/bin + install -Dm755 myrescue myrescue-bitmap2ppm myrescue-stat -t $out/bin installManPage ../doc/myrescue.1 runHook postInstall ''; From 169cac028346c92c8068d4be6cb4744dea7599b4 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Fri, 28 Jun 2024 18:04:44 -0700 Subject: [PATCH 035/562] haskellPackages.ghc98.th-desugar: 1.15 -> 1.16 With v1.16 the package is building again on GHC9.8 --- .../configuration-ghc-9.8.x.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+) 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 ae8aa37a720c..1b17494a7656 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -69,6 +69,7 @@ self: super: { hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; websockets = self.websockets_0_13_0_0; + th-desugar = self.th-desugar_1_16; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e3845b8c16f8..030b9bb998e6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -125,6 +125,7 @@ extra-packages: - ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci - versions < 6 # 2024-04-22: required by spago-0.21 - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 + - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5aef784d8ab5..55dadc69fe29 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -304945,6 +304945,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-desugar_1_16" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl + , ordered-containers, syb, template-haskell, th-abstraction + , th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.16"; + sha256 = "sha256-TsuH4NNhJ4xApiQQzbVYACns1jDP0sYZzkGBJRiGghA"; + libraryHaskellDepends = [ + base containers ghc-prim mtl ordered-containers syb + template-haskell th-abstraction th-orphans transformers-compat + ]; + testHaskellDepends = [ + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-desugar_1_17" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction From c1ff97e36248c8ba6b516d69b8892cda314dc6b2 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Fri, 28 Jun 2024 18:39:19 -0700 Subject: [PATCH 036/562] haskellPackages.ghc98.singletons-th: 3.2 -> 3.3 --- .../haskell-modules/configuration-ghc-9.8.x.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) 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 1b17494a7656..4fa9a5ad7e19 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -70,6 +70,7 @@ self: super: { ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; websockets = self.websockets_0_13_0_0; th-desugar = self.th-desugar_1_16; + singletons-th = self.singletons-th_3_3; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 030b9bb998e6..a4b7c8959b85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -126,6 +126,7 @@ extra-packages: - versions < 6 # 2024-04-22: required by spago-0.21 - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 + - singletons-th == 3.3 # 2024-06-28: preserve for GHC 9.8 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55dadc69fe29..e98f339e6dcc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -280107,6 +280107,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-th_3_3" = callPackage + ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons + , syb, template-haskell, th-desugar, th-orphans, transformers + }: + mkDerivation { + pname = "singletons-th"; + version = "3.3"; + sha256 = "sha256-GwtFa5/whjhQDqkK0C5fvrOw/KShkt6x6rwO0t0zO4w="; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl singletons syb template-haskell + th-desugar th-orphans transformers + ]; + description = "A framework for generating singleton types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th_3_4" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers From 45c7333061d2d80619294bfb7aa31cb44f1ec7e1 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Fri, 28 Jun 2024 18:45:49 -0700 Subject: [PATCH 037/562] haskellPackages.ghc98.singletons-base: 3.2 -> 3.3 and unbroken --- .../configuration-ghc-9.8.x.nix | 1 + .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 23 +++++++++++++++++++ 4 files changed, 25 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 4fa9a5ad7e19..b57d89573d64 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -71,6 +71,7 @@ self: super: { websockets = self.websockets_0_13_0_0; th-desugar = self.th-desugar_1_16; singletons-th = self.singletons-th_3_3; + singletons-base = self.singletons-base_3_3; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 096c5151739d..a960f078d3e9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5440,7 +5440,6 @@ broken-packages: - simplistic-generics # failure in job https://hydra.nixos.org/build/233217412 at 2023-09-02 - singlethongs # failure in job https://hydra.nixos.org/build/233202756 at 2023-09-02 - singleton-dict # failure in job https://hydra.nixos.org/build/233245405 at 2023-09-02 - - singletons-base # failure in job https://hydra.nixos.org/build/252714303 at 2024-03-16 - singleton-typelits # failure in job https://hydra.nixos.org/build/233250877 at 2023-09-02 - single-tuple # failure in job https://hydra.nixos.org/build/233204418 at 2023-09-02 - singnal # failure in job https://hydra.nixos.org/build/233214111 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a4b7c8959b85..56d1e5aae599 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -127,6 +127,7 @@ extra-packages: - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 - singletons-th == 3.3 # 2024-06-28: preserve for GHC 9.8 + - singletons-base == 3.3 # 2024-06-28: preserve for GHC 9.8 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e98f339e6dcc..846d288b679d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -280048,6 +280048,29 @@ self: { broken = true; }) {}; + "singletons-base_3_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, deepseq, directory + , filepath, pretty, process, singletons, singletons-th, tasty + , tasty-golden, template-haskell, text, th-desugar, turtle + }: + mkDerivation { + pname = "singletons-base"; + version = "3.3"; + sha256 = "sha256-CEfQTbHmTHeGkFn3jer8eGPEt9cDSqhto9c8ULxPB8E"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base pretty singletons singletons-th template-haskell text + th-desugar + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A promoted and singled version of the base library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-base_3_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty From cd98282ebc0a811a35be8344d8815fea9d8890e6 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 29 Jun 2024 10:27:52 -0700 Subject: [PATCH 038/562] haskellPackages.ghc98.th-desugar: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index b57d89573d64..73661b29bef9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -69,7 +69,7 @@ self: super: { hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; websockets = self.websockets_0_13_0_0; - th-desugar = self.th-desugar_1_16; + th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 singletons-th = self.singletons-th_3_3; singletons-base = self.singletons-base_3_3; From e7808666ea6abbe5fb9037d72710df77b1be6b01 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 1 Jul 2024 21:42:50 +0200 Subject: [PATCH 039/562] nixos/tests/darling-dmg: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/darling-dmg.nix | 34 +++++++++++++++++++ .../tools/filesystems/darling-dmg/default.nix | 8 ++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/darling-dmg.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d16b747bfa95..93391ee3d43a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -240,6 +240,7 @@ in { custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; darling = handleTest ./darling.nix {}; + darling-dmg = runTest ./darling-dmg.nix; dae = handleTest ./dae.nix {}; davis = handleTest ./davis.nix {}; db-rest = handleTest ./db-rest.nix {}; diff --git a/nixos/tests/darling-dmg.nix b/nixos/tests/darling-dmg.nix new file mode 100644 index 000000000000..0a2ec8298122 --- /dev/null +++ b/nixos/tests/darling-dmg.nix @@ -0,0 +1,34 @@ +{ lib, pkgs, ... }: +# This needs to be a VM test because the FUSE kernel module can't be used inside of a derivation in the Nix sandbox. +# This test also exercises the LZFSE support in darling-dmg. +let + # The last kitty release which is stored on an HFS+ filesystem inside the disk image + test-dmg-file = pkgs.fetchurl { + url = "https://github.com/kovidgoyal/kitty/releases/download/v0.17.4/kitty-0.17.4.dmg"; + hash = "sha256-m+c5s8fFrgUc0xQNI196WplYBZq9+lNgems5haZUdvA="; + }; +in +{ + name = "darling-dmg"; + meta.maintainers = with lib.maintainers; [ Luflosi ]; + + nodes.machine = {}; + + testScript = '' + start_all() + + machine.succeed("mkdir mount-point") + machine.succeed("'${pkgs.darling-dmg}/bin/darling-dmg' '${test-dmg-file}' mount-point") + + # Crude way to verify the contents + # Taken from https://stackoverflow.com/questions/545387/linux-compute-a-single-hash-for-a-given-folder-contents + # This could be improved. It does not check symlinks for example. + hash = machine.succeed(""" + (find mount-point -type f -print0 | sort -z | xargs -0 sha256sum; \ + find mount-point \( -type f -o -type d \) -print0 | sort -z | \ + xargs -0 stat -c '%n %a') \ + | sha256sum + """).strip() + assert hash == "00e61c2ef171093fbf194e420c17bb84bcdb823238d70eb46e375bab2427cc21 -", f"The disk image contents differ from what was expected (was {hash})" + ''; +} diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 8884ef2f63d5..916b2db3b64e 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse, libiconv }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse, libiconv +, nixosTests +}: stdenv.mkDerivation rec { pname = "darling-dmg"; @@ -20,6 +22,10 @@ stdenv.mkDerivation rec { "-llzfse" ]; + passthru.tests = { + inherit (nixosTests) darling-dmg; + }; + meta = with lib; { homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; From 9080624466f5dbdcde31d8d2738e937d95d2d87b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 1 Jul 2024 16:44:09 +0200 Subject: [PATCH 040/562] darling-dmg: 1.0.4+git20200427 -> 1.0.4-unstable-2023-07-26 --- pkgs/tools/filesystems/darling-dmg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 916b2db3b64e..4fca75a45bc8 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -2,15 +2,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "darling-dmg"; - version = "1.0.4+git20200427"; + version = "1.0.4-unstable-2023-07-26"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling-dmg"; - rev = "71cc76c792db30328663272788c0b64aca27fdb0"; - sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv"; + rev = "a36bf0c07b16675b446377890c5f6f74563f84dd"; + hash = "sha256-QM75GuFHl2gRlRw1BmTexUE1d9YNnhG0qmTqmE9kMX4="; }; nativeBuildInputs = [ cmake ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.darlinghq.org/"; - description = "Darling lets you open macOS dmgs on Linux"; + description = "FUSE module for .dmg files (containing an HFS+ filesystem)"; mainProgram = "darling-dmg"; platforms = platforms.unix; license = licenses.gpl3Only; From 496099641c37292cc00e438336fec1cb5f0ceeb7 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 1 Jul 2024 17:15:56 +0200 Subject: [PATCH 041/562] darling-dmg: migrate to by-name --- .../default.nix => by-name/da/darling-dmg/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/filesystems/darling-dmg/default.nix => by-name/da/darling-dmg/package.nix} (100%) diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/by-name/da/darling-dmg/package.nix similarity index 100% rename from pkgs/tools/filesystems/darling-dmg/default.nix rename to pkgs/by-name/da/darling-dmg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8112217897fe..f68fd8d4c357 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38951,8 +38951,6 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - depotdownloader = callPackage ../tools/misc/depotdownloader { }; dbacl = callPackage ../tools/misc/dbacl { }; From bd04ba7524b91b9f3be17f21e83c1c07de7fedf9 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Mon, 1 Jul 2024 17:47:47 -0700 Subject: [PATCH 042/562] haskellPackages.tomland: fix build ``` nix build .#haskellPackages.tomland ``` succeeds now --- .../haskell-modules/configuration-common.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3a337417940..19a82e8bfe61 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2963,20 +2963,6 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; - tomland = overrideCabal (drv: { - # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). - # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd - jailbreak = true; - # Fix compilation of test suite with GHC >= 9.8 - patches = drv.patches or [ ] ++ [ - (pkgs.fetchpatch { - name = "tomland-disambiguate-string-type-for-ghc-9.8.patch"; - url = "https://github.com/kowainik/tomland/commit/0f107269b8835a8253f618b75930b11d3a3f1337.patch"; - sha256 = "13ndlfw32xh8jz5g6lpxzn2ks8zchb3y4j1jbbm2x279pdyvvars"; - }) - ]; - }) super.tomland; - # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; From 7370f5d0fa0b3e791eeda492f9c595ef9775b430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Wed, 3 Jul 2024 09:08:08 +0900 Subject: [PATCH 043/562] python3Packages.formbox: 0.4.3 -> 1.0.0 --- pkgs/development/python-modules/formbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index f3f1ce44febb..a67216ebf30f 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "formbox"; - version = "0.4.3"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchzip { url = "https://trong.loang.net/~cnx/formbox/snapshot/formbox-${version}.tar.gz"; - hash = "sha256-sRu0otyeYpxot/Fyiz3wyQJsJvl8nsgIVitzT8frxLE="; + hash = "sha256-YS0hkmEly7SXQvMIPLmqY89ux6E951twAy7iA3K+asA="; }; nativeBuildInputs = [ flit-core ]; From fc6b91df58485a5883d7e8cc398fa0faa551d1ba Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Wed, 3 Jul 2024 10:09:35 +0200 Subject: [PATCH 044/562] haskellPackages.libmpd: Remove unnecessary patch Merged in https://github.com/vimus/libmpd-haskell/pull/138 --- .../haskell-modules/configuration-ghc-9.6.x.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 20af8f508b32..df467151596a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -144,15 +144,6 @@ self: super: { }) super.ascii-numbers; - # Fix ghc-9.6.x build errors. - libmpd = appendPatch - # https://github.com/vimus/libmpd-haskell/pull/138 - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; - name = "vimus-libmpd-haskell-pull-138.patch"; - sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; - }) - super.libmpd; - # Apply patch from PR with mtl-2.3 fix. ConfigFile = overrideCabal (drv: { editedCabalFile = null; From 09d92586514f91ae2bfa8bcb2d45efc7eee85091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Jul 2024 07:01:07 -0700 Subject: [PATCH 045/562] python312Packages.huawei-lte-api: 1.8.1 -> 1.9.3 Diff: https://github.com/Salamek/huawei-lte-api/compare/refs/tags/1.8.1...1.9.3 Changelog: https://github.com/Salamek/huawei-lte-api/releases/tag/1.9.3 --- .../python-modules/huawei-lte-api/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 15c7fcf81e0d..fd331c703670 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -6,24 +6,27 @@ pycryptodomex, pytestCheckHook, requests, + setuptools, xmltodict, }: buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.8.1"; - format = "setuptools"; + version = "1.9.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-KmkoCQDZ1NC3CKfV5DZBukExF9fUTojvWv2ZLTCzRZU="; + hash = "sha256-D3PABCFjy7ZhP4L02rUvmKttejDPUE5whxqQih0MvpU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pycryptodomex requests xmltodict From f1040f412cada833739aba80b004667dec8eb978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Jul 2024 07:24:33 -0700 Subject: [PATCH 046/562] python312Packages.krakenex: 2.2.1 -> 2.2.2 Diff: https://github.com/veox/python3-krakenex/compare/v2.2.1...v2.2.2 Changelog: https://github.com/veox/python3-krakenex/blob/v2.2.2/CHANGELOG.rst --- pkgs/development/python-modules/krakenex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix index 8009a6264b53..fb756b65ae64 100644 --- a/pkgs/development/python-modules/krakenex/default.nix +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "krakenex"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "veox"; repo = "python3-krakenex"; rev = "v${version}"; - hash = "sha256-aWALkM79VOm2/EQdp2rD1sm0NxhLKZOXzAs8m+t7M0s="; + hash = "sha256-htldEds3vf9bjFkJAew0e0fHDLD15OTcVYybSmIp3DI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; # no tests implemented doCheck = false; From 6e291fc330624af316ad4d801b7c33581e3ebbe8 Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Wed, 3 Jul 2024 21:43:33 +0200 Subject: [PATCH 047/562] git-annex: Update hash Signed-off-by: Roosembert Palacios --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3a337417940..23a56562c549 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -407,7 +407,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-adV7I1P0O/dqH1rEyf3c2Vp4GSiiHReJyqnkSOYQGT0="; + hash = "sha256-D/lvNe2pa1vZvMEsVV4SuwPAJd2Aer0yA3bRae6j3jQ="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From c1f87bcaccd1c19cfbc3eacebe520f5c31c6846a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jul 2024 09:19:14 +0000 Subject: [PATCH 048/562] mysql_jdbc: 8.4.0 -> 9.0.0 --- pkgs/servers/sql/mysql/jdbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index b7add5c5b09a..8ddb02aa0316 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - hash = "sha256-iavSaf1BCqoFjWUPpwo/NvbbFiXTktXqZc7TRcUtaeU="; + hash = "sha256-3Czzu7hheuF0FYF8+GtjkxXSXfxTaqHrPa/+69I8Wfg="; }; installPhase = '' From 4456a4eff9ce6f171d9213535cad7310248b24be Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 4 Jul 2024 19:39:44 +0800 Subject: [PATCH 049/562] haskellPackages.haskell-gi: Drop obsolete patch The patch was released in haskell-gi-0.26.9. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3a337417940..4e7dcce9d027 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2280,13 +2280,6 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; - # https://github.com/haskell-gi/haskell-gi/issues/431 - haskell-gi = appendPatch (fetchpatch { - url = "https://github.com/haskell-gi/haskell-gi/pull/430/commits/9ee545ad5028e5de8e1e1d96bbba2b9dbab47480.diff"; - hash = "sha256-kh32mZ7EdlOsg7HQILB7Y/EkHIqG/mozbnd/kbP+WDk="; - }) - super.haskell-gi; - # Too strict version bounds on haskell-gi # https://github.com/owickstrom/gi-gtk-declarative/issues/100 gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; From 88898d9b8e1cb15fff3e6d235eca771f46197860 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 4 Jul 2024 19:42:19 +0800 Subject: [PATCH 050/562] haskellPackages.gi-vte: Drop obsolete patch The patch was released in gi-vte-2.91.33. --- .../haskell-modules/configuration-common.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e7dcce9d027..779c21e40e9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2300,22 +2300,6 @@ self: super: { gi-gtk = self.gi-gtk_4; }; - # Missing dependency on gi-cairo - # https://github.com/haskell-gi/haskell-gi/pull/420 - gi-vte = - overrideCabal - (oldAttrs: { - # This is implemented as a sed expression instead of pulling a patch - # from upstream because the gi-vte repo doesn't actually contain a - # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata - # in the repo. - postPatch = (oldAttrs.postPatch or "") + '' - sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal - ''; - buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo]; - }) - super.gi-vte; - # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck From 6e8433414ace432fab18cacc3c8861f8f9f1e00f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:14:18 +0100 Subject: [PATCH 051/562] haskellPackages.gargoyle: remove jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c04b2f5e2c6..a49c1cf5e1ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1365,11 +1365,7 @@ self: super: { pkgs.postgresqlTestHook ] super.users-postgresql-simple; - # Need https://github.com/obsidiansystems/gargoyle/pull/45 - gargoyle = doJailbreak super.gargoyle; - gargoyle-postgresql = doJailbreak super.gargoyle-postgresql; - gargoyle-postgresql-nix = doJailbreak (addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix); - gargoyle-postgresql-connect = doJailbreak super.gargoyle-postgresql-connect; + gargoyle-postgresql-nix = addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix; # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 From 13e0dfb9bf6d75d3006a28a582e7628e1d483c52 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:04:09 +0100 Subject: [PATCH 052/562] haskellPackages.cli-git: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a49c1cf5e1ee..723985b1c5ff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2087,13 +2087,7 @@ self: super: { # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; - # https://github.com/obsidiansystems/cli-git/pull/7 turned into a flat patch cli-git = lib.pipe super.cli-git [ - (appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/cli-git/commit/be378a97e2f46522174231b77c952f759df3fad6.patch"; - sha256 = "sha256-6RrhqkKpnb+FTHxccHNx6pdC7ClfqcJ2eoo+W7h+JUo="; - excludes = [ ".github/**" ]; - })) doJailbreak (addBuildTool pkgs.git) ]; From cc6864b2c35c56f93dbedfa210f9f94455ffef88 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:04:24 +0100 Subject: [PATCH 053/562] haskellPackages.aeson-gadt-th: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 723985b1c5ff..65798ed1b261 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2646,12 +2646,6 @@ self: super: { relative = "dependent-sum-template"; }) super.dependent-sum-template; - aeson-gadt-th = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/aeson-gadt-th/commit/8f6922a6440019dece637d73d70766c473bcd6c0.patch"; - hash = "sha256-564DhfiubwNV8nAj8L5DzsWn4MdzqqaYYNmOSPUa7ys="; - excludes = [ ".github/**" ]; - }) super.aeson-gadt-th; - # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; From 99dcf5cfc7a43d5242731a2a61be0bf906193975 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:04:37 +0100 Subject: [PATCH 054/562] haskellPackages.proto3-wire: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 65798ed1b261..733d20daa53d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3114,12 +3114,6 @@ self: super: { # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged currencies = doJailbreak super.currencies; - # https://github.com/awakesecurity/proto3-wire/pull/104 - proto3-wire = appendPatch (pkgs.fetchpatch { - url = "https://github.com/awakesecurity/proto3-wire/commit/c1cadeb5fca2e82c5b28e2811c01f5b37eb21ed8.patch"; - hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs="; - }) super.proto3-wire; - argon2 = appendPatch (fetchpatch { # https://github.com/haskell-hvr/argon2/pull/20 url = "https://github.com/haskell-hvr/argon2/commit/f7cc92f18e233e6b1dabf1798dd099e17b6a81a1.patch"; From 4e0eb06e663057dfefca028b48c16e6e1556cd11 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:06:49 +0100 Subject: [PATCH 055/562] haskellPackages.dependent-sum-aeson-orphans: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 733d20daa53d..4278e431e385 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2633,12 +2633,6 @@ self: super: { hash = "sha256-QKDUh4jO8xZrThrkjTVNnkoVY+GejxOhpXOVA4+n1H8="; }) super.dependent-monoidal-map; - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-sum-aeson-orphans = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/9b4698154303a9865d7d68a2f01d280a8a39f108.patch"; - hash = "sha256-Pzjl2yp01XsYWcyhpLnsuccg7bOACgv+RpafauUox8c="; - }) super.dependent-sum-aeson-orphans; - # https://github.com/obsidiansystems/dependent-sum/pull/73 dependent-sum-template = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch"; From 5dd8c86e8a4dc84aed5b0c50c4f46bed3b993792 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:11:32 +0100 Subject: [PATCH 056/562] haskellPackages.dependent-monoidal-map: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4278e431e385..1bae6eab4189 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2627,12 +2627,6 @@ self: super: { # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-monoidal-map = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-monoidal-map/commit/3f8be15fa9bd2796d1c917e9f0979b4d6c62cf91.patch"; - hash = "sha256-QKDUh4jO8xZrThrkjTVNnkoVY+GejxOhpXOVA4+n1H8="; - }) super.dependent-monoidal-map; - # https://github.com/obsidiansystems/dependent-sum/pull/73 dependent-sum-template = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch"; From 7dc2bf3078adf07370a9580de378616e661d3660 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:16:16 +0100 Subject: [PATCH 057/562] haskellPackages.nix-thunk: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1bae6eab4189..7f421d70a1c2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2098,11 +2098,7 @@ self: super: { pkgs.nix-prefetch-git ] (doJailbreak super.cli-nix); - # https://github.com/obsidiansystems/nix-thunk/pull/51/ - nix-thunk = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/nix-thunk/commit/c3dc3e799e8ce7756330f98b9f73f59c4b7a5502.patch"; - sha256 = "sha256-C1ii1FXiCPFfw5NzyQZ0cEG6kIYGohVsnHycpYEJ24Q="; - }) (doJailbreak super.nix-thunk); + nix-thunk = doJailbreak super.nix-thunk; # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); From 99f8dac5c82f2d33d77e3fd493c6ba67283dc2a4 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 27 Jun 2024 21:21:25 +0100 Subject: [PATCH 058/562] haskellPackages.haskell-gi: remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7f421d70a1c2..e6d512162b5c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2266,13 +2266,6 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; - # https://github.com/haskell-gi/haskell-gi/issues/431 - haskell-gi = appendPatch (fetchpatch { - url = "https://github.com/haskell-gi/haskell-gi/pull/430/commits/9ee545ad5028e5de8e1e1d96bbba2b9dbab47480.diff"; - hash = "sha256-kh32mZ7EdlOsg7HQILB7Y/EkHIqG/mozbnd/kbP+WDk="; - }) - super.haskell-gi; - # Too strict version bounds on haskell-gi # https://github.com/owickstrom/gi-gtk-declarative/issues/100 gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; From 942e0062aa9309545be5e3aa7ef4bc257b9931c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 4 Jul 2024 15:04:51 +0100 Subject: [PATCH 059/562] haskellPackages.lzma: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08494b4d701a..3b0b885ccab4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3066,6 +3066,10 @@ self: super: { tasty-quickcheck = super.tasty-quickcheck_0_11; }); + lzma = doJailbreak (super.lzma.overrideScope (self: super: { + tasty = super.tasty_1_5_1; + })); + # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 commutative-semigroups = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/commutative-semigroups/commit/e031495dd24ae73ffb808eca34e993f5df8e8d76.patch"; From cbf9f5268dfd5c7c531fd4a80092ed30307bea48 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Wed, 3 Jul 2024 22:54:48 -0700 Subject: [PATCH 060/562] haskellPackages.cabal_3_12_0_0: fix build closes: https://github.com/NixOS/nixpkgs/issues/324425 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3a337417940..1e6cd5e321e5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,6 +27,13 @@ self: super: { process = self.process_1_6_20_0; })); + Cabal_3_12_0_0 = doDistribute (super.Cabal_3_12_0_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_12_0_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_20_0; + })); + # cabal-install needs most recent versions of Cabal and Cabal-syntax, # so we need to put some extra work for non-latest GHCs inherit ( From 78254452e403f6ad0a2c866303be4877a0d3a125 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Thu, 4 Jul 2024 14:44:24 -0400 Subject: [PATCH 061/562] haskellPackages.push-notify-apn: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3b0b885ccab4..1a6b98743102 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3085,4 +3085,12 @@ self: super: { hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0="; }) (doJailbreak super.argon2); # Unmaintained + # Apply patch to use v.4.0.2 + push-notify-apn = appendPatch ( + fetchpatch { + url = "https://github.com/digitallyinduced/push-notify-apn/commit/e54d40516f1b8f912a74df75256bb6bacc931943.patch"; + hash = "sha256-gH03Z/eDXUeIiAO+hIFxclekBHFAnukd+fgUl39g5cw"; + } + ) super.push-notify-apn; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 1ca3d78e13b9c88790c7eae9516c0f3c0f9ff000 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:41:36 -0400 Subject: [PATCH 062/562] spot: refactor https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/sp/spot/package.nix | 61 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 77cabcc19634..2dcf3c090ef4 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -2,25 +2,25 @@ lib, stdenv, fetchFromGitHub, - nix-update-script, + rustPlatform, + cargo, + rustc, + alsa-lib, + blueprint-compiler, + desktop-file-utils, + gettext, + glib, + gst_all_1, + gtk4, + libadwaita, + libpulseaudio, + libhandy, meson, ninja, - gettext, - desktop-file-utils, - cargo, - rustPlatform, - rustc, - pkg-config, - glib, - libadwaita, - libhandy, - gtk4, + nix-update-script, openssl, - alsa-lib, - libpulseaudio, + pkg-config, wrapGAppsHook4, - blueprint-compiler, - gst_all_1, }: stdenv.mkDerivation rec { @@ -41,30 +41,30 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + cargo + rustc + blueprint-compiler + desktop-file-utils gettext + gtk4 # for gtk-update-icon-cache + glib # for glib-compile-schemas meson ninja pkg-config - gtk4 # for gtk-update-icon-cache - glib # for glib-compile-schemas - desktop-file-utils - cargo rustPlatform.cargoSetupHook - rustc wrapGAppsHook4 - blueprint-compiler ]; buildInputs = [ + alsa-lib glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gtk4 libadwaita libhandy - openssl - alsa-lib libpulseaudio - gst_all_1.gst-plugins-base - gst_all_1.gstreamer + openssl ]; # https://github.com/xou816/spot/issues/313 @@ -74,12 +74,13 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Native Spotify client for the GNOME desktop"; - mainProgram = "spot"; homepage = "https://github.com/xou816/spot"; - license = licenses.mit; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/xou816/spot/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "spot"; + platforms = lib.platforms.linux; }; } From 1d9b7ecaed4af5318711eebcdf4d8c17e65784b4 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:46:09 -0400 Subject: [PATCH 063/562] spot: add `appstream-glib` to nativeBuildInputs this is required while building to validate appstream information --- pkgs/by-name/sp/spot/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 2dcf3c090ef4..8415da2f07a3 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -6,6 +6,7 @@ cargo, rustc, alsa-lib, + appstream-glib, blueprint-compiler, desktop-file-utils, gettext, @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cargo rustc + appstream-glib blueprint-compiler desktop-file-utils gettext From fb79d5e2f4dc94c150c816d23763ce4a6b282246 Mon Sep 17 00:00:00 2001 From: Carl Calaquian Date: Fri, 5 Jul 2024 23:29:13 +0800 Subject: [PATCH 064/562] maintainers: add camcalaquian --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ef487bcbd53..85b77b2521a7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3128,6 +3128,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + camcalaquian = { + email = "camcalaquian@gmail.com"; + github = "camcalaquian"; + githubId = 36902555; + name = "Carl Calaquian"; + }; camelpunch = { email = "me@andrewbruce.net"; github = "camelpunch"; From f4c81f9134038562fac88c6a308f96fb942ad00a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jul 2024 17:18:27 +0000 Subject: [PATCH 065/562] snipe-it: 7.0.6 -> 7.0.7 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 280ddc639fad..4503f82e2ac6 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "7.0.6"; + version = "7.0.7"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-WsjUXHbl3HTOrXSeNJrykHv9x5Kbch5GH4yOFKYf+jU="; + hash = "sha256-cka3ZczRYXmzeokiUg2WarArvW507AVsCIadPlVUYWo="; }; - vendorHash = "sha256-qAypUevd4qGt5WFYfuVx00nRKdk2qf9a0T6l/la8mpA="; + vendorHash = "sha256-nwzPmelTvInx055lyuhiTioWyF0JSCjNa2Ky8yQXwtc="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From 76afcbdc30fd2d2a2dca07e01658c0f19625f33a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jul 2024 17:46:55 +0000 Subject: [PATCH 066/562] pixelfed: 0.12.1 -> 0.12.3 --- pkgs/servers/web-apps/pixelfed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index 0d696b33a639..6047a3958506 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,16 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-pNo10vvUD7q0HLM7+GgT+6PyocF4kDZ3Zee4ZCPDJNQ="; + hash = "sha256-CKjqnxp7p2z/13zfp4HQ1OAmaoUtqBKS6HFm6TV8Jwg="; }; - vendorHash = "sha256-y6dgF/LHEYEVG+MgNnZa6f6oMQGvuvAgG6PVbmeMIz4="; + vendorHash = "sha256-zjIjGkR9MCnjRho/ViqZ5EbS9MJ7OQ1kkg93jBssuZU="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out From 7e7852d166b535c3f320f3d1bf0ecbfd9aad8544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 13:08:34 +0000 Subject: [PATCH 067/562] qdrant: 1.9.7 -> 1.10.0 --- pkgs/servers/search/qdrant/Cargo.lock | 5 +++-- pkgs/servers/search/qdrant/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 0f07b40a12e6..96e99f61e421 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -476,7 +476,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api" -version = "1.9.7" +version = "1.10.0" dependencies = [ "chrono", "common", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.9.7" +version = "1.10.0" dependencies = [ "actix-cors", "actix-files", @@ -5310,6 +5310,7 @@ dependencies = [ "criterion", "dataset", "fnv", + "fs4", "fs_extra", "generic-tests", "geo", diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index b34640a32aa9..4d77d3700c9a 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.9.7"; + version = "1.10.0"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-PM2nzHkZVvlH/ojZK8o2ELkLUtMNr0I2cezFlaPqYSA="; + sha256 = "sha256-TG8huGKhh0tqJhqtb6Pu3opX2lPK1UrbgrV/eoZnU08="; }; cargoLock = { From 82ab3a870f042dc86df8106b4ec63f42e5ab2be6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 11:29:14 +0100 Subject: [PATCH 068/562] imageworsener: move to `pkgs/by-name` --- .../default.nix => by-name/im/imageworsener/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/imageworsener/default.nix => by-name/im/imageworsener/package.nix} (100%) diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/by-name/im/imageworsener/package.nix similarity index 100% rename from pkgs/tools/graphics/imageworsener/default.nix rename to pkgs/by-name/im/imageworsener/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9e889de1649..33d1e39013f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3850,8 +3850,6 @@ with pkgs; imagelol = callPackage ../tools/compression/imagelol { }; - imageworsener = callPackage ../tools/graphics/imageworsener { }; - imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; imgcrypt = callPackage ../applications/virtualization/imgcrypt { }; From a023d4dff6a60cb4bae2053917c5c7d1c0f59b74 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 11:28:59 +0100 Subject: [PATCH 069/562] imageworsener: format with `nixfmt-rfc-style` --- pkgs/by-name/im/imageworsener/package.nix | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix index bf4c4f7a9c91..ab203ea62ea9 100644 --- a/pkgs/by-name/im/imageworsener/package.nix +++ b/pkgs/by-name/im/imageworsener/package.nix @@ -1,9 +1,11 @@ -{ lib, stdenv -, fetchurl -, zlib -, libpng -, libjpeg -, libwebp +{ + lib, + stdenv, + fetchurl, + zlib, + libpng, + libjpeg, + libwebp, }: stdenv.mkDerivation rec { @@ -24,7 +26,12 @@ stdenv.mkDerivation rec { cp readme.txt technical.txt $out/share/doc/imageworsener ''; - buildInputs = [ zlib libpng libjpeg libwebp ]; + buildInputs = [ + zlib + libpng + libjpeg + libwebp + ]; doCheck = true; @@ -35,7 +42,10 @@ stdenv.mkDerivation rec { homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; license = licenses.mit; - maintainers = with maintainers; [ emily smitop ]; + maintainers = with maintainers; [ + emily + smitop + ]; mainProgram = "imagew"; platforms = platforms.all; }; From cd4fb1fe7a68691c844c61008a664935a188cde2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 15:58:38 +0000 Subject: [PATCH 070/562] ugs: 2.1.7 -> 2.1.8 --- pkgs/tools/misc/ugs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 05fb77ac1573..2dc31d0831f2 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.7"; + version = "2.1.8"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-HxaFGa7UG7dWtVKTLDRbhY7UCWeA6E50txz45bjb5uE="; + hash = "sha256-2rGxo8Yu0i93CXmnkKJwjez3vXzaO69/ztwjXxgWtyo="; }; dontUnpack = true; From 442f0d7e6905374c1a10c123b74e14d43919875d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 21:37:27 +0000 Subject: [PATCH 071/562] oxlint: 0.2.15 -> 0.5.2 --- pkgs/development/tools/oxlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index d21488684f56..4625b97eb000 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.2.15"; + version = "0.5.2"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-hEN9TLIeAfMGO/PL5OcT7+H0dmoCtH+dcIEafpQ45UU="; + hash = "sha256-rjp1k3cnDSr/hKXNru7XQ6n5Wz97j2EULnHwg3HAm3g="; }; - cargoHash = "sha256-uChoDlU0tb52pBBEqmmwhCS83pykFRpXRFSuUGquHEQ="; + cargoHash = "sha256-3IebdIKw3lV+Qy6F7ZgWMchPLzrluGSeWTV9l5to8iM="; buildInputs = [ rust-jemalloc-sys From 0433f701615b6f18c5aa7624eeb2f979a2b2012f Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 2 Jul 2024 14:52:37 +0200 Subject: [PATCH 072/562] nagstamon 3.2.1 > 3.14.0 https://github.com/NixOS/nixpkgs/issues/323999 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/misc/nagstamon/default.nix | 18 ++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 165fb180f6ca..f1ca4d2afad7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11390,6 +11390,12 @@ github = "liberatys"; githubId = 35100156; }; + liberodark = { + email = "liberodark@gmail.com"; + github = "liberodark"; + githubId = 4238928; + name = "liberodark"; + }; libjared = { email = "jared@perrycode.com"; github = "libjared"; diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index a0570c77be5b..f004ad9b42fd 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -2,26 +2,24 @@ pythonPackages.buildPythonApplication rec { pname = "nagstamon"; - version = "3.2.1"; + version = "3.14.0"; src = fetchurl { - url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; - sha256 = "1048x55g3nlyyggn6a36xmj24w4hv08llg58f4hzc0fwg074cd58"; + url = "https://github.com/HenriWahl/Nagstamon/archive/refs/tags/v${version}.tar.gz"; + sha256 = "sha256-9RxQ/rfvoyjSUsY4tmAkBdVQqZYi3X6PBzQYFIeenzA="; }; # Test assumes darwin doCheck = false; - propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests - beautifulsoup4 keyring requests-kerberos kerberos lxml ]; + build-system = with pythonPackages; [ setuptools ]; + dependencies = with pythonPackages; [ configparser pyqt6 psutil requests + beautifulsoup4 keyring requests-kerberos lxml dbus-python python-dateutil pysocks ]; meta = with lib; { description = "Status monitor for the desktop"; - homepage = "https://nagstamon.ifw-dresden.de/"; + homepage = "https://nagstamon.de/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; - # fails to install with: - # TypeError: cannot unpack non-iterable bool object - broken = true; + maintainers = with maintainers; [ pSub liberodark ]; }; } From e7442f53ad2516c9b040ef00e002dc291a4af397 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 22:52:35 +0000 Subject: [PATCH 073/562] opera: 111.0.5168.43 -> 111.0.5168.61 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c594fa7328ad..36327e521994 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "111.0.5168.43"; + version = "111.0.5168.61"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; + hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo="; }; unpackPhase = "dpkg-deb -x $src ."; From bf0c89562b7908da55b7ced4db700ddf7c2be08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pe=C3=AFo=20Thibault?= Date: Sun, 7 Jul 2024 00:33:52 +0200 Subject: [PATCH 074/562] qwerty-fr: apply review suggestions --- pkgs/by-name/qw/qwerty-fr/package.nix | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/qw/qwerty-fr/package.nix b/pkgs/by-name/qw/qwerty-fr/package.nix index 5e182585002f..f898073f77c1 100644 --- a/pkgs/by-name/qw/qwerty-fr/package.nix +++ b/pkgs/by-name/qw/qwerty-fr/package.nix @@ -1,32 +1,30 @@ -{ stdenv -, fetchurl -, lib -, unzip -, +{ + stdenvNoCC, + fetchFromGitHub, + lib, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "qwerty-fr"; version = "0.7.3"; - src = fetchurl { - url = "https://github.com/qwerty-fr/qwerty-fr/releases/download/v${version}/qwerty-fr_${version}_linux.zip"; - sha256 = "0csxzs2gk8l4y5ii1pgad8zxr9m9mfrl9nblywymg01qw74gpvnm"; + src = fetchFromGitHub { + owner = "qwerty-fr"; + repo = "qwerty-fr"; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-TD67wKdaPaXzJzjKFCfRZl3WflUfdnUSQl/fnjr9TF8="; }; - nativeBuildInputs = [ unzip ]; - - unpackPhase = "unzip $src"; - installPhase = '' - mkdir -p $out/bin - cp -r * $out/bin + mkdir -p $out/share/X11/xkb/symbols + cp $src/linux/us_qwerty-fr $out/share/X11/xkb/symbols ''; meta = with lib; { description = "Qwerty keyboard layout with French accents"; + changelog = "https://github.com/qwerty-fr/qwerty-fr/blob/v${finalAttrs.version}/linux/debian/changelog"; homepage = "https://github.com/qwerty-fr/qwerty-fr"; license = licenses.mit; maintainers = with maintainers; [ potb ]; }; -} +}) From 3c4dc205fe56b307750a3e0e0f34ff4528db1dcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 23:16:03 +0000 Subject: [PATCH 075/562] signal-desktop-beta: 7.15.0-beta.1 -> 7.16.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 d6a543b77adb..6779149a5607 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.15.0-beta.1"; + version = "7.16.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-RnaYRd7hKTazh0dEX3wv0fFsdbYv0aqNJtswv8/f+YU="; + hash = "sha256-FaQhinUylZesX0gIFA1CynirLRxOw2P0IdZBjEPEo1U="; } From 7fa522446b3b6189e71a5bce38d8e41398e0bcb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 23:18:57 +0000 Subject: [PATCH 076/562] petsc: 3.21.0 -> 3.21.3 --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 5a547144b491..421ed4d5b8f1 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -28,11 +28,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.21.0"; + version = "3.21.3"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; - hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4="; + hash = "sha256-dxHa8JUJCN4zRIXMCx7gcvbzFH2SPtkJ377ssIevjgU="; }; inherit mpiSupport; From c0a7daff965087c15e7e4c7d2200ed3773e457f5 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Jul 2024 21:42:48 -0400 Subject: [PATCH 077/562] ukmm: 0.11.1 -> 0.12.1 --- pkgs/tools/games/ukmm/Cargo.lock | 1064 +++++++++++++++++------------ pkgs/tools/games/ukmm/default.nix | 4 +- 2 files changed, 615 insertions(+), 453 deletions(-) diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/tools/games/ukmm/Cargo.lock index c8c049fef936..3c2119dd3e87 100644 --- a/pkgs/tools/games/ukmm/Cargo.lock +++ b/pkgs/tools/games/ukmm/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -109,7 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "anyhow_ext" @@ -170,17 +170,16 @@ dependencies = [ [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "x11rb", ] @@ -219,9 +218,9 @@ dependencies = [ [[package]] name = "astrolabe" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55189fd93a1d108bb6fb4a7dc223c141a1200841dfeeea9f984b58338ef8fc24" +checksum = "5e969b837a80addc9a03dcfcd5569fad8607d26fc9391ebdeb2c279f720fafbf" [[package]] name = "async-io" @@ -294,9 +293,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" @@ -321,9 +320,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -364,8 +363,8 @@ checksum = "d6b019a3efebe7f453612083202887b6f1ace59e20d010672e336eea4ed5be97" dependencies = [ "either", "owo-colors", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -377,8 +376,8 @@ checksum = "cb515fdd6f8d3a357c8e19b8ec59ef53880807864329b1cb1cba5c53bf76557e" dependencies = [ "either", "owo-colors", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -411,9 +410,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -449,7 +448,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ "block-sys", - "objc2", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", ] [[package]] @@ -468,34 +476,34 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecount" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -535,10 +543,10 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.2", + "rustix 0.38.34", "slab", "thiserror", ] @@ -550,16 +558,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.32", + "rustix 0.38.34", "wayland-backend", "wayland-client", ] [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -588,21 +596,22 @@ dependencies = [ [[package]] name = "catppuccin-egui" -version = "5.1.0" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e55b1e8024ec4a7b9af879cf3eb4f9cfbedfa529cef9badb94226fed59e140c" +checksum = "1c521c1737df50564c5868f5d23e582fbcf8fc40366053cb02290421955e4c8f" dependencies = [ "egui", ] [[package]] name = "cc" -version = "1.0.90" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -613,9 +622,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -650,9 +659,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -660,7 +669,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -680,9 +689,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] @@ -706,7 +715,7 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics 0.23.1", + "core-graphics 0.23.2", "foreign-types 0.5.0", "libc", "objc", @@ -759,9 +768,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -769,18 +778,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "configparser" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" [[package]] name = "core-foundation" @@ -813,9 +822,9 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -867,9 +876,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog 2.4.0", ] @@ -888,9 +897,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -910,9 +919,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -947,9 +956,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -995,9 +1004,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1007,41 +1016,41 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47c6c8ad7c1a10d3ef0fe3ff6733f4db0d78f08ef0b13121543163ef327058b" +checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "scratch", - "syn 2.0.55", + "syn 2.0.68", ] [[package]] name = "cxxbridge-flags" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1049,27 +1058,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", - "strsim 0.10.0", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "strsim 0.11.1", + "syn 2.0.68", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", - "quote 1.0.35", - "syn 2.0.55", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1079,7 +1088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1170,9 +1179,9 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "duplicate" @@ -1217,7 +1226,7 @@ dependencies = [ "parking_lot", "percent-encoding", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "static_assertions", "thiserror", "wasm-bindgen", @@ -1269,7 +1278,7 @@ dependencies = [ "arboard", "egui", "log", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "smithay-clipboard", "web-time", "webbrowser", @@ -1284,7 +1293,7 @@ checksum = "013480797931a2649e03069613ed35514569372d6f79df70fc3653ae18a75c6c" dependencies = [ "egui", "egui_extras", - "pulldown-cmark 0.10.2", + "pulldown-cmark 0.10.3", ] [[package]] @@ -1330,6 +1339,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "egui_logger" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fce85f958e55de0295af328a0f0aa102b2b449b723b76dfaa03be0f06788e1d" +dependencies = [ + "egui", + "log", + "once_cell", + "regex", +] + [[package]] name = "ehttp" version = "0.5.0" @@ -1346,9 +1367,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" @@ -1367,9 +1388,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1388,9 +1409,9 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1400,9 +1421,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1411,9 +1432,9 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1454,18 +1475,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1539,9 +1561,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1577,9 +1599,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1647,9 +1669,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1813,9 +1835,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1892,7 +1914,7 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases", "cgl", "core-foundation", @@ -1902,7 +1924,7 @@ dependencies = [ "glutin_wgl_sys", "icrate", "libloading", - "objc2", + "objc2 0.4.1", "once_cell", "raw-window-handle 0.5.2", "wayland-sys", @@ -1982,9 +2004,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if 1.0.0", "crunchy", @@ -1998,9 +2020,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -2029,6 +2051,12 @@ 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.4.3" @@ -2091,9 +2119,9 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" dependencies = [ - "block2", + "block2 0.3.0", "dispatch", - "objc2", + "objc2 0.4.1", ] [[package]] @@ -2155,8 +2183,8 @@ checksum = "3a7d6e1419fa3129eb0802b4c99603c0d425c79fb5d76191d5a20d0ab0d664e8" dependencies = [ "libflate", "proc-macro-hack", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -2188,15 +2216,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -2268,9 +2296,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2335,9 +2363,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -2461,9 +2489,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" @@ -2487,46 +2515,45 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", ] -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall 0.4.1", -] - [[package]] name = "libredox" version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] +[[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 = "lighter" version = "0.1.0" @@ -2542,9 +2569,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38ce0407b25ce2ba0e9ff4ec2cf60c2b499da0658fe6b6745fb85dfbb56fae12" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -2571,9 +2598,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -2583,9 +2610,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2594,15 +2621,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lzma-rust" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f798132166cc040cb70dbab4ccbb89643a6966a4ac33f0b312e76a8238673a5" +checksum = "d5edcf5d1f4d78221ea7861fb69899afd15c42601751f92f09a06f7b051fb289" dependencies = [ "byteorder", ] @@ -2627,9 +2654,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2660,9 +2687,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2698,8 +2725,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8608fb1c805b5b6b3d5ab7bd95c40c396df622b64d77b2d621a5eae1eed050ee" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -2715,9 +2742,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2805,13 +2832,13 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys", "num_enum", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "thiserror", ] @@ -2895,9 +2922,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2927,10 +2954,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2955,9 +2982,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -2966,7 +2993,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -2975,6 +3052,49 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -3033,16 +3153,16 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ "ttf-parser", ] @@ -3073,9 +3193,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3083,22 +3203,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-slash" @@ -3146,9 +3266,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -3168,9 +3288,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3231,15 +3351,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -3266,6 +3386,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[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-macro-error" version = "1.0.4" @@ -3273,8 +3402,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -3285,8 +3414,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "version_check", ] @@ -3307,9 +3436,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3320,18 +3449,18 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] [[package]] name = "pulldown-cmark" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] @@ -3363,9 +3492,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] @@ -3381,11 +3510,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.86", ] [[package]] @@ -3435,9 +3564,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -3484,21 +3613,30 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -3508,9 +3646,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -3519,9 +3657,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "remove_dir_all" @@ -3580,9 +3718,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" dependencies = [ "bytemuck", ] @@ -3648,12 +3786,12 @@ dependencies = [ [[package]] name = "roead" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6616ebe9a3fe9654846fa1bb04be93de7c5feccf73fa46b4a054b17e5d76eb" +checksum = "4727c05997dc74a6fc4fb56acdc76aeb3bcbc409242f4b5a6bebd409b6dc3860" dependencies = [ "almost", - "base64 0.22.0", + "base64 0.22.1", "binrw 0.13.3", "cxx", "cxx-build", @@ -3679,7 +3817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -3746,14 +3884,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -3772,9 +3910,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring 0.17.8", @@ -3786,15 +3924,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -3816,9 +3954,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3874,38 +4012,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3914,20 +4052,20 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -3941,14 +4079,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ "darling", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4005,7 +4143,7 @@ checksum = "0bf83efe73d438a1aad929279a2fc0ff3fb32f841421c09a64f3d04c4d162a23" dependencies = [ "bit-set", "byteorder", - "crc 3.0.1", + "crc 3.2.1", "filetime_creation", "js-sys", "lzma-rust", @@ -4105,14 +4243,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2", - "rustix 0.38.32", + "rustix 0.38.34", "thiserror", "wayland-backend", "wayland-client", @@ -4137,9 +4275,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -4204,15 +4342,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svgtypes" @@ -4241,19 +4379,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.55" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "unicode-ident", ] @@ -4284,7 +4422,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -4301,7 +4439,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.12", + "toml 0.8.14", "version-compare", ] @@ -4324,8 +4462,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.2", - "rustix 0.38.32", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -4349,22 +4487,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4373,8 +4511,8 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -4400,9 +4538,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4421,9 +4559,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4457,9 +4595,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -4481,21 +4619,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4513,15 +4651,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "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 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -4542,15 +4691,15 @@ checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "twox-hash" @@ -4563,6 +4712,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -4588,14 +4743,14 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "uk-content" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -4607,7 +4762,7 @@ dependencies = [ "mimalloc", "minicbor-ser", "msyt", - "roead 0.25.1", + "roead 0.25.3", "rstb", "rustc-hash", "serde", @@ -4625,14 +4780,14 @@ dependencies = [ name = "uk-content-derive" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "uk-editor" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "eframe", @@ -4644,7 +4799,7 @@ dependencies = [ "path-slash", "rayon", "rfd", - "roead 0.25.1", + "roead 0.25.3", "ron", "serde", "serde_json", @@ -4659,7 +4814,7 @@ dependencies = [ [[package]] name = "uk-manager" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4676,7 +4831,7 @@ dependencies = [ "path-slash", "rayon", "remove_dir_all", - "roead 0.25.1", + "roead 0.25.3", "rstb", "rustc-hash", "sanitise-file-name", @@ -4697,7 +4852,7 @@ dependencies = [ [[package]] name = "uk-mod" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4719,7 +4874,7 @@ dependencies = [ "path-slash", "piz", "rayon", - "roead 0.25.1", + "roead 0.25.3", "rstb", "sanitise-file-name", "serde", @@ -4738,7 +4893,7 @@ dependencies = [ [[package]] name = "uk-reader" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4750,7 +4905,7 @@ dependencies = [ "minicbor-ser", "moka", "parking_lot", - "roead 0.25.1", + "roead 0.25.3", "serde", "serde_json", "smartstring", @@ -4763,7 +4918,7 @@ dependencies = [ [[package]] name = "uk-ui" -version = "0.11.1" +version = "0.12.1" dependencies = [ "catppuccin-egui", "color-hex", @@ -4778,7 +4933,7 @@ dependencies = [ "msyt", "once_cell", "rfd", - "roead 0.25.1", + "roead 0.25.3", "rustc-hash", "serde", "serde_yaml 0.9.34+deprecated", @@ -4790,21 +4945,21 @@ dependencies = [ name = "uk-ui-derive" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "uk-util" -version = "0.11.1" +version = "0.12.1" dependencies = [ "once_cell", ] [[package]] name = "ukmm" -version = "0.11.1" +version = "0.12.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4814,7 +4969,7 @@ dependencies = [ "eframe", "egui-notify", "egui_commonmark", - "env_logger", + "egui_logger", "flume", "fs-err", "http_req", @@ -4884,9 +5039,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -4914,26 +5069,26 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.6" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.3", + "rustls 0.22.4", "rustls-pki-types", "rustls-webpki", "url", - "webpki-roots 0.26.1", + "webpki-roots 0.26.3", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4986,9 +5141,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -5013,9 +5168,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -5052,9 +5207,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -5076,7 +5231,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] @@ -5086,9 +5241,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5101,13 +5256,13 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.32", + "rustix 0.38.34", "scoped-tls", "smallvec", "wayland-sys", @@ -5115,12 +5270,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.32", + "bitflags 2.6.0", + "rustix 0.38.34", "wayland-backend", "wayland-scanner", ] @@ -5131,18 +5286,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "wayland-client", "xcursor", ] @@ -5153,7 +5308,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5165,7 +5320,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5178,7 +5333,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5187,20 +5342,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.86", "quick-xml", - "quote 1.0.35", + "quote 1.0.36", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" dependencies = [ "dlib", "log", @@ -5230,9 +5385,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" dependencies = [ "core-foundation", "home", @@ -5266,9 +5421,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -5281,9 +5436,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -5303,11 +5458,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5357,7 +5512,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -5399,7 +5554,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -5434,17 +5589,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5461,9 +5617,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5491,9 +5647,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5521,9 +5677,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5551,9 +5713,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5581,9 +5743,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5599,9 +5761,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5629,9 +5791,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -5642,12 +5804,12 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop", "cfg_aliases", "core-foundation", - "core-graphics 0.23.1", + "core-graphics 0.23.2", "cursor-icon", "icrate", "js-sys", @@ -5656,14 +5818,14 @@ dependencies = [ "memmap2", "ndk", "ndk-sys", - "objc2", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "redox_syscall 0.3.5", - "rustix 0.38.32", + "rustix 0.38.34", "smithay-client-toolkit", "smol_str", "unicode-segmentation", @@ -5692,9 +5854,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -5721,24 +5883,24 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", "libloading", "once_cell", - "rustix 0.38.32", + "rustix 0.38.34", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -5767,7 +5929,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -5776,15 +5938,15 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlparser" @@ -5822,29 +5984,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" @@ -5878,9 +6040,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index b33ecbeb3b5d..dcfe3082c911 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ukmm"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yxF08kTA/IhM3LKFH523kVY3QfqwUElz3ICkjKPAo7E="; + hash = "sha256-YnF0gn2JihZKkDBwI6Odne2CW8k2trQJiPbxMrtI8Gg="; }; cargoLock = { From 6b75aa0af800b0cc6d2a2d6aef160a77c0660240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jul 2024 05:51:32 +0000 Subject: [PATCH 078/562] adguardhome: 0.107.51 -> 0.107.52 --- pkgs/servers/adguardhome/bins.nix | 28 ++++++++++++++-------------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index cccad0ea46ce..4bf85649acd2 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-4/NrNKzpAV9vdpKCngY8f2XCEFE3rTmfQkaubFNcdWg="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-+sPPhXO0fnHQfB7fqqQsZIUW+2bzAqjE6yMzd5tLRhI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-MCll8iM453MXAWJiQFSwykoSBzB4MsfSCTPFTogYsSc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-TebackOYGFA9Q99awS5RtIuj94ys3Jzg/EbCH8cmjTU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-F9hRelvPZr+2QC+oL4gT6Qo+gm/oyZdGyqNnZEJXeLc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-26iQrdenWI+88N6iy2zOXQ/+cTuQjCVtjjhzXmUotpk="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-brYcemcUwEkiB3yCh2y7n2Ii6D7GfKMKqm3FVCPZV7I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-omRezyPMrbsNl7Mkrvm8Z9EmuOOUQorlojwvG3PF0UA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-QCkh5zyUyf1COk2cb8sGdPtSzBYTjwpH3FSaI3jG5v0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-hq56fC25wVi52581BWhIXjzMQ+cDliTRpbxQux3uEEg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-7dEWH+cTrrcdO7RSHX4w95jlNH3FVtJ1cFOI6/mOBfU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-tMeNdlkqnzjzKX046GoaSjQgLD4nq82JlSH1PmSgmNM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-ODpHuFU4YxDeQAOyDptFQXvLPcTDJwBp4irEk5sry5U="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.51/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-fLa5H/wHo/sGjqk44JjFURvPwROC+h7nvA43/aeDiLs="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index de1a39dcce45..9739e39c4a0d 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.51"; + version = "0.107.52"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From 9208d0a63013daf2f8f5bfb1d3847304c8fbdaeb Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 15:04:05 +0200 Subject: [PATCH 079/562] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../transitive-broken.yaml | 15 -------- .../haskell-modules/hackage-packages.nix | 34 ++++++------------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 578da2a5b2b3..5d3fceaed4af 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1239,8 +1239,6 @@ dont-distribute-packages: - elasticsearch-interchange - electrs-client - elerea-examples - - eliminators - - eliminators_0_9_5 - elliptic-curve - elsa - ema-extra @@ -1310,11 +1308,6 @@ dont-distribute-packages: - eventuo11y-prometheus - every-bit-counts - exference - - exinst-aeson - - exinst-base - - exinst-bytes - - exinst-cereal - - exinst-serialise - exist - exist-instances - expand @@ -1419,8 +1412,6 @@ dont-distribute-packages: - forms-data-format - forsyde-deep - forth-hll - - fortran-src - - fortran-src-extras - foscam-directory - foscam-sort - fpco-api @@ -2302,7 +2293,6 @@ dont-distribute-packages: - igrf - ihaskell-inline-r - ihaskell-rlangqq - - ihaskell-widgets - ihttp - imap - imgurder @@ -3001,7 +2991,6 @@ dont-distribute-packages: - optimal-blocks - optimusprime - optparse-enum - - orbits - orchid - orchid-demo - order-maintenance @@ -3662,8 +3651,6 @@ dont-distribute-packages: - simple-postgresql-orm - simpleirc-lens - simseq - - singleton-nats - - singletons-presburger - siphon - siren-json - sirkel @@ -4072,8 +4059,6 @@ dont-distribute-packages: - uniqueness-periods-vector-filters - uniqueness-periods-vector-general - uniqueness-periods-vector-properties - - units - - units-defs - unitym-servant - unitym-yesod - universal diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 97f4a2e3b5aa..291130a9965f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -98069,7 +98069,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "eliminators_0_9_5" = callPackage @@ -103414,7 +103413,6 @@ self: { ]; description = "@exinst@ support for @aeson@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-base" = callPackage @@ -103435,7 +103433,6 @@ self: { ]; description = "@exinst@ support for @base@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-bytes" = callPackage @@ -103456,7 +103453,6 @@ self: { ]; description = "@exinst@ support for @bytes@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-cereal" = callPackage @@ -103477,7 +103473,6 @@ self: { ]; description = "@exinst@ support for @cereal@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-deepseq" = callPackage @@ -103525,7 +103520,6 @@ self: { ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exist" = callPackage @@ -111758,7 +111752,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; }) {}; @@ -111790,7 +111783,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Common functions and utils for fortran-src"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src-extras"; }) {}; @@ -126452,21 +126444,22 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring - , text, time + ({ mkDerivation, base, bytestring, c2hs, gnome-keyring + , libgnome-keyring, text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ libgnome-keyring ]; + librarySystemDepends = [ gnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) gnome-keyring; + inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs @@ -171462,7 +171455,6 @@ self: { ]; description = "IPython standard widgets for IHaskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ihp-hsx" = callPackage @@ -226636,7 +226628,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; @@ -279992,7 +279983,6 @@ self: { libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singleton-typelits" = callPackage @@ -280040,8 +280030,6 @@ self: { ]; description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-base_3_3" = callPackage @@ -280052,7 +280040,7 @@ self: { mkDerivation { pname = "singletons-base"; version = "3.3"; - sha256 = "sha256-CEfQTbHmTHeGkFn3jer8eGPEt9cDSqhto9c8ULxPB8E"; + sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -280088,7 +280076,6 @@ self: { description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-presburger" = callPackage @@ -280107,7 +280094,6 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singletons-th" = callPackage @@ -280133,7 +280119,7 @@ self: { mkDerivation { pname = "singletons-th"; version = "3.3"; - sha256 = "sha256-GwtFa5/whjhQDqkK0C5fvrOw/KShkt6x6rwO0t0zO4w="; + sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -304989,7 +304975,9 @@ self: { mkDerivation { pname = "th-desugar"; version = "1.16"; - sha256 = "sha256-TsuH4NNhJ4xApiQQzbVYACns1jDP0sYZzkGBJRiGghA"; + sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; + revision = "1"; + editedCabalFile = "18qjikbyjzbhickq11hrn5ill89jdfdzbdx3q2s3630k4g8g2qzi"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat @@ -317847,7 +317835,6 @@ self: { ]; description = "A domain-specific type system for dimensional analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -317876,7 +317863,6 @@ self: { libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-parser" = callPackage From a231b6ea37668c1b7abdd40edc095785506d8fff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jul 2024 14:03:24 +0000 Subject: [PATCH 080/562] llama-cpp: 3260 -> 3328 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index e1f14a4b31eb..59f9721f772a 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -67,13 +67,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3260"; + version = "3328"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-0KVwSzxfGinpv5KkDCgF2J+1ijDv87PlDrC+ldscP6s="; + hash = "sha256-rV+Lq5dBkVdoGB/BYNfgvqDB/9+SWfk5rKkKu1xq0PQ="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From a69a71913c512547494d4cadf9fa8540f69b8cb0 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 13:53:34 +0200 Subject: [PATCH 081/562] haskell-language-server: Fix build --- .../haskell-modules/configuration-common.nix | 7 +- .../configuration-hackage2nix/main.yaml | 4 - .../haskell-modules/hackage-packages.nix | 100 ------------------ 3 files changed, 5 insertions(+), 106 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f75329ec0bb1..c63ffeebf1bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -110,7 +110,8 @@ self: super: { ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { + # All jailbreaks in this section due to: https://github.com/haskell/haskell-language-server/pull/4316#discussion_r1667684895 + haskell-language-server = doJailbreak (dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -121,7 +122,9 @@ self: super: { # otherwise we have different versions of ghc-paths # around which have the same abi-hash, which can lead to confusions and conflicts. ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; - })); + }))); + hls-plugin-api = doJailbreak super.hls-plugin-api; + ghcide = doJailbreak super.ghcide; # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56d1e5aae599..6e8ea05af4b4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,10 +28,6 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - # 2024-05-18: Various overrides for hls compatibility - - lsp < 2.5 - - lsp-types < 2.2 - - lsp-test < 0.17.0.1 - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10 # 2024-05-10: need to match hlegder from stackage - hledger-ui < 1.33 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 291130a9965f..ca1ee93cd749 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -197075,35 +197075,6 @@ self: { }) {}; "lsp" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , co-log-core, containers, data-default, directory, exceptions - , filepath, hashable, hspec, hspec-discover, lens, lens-aeson - , lsp-types, mtl, prettyprinter, random, row-types, sorted-list - , stm, text, text-rope, transformers, unliftio-core - , unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; - version = "2.4.0.0"; - sha256 = "1ggfw2wp9g9fpg9x3kj9zh6l6p2yiw4q0v1gzxjg0mcmvp4aad8w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring co-log-core containers - data-default directory exceptions filepath hashable lens lens-aeson - lsp-types mtl prettyprinter random row-types sorted-list stm text - text-rope transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - base containers hspec row-types sorted-list text text-rope - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - }) {}; - - "lsp_2_7_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , extra, filepath, hashable, hspec, hspec-discover, lens @@ -197130,7 +197101,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-client" = callPackage @@ -197159,38 +197129,6 @@ self: { }) {}; "lsp-test" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, co-log-core, conduit, conduit-parse, containers - , data-default, Diff, directory, exceptions, extra, filepath, Glob - , hspec, lens, lens-aeson, lsp, lsp-types, mtl, parser-combinators - , process, row-types, some, text, time, transformers, unix - , unliftio - }: - mkDerivation { - pname = "lsp-test"; - version = "0.17.0.0"; - sha256 = "1jjzqp7dbvaxysfa765zlcmb8h973242fb7a6b17cab3bjc12laq"; - revision = "1"; - editedCabalFile = "07090b7n5a02s1npzmwn6yfk4jnxwi98j1hqflcihni48ylx3b4g"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring co-log-core - conduit conduit-parse containers data-default Diff directory - exceptions extra filepath Glob lens lens-aeson lsp lsp-types mtl - parser-combinators process row-types some text time transformers - unix - ]; - testHaskellDepends = [ - aeson base co-log-core containers data-default directory extra - filepath hspec lens lsp mtl parser-combinators process text - unliftio - ]; - testToolDepends = [ lsp ]; - benchmarkHaskellDepends = [ base extra lsp process ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - }) {}; - - "lsp-test_0_17_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob @@ -197216,7 +197154,6 @@ self: { benchmarkHaskellDepends = [ base extra lsp process ]; description = "Functional test framework for LSP servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-types_2_0_2_0" = callPackage @@ -197257,42 +197194,6 @@ self: { }) {}; "lsp-types" = callPackage - ({ mkDerivation, aeson, base, binary, containers, data-default - , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath - , generic-arbitrary, hashable, hspec, hspec-discover - , indexed-traversable, indexed-traversable-instances, lens - , lens-aeson, mod, mtl, network-uri, prettyprinter, QuickCheck - , quickcheck-instances, regex, row-types, safe, some - , template-haskell, text - }: - mkDerivation { - pname = "lsp-types"; - version = "2.1.1.0"; - sha256 = "0gsr0v11xfav7dnq4d433y9ca0snmqaax4pp5sgmf33zl8qhi6s0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary containers data-default deepseq Diff dlist - exceptions file-embed filepath generic-arbitrary hashable - indexed-traversable indexed-traversable-instances lens lens-aeson - mod mtl network-uri prettyprinter QuickCheck quickcheck-instances - row-types safe some template-haskell text - ]; - executableHaskellDepends = [ - base containers directory filepath mtl prettyprinter regex text - ]; - testHaskellDepends = [ - aeson base filepath hspec lens network-uri QuickCheck - quickcheck-instances row-types text - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - mainProgram = "generator"; - }) {}; - - "lsp-types_2_3_0_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath , generic-arbitrary, hashable, hspec, hspec-discover, hspec-golden @@ -197325,7 +197226,6 @@ self: { doHaddock = false; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "generator"; }) {}; From 03da332d60775f0e034475f79c0a22367edeacda Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 15:04:05 +0200 Subject: [PATCH 082/562] haskell.packages.ghc92.haskell-language-server: Fix build --- .../haskell-modules/configuration-ghc-9.2.x.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 516c3caaa08f..2da13fccb708 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -70,16 +70,6 @@ self: super: { (disableCabalFlag "fourmolu") (disableCabalFlag "ormolu") (disableCabalFlag "stylishHaskell") - (overrideCabal (drv: { - # Disabling the build flags isn't enough: `Setup configure` still configures - # every component for building and complains about missing dependencies. - # Thus we have to mark the undesired components as non-buildable. - postPatch = drv.postPatch or "" + '' - for lib in hls-ormolu-plugin hls-fourmolu-plugin; do - sed -i "/^library $lib/a\ buildable: False" haskell-language-server.cabal - done - ''; - })) (d: d.override { ormolu = null; fourmolu = null; From 4db6ab8aa6c526068b4f8a76b1aa328428e5f957 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 10:40:57 +0200 Subject: [PATCH 083/562] haskell-language-server: Decrease set of packages to check ABI mismatches for Inspired by: https://github.com/haskell/haskell-language-server/pull/3214#discussion_r979524591 It should be enough to check only for ghc and template-haskell Fixes #321569 --- 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 6767fe1f3482..90fcf001b0ac 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -62,7 +62,7 @@ self: super: builtins.intersectAttrs super { # This prevents linking issues when running TH splices. postInstall = '' mv "$out/bin/haskell-language-server" "$out/bin/.haskell-language-server-${self.ghc.version}-unwrapped" - BOOT_PKGS=`ghc-pkg-${self.ghc.version} --global list --simple-output` + BOOT_PKGS="ghc-${self.ghc.version} template-haskell-$(ghc-pkg-${self.ghc.version} --global --simple-output field template-haskell version)" ${pkgs.buildPackages.gnused}/bin/sed \ -e "s!@@EXE_DIR@@!$out/bin!" \ -e "s/@@EXE_NAME@@/.haskell-language-server-${self.ghc.version}-unwrapped/" \ From 19123264df5e839c03615cb9813395c6313298ca Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Mon, 8 Jul 2024 00:09:49 +0900 Subject: [PATCH 084/562] kavita: 0.8.1 -> 0.8.2 --- .../web-apps/kavita/change-webroot.diff | 18 +- pkgs/servers/web-apps/kavita/default.nix | 19 +- pkgs/servers/web-apps/kavita/nuget-deps.nix | 776 +++++++++--------- 3 files changed, 403 insertions(+), 410 deletions(-) diff --git a/pkgs/servers/web-apps/kavita/change-webroot.diff b/pkgs/servers/web-apps/kavita/change-webroot.diff index 7c31e6844c63..8c9e600376fe 100644 --- a/pkgs/servers/web-apps/kavita/change-webroot.diff +++ b/pkgs/servers/web-apps/kavita/change-webroot.diff @@ -12,10 +12,10 @@ index 0c92547..d54abb9 100644 } diff --git a/API/Services/DirectoryService.cs b/API/Services/DirectoryService.cs -index e3dede8..8ec6358 100644 +index 8c6c796..711f315 100644 --- a/API/Services/DirectoryService.cs +++ b/API/Services/DirectoryService.cs -@@ -117,7 +117,7 @@ public class DirectoryService : IDirectoryService +@@ -120,7 +120,7 @@ public class DirectoryService : IDirectoryService ExistOrCreate(SiteThemeDirectory); FaviconDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "favicons"); ExistOrCreate(FaviconDirectory); @@ -39,7 +39,7 @@ index ab3ad3d..f1a068b 100644 _cacheOptions = new MemoryCacheEntryOptions() diff --git a/API/Startup.cs b/API/Startup.cs -index 3b872f3..424984c 100644 +index 7e3857c..84c466b 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -36,6 +36,7 @@ using Microsoft.AspNetCore.StaticFiles; @@ -50,7 +50,7 @@ index 3b872f3..424984c 100644 using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; -@@ -295,9 +296,6 @@ public class Startup +@@ -314,9 +315,6 @@ public class Startup app.UsePathBase(basePath); if (!env.IsDevelopment()) { @@ -60,15 +60,15 @@ index 3b872f3..424984c 100644 // Update DB with what's in config var dataContext = serviceProvider.GetRequiredService(); var setting = dataContext.ServerSetting.SingleOrDefault(x => x.Key == ServerSettingKey.BaseUrl); -@@ -341,6 +339,7 @@ public class Startup +@@ -360,6 +358,7 @@ public class Startup app.UseStaticFiles(new StaticFileOptions { + FileProvider = new PhysicalFileProvider("@webroot@"), - ContentTypeProvider = new FileExtensionContentTypeProvider(), - HttpsCompression = HttpsCompressionMode.Compress, - OnPrepareResponse = ctx => -@@ -410,7 +409,7 @@ public class Startup + // bcmap files needed for PDF reader localizations (https://github.com/Kareadita/Kavita/issues/2970) + ContentTypeProvider = new FileExtensionContentTypeProvider + { +@@ -439,7 +438,7 @@ public class Startup try { var htmlDoc = new HtmlDocument(); diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index f68681300a82..1adbbecec3bb 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -1,23 +1,23 @@ { lib , stdenvNoCC , fetchFromGitHub -, fetchpatch , buildDotnetModule , buildNpmPackage , dotnetCorePackages , nixosTests -, substituteAll }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "kareadita"; repo = "kavita"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Z8bGVF6h//37zz/J+PDlJhm7c9AUs2pgKhYY/4ELMhQ="; + # commit immediately following the v${version} tag + # for correct version reporting + rev = "44c046176e54fa81e3420a1a40dcd9871e0a45f1"; + hash = "sha256-cHX6nzajFqygdFF9y4KEAMv0tdNx9xFbpOoVNo8uafs="; }; backend = buildDotnetModule { @@ -25,13 +25,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) version src; patches = [ - # Fix wrongly bumped version 0.8.0.10 -> 0.8.1 - # Remove on next release - (fetchpatch { - name = "fix-0.8.1-version.patch"; - url = "https://github.com/Kareadita/Kavita/commit/3c9565468ad5494aef11dace62ba4b18b0c7d7f3.patch"; - hash = "sha256-/dPHYrCeS6M82rw0lQ8K6C4jfXEvVVmjA85RKyVaxcE="; - }) # The webroot is hardcoded as ./wwwroot ./change-webroot.diff # Upstream removes database migrations between versions @@ -65,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers - npmDepsHash = "sha256-+RJ9mX/cIainO2xS/hIrIOShPVbHkhkCq6q2bP8dGKM="; + npmDepsHash = "sha256-H53lwRr43MQWBbwc8N0GikAOkN2N0CwyiY8eGHveNFc="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/kavita/nuget-deps.nix b/pkgs/servers/web-apps/kavita/nuget-deps.nix index 481f34385626..77fa4d46c88a 100644 --- a/pkgs/servers/web-apps/kavita/nuget-deps.nix +++ b/pkgs/servers/web-apps/kavita/nuget-deps.nix @@ -2,392 +2,392 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; sha256 = "0s0wjl4ck3sal8a50x786wxs9mbca7bxaqk3558yx5wpld4h4z3b"; }) - (fetchNuGet { pname = "AutoMapper.Extensions.Microsoft.DependencyInjection"; version = "12.0.1"; sha256 = "0gjsjgfmfa3xx773idh7nxly4mz9ragiy0dqsc9xfzy7b5mlzw91"; }) - (fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.3.0"; sha256 = "1zdik0ifv2ir958ks7hgm9p11axwlkvbhw7vr98z24a009x4x02c"; }) - (fetchNuGet { pname = "Cronos"; version = "0.8.4"; sha256 = "0gy75x1jb3ks2i9czb0sl5zdgf7mg14fn8174klb7jfhm5rcpnig"; }) - (fetchNuGet { pname = "CsvHelper"; version = "31.0.3"; sha256 = "0ldq5715gj1j2w5qr2x28i6kfqfqk1zllhwcy2w1km2d8pvsdf1f"; }) - (fetchNuGet { pname = "Docnet.Core"; version = "2.6.0"; sha256 = "1b1nj984ly4zgj28fri1a6ych9sdiacxkms8pvzsclvyxkf0ri8m"; }) - (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; sha256 = "1klgj9m7i3g8x1yj96wnikvf0hlvr6rhqhl4mgis08imcrl95qg6"; }) - (fetchNuGet { pname = "EasyCaching.Core"; version = "1.9.2"; sha256 = "0qkzaxmn899hhfh32s8mhg3zcqqy2p05kaaldz246nram5gvf7qp"; }) - (fetchNuGet { pname = "EasyCaching.InMemory"; version = "1.9.2"; sha256 = "0ifcnmd3hqy44jvfwy3zzjccsxqalfv6clmj0clp9yln3js51awq"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.2.5"; sha256 = "0p4456qkkxx9448y16xisj43a7syrq79wii2jnyqp2jm64wz5yb0"; }) - (fetchNuGet { pname = "Flurl"; version = "3.0.6"; sha256 = "1y82lbag0gkfpj361psk5761hn7k0zmrp9cpdvnjyp75bdimiaiy"; }) - (fetchNuGet { pname = "Flurl"; version = "3.0.7"; sha256 = "1i56774jsy2qlk573vzvcpjh5hf22yrhxs694j1c4gwggarnqz16"; }) - (fetchNuGet { pname = "Flurl.Http"; version = "3.2.4"; sha256 = "0vp5a1rrfi28in775d7fac96rcrikzjd2gbz0k3p925y1f2wlw5k"; }) - (fetchNuGet { pname = "Hangfire"; version = "1.8.12"; sha256 = "0hbd21smpsb4vzi1y21zx4b51nd5z8isni0s0s2s78msgfh81a9b"; }) - (fetchNuGet { pname = "Hangfire.AspNetCore"; version = "1.8.12"; sha256 = "1jaiz0nfmfjp9vr3x62qjgkwb2rk0jlzgl74ja089yaq6n3jwrqc"; }) - (fetchNuGet { pname = "Hangfire.Core"; version = "1.6.17"; sha256 = "0kr2hjnl9c4dpk4kf95jxcgsxalvixfm6xis37qn5ja9n9ygqans"; }) - (fetchNuGet { pname = "Hangfire.Core"; version = "1.8.0"; sha256 = "047g50s2nz32dnpqm9lnsvpgz8g3azip2mpc6s15wb78b8c9s48n"; }) - (fetchNuGet { pname = "Hangfire.Core"; version = "1.8.12"; sha256 = "19bbk3cqd1vw2x94gilvgwfjgl9yr5nvy8y4hjngx93jg563i17y"; }) - (fetchNuGet { pname = "Hangfire.InMemory"; version = "0.8.1"; sha256 = "1i1j4mysk636dmf0p41w5bvi1i2nmr39svwj8svyqhij4yhih019"; }) - (fetchNuGet { pname = "Hangfire.MaximumConcurrentExecutions"; version = "1.1.0"; sha256 = "181147h5dsbml58ffq1jc7k6012fahi0n20wply9gmn6v1dh8h66"; }) - (fetchNuGet { pname = "Hangfire.NetCore"; version = "1.8.12"; sha256 = "19987w1nng7mr5r66y5523q67ig2xb98im4b1ahqsc5s9mwkm0qh"; }) - (fetchNuGet { pname = "Hangfire.SqlServer"; version = "1.8.12"; sha256 = "0h68hz7bzbypff1sg5hq1b0pfg7ckz506rfsiphqninrpczc9zsa"; }) - (fetchNuGet { pname = "Hangfire.Storage.SQLite"; version = "0.4.2"; sha256 = "1sa2ws9p6fxrlp0ny42hsqmlxsnnsy3zsyx2mh1hg4kyyndk9zpz"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.60"; sha256 = "0jpv1vry0mfwbswxn70knbkzsrwwz2ijsm5d4rj9jf2kk37m0xga"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "MailKit"; version = "4.5.0"; sha256 = "0f9z43bba2g6vzwbb9frdf9787vzablyzaswdxryn5s1fgqkrrda"; }) - (fetchNuGet { pname = "MarkdownDeep.NET.Core"; version = "1.5.0.4"; sha256 = "0cpshs1lwmyyg40lvnf4b9s1z7yaw6s4a0341qr4ww40791gzvrl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.4"; sha256 = "1q2ai2jqc4zc2bdrbjng9fb7n0pch4f8bap3drd1v2vrha0d2r3q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.4"; sha256 = "1gscq70xqnv2sv5ka8m754mzq875qp3r45bfl36jfa6ag0ivjxsb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; sha256 = "1mpq8pmxlxfa625k2ghv6xcyy2wdpwv56xzya9mvmlnh50h1i8rx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.4"; sha256 = "0nb87rimc7brciav6ngfcx3g2k0g903fmax3w408m5dm8fan2ysp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.4"; sha256 = "1l9lvyw81f6ckby1q3wy1677jdcp46i25m58qpkma7wd1gmg36pg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections"; version = "1.1.0"; sha256 = "03wh8cl2ar3v6v3j7ysif680wqy1wgzmcfrzrcsy16fn8y73dylq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "1.1.0"; sha256 = "0x3hq0d3bs6n46nfvbd5n4cgi6m4yjfsf3k25xjcc8gcj66072iy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.4"; sha256 = "17hmg59zk537vvp7vl59xrzjwbnlp6lb42sil7xszw7assb51795"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR"; version = "1.1.0"; sha256 = "16p01hxcrpj7iiwcqmwjfmciyisxp1mr0qa1wcx1ja4i0m0g292l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "1.1.0"; sha256 = "0gfcq6wg7ygkb7l9y8avx88gilpds58p2vb8sqd7xmgm6616saax"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Core"; version = "1.1.0"; sha256 = "1lrya5f6nzimx43vwywrrl7jvg1rm0gdigqmg1z52wbllb7jpmph"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "1.1.0"; sha256 = "0zcyb3brzpw03f7vgkc3450izpvjgy0kjkgkp1mi9bc76xrvv094"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebSockets"; version = "2.2.0"; sha256 = "0hii6kd45xhswjwakhzm8wqxr10l959cch6h2w0x0ika3315a6b3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; sha256 = "0skg5a8i4fq6cndxcjwciai808p0zpqz9kbvck94mcywfzassv1a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; sha256 = "1wjwsrnn5frahqciwaxsgalv80fs6xhqy6kcqy7hcsh7jrfc1kjq"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.4"; sha256 = "03i9b45n2vnsv4wdsk6qvjzj1ga2hcli168liyrqfa87l54skckd"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.4"; sha256 = "14a74ssvklpv9v1x023mfv3a5dncwfpw399larfp9qx7l6ifsjly"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.4"; sha256 = "1xs1cs29csnbahxgikc094xr878i8wp4h4n84xffaxms6wx5c1fb"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.4"; sha256 = "1h2bdh7cyw2z71brwjfirayd56rp3d2dx4qrhmsw573mb5jgvara"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.4"; sha256 = "1ni5qkjgarcjbqvw9cx0481fc99nna7rnp7170wq650jwm0f8c2f"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.4"; sha256 = "17v2wm6wwsl169sq6lawxhn9wvd299n1hdrxih8c3lzvi8igy4sd"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.4"; sha256 = "0h9ib00k54jmsrbhipr33q3sqd3mdiw31qi4g8vak1slal9b70zw"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.4"; sha256 = "0pa0xz96g2f99yj3x3hfj362br3zjcx3qd89ckqmymqpvnhk4bw0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.0"; sha256 = "0xdchxw63r8rh84zdjkv8i89lq4a7h5iwqw19vwjf0l5gavyz40q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; sha256 = "1br01zhzhnxjzqx63bxd25x48y9xs69hcs71pjni8y9kl50zja7z"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.9"; sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; sha256 = "0ghwkld91k20hcbmzg2137w81mzzdh8hfaapdwckhza0vipya4kw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.0.0"; sha256 = "165l30n9mi9j3dv45rr4xx1dwg9z520yja22jcb7jw0lq0ic28j2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; sha256 = "1f2af5m1yny8b43251gsj75hjd9ixni1clcldy8cg91z1vxxm8dh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.0.0"; sha256 = "13ijaki0nzlvbwxjxb1hjhzj86jgn23nw34gdwp2l7bf3x2h4hw9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.4"; sha256 = "1k9x667wi3izxjjiprqkdgajfn1slb0w8lyjdp2x441hp4wyzf6c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.4"; sha256 = "0dajblmwx1z7jk08ycsfabv30b28mvazgv3wq6m7pnlrpijkvcp4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.0"; sha256 = "0453382r1f39hgvw631lk1hx2kas8xa1xjr6xq4wshan8d62xgd7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; sha256 = "1h7mg97lj0ss47kq7zwnihh9c6xcrkwrr8ffhc16qcsrh36sg6q0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; sha256 = "05vfrxw7mlwlwhsl6r4yrhxk3sd8dv5sl0hdlcpgw62n53incw5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; sha256 = "0gbjll6p03rmw0cf8fp0p8cxzn9awmzv8hvnyqbczrkax5h7p94i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; sha256 = "0as39ml1idgp42yvh725ddqp4illq87adzd1ymzx6xjxsxsjadq2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.0"; sha256 = "1d89yybxm7c30h5w79psybmpvy0pw7ha9r0y70f7i0kxgp8n62bk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; sha256 = "01jdg8b1hi4nx5h1cn9baalfkp4y70kc2wf4lz77kw8w1fvrppa0"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; sha256 = "0kdxb47rafvk6mx0xkf2pik7b638b2d847jlhzi3fvj6swg3v15b"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; sha256 = "1ny97mhld7vzn5xwxvcy1jhfq4mw15wrk9c77z6cg2fydkgawyzx"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; sha256 = "1yi7s2pm4f8vl6b0qck0nrfsrf1h4jwamznkzl75n1cwxpbdikp8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; sha256 = "1zharnx3vhrfdn761w16ygxyj9ig5zn71346aqkk0nmzlll3gfjf"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; sha256 = "0ql5b7472g7359b1pqh2lfm8s3lym9vyzj1xpvbhsv9syk9czrg8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; sha256 = "06r9i1m6zhfbbx18p0drpcbswirlq7xg0wm3iqfjgzxyv053033h"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; sha256 = "1q70c1ax9f5nggqp4g8nyfaz0481grsaxhp85cmjpmx8l3q35zx9"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; sha256 = "14fjr679hwal35mdwdv4w40mnxzfnnx65yc16807zzkyri011zc1"; }) - (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; sha256 = "1zl39k27r4zq75r1x1zr1yl4nzxpkxdnnv6dwd4qp0xr22my85aq"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; sha256 = "0jaan2wmg80lr0mhgfy70kb5cqjwv1a2ikmxgd0glpcxp7wr7pag"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Portable.Compatibility"; version = "1.0.1"; sha256 = "1qwar1jv2pwl354bbi75rvcjz27rrk0z0vzgx8h4f1ypn2m5h3f5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2"; sha256 = "1hxgsjyzh7hdgd34xwpn5s2myy1b1y9ms7xhvs6mkb75wap49bpc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1"; sha256 = "16k8chghkr25jf49banhzl839vs8n3vbfpg4wn4idi0hzjipix78"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.3.1"; sha256 = "0icds4jxz90v156vkbza1s1rqdf737glfddbllkp6y2zcnin99yv"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; }) - (fetchNuGet { pname = "MimeKit"; version = "4.5.0"; sha256 = "1df0wrfhg8lw9a401rbj9vdsm0nkn064bv9jq2wy0b3jpw33gj9n"; }) - (fetchNuGet { pname = "MimeTypeMapOfficial"; version = "1.0.17"; sha256 = "1l5d42pgfz4cpvgdyxf2crzyv7jycky5mhmrrl5501p3806i3r0y"; }) - (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; sha256 = "1ih6399x4bxzchw7pq5195imir9viy2r1w702vy87vrarxyjqdp1"; }) - (fetchNuGet { pname = "Nager.ArticleNumber"; version = "1.0.7"; sha256 = "1lfhr20527xhzql5nsn5c1s5as79haz9xcqan8pqsfk200hc27af"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NetVips"; version = "2.4.1"; sha256 = "1jf0carq4aqw12shl91dbxmc65djhqlm5rlca1dag3aj5h05jzaj"; }) - (fetchNuGet { pname = "NetVips.Native"; version = "8.15.2"; sha256 = "0jngfr5p37x5mjrrq7rq62nzq2fi9fsvls25i48ra62fscj1skva"; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.2"; sha256 = "1pcc2vkgjbcx1a88bnwn2vv71k7vv1q3hzcnpwbyaq8drh2q9zsy"; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.2"; sha256 = "11wd1fxmipcd897rab9rdvb06ax71qg2zd4vsbdf0bqjq7ja741x"; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.2"; sha256 = "16fc3bf5n13yhd03wfdi3g8d9n2qgmbwiwil1vh3vxwb3qrdii03"; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.2"; sha256 = "0iznsfxg0f3xw36j9rxa37zr7vryvxaj3a303mrsvj47qgxjd1fs"; }) - (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.2"; sha256 = "09zcfx71107wifj2qhvqbjcjsjs7v790mpplq7aczfvj8kccnfdx"; }) - (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.2"; sha256 = "04ak05razgqcizpbxwfcmb2cgzbq7yw2jgb74p354nkmrs7knwbr"; }) - (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.2"; sha256 = "1028p1iyvp7rhmssr6hk1f5n2z2y7cvslf11kzb826gxd2yvn52m"; }) - (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.2"; sha256 = "0yggh8mqvqidrlhc3756rxsaarhmvvp4yhwj0ffgyzzclcbff4nf"; }) - (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.2"; sha256 = "0y8x5w70c7y7xmc8g1b200d2yhkg8nx41k337c2416zfbm268wzg"; }) - (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.2"; sha256 = "08p2wbdv1j50s1yllycc1c5cglaimssmn3p1v1qybxmaasj2ff3x"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NReco.Logging.File"; version = "1.2.0"; sha256 = "0bqj9xygxg8bdhm467cmrpzigcikmadir1bq8p0rbfg0rg7ppd4a"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Scrutor"; version = "3.3.0"; sha256 = "0qdfbp73hbsiqbv0rg6f91hnp1j535iqk8bmp3ickwd7w337m1vi"; }) - (fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; sha256 = "0vmrbhj9vb00fhvxrw3w5j1gvdx4xzxz8d2cp65hps988zxwykkb"; }) - (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.2.0-dev-00752"; sha256 = "0d0phxzdpc8xkbyd18s1dcv9xa22gqs2i2x5cpa9qzj0g8zwp641"; }) - (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; sha256 = "10cgp4nsrzkld5yxnvkfkwd0wkc1m8m7p5z42w4sqd8f188n8i9q"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; sha256 = "087ab94sfhkj6h6x3cwwf66g456704faxnfyc4pi6shxk45b318s"; }) - (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; sha256 = "0y7vg2qji02riq7r0kgybarhkngw6gh3xw89w7c2hcmjawd96x3k"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; sha256 = "0245gvndwbj4nbp8q09vp7w4i9iddxr0vzda2c3ja5afz1zgs395"; }) - (fetchNuGet { pname = "Serilog.Sinks.AspNetCore.SignalR"; version = "0.4.0"; sha256 = "0sljv39dr8mfbxjzqzik6qa72rc48v9z1hny4j61381cscnank1a"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; sha256 = "0cnjjpnnhlx3k4385dbnddkz3n6khdshjix0hlv4gjmrrmjaixva"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "Serilog.Sinks.SignalR.Core"; version = "0.1.2"; sha256 = "16f86661vr7gw8xay1735y551p0z39mks7xagwxb8lxqxwmm4gzf"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.36.0"; sha256 = "164ikphk4glldr73l247cjb65v064md0ccccm06rh0zvjq5iqlph"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; sha256 = "0cs6wfx74rwp88m5arci04ldv2s92kpif28ykfm9ig17h9a8gsnc"; }) - (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.23.2.88755"; sha256 = "1nrvvpbxsgxsa0byy7drw7lrw5byg45n9gkmk2n4b9400fs2b0b5"; }) - (fetchNuGet { pname = "sqlite-net-pcl"; version = "1.8.116"; sha256 = "0h3s43pfjqgy9amrdj4d7p65hmys895hlkczj62wg974qb4z8l2y"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.4"; sha256 = "1197ynpm4fl6il9vi0mi1s1pmw3rk3j0a05kwrxpqlfgp7iwhc22"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.4"; sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.4"; sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters"; version = "8.0.1"; sha256 = "1qs9awkh9jijmrdb0w0j669sn1i5wrl3bk5phpq1kscfa6ywkp5g"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters.Abstractions"; version = "8.0.1"; sha256 = "1739p184hihfl6p42bcn66d2wflilhrbsyq0ddbbqxgxi3kdcxn6"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.4"; sha256 = "17i50sbv5v9c138gjammn9nf1p0qa0lpmvmw26ffdhmlshjla6fi"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; sha256 = "04h75wflmzl0qh125p0209wx006rkyxic1y404m606yjvpl2alq1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.5.1"; sha256 = "0priwzi8w2rnspppldl2mhi4fh835dpyyy8f7ri6qbqs7n8l746n"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mp73hkrxb83bs16458qgf7l3n20ddnfkij1pd603dr8w22j7279"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.5.2"; sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebSockets.WebSocketProtocol"; version = "4.5.1"; sha256 = "1n0ag9ws6fgyqcz39xyk5dnchskfji8bcgqw90i2ai7lyvd843p6"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "8.0.0"; sha256 = "04kqf1lhsq3fngiljanmrz2774x5h2fc8p57v04c51jwwqhwi9ya"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mc358wlq9y21gzj44af8hxlyjm0ws0i9f5vmsn31dn5wbfh4dy5"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.2"; sha256 = "0q3vghssyh6rd7w7n4rjv5ngh5byf1y80i22yw9fx10f4hcsw1az"; }) - (fetchNuGet { pname = "VersOne.Epub"; version = "3.3.1"; sha256 = "1v7ms857yhm38syi4l63g9hzn0y08n8csr4z4i56xmzpj1big2s6"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; sha256 = "1nz05bh78d6ilz2g2vqp3jgxag5p3h1cnidwr9qxzgr89nj2fas6"; }) - (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.7.4"; sha256 = "0087rymvclj96pscd8lbjidsdg1g4p83m6y20bcicz8sx7jnnzyg"; }) + (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; hash = "sha256-a3wCSaOXl+5RKWNi1ddRbNWkOzfodFAUokqPyQiVHGg="; }) + (fetchNuGet { pname = "AutoMapper.Extensions.Microsoft.DependencyInjection"; version = "12.0.1"; hash = "sha256-IfFPa1nHf9cT07gBH5/K6VfiabcHtjjO6X0oV92TWj4="; }) + (fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.4.0"; hash = "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="; }) + (fetchNuGet { pname = "Cronos"; version = "0.8.4"; hash = "sha256-L9rLcqnQybPoJCcg60h49bjXfqEarM9SFHqOJUMvxz8="; }) + (fetchNuGet { pname = "CsvHelper"; version = "33.0.1"; hash = "sha256-4MwA/WerpI0VYWiaEudNCNnE1v6/k2tPmLbRjmgijV4="; }) + (fetchNuGet { pname = "Docnet.Core"; version = "2.6.0"; hash = "sha256-FcUM3Ox+U6b/vkjX2ZmKTSfIvFEhZoeEfJ94SlCSNqw="; }) + (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; hash = "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="; }) + (fetchNuGet { pname = "EasyCaching.Core"; version = "1.9.2"; hash = "sha256-Fx+3X6kqW0PEb1SpWcAVHmP2x4MVaTGggzAlZGtXf2I="; }) + (fetchNuGet { pname = "EasyCaching.InMemory"; version = "1.9.2"; hash = "sha256-mKtQtByW+nQpA7JSZrajCnfNmPx/eO62JMRjOFq1zEU="; }) + (fetchNuGet { pname = "ExCSS"; version = "4.2.5"; hash = "sha256-YPnyOTFViou9lSJGng7OXh81iNSxm+ARIan3ObEphFw="; }) + (fetchNuGet { pname = "Flurl"; version = "3.0.6"; hash = "sha256-PqpYY1vlXC/tbpelm+sH81gYzClT32CGvG4+8NSiAvk="; }) + (fetchNuGet { pname = "Flurl"; version = "3.0.7"; hash = "sha256-Jnxss3qPP8KCJMnoDrMXwsEC5WX773HKpFh4Lck5psQ="; }) + (fetchNuGet { pname = "Flurl.Http"; version = "3.2.4"; hash = "sha256-s3DKhQu+iHTHBH890eSfMbNsElPutHKOjUhEl3NQ5W4="; }) + (fetchNuGet { pname = "Hangfire"; version = "1.8.14"; hash = "sha256-N1bTpAb6zJ7qMhc1KgReVbNbXSkRLRI6ZMSS6jAcIgk="; }) + (fetchNuGet { pname = "Hangfire.AspNetCore"; version = "1.8.14"; hash = "sha256-qcRz1+KEp78FaycOFzmwyuhGt7oJX1VBm+7ebe4dXg4="; }) + (fetchNuGet { pname = "Hangfire.Core"; version = "1.6.17"; hash = "sha256-2ir8fLJJyWLxGTp2U12Pm6quH+uyJDfJvI2wRK2EIk8="; }) + (fetchNuGet { pname = "Hangfire.Core"; version = "1.8.0"; hash = "sha256-FhGdGFroLF6CNuxWceNX46H/7taWpoqvbWJ8KzQo7xA="; }) + (fetchNuGet { pname = "Hangfire.Core"; version = "1.8.14"; hash = "sha256-IZU9b9MfMrlKRXe3J9AeA3WrJ3Tx/oakoo1xU7ozxAs="; }) + (fetchNuGet { pname = "Hangfire.InMemory"; version = "0.10.3"; hash = "sha256-qvwnckX3i4bKELM86hap/tk9j46oSs2hnKAqlF/Yn50="; }) + (fetchNuGet { pname = "Hangfire.MaximumConcurrentExecutions"; version = "1.1.0"; hash = "sha256-xkAEW9jG1pc8vRwICyJUTgRg5mEyYOdQoXXpVuAhIaA="; }) + (fetchNuGet { pname = "Hangfire.NetCore"; version = "1.8.14"; hash = "sha256-AcBAONay/nnNrGy0Hjt1UA7rxzIeTm0rQgZO+AJpQbM="; }) + (fetchNuGet { pname = "Hangfire.SqlServer"; version = "1.8.14"; hash = "sha256-OkKb2D2kKN9ESrSwFH1up9/KC4qZHblGiuLLwMWojfE="; }) + (fetchNuGet { pname = "Hangfire.Storage.SQLite"; version = "0.4.2"; hash = "sha256-//40m/V+kgcDrKJ7/YfX1upOK9ZQEG/Bpbk7c5PmQuk="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.61"; hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "MailKit"; version = "4.7.0"; hash = "sha256-9KcpzvO9MKAlxCh2B2XOBWbPfQ8TRo27gxuSJpB57vs="; }) + (fetchNuGet { pname = "MarkdownDeep.NET.Core"; version = "1.5.0.4"; hash = "sha256-NO//QjqAcE4yDmQARbThyp8fdFrE2U0Bed5XToOG+jI="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; hash = "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; hash = "sha256-rUg3keud5JjMtyncxNc2/8Sey2bMTth/AFjeketJR88="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.6"; hash = "sha256-tTPB/xKJA9BJiwcrBhcV+kwqxyumew2RXDlicn85fgE="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; hash = "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; hash = "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; hash = "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.6"; hash = "sha256-8+2aRr6mWkdzcGEpIAA9mwI+HPAxqZek8MtNS50mPJQ="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.6"; hash = "sha256-5ss60ArZhhZCml464QwlRdvRdyBWIR8cmCZfiPt05vo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; hash = "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; hash = "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; hash = "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections"; version = "1.1.0"; hash = "sha256-mPo2jkfWmeA1yz87Vv/jwWMOkHFR+yPHNntkJShDkA8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "1.1.0"; hash = "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-8Jc28VhEkWgW0dE5riY/Ye7w6vlkIQ44dduLBx1p/s4="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; hash = "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; hash = "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR"; version = "1.1.0"; hash = "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "1.1.0"; hash = "sha256-XSltgjH11X4a1mhtcVHR7dL4EOpbIZ/oWfP587jBzD0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Core"; version = "1.1.0"; hash = "sha256-8NYrz6J0cVF+eBW/2B6oObwtD82Ze74H6TV+a1xRPtM="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "1.1.0"; hash = "sha256-JIG9czeHrRRruPNNOYF/ct8fQSGDzbePG4Dfn9dYnn0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebSockets"; version = "2.2.0"; hash = "sha256-YxlVwhhqRtABF9BAxlJJFITcMUf1w6m45Br2Qto0MUI="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; hash = "sha256-UdfOwSWqOUXdb0mGrSMx6Z+d536/P+v5clSRZyN5QTM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; hash = "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; hash = "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-T9Pz6bCGULBEYjzdUBd1KXSAnw1c4VljSkwgbTE2MmE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; hash = "sha256-RdcIA9WUJnHyAFdlpBPs5qUusKMUH9uLFGusKBWDCX8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; hash = "sha256-aTWfaOL0MfWYBbR+1Q1g+sxzmcjA4Q/OBFnVZDQqKJ8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; hash = "sha256-svQdeAv19bCM/RQwWFA6wFssrXecqazqs5ctbdZCBgQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; hash = "sha256-l2fkzSq3Tb15Uq7a879Bihat+Y7rijDwsrs/MDiApdw="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.6"; hash = "sha256-kb+8eSHhmaxJ5OXYSFTHtKYaQ2TV+WJ5nfZMP+XXsto="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; hash = "sha256-4rVgUuCdBUvQyEnadrieZ1RxgwGAfuRCj9kkWM24NKA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; hash = "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.0"; hash = "sha256-GJDvt3qFAif5ToFjHgs8imCaUER7yvYJghnlYXiHrHU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; hash = "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; hash = "sha256-dGTb6sHsjZ86fiLnwbauGf9CQdN7G96lCM4ADjaSSBs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.9"; hash = "sha256-Zkt069WHJ542l+LbeeZxmaddoQiUeYE9bdyh4MN59tA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; hash = "sha256-TKEE5GJmn1wLKuiF6Wd+Q7jpIlq9gSvlWvTVopCyoo4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.0.0"; hash = "sha256-QiLBIsAUcHkWk0Io6YEoPz3eQu8k50J2GzLFmiwYtJg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.0.0"; hash = "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.6"; hash = "sha256-0cquYLpXjFMdd2VQrsr54LrbQ723jbIwoLOhO04wTnM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.6"; hash = "sha256-/HmTyyTMpY5xpgjwU9GO8uTIefTaTztFagZKEqXX6iY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; hash = "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; hash = "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.0"; hash = "sha256-p70uTENWQc0J7ibLHlRHWk3RYZg0DMP3g2m4kAUaoxA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; hash = "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; hash = "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; hash = "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; hash = "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; hash = "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.0"; hash = "sha256-cwlj0X19gngcOB7kpODhF/h96/L6psMLBIOd2pf3CbU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; hash = "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; hash = "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; hash = "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; hash = "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; hash = "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.1"; hash = "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; hash = "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Portable.Compatibility"; version = "1.0.1"; hash = "sha256-xQ1YqrDXB0cg6u9v8MHM+Ygv2c7lxLVIGZRfsWXIiuM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2"; hash = "sha256-7K5EruLlrFmN3rAfXZMPK3hfhS728k5Gew0e+L3Ur8M="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1"; hash = "sha256-6PR4o/wQxBaJ5eRdt/awSO80EP3QqpWIk0XkCR9kaJo="; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.3.1"; hash = "sha256-26dko2VfeHMnpas1R98ZxzWcgw7qr7lNCRuk3yXRjUU="; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) + (fetchNuGet { pname = "MimeKit"; version = "4.7.0"; hash = "sha256-bdBpES930ZgPaFrXJuNkW3vRryMygwXpE5dNyW1xOS0="; }) + (fetchNuGet { pname = "MimeTypeMapOfficial"; version = "1.0.17"; hash = "sha256-HuQRDUDjBlAKzbnCWvxkXp7tf2bCdd/evox8964grdA="; }) + (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; }) + (fetchNuGet { pname = "Nager.ArticleNumber"; version = "1.0.7"; hash = "sha256-Th3BIABiOo0vsgqznr6C6WhVdGDFalso/rAfUYDI0NE="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NetVips"; version = "2.4.1"; hash = "sha256-Un1ZACxSjadaUIzmUimGshXDal8tJAq1CBwrgrNiwMk="; }) + (fetchNuGet { pname = "NetVips.Native"; version = "8.15.2"; hash = "sha256-ak8dJNNOGJURiUVourVL0Qn8rTA4H5yzrKWfcUt2z0o="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.2"; hash = "sha256-Xv+EBcwNYeUXv5Z9OHDY+8xw9haW24WQCp0t+eYWjN0="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.2"; hash = "sha256-PZCj5MESL+Da0pu0Lx4OpysD1m45LZVPQo3dWLsLjYc="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.2"; hash = "sha256-A8TYMh6L9z3gDjTyyFd9WNjU0BuxOT5Ag34EW9wazJk="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.2"; hash = "sha256-2oUm+8OHyK1zHWCoIVXfPu+T/xmq5yTN4H048LrT9kc="; }) + (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.2"; hash = "sha256-vTnL2ERyu8/UwfTeCtLZR0stmVx4Qyyki/yAEE537Cc="; }) + (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.2"; hash = "sha256-eXE7j851WlLGJWc9Kbg/eP3HxKrM8b7ujwy/r3IBUxE="; }) + (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.2"; hash = "sha256-VRS7vWj9GYHWnyE4qjc7XnxhiwsTmqx1hfnc7WO4SIA="; }) + (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.2"; hash = "sha256-zhLnFqPsf/+cA5JDT+7eFWaldM+mnMEgzS3ijSuC73k="; }) + (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.2"; hash = "sha256-73NkRF3um0AEO2PMQLpFb0IvGgBihYdY7ccfBg4vHXk="; }) + (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.2"; hash = "sha256-fTgnpFaq9uVx2OEOW7WuUdHHCguMeUp90KDIsNvi4iI="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; hash = "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NReco.Logging.File"; version = "1.2.1"; hash = "sha256-zFAeY5b3Bdy9EOxJcx8eyaXE4gMSRg6auDhQLm+/oLY="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Scrutor"; version = "3.3.0"; hash = "sha256-cYd6xuCn8cniuHWhiWMZRYZrYUjOvAz2wlEvOM5drmE="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; }) + (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; }) + (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.1"; hash = "sha256-UqaNQPN5devzd8czUWu6D7zWJs/pUVsU5PJQRnyT4uw="; }) + (fetchNuGet { pname = "Serilog.Sinks.AspNetCore.SignalR"; version = "0.4.0"; hash = "sha256-KkyrLNMsoBGMJN7C8NNGhGVxFDYzfvxlX66i3NLYkmo="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) + (fetchNuGet { pname = "Serilog.Sinks.SignalR.Core"; version = "0.1.2"; hash = "sha256-7j9SK++4U7Q6f6ofPWsaH9xQii/jBK864u/kHYwxyJk="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.37.2"; hash = "sha256-IP7/ssqWKT85YwLKrLGACHo0sgp7sMe603X+o485sYo="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.28.0.94264"; hash = "sha256-lG8+16cWHYNhO0MFjUHv0zQGj5mipRmUr57z3CaO1wk="; }) + (fetchNuGet { pname = "sqlite-net-pcl"; version = "1.8.116"; hash = "sha256-XlD0ycLkpMeFkZ9NCktC2ldYzD2NyJarSv5h6e4gekA="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.4"; hash = "sha256-QjDI47nPUXx75rMABeSYefB6gw6xgrgTjYY6Uq/1J4U="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.4"; hash = "sha256-IUfP6hlLayClMzG3V0cEU2woJrlCqvZ/J6LBQB3fZVE="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.4"; hash = "sha256-rPj53a6jdeX4gSr7SsUz7LtbecdoDJQb7bxSigsPvU4="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; hash = "sha256-0rzyURehoQsyDxW8Yj477TJLNcItBsJVwKBeGidKmSA="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters"; version = "8.0.2"; hash = "sha256-RCFdFvCzUYS850axoGaprr0heFyBFCIu9jzusXJ0YAA="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters.Abstractions"; version = "8.0.2"; hash = "sha256-oe6KYmrvaAKu0JpAwxpIiyxSaqfRg2VAyc/KKQX6xFI="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; hash = "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; hash = "sha256-JGMmhhq6OdscsGsnSM6182ZkyWiSdr0ERmNZvJV4XAM="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; hash = "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.6.2"; hash = "sha256-RL7l7Xfi9a7w8v1DOTxrOFLrNVUkXWoCcE2YdCN6Q+Y="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.5.2"; hash = "sha256-AXsErCMtJnoT1ZhYlChyObzAimwEp1Cl1L6X6fewuhA="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Net.WebSockets.WebSocketProtocol"; version = "4.5.1"; hash = "sha256-5g6C2vb0RCUiSBw/tlCUbmrIbCvT9zQ+w/45o3l6Ctg="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; hash = "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; hash = "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; hash = "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "8.0.0"; hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; hash = "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; hash = "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; }) + (fetchNuGet { pname = "VersOne.Epub"; version = "3.3.2"; hash = "sha256-jzkD4HDgFMevH8FRYml7UHEwMt7BWG+VpinIPlioIUo="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.8.1"; hash = "sha256-PzTY1UeDK4t22o3GjAV1qV/zsXe/N4yOQsFu5l8Zu/A="; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.0"; hash = "sha256-nQkUIDqpgy7ZAtRWyMXQflYnWdPUcbIxIblOINO2O5k="; }) ] From c2ca1d98e94c6c2bce443ea07e3cf8aed2c04538 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 17:36:13 +0200 Subject: [PATCH 085/562] haskell.packages.ghc98.haskell-language-server: Fix build --- .../configuration-ghc-9.8.x.nix | 4 +- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/configuration-nix.nix | 8 +- .../haskell-modules/hackage-packages.nix | 73 +++++++++++++++++++ 4 files changed, 80 insertions(+), 7 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 73661b29bef9..72ee1aca1d25 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -63,8 +63,8 @@ self: super: { attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; - ormolu = self.ormolu_0_7_7_0; - fourmolu = self.fourmolu_0_16_2_0; + ormolu = self.ormolu_0_7_4_0; + fourmolu = self.fourmolu_0_15_0_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6e8ea05af4b4..72372897737e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -96,8 +96,10 @@ extra-packages: - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - fourmolu == 0.15.0.0 # 2024-07-07: for ghc 9.8 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - ormolu == 0.7.4.0 # 2024-07-07: for ghc 9.8 compat - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 90fcf001b0ac..479c53ac963f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1212,12 +1212,10 @@ self: super: builtins.intersectAttrs super { ''; }); in - - { - fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_16_2_0 = fourmoluTestFix super.fourmolu_0_16_2_0; - }) + builtins.mapAttrs (_: fourmoluTestFix) super + ) fourmolu + fourmolu_0_15_0_0 fourmolu_0_16_2_0 ; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ca1ee93cd749..b26e39e67fec 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111996,6 +111996,43 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_15_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.15.0.0"; + sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; + revision = "1"; + editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fourmolu_0_16_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, choice, containers, deepseq, Diff @@ -227111,6 +227148,42 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_7_4_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, deepseq, Diff, directory, file-embed + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.4.0"; + sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; + revision = "1"; + editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + deepseq Diff directory file-embed filepath ghc-lib-parser + megaparsec MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "ormolu_0_7_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, choice, containers, deepseq, Diff, directory From ceb36f32e3509f6692d15d04f2002a1c819fa9aa Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 7 Jul 2024 12:59:36 -0400 Subject: [PATCH 086/562] haskellPackages.ghc98.ghc-syntax-highlighter: 0.0.11.0 -> 0.0.12.0 --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 72ee1aca1d25..8a4ca3622221 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -67,7 +67,7 @@ self: super: { fourmolu = self.fourmolu_0_15_0_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; - ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_12_0; websockets = self.websockets_0_13_0_0; th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 singletons-th = self.singletons-th_3_3; From 57af7250bd79b249f6393cc3fb05085b6b97b6d4 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 7 Jul 2024 13:59:51 -0400 Subject: [PATCH 087/562] haskellPackages.ghc96.singletons-base: unbreak --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index df467151596a..fcd97a908af5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -165,6 +165,8 @@ self: super: { lambdabot lambdabot-haskell-plugins ; + + singletons-base = dontCheck super.singletons-base; } # super.ghc is required to break infinite recursion as Nix is strict in the attrNames // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && lib.versionOlder super.ghc.version "9.6.4") { From bee394b999ba9f3456914072b51a48dd052a11f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jul 2024 18:32:35 +0000 Subject: [PATCH 088/562] prowlarr: 1.19.0.4568 -> 1.20.1.4603 --- pkgs/servers/prowlarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 61b867b65332..3573faf1b4f2 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-4bzeHU52XNAZW24P6uKQ0etUCW7dIsVpujrilPrI3hM="; - aarch64-linux = "sha256-0IpayOFTxhdbz7R3PhbTsdweMdDyY6J5WJ8JX/6aFbg="; - x86_64-darwin = "sha256-6hcuD63xwolT/dDKnrdfosyJy1W5kyPJJf/H4u6XGfw="; - x86_64-linux = "sha256-7ZDdXAVdMAArOy7iYaqmS6s70TQaZIknRoLRyTKpULg="; + aarch64-darwin = "sha256-LmRF4hXVbjYj/4v4SKwBm5lRFUuHv11h3tmWo2vOskQ="; + aarch64-linux = "sha256-fj0E1lcCLJs4jQwQQBmbh6uts0axubhxDz7kn1Qzuk4="; + x86_64-darwin = "sha256-1P+R9MBaWsLYVST+WlyI7TH+1ZmB90J9P2IP2WVZEvE="; + x86_64-linux = "sha256-V0MNjLswcxtyU7kl7Gn5474SGSAfwUVHbJcsYVE4WfY="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.19.0.4568"; + version = "1.20.1.4603"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; From 8eb0fc8d1b11abfc8934b4ffffd4c5c2a274fa2b Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Jul 2024 14:39:09 +0900 Subject: [PATCH 089/562] gnucash: 5.6 -> 5.8 Diff: https://github.com/Gnucash/gnucash/compare/5.6...5.8 --- pkgs/applications/office/gnucash/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 8d86d771d0aa..c51fe700573f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchurl -, fetchpatch , aqbanking , boost , cmake @@ -28,12 +27,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.6"; + version = "5.8"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-tLQsYmNQ8+effKHyFzVFzGPd7hrd8kYLGh8iIhvyG9E="; + hash = "sha256-osgj+3ALnUWYaS7IE5SVm944jY7xke/k6iwCQmu1JZM="; }; nativeBuildInputs = [ @@ -79,12 +78,6 @@ stdenv.mkDerivation rec { # this patch disables a flaky test # see https://bugs.gnucash.org/show_bug.cgi?id=799289 ./0005-disable-test-lots.patch - # Fix importing QIF by backporting a fix. remove on next release - # https://bugs.gnucash.org/show_bug.cgi?id=799262 - (fetchpatch { - url = "https://github.com/Gnucash/gnucash/commit/b33b864c2fa0ba72d1940465e7fa962dd36833c9.patch"; - hash = "sha256-A8pYW6CcNFBGC/MDijnuFJdlNAzSDS6Tcj+haCcEI/M="; - }) ]; # this needs to be an environment variable and not a cmake flag to suppress @@ -108,7 +101,7 @@ stdenv.mkDerivation rec { owner = "Gnucash"; repo = "gnucash-docs"; rev = version; - hash = "sha256-rQZoau466Bi/YpPj1XpSsm67FgTYhiMfZfogTtn+m1k="; + hash = "sha256-3b1Nue3eEefDi4WI+o3ATfrsQ+H/I+QwTr4Nuc9J7Zg="; }; nativeBuildInputs = [ cmake ]; From 08cb23c875953f3278a2ed3e06e9fe46b9e2d61a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 04:06:04 +0000 Subject: [PATCH 090/562] saxon-he: 12.4 -> 12.5 --- pkgs/development/libraries/java/saxon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 5469266d0c12..cb6df7e5558b 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -145,11 +145,11 @@ in { saxon_12-he = common rec { pname = "saxon-he"; - version = "12.4"; + version = "12.5"; jar = "saxon-he-${version}"; src = fetchurl { url = github.downloadUrl version; - hash = "sha256-RKso6pRQkJgxlvC2R5WWon/VejQehGW223/C7KjD3c4="; + hash = "sha256-NaRnKHkr1M7C/CYtSHd7THm1ze7wPSmB46ZOyzoZ9xY="; }; updateScript = github.updateScript version; description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1"; From cdbac5df1225e951eb94253ec3d5a4195852606a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 04:39:35 +0000 Subject: [PATCH 091/562] astyle: 3.5.1 -> 3.5.2 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 9912736cf31a..606518ebf143 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-dHoVlcvZeX2+r4SgKDaUHOiNYpSNMFG/WNdL4N10ojQ="; + hash = "sha256-2wwKctQOZAwgHjnmRni2/jFvN+fvBfZ84rItVVwKbRI="; }; nativeBuildInputs = [ cmake ]; From 522ec18ea2416fce26ca430b1c7ef35448910ade Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 8 Jul 2024 14:52:26 +1000 Subject: [PATCH 092/562] py-spy: pin python311 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f72f3fa8987..0a149d26c055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11994,7 +11994,10 @@ with pkgs; pythonPackages = python3Packages; }; - py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { }; + py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { + # https://github.com/benfred/py-spy/issues/633 + python3 = python311; + }; pydeps = with python3Packages; toPythonApplication pydeps; From 51c347bd13f2654de9b203dbbd388bb7e032fdaf Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 8 Jul 2024 15:05:23 +1000 Subject: [PATCH 093/562] python3Packages.kserve: relax psutil --- pkgs/development/python-modules/kserve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index b8877b7a6462..962ba7d8375c 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -55,7 +55,6 @@ buildPythonPackage rec { poetry-core ]; - dependencies = [ async-timeout cloudevents @@ -84,6 +83,7 @@ buildPythonPackage rec { "protobuf" "ray" "uvicorn" + "psutil" ]; pythonImportsCheck = [ "kserve" ]; From fedc0b231a6b34f03d08d7f5723184ff0605f5e3 Mon Sep 17 00:00:00 2001 From: Adrien Bustany Date: Tue, 2 Jul 2024 21:10:35 +0200 Subject: [PATCH 094/562] openjph: init at 0.14.2 --- pkgs/by-name/op/openjph/package.nix | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/op/openjph/package.nix diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix new file mode 100644 index 000000000000..c19c18f17a45 --- /dev/null +++ b/pkgs/by-name/op/openjph/package.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, validatePkgConfig, testers, nix-update-script }: + +stdenv.mkDerivation (finalAttrs: { + pname = "openjph"; + version = "0.14.2"; + + src = fetchFromGitHub { + owner = "aous72"; + repo = "openjph"; + rev = finalAttrs.version; + hash = "sha256-jksQfNcgw3LRzQlcsGpTAn6avmM3BsH6wGNTdX9khYY="; + }; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + outputs = [ "out" "dev" ]; + + cmakeFlags = [ + (lib.cmakeBool "OJPH_ENABLE_TIFF_SUPPORT" false) + ]; + + strictDeps = true; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Open-source implementation of JPEG2000 Part-15 (or JPH or HTJ2K)"; + homepage = "https://openjph.org/"; + maintainers = with lib.maintainers; [ abustany ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + pkgConfigModules = [ "openjph" ]; + }; +}) From 93d765be7e7db383c08b41bce4591b00abbfdbb1 Mon Sep 17 00:00:00 2001 From: doyougnu Date: Wed, 3 Jul 2024 13:56:04 -0400 Subject: [PATCH 095/562] haskell.compiler.ghc8107: use libffi 3.3 This is the libffi version that GHC 8.10.7 was released with. libffi >= 3.4 in nixpkgs is no longer getting configured with the configure flag that enabled GHC to continue working. See https://gitlab.haskell.org/ghc/ghc/-/issues/20051. Fixes #324384. Co-authored-by: sternenseemann --- pkgs/development/compilers/ghc/8.10.7.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index c8669a2761f8..7b873d903eee 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -9,7 +9,9 @@ , libiconv ? null, ncurses , # GHC can be built with system libffi or a bundled one. - libffi ? null + # we explicitly use libffi-3.3 here because 3.4 removes a flag that causes + # problems for ghc-8.10.7's RTS. See #324384. + libffi_3_3 ? null , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower @@ -119,7 +121,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] + ++ [libffi_3_3] ++ lib.optional (!enableIntegerSimple) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -334,10 +336,10 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi_3_3 != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetPackages.libffi_3_3.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi_3_3.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" From aadfe3ef2b1e4b65e35befda51874befd9491263 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 8 Jul 2024 11:38:42 +0200 Subject: [PATCH 096/562] haskell.compiler.ghc966: init at 9.6.6 https://www.haskell.org/ghc//blog/20240701-ghc-9.6.6-released.html --- pkgs/development/compilers/ghc/9.6.6.nix | 4 ++++ .../compilers/ghc/common-hadrian.nix | 2 +- pkgs/top-level/haskell-packages.nix | 23 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghc/9.6.6.nix diff --git a/pkgs/development/compilers/ghc/9.6.6.nix b/pkgs/development/compilers/ghc/9.6.6.nix new file mode 100644 index 000000000000..60854685f1e1 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.6.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.6.6"; + sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b5fef30332f7..5a9be57e613c 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -171,7 +171,7 @@ then ./docs-sphinx-7-ghc98.patch else ./docs-sphinx-7.patch ) ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ (fetchpatch { name = "fix-fully_static.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1bb24432ff77e11a0340a7d8586e151e15bba2a1.diff"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ad8a4b947964..24a8e979b020 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -316,6 +316,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; + ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc928 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc928 + else + packages.ghc924Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; ghc96 = compiler.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = @@ -547,6 +565,11 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; + ghc966 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc966; + ghc = bh.compiler.ghc966; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; From 6d942c64031031b41880722d77deb316d16debbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 03:28:56 -0700 Subject: [PATCH 097/562] python311Packages.approvaltests: 12.2.1 -> 14.0.0 Diff: https://github.com/approvals/ApprovalTests.Python/compare/refs/tags/v12.2.1...v14.0.0 Changelog: https://github.com/approvals/ApprovalTests.Python/releases/tag/v14.0.0 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b1fa512928c3..598ad6487026 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "12.2.1"; + version = "14.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-Hd0cEAL5RGmAhob1oZwOVC+eXOxc9OTeUnrTTNCpL2E="; + hash = "sha256-BTTmmtmFjYBfzbVf/Fi8PwnpVJBcOOBTdFBmGowGez4="; }; build-system = [ setuptools ]; From 0cbbd28a4ddffadef0098d9d8c2fc87fd922374a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 03:29:59 -0700 Subject: [PATCH 098/562] python311Packages.robotframework-pythonlibcore: 4.4.0 -> 4.4.1 Diff: https://github.com/robotframework/PythonLibCore/compare/refs/tags/v4.4.0...v4.4.1 Changelog: https://github.com/robotframework/PythonLibCore/blob/refs/tags/v4.4.1/docs/PythonLibCore-4.4.1.rst --- .../robotframework-pythonlibcore/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 559e769f37ff..0a24bb1ca9df 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, setuptools, robotframework, approvaltests, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.4.0"; + version = "4.4.1"; disabled = pythonOlder "3.8"; @@ -24,16 +23,9 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-282A4EW88z6ODSIEIIeBbN8YO491rwI4M7njI7kL3XQ="; + hash = "sha256-5RUi65+DljCqWoB8vZxc0hyIefEFOWuKluplXrD0SkI="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/robotframework/PythonLibCore/commit/8b756a4bd119d660109437023789bfada21bdc78.patch"; - hash = "sha256-4NtgkGbIj9gH9Det6VNh1MpGSGroESxQ8X2ZTeoX/zU="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ robotframework ]; From 0dc4e4ceb7e3ddb65919b8f60750989da50f0f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 03:29:37 -0700 Subject: [PATCH 099/562] python311Packages.robotframework-seleniumlibrary: 6.4.0 -> 6.5.0 Diff: https://github.com/robotframework/SeleniumLibrary/compare/refs/tags/v6.4.0...v6.5.0 Changelog: https://github.com/robotframework/SeleniumLibrary/blob/refs/tags/v6.5.0/docs/SeleniumLibrary-6.5.0.rst --- .../robotframework-seleniumlibrary/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index f535055d3201..cfd0c71d38d4 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + click, robotframework, robotframework-pythonlibcore, selenium, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.4.0"; + version = "6.5.0"; pyproject = true; # no tests included in PyPI tarball @@ -22,12 +23,13 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Rjbdn1WXdXLn//HLtHwVrlLD+3vw9mgre/0wvMb+xbc="; + sha256 = "sha256-sB2lWFFpCGgF0XFes84fBBvR8GF+S8aWWJoih+xBmW8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + click robotframework robotframework-pythonlibcore selenium @@ -44,11 +46,11 @@ buildPythonPackage rec { mkdir utest/output_dir ''; - meta = with lib; { + meta = { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 05cecbfb690d6aa843110b67d73fedbd508f0c7c Mon Sep 17 00:00:00 2001 From: sorki Date: Thu, 20 Jun 2024 18:18:44 +0200 Subject: [PATCH 100/562] haskellPackages.serialport unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 854246133ddb..3e8d031be422 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5265,7 +5265,6 @@ broken-packages: - serf # failure in job https://hydra.nixos.org/build/233251981 at 2023-09-02 - serial # failure in job https://hydra.nixos.org/build/252729356 at 2024-03-16 - serialize-instances # failure in job https://hydra.nixos.org/build/233239330 at 2023-09-02 - - serialport # failure in job https://hydra.nixos.org/build/233201348 at 2023-09-02 - serokell-util # failure in job https://hydra.nixos.org/build/233209952 at 2023-09-02 - servant-aeson-specs # failure in job https://hydra.nixos.org/build/233202245 at 2023-09-02 - servant-auth-cookie # failure in job https://hydra.nixos.org/build/233235829 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b26e39e67fec..0668ebdf67ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -271847,8 +271847,6 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serokell-util" = callPackage From 805943e5fa5e0985ad01cc691327a4382a7f3d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 04:22:21 -0700 Subject: [PATCH 101/562] python312Packages.pykeepass: 4.0.7 -> 4.1.0 Diff: https://github.com/libkeepass/pykeepass/compare/v4.0.7...v4.1.0 Changelog: https://github.com/libkeepass/pykeepass/blob/v4.1.0/CHANGELOG.rst --- .../python-modules/pykeepass/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 73530902ee89..d21620696feb 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -13,30 +13,23 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.7"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-qUNMjnIhQpUSQY0kN9bA4IxQx8fiFIA6p8rPqNqdjNo="; + hash = "sha256-33bpkj2ADpxSqiTOVcawE5aJdqWHfcY9WrlQJdg3vHY="; }; - postPatch = '' - # https://github.com/libkeepass/pykeepass/pull/378 - substituteInPlace pyproject.toml \ - --replace-fail 'packages = ["pykeepass"]' 'packages = ["pykeepass", "pykeepass.kdbx_parsing"]' - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ argon2-cffi construct lxml pycryptodomex - setuptools ]; propagatedNativeBuildInputs = [ argon2-cffi ]; From ea61ed3f2136cb15c08305060b868aa64c6c3658 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 8 Jul 2024 14:50:19 +0200 Subject: [PATCH 102/562] haskellPackages.cpython: pin to python 3.11 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c63ffeebf1bb..7242ce6b0001 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3103,4 +3103,10 @@ self: super: { } ) super.push-notify-apn; + # Python 3.12 breaks unicode C-API. Requires an upstream fix in the CPython + # package to support Python > 3.12 API. Thus, should be removed at next CPython + # Hackage release. + cpython = super.cpython.override { + python3 = pkgs.python311; + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 3c4a12537b0be1013eaa6c03f4627b4141f0f1f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 05:59:43 +0000 Subject: [PATCH 103/562] moodle-dl: 2.3.9 -> 2.3.11 --- pkgs/tools/networking/moodle-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/tools/networking/moodle-dl/default.nix index 8d220524cdb2..d0a70efec716 100644 --- a/pkgs/tools/networking/moodle-dl/default.nix +++ b/pkgs/tools/networking/moodle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "moodle-dl"; - version = "2.3.9"; + version = "2.3.11"; src = fetchFromGitHub { owner = "C0D3D3V"; repo = "Moodle-DL"; rev = "refs/tags/${version}"; - hash = "sha256-GTOeqHWtFsuf5KcklEidjBNJP/9rtMGnQFym3PSp+ss="; + hash = "sha256-Rts7J4MdMo1TqUOYF1MDjwCIP66gHzxw/szIYcKZYrg="; }; propagatedBuildInputs = with python3Packages; [ From f18288618beb76a426f06f9e120d768a6dff8a7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 14:55:25 +0000 Subject: [PATCH 104/562] python312Packages.dnslib: 0.9.24 -> 0.9.25 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 7153ea8fd4a2..49a59efc7029 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.24"; + version = "0.9.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7xZ4aKMNTOfJC5ISedfs+5hr6OvFMPPmBQouy2hwfHY="; + hash = "sha256-aH3yCG4oCGyzK5R9r6TApOYT8UKbqjvmHYuU5pQYtO8="; }; checkPhase = '' From 49a526b98a92d02812ab46906a1782410ecc91d7 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Mon, 8 Jul 2024 18:53:49 +0200 Subject: [PATCH 105/562] appflowy: 0.6.2 -> 0.6.3 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.3 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index e9b543a4e300..a4f80df9010b 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.6.2"; + version = "0.6.3"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-vwhFFSdKlt2Ddikhdr3uyILjTVdgCjMtAW9HeLmT5qU="; + hash = "sha256-u8Y676sBLDI57z7Zpe72ELaibe83EFwB0oq+ondRIcU="; stripRoot = false; }; From 02083c79cfa2a85491f2b5bf38793a023753591b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 11:31:08 +0100 Subject: [PATCH 106/562] imageworsener: modernize --- pkgs/by-name/im/imageworsener/package.nix | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix index ab203ea62ea9..81758fe73438 100644 --- a/pkgs/by-name/im/imageworsener/package.nix +++ b/pkgs/by-name/im/imageworsener/package.nix @@ -8,12 +8,12 @@ libwebp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imageworsener"; version = "1.3.5"; src = fetchurl { - url = "https://entropymine.com/${pname}/${pname}-${version}.tar.gz"; + url = "https://entropymine.com/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-p/u2XFreZ9nrwy5SxYmIpPmGuswAjJAh/ja1mEZtXI0="; }; @@ -33,20 +33,24 @@ stdenv.mkDerivation rec { libwebp ]; + strictDeps = true; + doCheck = true; enableParallelBuilding = true; - meta = with lib; { + __structuredAttrs = true; + + meta = { description = "Raster image scaling and processing utility"; homepage = "https://entropymine.com/imageworsener/"; - changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; - license = licenses.mit; - maintainers = with maintainers; [ - emily - smitop + changelog = "https://github.com/jsummers/${finalAttrs.pname}/blob/${finalAttrs.version}/changelog.txt"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.emily + lib.maintainers.smitop ]; mainProgram = "imagew"; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From fdb840f002c1d524b80464b8ced6f779e8918aee Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 11:31:08 +0100 Subject: [PATCH 107/562] imageworsener: add `longDescription` --- pkgs/by-name/im/imageworsener/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix index 81758fe73438..78fb80a70e4d 100644 --- a/pkgs/by-name/im/imageworsener/package.nix +++ b/pkgs/by-name/im/imageworsener/package.nix @@ -43,6 +43,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Raster image scaling and processing utility"; + longDescription = '' + ImageWorsener is a cross-platform command-line utility and library for + image scaling and other image processing. It has full support for PNG, + JPEG, BMP formats, experimental support for WebP, read-only support for + GIF, and limited support for some other image formats. It’s not as + fast or memory-efficient as some utilities, but it’s very accurate. + ''; homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${finalAttrs.pname}/blob/${finalAttrs.version}/changelog.txt"; license = lib.licenses.mit; From db313ef39f4e90f50a9d66b0211c78248267ab5c Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 11:31:08 +0100 Subject: [PATCH 108/562] imageworsener: fetch source from GitHub --- pkgs/by-name/im/imageworsener/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix index 78fb80a70e4d..dc20823ec73f 100644 --- a/pkgs/by-name/im/imageworsener/package.nix +++ b/pkgs/by-name/im/imageworsener/package.nix @@ -1,20 +1,24 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, zlib, libpng, libjpeg, libwebp, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "imageworsener"; version = "1.3.5"; - src = fetchurl { - url = "https://entropymine.com/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-p/u2XFreZ9nrwy5SxYmIpPmGuswAjJAh/ja1mEZtXI0="; + src = fetchFromGitHub { + owner = "jsummers"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-1f5x8Ph994Kkjo38NudXL+UF0fpR8BmZfaGPxc8RENU="; }; postPatch = '' @@ -26,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { cp readme.txt technical.txt $out/share/doc/imageworsener ''; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib libpng @@ -41,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Raster image scaling and processing utility"; longDescription = '' @@ -51,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: { fast or memory-efficient as some utilities, but it’s very accurate. ''; homepage = "https://entropymine.com/imageworsener/"; - changelog = "https://github.com/jsummers/${finalAttrs.pname}/blob/${finalAttrs.version}/changelog.txt"; + changelog = "${finalAttrs.src.meta.homepage}/blob/${finalAttrs.src.rev}/changelog.txt"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; license = lib.licenses.mit; maintainers = [ lib.maintainers.emily From 8e484a4cd100b11b5968d4ff335b55237a9b69f5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 6 Jul 2024 20:10:49 +0100 Subject: [PATCH 109/562] imageworsener: fix tests --- pkgs/by-name/im/imageworsener/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix index dc20823ec73f..7c108002c217 100644 --- a/pkgs/by-name/im/imageworsener/package.nix +++ b/pkgs/by-name/im/imageworsener/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook, zlib, libpng, @@ -16,13 +17,26 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "jsummers"; - repo = finalAttrs.pname; + repo = "imageworsener"; rev = finalAttrs.version; hash = "sha256-1f5x8Ph994Kkjo38NudXL+UF0fpR8BmZfaGPxc8RENU="; }; + patches = [ + # Fix tests not failing even when they should. + # https://github.com/jsummers/imageworsener/pull/46 + (fetchpatch2 { + url = "https://github.com/jsummers/imageworsener/commit/91c7c79d86f55920193d17a7b87631b14ac7779f.patch?full_index=1"; + hash = "sha256-8vxht0FiQFOdglwaO0ZQpg5BNYXXHROkznZ+Caxm/v0="; + }) + ]; + postPatch = '' patchShebangs tests/runtest + + # JPEG tests fail due to libjpeg-turbo differences. + sed -i '/\.jpg/d' tests/runtest + rm tests/expected/*.jpg ''; postInstall = '' From adb0bda124e17e7bc81bd02f257de92517ae12f0 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 9 Jul 2024 00:16:05 +0000 Subject: [PATCH 110/562] pyinotify: add pythonImportsCheck for itself --- pkgs/development/python-modules/pyinotify/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 4fbb435db53b..5d0b22bfe31f 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # No tests distributed doCheck = false; + pythonImportsCheck = [ "pyinotify" ]; + meta = with lib; { homepage = "https://github.com/seb-m/pyinotify/wiki"; description = "Monitor filesystems events on Linux platforms with inotify"; From 7ea81e03624a5d28ddab807d1c145de241762911 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 9 Jul 2024 00:22:02 +0000 Subject: [PATCH 111/562] pyinotify: patch to skip asyncore for python 3.12+ asyncore was removed from the python 3.12 standard library: https://peps.python.org/pep-0594/ This patch was original sourced from: https://github.com/seb-m/pyinotify/pull/205 --- .../python-modules/pyinotify/default.nix | 2 + .../pyinotify/skip-asyncore-python-3.12.patch | 84 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 5d0b22bfe31f..8232ab456719 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; + patches = [ ./skip-asyncore-python-3.12.patch ]; + # No tests distributed doCheck = false; diff --git a/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch new file mode 100644 index 000000000000..6f8f65545b8c --- /dev/null +++ b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch @@ -0,0 +1,84 @@ +From 478d595a7d086423733e9f5da5edfe9f1df48682 Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr +Date: Thu, 10 Aug 2023 21:51:15 -0400 +Subject: [PATCH] Make asyncore support optional for Python 3. + +Fixes #204. +--- + python3/pyinotify.py | 50 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 22 deletions(-) + +diff --git a/python3/pyinotify.py b/python3/pyinotify.py +index bc24313..f4a5a90 100755 +--- a/python3/pyinotify.py ++++ b/python3/pyinotify.py +@@ -68,7 +68,6 @@ def __init__(self, version): + from datetime import datetime, timedelta + import time + import re +-import asyncore + import glob + import locale + import subprocess +@@ -1494,33 +1493,40 @@ def run(self): + self.loop() + + +-class AsyncNotifier(asyncore.file_dispatcher, Notifier): +- """ +- This notifier inherits from asyncore.file_dispatcher in order to be able to +- use pyinotify along with the asyncore framework. ++try: ++ import asyncore + +- """ +- def __init__(self, watch_manager, default_proc_fun=None, read_freq=0, +- threshold=0, timeout=None, channel_map=None): ++ class AsyncNotifier(asyncore.file_dispatcher, Notifier): + """ +- Initializes the async notifier. The only additional parameter is +- 'channel_map' which is the optional asyncore private map. See +- Notifier class for the meaning of the others parameters. ++ This notifier inherits from asyncore.file_dispatcher in order to be able to ++ use pyinotify along with the asyncore framework. + + """ +- Notifier.__init__(self, watch_manager, default_proc_fun, read_freq, +- threshold, timeout) +- asyncore.file_dispatcher.__init__(self, self._fd, channel_map) ++ def __init__(self, watch_manager, default_proc_fun=None, read_freq=0, ++ threshold=0, timeout=None, channel_map=None): ++ """ ++ Initializes the async notifier. The only additional parameter is ++ 'channel_map' which is the optional asyncore private map. See ++ Notifier class for the meaning of the others parameters. + +- def handle_read(self): +- """ +- When asyncore tells us we can read from the fd, we proceed processing +- events. This method can be overridden for handling a notification +- differently. ++ """ ++ Notifier.__init__(self, watch_manager, default_proc_fun, read_freq, ++ threshold, timeout) ++ asyncore.file_dispatcher.__init__(self, self._fd, channel_map) + +- """ +- self.read_events() +- self.process_events() ++ def handle_read(self): ++ """ ++ When asyncore tells us we can read from the fd, we proceed processing ++ events. This method can be overridden for handling a notification ++ differently. ++ ++ """ ++ self.read_events() ++ self.process_events() ++except ImportError: ++ # asyncore was removed in Python 3.12, but try the import instead of a ++ # version check in case the compatibility package is installed. ++ pass + + + class TornadoAsyncNotifier(Notifier): From 3aaf535569297cfde6cd70328285592cbf8e4f4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 01:56:43 +0000 Subject: [PATCH 112/562] mbuffer: 20240107 -> 20240707 --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 177e70dd574c..a4c934e9a6a4 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mbuffer"; - version = "20240107"; + version = "20240707"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "sha256-14YG4X3ZAmpTI21ezAenAgLSZC0X49kHRxzbWKBFiBQ="; + sha256 = "sha256-fzkm6S+qgblqMkIPgCiLVfGFBIDyoDLBbtYbUyZ8rgk="; }; buildInputs = [ From 484b50224d820a4445ad31b3a07e710ec7b9e628 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 04:22:58 +0000 Subject: [PATCH 113/562] imgproxy: 3.24.1 -> 3.25.0 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 4a2e89191e18..5388376720c9 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.24.1"; + version = "3.25.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-1AacDY4qNe+1SESsEEazxoBnJZRphnext1mu3BOKwKY="; + hash = "sha256-TkfyhePilOwuW6+MtTqYUYvpP/FnFhpsHt2APMFNbvo="; rev = "v${version}"; }; - vendorHash = "sha256-GIMba/XlINwJilRo5Oi2j7HJJTQQpMOa2kPH17T/vLU="; + vendorHash = "sha256-LlVZRHotJcHtgeGXIDnbIwpO8iCrBB8nXBnqzHcrJWk="; nativeBuildInputs = [ pkg-config gobject-introspection ]; From 2308f886079614235420fdaee577aecade88f411 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 04:32:03 +0000 Subject: [PATCH 114/562] chatty: 0.8.3 -> 0.8.4 --- .../networking/instant-messengers/chatty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index c939412e152f..a18ba2c1b96a 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "chatty"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "Chatty"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Ywed/8PhOgmzcka+5dyxjmWTcDBPF90LW+C2eeQmyLo="; + hash = "sha256-1CHreTkw1C3tc6vOCG+7Y/u4R/xTFOnlI4mcxjY/alY="; }; nativeBuildInputs = [ From fd0f5d381fba6458f3443ecc9b728aafe632327c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 05:36:29 +0000 Subject: [PATCH 115/562] swagger-codegen3: 3.0.57 -> 3.0.58 --- pkgs/tools/networking/swagger-codegen3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index b2bc6d5ccd71..257a6a9a27bb 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }: stdenv.mkDerivation rec { - version = "3.0.57"; + version = "3.0.58"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-KwygxRjw6NE/swVjDYQAkwfO/OnLiIGhsKCJbXM0VYQ="; + sha256 = "sha256-+6jWSNDxX6ZqdOYCQ+Vqpfv95drZLqp1AGW4YdNY57M="; }; dontUnpack = true; From f9d0b50c8a734144b1d8fdbad35a041fe77e4c34 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Tue, 9 Jul 2024 09:30:21 +0200 Subject: [PATCH 116/562] quarto: 1.5.53 -> 1.5.54 --- pkgs/development/libraries/quarto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index e90f7f8f4b5a..44319657eb18 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.5.53"; + version = "1.5.54"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-6/gq1yD4almO+CUY5xVnhWCjmu3teiJEGE7ONE1Zk8A="; + sha256 = "sha256-QkqMWaa5fLrKmgr5ix08FX1Efdrj78oDQKuLtl2QB0k="; }; nativeBuildInputs = [ From f42f07bad242e507d0236cfd392a5829a7c98cdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 08:36:03 +0000 Subject: [PATCH 117/562] rsyslog: 8.2404.0 -> 8.2406.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index dbe89c909213..d1dcca9159eb 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2404.0"; + version = "8.2406.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-MFKNFA7BsfB5IkCB+jffbgZYf/QrAuPmHy2qBSbFTTM="; + hash = "sha256-E0PgJp3TIWb/3gTXzuv6DnFGzx28aWLFa/Qoxh8Bp98="; }; nativeBuildInputs = [ From e7fde69078434e06d28cf14321c938ba6ea7a171 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 10:03:18 +0000 Subject: [PATCH 118/562] metabase: 0.50.8 -> 0.50.10 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 908fc87537aa..eb2fc8282141 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.50.8"; + version = "0.50.10"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-Z0xvU8ZT9aXe0NKUhh302XrWwROlkIRHWgcjwzLMr8Q="; + hash = "sha256-bdnD7lIo3q8jIo0m6Ox0HWsDyYtpfOnNqhPbakd3X5g="; }; nativeBuildInputs = [ makeWrapper ]; From 603baa1f83dfc41b05a539fe923ec4295bc51306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 11:01:50 +0000 Subject: [PATCH 119/562] atmos: 1.83.0 -> 1.83.1 --- pkgs/applications/networking/cluster/atmos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index cd37da1af650..03d181325ac7 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atmos"; - version = "1.83.0"; + version = "1.83.1"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FIl+SWYK8+OLuynhma7IG2fozekhGZKK/t5RgD+eTtA="; + sha256 = "sha256-B1s+9oLShbrziYm9P8xE5UPwxTchlGPUmjYSWGhsGjY="; }; vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E="; From d3bba1d575a3b84b389235b59bf854def28a95f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 9 Jul 2024 09:08:28 -0300 Subject: [PATCH 120/562] font-manager: 0.8.9 -> 0.9.0 --- pkgs/by-name/fo/font-manager/package.nix | 17 ++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index 83fba770c113..aff880f06d2d 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -13,11 +13,11 @@ , yelp-tools , vala , gsettings-desktop-schemas -, gtk3 +, gtk4 , adwaita-icon-theme , desktop-file-utils , nix-update-script -, wrapGAppsHook3 +, wrapGAppsHook4 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts , withWebkit ? true, glib-networking, libsoup, webkitgtk @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "FontManager"; repo = "font-manager"; rev = version; - hash = "sha256-LsQry6CjvVcJFRutKOaqA4lLP7Ek09Q/D/TPnSvx59Q="; + hash = "sha256-nUFxjqUiL8zLfPJrLM1aQ/SZ2x6CYFKFJI1W/eXlrV8="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { desktop-file-utils vala yelp-tools - wrapGAppsHook3 + wrapGAppsHook4 # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { json-glib sqlite gsettings-desktop-schemas # for font settings - gtk3 + gtk4 adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load @@ -67,11 +67,6 @@ stdenv.mkDerivation rec { (lib.mesonBool "webkit" withWebkit) ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d48e0156367b..003eab711b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30433,7 +30433,7 @@ with pkgs; font-manager = callPackage ../by-name/fo/font-manager/package.nix { libsoup = libsoup_3; - webkitgtk = webkitgtk_4_1; + webkitgtk = webkitgtk_6_0; }; fontfinder = callPackage ../applications/misc/fontfinder { }; From 56295005ef2da06caad300824f2a2026cc3663de Mon Sep 17 00:00:00 2001 From: Carl Calaquian Date: Fri, 5 Jul 2024 23:29:26 +0800 Subject: [PATCH 121/562] oathkeeper: init at 0.40.7 --- pkgs/by-name/oa/oathkeeper/package.nix | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/oa/oathkeeper/package.nix diff --git a/pkgs/by-name/oa/oathkeeper/package.nix b/pkgs/by-name/oa/oathkeeper/package.nix new file mode 100644 index 000000000000..99641c35f004 --- /dev/null +++ b/pkgs/by-name/oa/oathkeeper/package.nix @@ -0,0 +1,46 @@ +{ + fetchFromGitHub, + buildGoModule, + lib, +}: +let + pname = "oathkeeper"; + version = "0.40.7"; + commit = "c75695837f170334b526359f28967aa33d61bce6"; +in +buildGoModule { + inherit pname version commit; + + src = fetchFromGitHub { + owner = "ory"; + repo = "oathkeeper"; + rev = "v${version}"; + hash = "sha256-Y5bowCFR9S70ko0vNCwZnhOIKKGdqgcDEBEtZisKEig="; + }; + + vendorHash = "sha256-+hh7MFYGPTaAlU/D0ROv5pw6YvzkAm6URuhP5jdgQtM="; + + tags = [ + "sqlite" + "json1" + "hsm" + ]; + + subPackages = [ "." ]; + + # Pass versioning information via ldflags + ldflags = [ + "-s" + "-w" + "-X github.com/ory/oathkeeper/internal/driver/config.Version=${version}" + "-X github.com/ory/oathkeeper/internal/driver/config.Commit=${commit}" + ]; + + meta = { + description = "Open-source identity and access proxy that authorizes HTTP requests based on sets of rules"; + homepage = "https://www.ory.sh/oathkeeper/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ camcalaquian ]; + mainProgram = "oathkeeper"; + }; +} From 5a1fb43c16cd122b458f1b8493a3798cf4e431a5 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 20:27:28 +0200 Subject: [PATCH 122/562] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 12 ------------ .../development/haskell-modules/hackage-packages.nix | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5d3fceaed4af..8246730c09db 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -199,7 +199,6 @@ dont-distribute-packages: - HStringTemplateHelpers - HTab - HXMPP - - HaMinitel - HaRe - HaTeX-meta - HaTeX-qq @@ -287,7 +286,6 @@ dont-distribute-packages: - MutationOrder - NGLess - NTRU - - NXT - NaCl - NaperianNetCDF - NearContextAlgebra @@ -635,7 +633,6 @@ dont-distribute-packages: - bein - belka - bff - - bglib - bifunctor - billboard-parser - billeksah-forms @@ -688,7 +685,6 @@ dont-distribute-packages: - blink1 - blip - blogination - - bloohm - bloxorz - blubber - bluetile @@ -726,7 +722,6 @@ dont-distribute-packages: - bulletproofs - bulmex - burnt-explorer - - bus-pirate - buster-gtk - buster-network - butterflies @@ -1460,7 +1455,6 @@ dont-distribute-packages: - funnyprint - funsat - fwgl-glfw - - fxpak - g2 - g2q - g3p-hash @@ -1812,7 +1806,6 @@ dont-distribute-packages: - guarded-rewriting - guess-combinator - h3spec - - hArduino - hOff-display - hPDB - hPDB-examples @@ -1854,7 +1847,6 @@ dont-distribute-packages: - hall-symbols - halma-gui - halma-telegram-bot - - ham - hamilton - hamusic - hans-pcap @@ -2947,7 +2939,6 @@ dont-distribute-packages: - nyx-game - oath - oauth2-jwt-bearer - - obd - obdd - oberon0 - obj @@ -3816,7 +3807,6 @@ dont-distribute-packages: - sugar-json - sugar-scheme - summoner-tui - - sump - sunroof-examples - sunroof-server - supercollider-ht @@ -3920,7 +3910,6 @@ dont-distribute-packages: - thumbnail-polish - tic-tac-toe - tickle - - tidal-serial - tighttp - timberc - time-exts @@ -3931,7 +3920,6 @@ dont-distribute-packages: - timezone-unix - tinkoff-invest-sdk - tintin - - tinyMesh - tinytools - tinytools-vty - tip-haskell-frontend diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0668ebdf67ad..2a7047f0f800 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10236,7 +10236,6 @@ self: { libraryHaskellDepends = [ base bytestring serialport stm ]; description = "An Haskell library to drive the french Minitel through a serial port"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "HaPy" = callPackage @@ -15151,7 +15150,6 @@ self: { ]; description = "A Haskell interface to Lego Mindstorms NXT"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -48202,7 +48200,6 @@ self: { ]; description = "Implementation of the BGAPI serial protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "bglibtest"; }) {}; @@ -52734,7 +52731,6 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "visual bloom filter for neotrellis m4 output"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bloohm"; }) {}; @@ -56275,7 +56271,6 @@ self: { ]; description = "Haskell interface to the Bus Pirate binary interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "buster" = callPackage @@ -115447,7 +115442,6 @@ self: { libraryHaskellDepends = [ base bytestring serialport ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "g-npm" = callPackage @@ -133306,7 +133300,6 @@ self: { ]; description = "Control your Arduino board from Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hBDD" = callPackage @@ -136499,7 +136492,6 @@ self: { ]; testHaskellDepends = [ base bytestring ]; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "hamlog"; }) {}; @@ -222690,7 +222682,6 @@ self: { testHaskellDepends = [ base ]; description = "Communicate to OBD interfaces over ELM327"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "obdd" = callPackage @@ -294325,7 +294316,6 @@ self: { ]; description = "A Haskell interface to SUMP-compatible logic analyzers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sundown" = callPackage @@ -306545,7 +306535,6 @@ self: { ]; description = "Serial support for tidal"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-vis" = callPackage @@ -307812,7 +307801,6 @@ self: { ]; description = "TinyMesh - communicating with auto-meshing sensor network"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "tinyXml" = callPackage From e41416b504dc2f303390142e7a72195a29656937 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 20:21:41 +0200 Subject: [PATCH 123/562] haskellPackages.rhine: Fix build by bumping monad-schedule --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c63ffeebf1bb..2c3fe3754e2b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -173,6 +173,9 @@ self: super: { alex = self.alex_3_5_1_0; }; + # 2024-07-09: rhine 1.4.* needs newer monad-schedule than stackage (and is only consumer) + monad-schedule = assert super.monad-schedule.version == "0.1.2.2"; doDistribute self.monad-schedule_0_2; + aeson = # aeson's test suite includes some tests with big numbers that fail on 32bit # https://github.com/haskell/aeson/issues/1060 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3e8d031be422..e75c3ac6bcc5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5065,7 +5065,6 @@ broken-packages: - rfc-prelude # failure in job https://hydra.nixos.org/build/233227572 at 2023-09-02 - r-glpk-phonetic-languages-ukrainian-durations # failure in job https://hydra.nixos.org/build/253703155 at 2024-03-31 - rhbzquery # failure in job https://hydra.nixos.org/build/233259706 at 2023-09-02 - - rhine # failure in job https://hydra.nixos.org/build/233245503 at 2023-09-02 - riak # failure in job https://hydra.nixos.org/build/233192622 at 2023-09-02 - riak-protobuf-lens # failure in job https://hydra.nixos.org/build/233203142 at 2023-09-02 - ribbit # failure in job https://hydra.nixos.org/build/233191000 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 8246730c09db..e6f8a8681410 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3417,8 +3417,6 @@ dont-distribute-packages: - rfc-redis - rfc-servant - rhine-bayes - - rhine-gloss - - rhine-terminal - rhythm-game-tutorial - rib - ribosome diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2a7047f0f800..bc53c5e149ae 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -262299,9 +262299,7 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; - broken = true; }) {}; "rhine-bayes" = callPackage @@ -262343,7 +262341,6 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-gloss-gears"; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -262367,7 +262364,6 @@ self: { ]; description = "Terminal backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-terminal-simple"; }) {}; From a572d5151ca4c9bb67f668fa5644800302b50a22 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sun, 20 Nov 2022 19:58:49 +0200 Subject: [PATCH 124/562] nixos/prometheus-nginxlog-exporter: define types of inner options --- .../prometheus/exporters/nginxlog.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix index 2b4fd12895a3..63d25f3d88fb 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix @@ -7,7 +7,27 @@ in { port = 9117; extraOpts = { settings = mkOption { - type = types.attrs; + type = types.submodule { + options = { + consul = mkOption { + default = null; + type = types.nullOr (types.attrsOf types.anything); + description = '' + Consul integration options. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file). + + This is disabled by default. + ''; + }; + namespaces = mkOption { + default = []; + type = types.listOf (types.attrsOf types.anything); + + description = '' + Namespaces to collect the metrics for. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file). + ''; + }; + }; + }; default = {}; description = '' All settings of nginxlog expressed as an Nix attrset. From 4a8fbb53f249dbc5c99901388d20be19e61b0bd9 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 20:38:37 +0200 Subject: [PATCH 125/562] haskellPackages.cabal-gild: Fix build by dropping obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 98c0e7119adc..4a3b92cf3b19 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3074,11 +3074,6 @@ self: super: { # https://github.com/isovector/cornelis/issues/150 cornelis = dontCheck super.cornelis; - cabal-gild = super.cabal-gild.overrideScope (self: super: { - tasty = super.tasty_1_5_1; - tasty-quickcheck = super.tasty-quickcheck_0_11; - }); - lzma = doJailbreak (super.lzma.overrideScope (self: super: { tasty = super.tasty_1_5_1; })); From ce4d7a5ff84b919658ed6b688347b25ecae277af Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 23:02:29 +0200 Subject: [PATCH 126/562] haskellPackages.reflex-dom: Fix dependencies --- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 479c53ac963f..0086e6157aef 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1358,11 +1358,13 @@ self: super: builtins.intersectAttrs super { webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; gi-webkit2 = lib.pipe super.gi-webkit2 [ (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; From 9104942f95010a879d824ba03c6448d90106f99b Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 23:22:22 +0200 Subject: [PATCH 127/562] haskellPackages.zinza: dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a3b92cf3b19..56fbc133fbf5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3101,6 +3101,10 @@ self: super: { } ) super.push-notify-apn; + # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts. + # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5 + zinza = dontCheck super.zinza; + # Python 3.12 breaks unicode C-API. Requires an upstream fix in the CPython # package to support Python > 3.12 API. Thus, should be removed at next CPython # Hackage release. From 237294dbf9b9ea5053e6704509b945ba3b309266 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 9 Jul 2024 23:36:50 +0200 Subject: [PATCH 128/562] haskellPackages.fwgl-javascript: Mark broken To fix eval --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e75c3ac6bcc5..00407c5fc378 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1895,6 +1895,7 @@ broken-packages: - fuzzy-timings # failure in job https://hydra.nixos.org/build/233235765 at 2023-09-02 - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13 - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 + - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02 - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16 - gameclock # failure in job https://hydra.nixos.org/build/233234964 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc53c5e149ae..f9206d586f81 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115420,6 +115420,8 @@ self: { ]; description = "FWGL GHCJS backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fx" = callPackage From b73a0183a2eda73f549ef9b8af8c4e12c97c0eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:50:55 -0400 Subject: [PATCH 129/562] treewide: remove unused args --- pkgs/development/python-modules/laces/default.nix | 1 - pkgs/development/python-modules/lcd-i2c/default.nix | 1 - pkgs/development/python-modules/pytest-image-diff/default.nix | 1 - pkgs/development/python-modules/rtp/default.nix | 1 - 4 files changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix index 16f104a01a69..9f5c74af8329 100644 --- a/pkgs/development/python-modules/laces/default.nix +++ b/pkgs/development/python-modules/laces/default.nix @@ -4,7 +4,6 @@ django, fetchFromGitHub, flit-core, - python3, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix index 02008f02c2af..27d9716cd128 100644 --- a/pkgs/development/python-modules/lcd-i2c/default.nix +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -1,6 +1,5 @@ { lib, - python3, fetchPypi, buildPythonPackage, smbus2, diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix index 4a8b94a0c73b..59b32c8f1172 100644 --- a/pkgs/development/python-modules/pytest-image-diff/default.nix +++ b/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -1,6 +1,5 @@ { lib, - python3, buildPythonPackage, fetchFromGitHub, typing-extensions, diff --git a/pkgs/development/python-modules/rtp/default.nix b/pkgs/development/python-modules/rtp/default.nix index dbafa102ea1d..ad27d151776c 100644 --- a/pkgs/development/python-modules/rtp/default.nix +++ b/pkgs/development/python-modules/rtp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python3, # nativeCheckInputs hypothesis, From 50d5bc7b2d7ee10d56f93af4871a789422c1965d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:21:32 -0400 Subject: [PATCH 130/562] treewide: replace python3 with python within python package set --- pkgs/development/python-modules/dbt-core/default.nix | 4 ++-- pkgs/development/python-modules/dbt-core/with-adapters.nix | 4 ++-- .../development/python-modules/django-currentuser/default.nix | 4 ++-- pkgs/development/python-modules/kaldi-active-grammar/fork.nix | 4 ++-- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- pkgs/development/python-modules/pybars3/default.nix | 4 ++-- pkgs/development/python-modules/ssg/default.nix | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 0d2437e47f0b..638c5ef8a9ff 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -17,7 +17,7 @@ packaging, pathspec, protobuf, - python3, + python, pythonOlder, pytz, pyyaml, @@ -85,7 +85,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - withAdapters = python3.pkgs.callPackage ./with-adapters.nix { }; + withAdapters = python.pkgs.callPackage ./with-adapters.nix { }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/dbt-core/with-adapters.nix b/pkgs/development/python-modules/dbt-core/with-adapters.nix index 92bd22dd2f9f..b5fe0a527f0e 100644 --- a/pkgs/development/python-modules/dbt-core/with-adapters.nix +++ b/pkgs/development/python-modules/dbt-core/with-adapters.nix @@ -1,5 +1,5 @@ { - python3, + python, dbt-bigquery, dbt-core, dbt-postgres, @@ -17,7 +17,7 @@ let }; in adapterFun: -(python3.buildEnv.override { +(python.buildEnv.override { extraLibs = [ dbt-core ] ++ (adapterFun adapters); ignoreCollisions = true; }).overrideAttrs diff --git a/pkgs/development/python-modules/django-currentuser/default.nix b/pkgs/development/python-modules/django-currentuser/default.nix index 7325793966c4..4bbbe4fdb955 100644 --- a/pkgs/development/python-modules/django-currentuser/default.nix +++ b/pkgs/development/python-modules/django-currentuser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - python3, + python, pythonOlder, django, hatchling, @@ -38,7 +38,7 @@ buildPythonPackage { checkPhase = '' runHook preCheck - ${python3.interpreter} manage.py test testapp + ${python.interpreter} manage.py test testapp runHook postCheck ''; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index a3c9ae63c784..b5c785d2b12b 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -7,7 +7,7 @@ icu, pkg-config, fetchFromGitHub, - python3, + python, openblas, zlib, gfortran, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - python3 + python gfortran ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index e4613db87f7f..fa0842267031 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, isPyPy, ordered-set, - python3, + python, setuptools, zstandard, wheel, @@ -40,7 +40,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${python3.interpreter} tests/basics/run_all.py search + ${python.interpreter} tests/basics/run_all.py search runHook postCheck ''; diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix index 8bd031801137..937de513347e 100644 --- a/pkgs/development/python-modules/pybars3/default.nix +++ b/pkgs/development/python-modules/pybars3/default.nix @@ -1,5 +1,5 @@ { - python3, + python, fetchPypi, lib, pymeta3, @@ -19,7 +19,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${python3.interpreter} tests.py + ${python.interpreter} tests.py runHook postCheck ''; diff --git a/pkgs/development/python-modules/ssg/default.nix b/pkgs/development/python-modules/ssg/default.nix index 53fbbb0f3868..a54b198a4533 100644 --- a/pkgs/development/python-modules/ssg/default.nix +++ b/pkgs/development/python-modules/ssg/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, - python3, + python, unittestCheckHook, setuptools, @@ -45,7 +45,7 @@ buildPythonPackage { pythonImportsCheck = [ "ssg" ]; - postInstall = "rm -rf $out/${python3.sitePackages}/scripts"; + postInstall = "rm -rf $out/${python.sitePackages}/scripts"; meta = with lib; { description = "TCRF syllable segmenter for Thai"; From beaea78be5bb9964b4854f54e1d76e53df6dc3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:05:12 -0400 Subject: [PATCH 131/562] python311Packages.llm: fix build --- .../python-modules/llm/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 899a95ab3b26..388077b38944 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -5,10 +5,22 @@ fetchFromGitHub, makeWrapper, pytestCheckHook, - python3, + python, pythonOlder, ruff, setuptools, + click-default-group, + numpy, + openai, + pip, + pluggy, + pydantic, + python-ulid, + pyyaml, + sqlite-migrate, + cogapp, + pytest-httpx, + sqlite-utils, }: let llm = buildPythonPackage rec { @@ -29,7 +41,7 @@ let nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ click-default-group numpy openai @@ -43,7 +55,7 @@ let sqlite-utils ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ cogapp numpy pytest-httpx @@ -89,7 +101,7 @@ let installPhase = '' makeWrapper ${llm}/bin/llm $out/bin/llm \ - --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH" ln -sfv ${llm}/lib $out/lib ''; From 19d8a7800f9b628b572d9276c52fe59e3b1d47e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:16:41 -0400 Subject: [PATCH 132/562] python311Packages.python-secp256k1-cardano: fix build --- .../python-secp256k1-cardano/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix index 1328dc98ae35..ca14b00ea525 100644 --- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix +++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix @@ -1,11 +1,14 @@ { lib, fetchFromGitHub, - python3, + buildPythonPackage, pkg-config, + cffi, + secp256k1, + pytestCheckHook, }: -python3.pkgs.buildPythonPackage { +buildPythonPackage { pname = "python-secp256k1-cardano"; version = "0.2.3"; @@ -20,20 +23,20 @@ python3.pkgs.buildPythonPackage { nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ cffi secp256k1 ]; - nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests expect .so files and are failing doCheck = false; preConfigure = '' - cp -r ${python3.pkgs.secp256k1.src} libsecp256k1 - export INCLUDE_DIR=${python3.pkgs.secp256k1}/include - export LIB_DIR=${python3.pkgs.secp256k1}/lib + cp -r ${secp256k1.src} libsecp256k1 + export INCLUDE_DIR=${secp256k1}/include + export LIB_DIR=${secp256k1}/lib ''; meta = { From 3c7638a736c76dc2eb10752afe9f4de32b3d8020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:40:24 -0400 Subject: [PATCH 133/562] python311Packages.tabcmd: use correct interpreter version --- pkgs/development/python-modules/tabcmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 7638e67378ae..6d38e8e3fe77 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -10,7 +10,7 @@ pyinstaller-versionfile, pytest-order, pytestCheckHook, - python3, + python, pythonOlder, requests, setuptools, @@ -79,7 +79,7 @@ buildPythonPackage rec { cp -r build/lib/tabcmd/__main__.py $out/bin/ # Create a 'tabcmd' script with python3 shebang - echo "#!${python3}/bin/python3" > $out/bin/tabcmd + echo "#!${python.interpreter}" > $out/bin/tabcmd # Append __main__.py contents cat $out/bin/__main__.py >> $out/bin/tabcmd From bedf04b195769f70197ebac995697bef881072f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 9 Jul 2024 20:53:48 -0400 Subject: [PATCH 134/562] python311Packages.tabcmd: mark broken --- pkgs/development/python-modules/tabcmd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 6d38e8e3fe77..994449debbba 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -91,6 +91,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tabcmd" ]; meta = with lib; { + broken = true; description = "Command line client for working with Tableau Server"; homepage = "https://github.com/tableau/tabcmd"; changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; From c7e90d9f2042ebc59e7340a131528579f5b60bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 01:18:23 +0000 Subject: [PATCH 135/562] vttest: 20240218 -> 20240708 --- pkgs/tools/misc/vttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 4808d4dacdbf..eff71d25fe09 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20240218"; + version = "20240708"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-YlspL4BS/7vv59nW+9+cjR/Bi1yFVo8lRwl9l8VAvXU="; + sha256 = "sha256-wZVEnrLSKZyjwKJHiKmqtWn+QcLg6DEotcKbqW5auxs="; }; meta = with lib; { From 1dfc405d10f33a4c39e7b7dac803ad3e8a699cb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:06:39 +0000 Subject: [PATCH 136/562] monetdb: 11.49.9 -> 11.49.11 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 2efe120b4d8c..6ccddc5faea1 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.49.9"; + version = "11.49.11"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-dN4Me9VTLHzJHIiHP2mMy84I6nCycP2nYgb/J36rJnU="; + hash = "sha256-tnGRNTx/SH7Yj8xvaFUxKr8af+7b8ZouU4PdmKEMkKk="; }; nativeBuildInputs = [ bison cmake python3 ]; From 63c623c3ffc67db74de65a8ccc23a559b05126c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:24:33 +0000 Subject: [PATCH 137/562] freeradius: 3.2.4 -> 3.2.5 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 4c0853a6e3e3..14967231432f 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -23,11 +23,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-/dR2lJ88mRwZ8U73GZtSLlIEiW0TnGmUY4Hc6biSKUE="; + hash = "sha256-HnX1/Blh2YVNHLPGkhYS++K57bjuUIpafL1p8edgcRU="; }; nativeBuildInputs = [ autoreconfHook ]; From 256a0b89d919873981f0132bc8e2d7976b6164d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:33:48 +0000 Subject: [PATCH 138/562] ballerina: 2201.9.1 -> 2201.9.2 --- pkgs/development/compilers/ballerina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index f32cc203b67d..6dd49281bb81 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.9.1"; + version = "2201.9.2"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-5ATrR2TZHu4xr+XuGaiSZpIKTDQt6MTxg2DdU1qVjMI="; + hash = "sha256-J73fai5mPPNHk/wux4nhX3KsalxWER8nMqWovWgm6WA="; }; nativeBuildInputs = [ makeWrapper ]; From 1a933234992b1d82c4628d0542eaf416e9ac6e46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:51:30 +0000 Subject: [PATCH 139/562] containerlab: 0.55.1 -> 0.56.0 --- pkgs/tools/networking/containerlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 07cdb09a4955..b0b639c8d718 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.55.1"; + version = "0.56.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-Dk1so6CXAbnfyWfqHne/mMc8LYS3JqXj6XM53fQKANk="; + hash = "sha256-7jQvfEplGIwTtIAOBc6R5OfcxPQuEbBnzBoAI9mE+7E="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-D0nZhw1YY+Ci7g6wTiUoPp8EoKcL0YIfWHsjDlLR/K8="; + vendorHash = "sha256-SPxpi9jG3Xtit9JOAv0xWd89qWJZXeIjMwoNTkVeDgk="; ldflags = [ "-s" From c852c7b5e0de2e29bb0d2dee5049c54cbc4e14ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 06:23:57 +0000 Subject: [PATCH 140/562] networkmanager: 1.48.2 -> 1.48.4 --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 034a4847abd5..3cb389e0bd97 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.48.2"; + version = "1.48.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-PZBxzGKWTd8OMfXQbwYD4XVouMlRFK4ndwNYGt1ahqE="; + hash = "sha256-8l81/i6hpHP30YTMxyyNStyXBZJv5POno8hUmUH1awM="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From c359e73b8ea1a89eba75632c97aa82ae9f28cab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 2 Jul 2024 14:02:26 +0200 Subject: [PATCH 141/562] n8n: refactor build process --- pkgs/by-name/n8/n8n/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 8e0bb92906c8..d13c1bb96cdc 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation (finalAttrs: { node-gyp rebuild popd - pnpm build + # TODO: use deploy after resolved https://github.com/pnpm/pnpm/issues/5315 + pnpm build --filter=n8n runHook postBuild ''; @@ -61,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/{lib,bin} - cp -r {packages,node_modules} $out/lib + mkdir -p $out/{bin,lib/n8n} + mv {packages,node_modules} $out/lib/n8n - makeWrapper $out/lib/packages/cli/bin/n8n $out/bin/n8n \ + makeWrapper $out/lib/n8n/packages/cli/bin/n8n $out/bin/n8n \ --set N8N_RELEASE_TYPE "stable" runHook postInstall @@ -94,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: { ]; license = licenses.sustainableUse; mainProgram = "n8n"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; }) From e33042a9fbff7d136154c3a549c2408e81a617e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 2 Jul 2024 09:56:53 +0200 Subject: [PATCH 142/562] n8n: 1.46.0 -> 1.48.3 --- pkgs/by-name/n8/n8n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index d13c1bb96cdc..b2bfe9cad3a7 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.46.0"; + version = "1.48.3"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-9T/x2k7XIO+PV0olTQhb4WF1congTbXFvHqaxoaNbp4="; + hash = "sha256-aCMbii5+iJ7m4P6Krr1/pcoH6fBsrFLtSjCx9DBYOeg="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-oldvZC0B/r3fagI5hCn16wjQsD9n4q9foo73lJBJXeU="; + hash = "sha256-n1U5ftbB7BbiDIkZMVPG2ieoRBlJ+nPYFT3fNJRRTCI="; }; nativeBuildInputs = [ From 2d68785b6e8cd91d52d335bc36d96e2175cb2f82 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:41:53 +0200 Subject: [PATCH 143/562] python312Packages.opensearch-py: fix build --- pkgs/development/python-modules/opensearch-py/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index a73c319fd10b..90da26c44fe3 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -12,6 +12,7 @@ requests, six, urllib3, + events, # optional-dependencies aiohttp, @@ -46,6 +47,7 @@ buildPythonPackage rec { requests six urllib3 + events ]; passthru.optional-dependencies.async = [ aiohttp ]; From aacbcb197d2047ed86208e64692e86a6c05b59cd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:10:34 +0200 Subject: [PATCH 144/562] distribution: 3.0.0-alpha.1 -> 3.0.0-beta.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/di/distribution/package.nix | 33 +++++++----------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index 9da917b51218..7f2e4c5407b7 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -1,38 +1,23 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, nix-update-script -, testers -, distribution +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + distribution, }: buildGoModule rec { pname = "distribution"; - version = "3.0.0-alpha.1"; + version = "3.0.0-beta.1"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; rev = "v${version}"; - hash = "sha256-reguAtBkEC9OMUTdCtFY6l0fkk28VoA0IlPcQ0sz84I="; + hash = "sha256-tiTwrcRtOEIs1sCkzHXY1TPYw0TOdDvM2Y8YdgQjEmI="; }; - patches = [ - # fix: load gcs credentials and client inside DriverConstructor - # Needed to pass the tests. Remove with next update. - (fetchpatch { - url = "https://github.com/distribution/distribution/commit/14366a2dff6a8f595e39d258085381731b43cec6.diff"; - hash = "sha256-0ns9JuIeLBzRLMVxY6uaWTIYcRRbuwQ+n9tmK+Pvf4U="; - }) - # fix: add missing skip in s3 driver test - # Needed to pass the tests. Remove with next update. - (fetchpatch { - url = "https://github.com/distribution/distribution/commit/6908e0d5facd31ed32046df03a09040c964be0b3.patch"; - hash = "sha256-ww+BwBGw+dkZ2FhVzynehR+sNYCgq8/KkPDP9ac6NWg="; - }) - ]; - vendorHash = null; checkFlags = [ From 4c535b9c43741b5d4d01a52f14e1f2586051507f Mon Sep 17 00:00:00 2001 From: Finn Landweber Date: Thu, 11 Jul 2024 12:03:11 +0200 Subject: [PATCH 145/562] gittuf: 0.4.0 -> 0.5.1 --- pkgs/by-name/gi/gittuf/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index ef58a0672405..520decaf3dba 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -1,22 +1,22 @@ -{ lib, fetchFromGitHub, buildGoModule, git }: +{ lib, fetchFromGitHub, buildGoModule, git, openssh }: buildGoModule rec { pname = "gittuf"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-BXqxVtdxUbcl2cK4kYEBZIbMCKOjPvuoTnDh8L6+mO8="; + hash = "sha256-beIEnm9KPAwZnYiCpoknivhunVDDhp7udgCW3pCHkDU="; }; - vendorHash = "sha256-yRUgtUeoTthxSGZ6VX/MOVeY0NUXq0Nf+XlysHqcpWw="; + vendorHash = "sha256-haiTDOjehLwwpooIjrOKZKwdQSuvKLnwzghIMVJRrvI="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; - nativeCheckInputs = [ git ]; - checkFlags = [ "-skip=TestLoadRepository" ]; + nativeCheckInputs = [ git openssh ]; + checkFlags = [ "-skip=TestLoadRepository" "-skip=TestSSH" ]; postInstall = "rm $out/bin/cli"; # remove gendoc cli binary From f6ccd9d45106f1dcd631c30b595db1f92b7b65b5 Mon Sep 17 00:00:00 2001 From: Robert Sliwinski Date: Thu, 11 Jul 2024 15:31:50 +0200 Subject: [PATCH 146/562] pocketbase: 0.22.15 -> 0.22.17 Release notes: https://github.com/pocketbase/pocketbase/releases/tag/v0.22.17 Changelog: https://github.com/pocketbase/pocketbase/compare/v0.22.15...v0.22.17 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index a8812cfa2841..75bb2c48e2fc 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.15"; + version = "0.22.17"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-HdsQ/l0TjvOegbX6YGI2ZZkZKofxJoXFIpUb2Vss1hc="; + hash = "sha256-BQmqd8h1wc0AKaKECBAyOMYfXio/+nJrDfYs8Qbq5PY="; }; vendorHash = "sha256-KG1etP/wrjoDCTNYB9J5gmW2NMgBZQcdA1QfXKGipO8="; From 4f5c6cc337b3f186ec221f0c7ceca89ae9602c51 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Thu, 11 Jul 2024 08:21:55 -0500 Subject: [PATCH 147/562] python311Packages.suds: init at 1.1.2 --- .../python-modules/suds/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/suds/default.nix diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix new file mode 100644 index 000000000000..054f0b0cb434 --- /dev/null +++ b/pkgs/development/python-modules/suds/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + setuptools, + six, +}: + +buildPythonPackage rec { + pname = "suds"; + version = "1.1.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HVz6dBFxk7JEpCM/JGxIPZ9BGYtEjF8UqLrRHE9knys="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "suds" ]; + + meta = { + changelog = "https://github.com/suds-community/suds/blob/v${version}/CHANGELOG.md"; + description = "Lightweight SOAP python client for consuming Web Services"; + homepage = "https://github.com/suds-community/suds"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ wrmilling ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b748b79e260..c82bce719401 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14870,6 +14870,8 @@ self: super: with self; { sudachipy = callPackage ../development/python-modules/sudachipy { }; + suds = callPackage ../development/python-modules/suds { }; + sumo = callPackage ../development/python-modules/sumo { }; sumtypes = callPackage ../development/python-modules/sumtypes { }; From 2a3320e08b6a285594e383a7b21e77f12ff07bd4 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Thu, 11 Jul 2024 08:23:01 -0500 Subject: [PATCH 148/562] chirp: 0.4.0-unstable-2024-05-10 -> 0.4.0-unstable-2024-07-05 --- pkgs/applications/radio/chirp/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index c113f365aef5..42c397796385 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "0.4.0-unstable-2024-05-24"; + version = "0.4.0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "e17c021ba4fc39eea8a2a1de37ef04a0d1253090"; - hash = "sha256-YvIRo7g9fxnlf8og5CM2JLf8DeADVkcHdvb4ppS1veE="; + rev = "f28814fff0566dcf6f93ac5b7a79d6d594202757"; + hash = "sha256-SQ0j9DGJc48TsaUaesixJT/pMBm9NGw22qapSokj9r8="; }; buildInputs = [ glib @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { pyserial requests six + suds wxpython yattag ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 778ef250dd1b..583f9d3cc188 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29746,7 +29746,9 @@ with pkgs; chatty = callPackage ../applications/networking/instant-messengers/chatty { }; - chirp = callPackage ../applications/radio/chirp { }; + chirp = callPackage ../applications/radio/chirp { + python3 = python311; + }; browsh = callPackage ../applications/networking/browsers/browsh { }; From a445123f0c8c29ff940dc146f791a3530e42cab3 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Thu, 11 Jul 2024 08:23:31 -0500 Subject: [PATCH 149/562] chirp: add maintainer wrmilling --- pkgs/applications/radio/chirp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 42c397796385..62fbba4e9867 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { description = "Free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.emantor ]; + maintainers = with maintainers; [ emantor wrmilling ]; platforms = platforms.linux; }; } From fbb80bc6b38f75c36e1fe30708c5920469ddf991 Mon Sep 17 00:00:00 2001 From: Aleksandr Sterkhov Date: Thu, 11 Jul 2024 19:48:56 +0200 Subject: [PATCH 150/562] tilt: 0.33.13 -> 0.33.17 --- pkgs/applications/networking/cluster/tilt/assets.nix | 2 +- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix index a77db6f1574d..a1edf18d594d 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation { dontInstall = true; outputHashAlgo = "sha256"; - outputHash = "sha256-UpKWpwKUouW4BHZAQNvg4PeQ3bd28mrbv547GyN/drI="; + outputHash = "sha256-5f9lKRD6vc2FOnUeSxK/zlu/tshS1+RCSB0slGSO/Rc="; outputHashMode = "recursive"; }; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index af3f171d3c1e..bb52c7e63301 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ let args = rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.33.13"; + version = "0.33.17"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; rev = "v${version}"; - hash = "sha256-B1kau6G56Iz6Yso2KpJCPE18yznhKCmq+Pabi2sxSmI="; + hash = "sha256-GzWnTq3X615A/jRjYhBriRYaH4tjv+yg2/zHIJuKXPE="; }; }; From 64a4b5a25068ab49d20839e490095f1a82044926 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 12 Jul 2024 06:35:33 +1000 Subject: [PATCH 151/562] py-spy: 0.3.14 -> 0.3.14-unstable-2024-02-27 Diff: https://github.com/benfred/py-spy/compare/v0.3.14...8dd54929106916a3c961cc57c1172793ce126180 --- pkgs/development/tools/py-spy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 8ac80ee1dade..8522333ef9db 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.14"; + version = "0.3.14-unstable-2024-02-27"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; - rev = "refs/tags/v${version}"; - hash = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; + rev = "8dd54929106916a3c961cc57c1172793ce126180"; + hash = "sha256-rrngOqlXIJXbh3A7OBEcgoakZyyuvlHHXhWo3/1BRpY="; }; - cargoHash = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; + cargoHash = "sha256-gNnuuq2cz168Gaw+gL2nJ8EC32BMPu9DgnRzIh1hGKk="; # error: linker `arm-linux-gnueabihf-gcc` not found postPatch = '' From 644ffe6218bd70b22d367654eab2155f406cd398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 00:48:39 +0000 Subject: [PATCH 152/562] feed2imap-go: 1.7.0 -> 1.7.2 --- .../networking/feedreaders/feed2imap-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix index 806e4fc147e0..d34eecd9e2d3 100644 --- a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix +++ b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "feed2imap-go"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "Necoro"; repo = "feed2imap-go"; rev = "v${version}"; - sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs="; + sha256 = "sha256-LMtuGrNRVG3/2cgZFS7YlVmassbWDhH/nQgPh08NmpA="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/Necoro/feed2imap-go/pkg/version.commit=nixpkgs" ]; - vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU="; + vendorHash = "sha256-3J9fd/ogClQ+1a2ORahwf+JwkC4b1+pR1vdVjwLutoY="; # The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94) postInstall = '' From a43f0d07b2fdfde753bd9315c10371c3573632a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 01:14:59 +0000 Subject: [PATCH 153/562] php81Packages.phpspy: 0.6.0 -> 0.7.0 --- pkgs/development/php-packages/phpspy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpspy/default.nix b/pkgs/development/php-packages/phpspy/default.nix index 7bb3009bb17e..eb96160ea73c 100644 --- a/pkgs/development/php-packages/phpspy/default.nix +++ b/pkgs/development/php-packages/phpspy/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpspy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "adsr"; repo = "phpspy"; rev = "v${finalAttrs.version}"; - hash = "sha256-iQOeZLHRc5yUgXc6xz52t/6oc07eZfH5ZgzSdJBcaak="; + hash = "sha256-QphoDdnSFPVRvEro0WDUC/yRsOf4I5p5BpHq32olqJI="; fetchSubmodules = true; }; From e7ded0a5e0ae70e8c4e0058971e822f573a02609 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 11 Jul 2024 21:54:59 -0700 Subject: [PATCH 154/562] retrospy: 6.4.8 -> 6.5 --- pkgs/by-name/re/retrospy/deps.nix | 282 +++++++++++++-------------- pkgs/by-name/re/retrospy/package.nix | 8 +- 2 files changed, 137 insertions(+), 153 deletions(-) diff --git a/pkgs/by-name/re/retrospy/deps.nix b/pkgs/by-name/re/retrospy/deps.nix index 3e91b8962400..ba40f58191cf 100644 --- a/pkgs/by-name/re/retrospy/deps.nix +++ b/pkgs/by-name/re/retrospy/deps.nix @@ -2,153 +2,137 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; sha256 = "0wfbwrr8p5hg9f809d44gh2zfkfwnwayfw84vs33hh7ms0r380gd"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; sha256 = "0d9hyc1zmyvzlb320arwrv12ncp45llq98hibv711b7ibm11dm7c"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; sha256 = "0qlcdx4w1pcljgs7sfbn5xmmnqwp2m0fqyswrgz6c8cvjzcfsjsj"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; sha256 = "08y31b357fax7c1ggwhjsfwgaj6zkm2abhpc6amlmk6ci4zn12lf"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; sha256 = "134xl19rfswnz75a1mhil9yqy8haqa788rmd1p1kk6ibjbhb3np9"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; sha256 = "042s8lc83lw6ygcsiza14wlsc09rgzw3ch2qaxkhlp73bh736ps3"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; sha256 = "1j7wpv81wqwh6zhfzc1f36vb5dp6s2ig45v8km9sp0q6f66zkrsh"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; sha256 = "1fhp6f2aj2bmzlcj0s5r9i9rcxwakdg9gvjqvdqaq8s98d0s06qh"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0"; sha256 = "0v1pnk3hjclr2yqxmff8w6mlgmjch5gfb6yb8h0z1a5m5j6y31qv"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; sha256 = "1qw76n78c14xl419yzabahbsrgymm850ql05gd4fh5naq2brksdm"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; sha256 = "1djp4m5yin4i2f9sjv4v3syv02fllwbfinzm9h0hm2abc2ccvrm3"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; sha256 = "1gd4zrjyw3hg3d48ivhxp0ca7ma13dnpr8y1wc7d51ddlrj3c86g"; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; sha256 = "1vf5fp11zx21bsakbpf12j6mchafh749cs03w9cifb6ci98jchgh"; }) - (fetchNuGet { pname = "Desktop.Robot"; version = "1.5.0"; sha256 = "1y78cpv97cwk4xas0rcpr2wwyags424f3in63kzj8w80d9gradr1"; }) - (fetchNuGet { pname = "DialogHost.Avalonia"; version = "0.7.5"; sha256 = "1wkvqrzvhjhhg128gfr57fcm2xvs9yvix405nm7v06kn6xr12d73"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "LibUsbDotNet"; version = "3.0.102-alpha"; sha256 = "05hz68aj5z76lgxz87r26314xw1a37s9wjy6gmvwwa77kg6av4d0"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; sha256 = "0ks9k3wqwvdssiwbcjc4gnrfn1r8x2dbp9amraxkmws5a7vbjdyk"; }) - (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.0.0"; sha256 = "1hyfhbayyi8dqsy9fnp09qh92qdil9wsjy97pdfp2mywgr121q50"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NodaTime"; version = "3.1.9"; sha256 = "10vyhv24awjqxjhyq6sw0gbbim8wddj1hnsv9l7mjv2vmg71qz1w"; }) - (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1q38c2fq6c464h1hs3g6528m0m8c3a5a08vsg59mzmm42r0ayh4k"; }) - (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0gvrha8fp26hnzxqw99r50ki3mjnpjr6iaa483b4lahpljk06ijb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1z35v6bwwl8lv7yz37xj99gablhs9sr5y0r3zb57qmjx4psvix3f"; }) - (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "1flvgvbpk7iqsi3cr23bjm9kdj63rmb97bn1hxzcia8iyybdzcnj"; }) - (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1gfzdz42rsv5gp1p4w5ygkw43gm101q444a3jzgsspp2jk50hdj7"; }) - (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "17fw28ymsdbwpimmvh3nx2shc2khqm8gypg5q1s90kvyzb5ivzpg"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "0l52l3kkl4rg9wg25lacb8khywmclcyq230mss0aqsyjqlyxv9l8"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0gigh53b9ddkycvhm8vg5gz53wq02qzb7kivwh69vh2454f1qap7"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "03fjxh2lcrkgbr63zdk3sal99rrr60z9rgwa58pz4a2y78zy5h53"; }) - (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0zphic782inl2mc6ijv7m4003pdlrk3rb7xdkcavxb5gy00lgc7n"; }) - (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "0y3rj0dv8l4fsw4w149q94zbqz4wm28ix5cvbhs8da3r92nqy9dj"; }) - (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0rnx41sgf690wx02z3i6bxgiw43khx5xq7f27arp53v7m0d11xny"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) - (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.0.1"; sha256 = "12ypfknphk30szsymmn1378vlp4jmlcvsz88flfxyhwgxrir0453"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) - (fetchNuGet { pname = "SSH.NET"; version = "2020.0.2"; sha256 = "18mq7jjdbzc7qcsh5wg2j0gd39qbnrxkn811cy8wrdvki0pfi0sm"; }) - (fetchNuGet { pname = "SshNet.Security.Cryptography"; version = "1.3.0"; sha256 = "1y9r9c2dn81l1l4nn976fwf0by83qbvb0sp1hw7m19pqz7pmaflh"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0-preview.6.23329.7"; sha256 = "1wbh229qyhrhcwihpkh99kzcfmn7f13s8l94gbw3hm4d24kqks7b"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0-preview.6.23329.7"; sha256 = "1jj4yizbcj54m0qhj18il5b2r2cw4njl5z46v0121qvsxsgllc8k"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0-preview.6.23329.7"; sha256 = "0c1m9c6fq4mqxv8mnwzmhpv5321lrgnn3sikis9l2072cm5lzcnm"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.IO.Ports"; version = "7.0.0"; sha256 = "0nk5r3vair9kvbgcrp8zbc60x2yr464cnm6gjsz6wj1pm5b51gvp"; }) - (fetchNuGet { pname = "System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0mc02ngqdbgazg7kw82g68kpbm5f7pdyjbfssjj30281116plyqq"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; }) - (fetchNuGet { pname = "System.Management"; version = "8.0.0-preview.6.23329.7"; sha256 = "1f7apr1yq5jpr9alq03g90mj8wg9s30vxd8hp6irnf3pk9sgk5ys"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0-preview.6.23329.7"; sha256 = "1xs1fmz30gr0g5c2m0xy1dx5rlfsfapyj8l6v7a9c312bd02m4id"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "Vortice.DirectInput"; version = "3.2.0"; sha256 = "0ig60651kvynw6x3f70y3c95n581shr1k75b407p1n9mr8qnzfsy"; }) - (fetchNuGet { pname = "Vortice.DirectX"; version = "3.2.0"; sha256 = "15wlzag7p8kvrjzjpndaa1pb9acpvylnxz8vb3rx2d3q62k9k2hw"; }) - (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.5.2"; sha256 = "04s282b07fz1h1d6rw1iiqcsfpj415fin5q5cxmq2bg7a930rfjz"; }) - (fetchNuGet { pname = "Vortice.XInput"; version = "3.2.0"; sha256 = "00bkrsml45rzy1yvxfrykdgmg9g74ac3a2xb0251205mziwa0m3x"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; hash = "sha256-G0ooIjNRW5YHKvQ6qPxe5gaE3HPwGfiCQUo34PSxXGg="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; hash = "sha256-0v4evkV0jbLffwfQG/QO/RQbHXlCBmFv8A2pBZjS5Y0="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; hash = "sha256-itnN+LIZ2S+1CjD0ZS/woKtpgWbC/srMYzbYfX3a8LA="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.11"; hash = "sha256-8/ixQaKhkv6Jk8Y/VF6HtCkm/9M6MEV7XFNLwOsjtzo="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; hash = "sha256-qtvlczTg2yUZWyyqXkkboB8lK9aYv+STbfDvSKb55Vw="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; hash = "sha256-54fc2g1yvM7pPRaF062lSjXaQDe2i61xQRM8m81vWm8="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) + (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; }) + (fetchNuGet { pname = "Desktop.Robot"; version = "1.5.0"; hash = "sha256-ITeVX2oAcST/HMbG4Ygg+inPuciXZaBVJ5Ozk/Zl6Pg="; }) + (fetchNuGet { pname = "DialogHost.Avalonia"; version = "0.7.7"; hash = "sha256-pXRv4P4i/zxZ1Ucq3kaGs9HKNG+4CNB4n33YswbjEio="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "LibUsbDotNet"; version = "3.0.102-alpha"; hash = "sha256-oJGtzJvnKM53fcZLnvQZKvBOwjAiH/T7o+b8IhUyHxY="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.1.5.1"; hash = "sha256-C15vOuNgsvdXq4e0G2C2Umwmq2rF7IoHxV5lUSSMFdA="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "NodaTime"; version = "3.1.11"; hash = "sha256-ZvJlCEjq61KS3qr4Lw/C+yyagic4rESZ7qa0RGul/sU="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-m5+od7ZhlzImwSE9E7Qq1nH3A3muXwCnsvrVUoJ7+WE="; }) + (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-IgbG3HT3A0VItWl5asE7Hk0zaQjQneKQS9f65cQAjLI="; }) + (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-44oujSHhc0Nl2WCvLYkScrAyqNAlbGfOnlzPwCofwlA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-BqExVU/zHj7o++mzOpY9y+i9yZZVbcGmO/D4mRzigY8="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-oFMF60yyTy3fXwLlXJkNUtzdRz4EyxevAUIcfcVESCE="; }) + (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-b2J9DcunMtChpuyNC0XN39Z01Wr738HI/syJW1n9bfE="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.1.2-beta"; hash = "sha256-wM8plHp9m+pnKPK0vu9BRburPMIL2lwxdRkQFEhjbDk="; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.1.2-beta"; hash = "sha256-VGmWpeLV4v8gfqtJKKU43rUad9CDgdIO+lmUUa65XJE="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "SSH.NET"; version = "2024.0.0"; hash = "sha256-WfJc+ykcWQaYkTkMgy3fBbC1MrwVptF8Cb9PI0iQEMo="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.IO.Ports"; version = "8.0.0"; hash = "sha256-G8j9c0erBzZfJAVlW08XoE58gPhiNWJE78sFaBV2e4Q="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "Vortice.DirectInput"; version = "3.5.0"; hash = "sha256-TxUIn0YXlzWHGyMAOVVC0SiNaM2vFqa0ddFpoWH0fwI="; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "3.5.0"; hash = "sha256-cHoY2+czSdj3w3qcGeCTN0iU2nY9xbMrfK80RGEoDzk="; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.7.8"; hash = "sha256-8tHkHDvHMT3iDKDkVIms9tZnspBaw0nbvYyXUsUGv8A="; }) + (fetchNuGet { pname = "Vortice.XInput"; version = "3.5.0"; hash = "sha256-w4VJlkGjEmD/QElDZ3ZJS+GbN/4+yyVeJq1Le7Mdas8="; }) ] diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index dbc6b6b0716a..7757fb9c44a0 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -12,13 +12,13 @@ , runCommandLocal }: let - version = "6.4.8"; + version = "6.5"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-0rdLdud78gnBX8CIdG81caJ1IRoIjGzb7coP4huEPDA="; + hash = "sha256-gnk/cOxCZuBNrBgvzvEeUjGIeCGtC1uXpYBrWwTqeCQ="; }; executables = [ @@ -58,8 +58,8 @@ buildDotnetModule { "UsbUpdaterX2/UsbUpdaterX2.csproj" ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; nugetDeps = ./deps.nix; From fbb2c488860b9187f361d65c01152d3bd5a72d0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 06:05:22 +0000 Subject: [PATCH 155/562] wireshark: 4.2.5 -> 4.2.6 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 81dd459f5cb0..46b30dea7aff 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -54,7 +54,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.5"; + version = "4.2.6"; outputs = [ "out" "dev" ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-g0b0YGWQzWsALVnNJl/WQGl9J2QjaLnry2VL6qvN1FQ="; + hash = "sha256-zlFTUgsEKraE9crS5SZ13r93JJzUb6eyBhusJbbGwsE="; }; patches = [ From c6caa09ba264a3f865bcc23339c4775f98ad28eb Mon Sep 17 00:00:00 2001 From: Ruben Beck Date: Thu, 11 Jul 2024 09:06:10 +0200 Subject: [PATCH 156/562] fastfetch: 2.17.2-> 2.18.1 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index d4a64e36ff74..5de04db0ffe7 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.17.2"; + version = "2.18.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-XQ0A1eeajiExrD440FVj5STjyMTYdIK0SyysFo/tF3o="; + hash = "sha256-vm0KlJ3w71b6OzvbvJBu2hM71FqyjGpP222KguPgHEc="; }; outputs = [ "out" "man" ]; From aeed98d0da2cd186907f579af5b77eb192d33f03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 08:54:10 +0000 Subject: [PATCH 157/562] mcfly: 0.9.0 -> 0.9.1 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index adcbfa7db826..ad5c707a966b 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-vVpZP3bixbV9K32PP0rxWoEGCnWa4xRYHFmgr8wDbS8="; + hash = "sha256-XlAzQNZ4XREp+mmvASGWUnoX2na//lQCgve7OtNcHeE="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-MTCHznGki7WALNyZByTz4bZ6NDZFpDXcaQ7iYqbMruA="; + cargoHash = "sha256-k+CNsDz3qbCFD0jiiB++1uZJlSfThuCiQkaD6QYyfsY="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From 9485537de608224d1751ebcbf88ac55e56bf24fd Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Fri, 12 Jul 2024 11:36:58 +0100 Subject: [PATCH 158/562] clamav: Fix check failure of clamscan no tests It seems like clamav uses `pytest` as a test runner preferentially, then falls back to `unittest`. For some reason `unittest` isn't discovering the tests inside clamav/unit_test/clamscan, and instead exitting with `sys.exit(_NO_TESTS_EXITCODE)`. I have checked actual `clamscan` tests are being run using `nix develop .#clamscan`, `genericBuild`, `checkPhase` then manually running `ctest -V`. Fixes https://github.com/NixOS/nixpkgs/issues/325510 --- pkgs/tools/security/clamav/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index be40a271cc92..4f9ca4fe9e9f 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { doCheck = true; + checkInputs = [ + python3.pkgs.pytest + ]; + meta = with lib; { homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; From 62d13413f4281a8d5b092101f706c04a44e0ddd4 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Mon, 4 Dec 2023 23:18:06 +0700 Subject: [PATCH 159/562] mitm-cache: init at 0.1.1 --- pkgs/build-support/mitm-cache/default.nix | 44 ++++++++++++++++++ pkgs/build-support/mitm-cache/fetch.nix | 49 +++++++++++++++++++++ pkgs/build-support/mitm-cache/setup-hook.sh | 21 +++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 118 insertions(+) create mode 100644 pkgs/build-support/mitm-cache/default.nix create mode 100644 pkgs/build-support/mitm-cache/fetch.nix create mode 100644 pkgs/build-support/mitm-cache/setup-hook.sh diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix new file mode 100644 index 000000000000..dd44a7ddca9a --- /dev/null +++ b/pkgs/build-support/mitm-cache/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, rustPlatform +, substituteAll +, openssl +, Security +, python3Packages +}: + +rustPlatform.buildRustPackage rec { + pname = "mitm-cache"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "chayleaf"; + repo = "mitm-cache"; + rev = "v${version}"; + hash = "sha256-l9dnyA4Zo4jlbiCMRzUqW3NkiploVpmvxz9i896JkXU="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; + + setupHook = substituteAll { + src = ./setup-hook.sh; + inherit openssl; + ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; + }; + + passthru.fetch = callPackage ./fetch.nix { }; + + meta = with lib; { + description = "A MITM caching proxy for use in nixpkgs"; + homepage = "https://github.com/chayleaf/mitm-cache#readme"; + license = licenses.mit; + maintainers = with maintainers; [ chayleaf ]; + mainProgram = "mitm-cache"; + }; +} diff --git a/pkgs/build-support/mitm-cache/fetch.nix b/pkgs/build-support/mitm-cache/fetch.nix new file mode 100644 index 000000000000..4e1f24ae7d7b --- /dev/null +++ b/pkgs/build-support/mitm-cache/fetch.nix @@ -0,0 +1,49 @@ +{ lib +, fetchurl +, runCommand +, writeText +}: + +{ name ? "deps" +, data +, dontFixup ? true +, ... +} +@ attrs: + +let + data' = builtins.removeAttrs + (if builtins.isPath data then lib.importJSON data else data) + [ "!version" ]; + + urlToPath = url: + if lib.hasPrefix "https://" url then ( + let + url' = lib.drop 2 (lib.splitString "/" url); + in "https/${builtins.concatStringsSep "/" url'}" + ) + else builtins.replaceStrings ["://"] ["/"] url; + code = '' + mkdir -p "$out" + cd "$out" + '' + builtins.concatStringsSep "" (lib.mapAttrsToList (url: info: + let + key = builtins.head (builtins.attrNames info); + val = info.${key}; + path = urlToPath url; + name = baseNameOf path; + source = { + redirect = "$out/${urlToPath val}"; + hash = fetchurl { inherit url; hash = val; }; + text = writeText name val; + }.${key} or (throw "Unknown key: ${url}"); + in '' + mkdir -p "${dirOf path}" + ln -s "${source}" "${path}" + '') data'); +in + runCommand name (builtins.removeAttrs attrs [ "name" "data" ] // { + passthru = (attrs.passthru or {}) // { + data = writeText "deps.json" (builtins.toJSON data); + }; + }) code diff --git a/pkgs/build-support/mitm-cache/setup-hook.sh b/pkgs/build-support/mitm-cache/setup-hook.sh new file mode 100644 index 000000000000..219674eb9ea4 --- /dev/null +++ b/pkgs/build-support/mitm-cache/setup-hook.sh @@ -0,0 +1,21 @@ +mitmCacheConfigureHook() { + if [ -d "$mitmCache" ] && [ -z "$MITM_CACHE_CERT_DIR" ]; then + MITM_CACHE_CERT_DIR="$(mktemp -d)" + pushd "$MITM_CACHE_CERT_DIR" + MITM_CACHE_CA="$MITM_CACHE_CERT_DIR/ca.cer" + @openssl@/bin/openssl genrsa -out ca.key 2048 + @openssl@/bin/openssl req -x509 -new -nodes -key ca.key -sha256 -days 1 -out ca.cer -subj "/C=AL/ST=a/L=a/O=a/OU=a/CN=example.org" + MITM_CACHE_HOST="127.0.0.1" + MITM_CACHE_PORT="${mitmCachePort:-$(@ephemeral_port_reserve@/bin/ephemeral-port-reserve "$MITM_CACHE_HOST")}" + MITM_CACHE_ADDRESS="$MITM_CACHE_HOST:$MITM_CACHE_PORT" + export http_proxy="$MITM_CACHE_ADDRESS" + export https_proxy="$MITM_CACHE_ADDRESS" + export SSL_CERT_FILE="$MITM_CACHE_CA" + export NIX_SSL_CERT_FILE="$MITM_CACHE_CA" + mitm-cache -l"$MITM_CACHE_ADDRESS" replay "$mitmCache" >/dev/null 2>/dev/null & + popd + fi +} + +# prepend it so any other configure hooks can use the generated root CA +preConfigureHooks=(mitmCacheConfigureHook "${preConfigureHooks[@]}") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27412bbac617..d26f1cdcd4af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1391,6 +1391,10 @@ with pkgs; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; + mitm-cache = callPackage ../build-support/mitm-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; + # intended to be used like nix-build -E 'with import { }; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; From dd42ff820e5b0cb6ecb78b37d763b06dbb780d9c Mon Sep 17 00:00:00 2001 From: Ignacio Marmolejo Date: Tue, 9 Jul 2024 23:28:45 -0700 Subject: [PATCH 160/562] bruno: fix css issue with patch file --- pkgs/by-name/br/bruno/package.nix | 5 +++ pkgs/by-name/br/bruno/scroll-width-fix.patch | 37 ++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/br/bruno/scroll-width-fix.patch diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 9648a86e01ba..6c4217090a2f 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -73,6 +73,11 @@ buildNpmPackage' rec { }) ]; + patches = [ + # Workaround to fix css issue in bruno due to electron difference between Nix and mainstream. https://github.com/NixOS/nixpkgs/issues/324176 + ./scroll-width-fix.patch + ]; + postPatch = '' substituteInPlace scripts/build-electron.sh \ --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then' diff --git a/pkgs/by-name/br/bruno/scroll-width-fix.patch b/pkgs/by-name/br/bruno/scroll-width-fix.patch new file mode 100644 index 000000000000..e2a0326d1714 --- /dev/null +++ b/pkgs/by-name/br/bruno/scroll-width-fix.patch @@ -0,0 +1,37 @@ +diff --git a/packages/bruno-app/src/globalStyles.js b/packages/bruno-app/src/globalStyles.js +index c2b16781..936449ed 100644 +--- a/packages/bruno-app/src/globalStyles.js ++++ b/packages/bruno-app/src/globalStyles.js +@@ -163,32 +163,6 @@ const GlobalStyle = createGlobalStyle` + } + + +- // scrollbar styling +- // the below media query target non-macos devices +- // (macos scrollbar styling is the ideal style reference) +- @media not all and (pointer: coarse) { +- * { +- scrollbar-width: thin; +- scrollbar-color: ${(props) => props.theme.scrollbar.color}; +- } +- +- *::-webkit-scrollbar { +- width: 5px; +- } +- +- *::-webkit-scrollbar-track { +- background: transparent; +- border-radius: 5px; +- } +- +- *::-webkit-scrollbar-thumb { +- background-color: ${(props) => props.theme.scrollbar.color}; +- border-radius: 14px; +- border: 3px solid ${(props) => props.theme.scrollbar.color}; +- } +- } +- +- + // codemirror + .CodeMirror { + .cm-variable-valid { From 1112448a1a2760ceae3db290221da7eb299c33fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Jul 2024 16:06:45 +0200 Subject: [PATCH 161/562] python312Packages.python-lsp-server: avoid qt dependencies This not only reduces dependencies by ~300 but also fixes the build for systems that use enviroment.noXlibs --- .../python-modules/python-lsp-server/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index f2df743ee1c4..daa39455f8ab 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -18,7 +18,6 @@ pydocstyle, pyflakes, pylint, - pyqt5, pytestCheckHook, python-lsp-jsonrpc, pythonOlder, @@ -111,9 +110,7 @@ buildPythonPackage rec { pandas pytestCheckHook ] - ++ passthru.optional-dependencies.all - # pyqt5 is broken on aarch64-darwin - ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; + ++ passthru.optional-dependencies.all; disabledTests = [ @@ -123,9 +120,7 @@ buildPythonPackage rec { "test_numpy_completions" "test_workspace_loads_pycodestyle_config" "test_autoimport_code_actions_and_completions_for_notebook_document" - ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # pyqt5 is broken on aarch64-darwin + # avoid dependencies on many Qt things just to run one singular test "test_pyqt_completion" ]; From c12b2a0b196a42a20949cf648c86acfbe6418ad3 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 6 Dec 2023 06:24:17 +0700 Subject: [PATCH 162/562] gradle: add setup hook --- doc/languages-frameworks/gradle.section.md | 189 ++++++++++++++ .../tools/build-managers/gradle/README.md | 245 ++++++++++++++++++ .../gradle/compress-deps-json.py | 163 ++++++++++++ .../tools/build-managers/gradle/default.nix | 40 +++ .../build-managers/gradle/fetch-deps.nix | 222 ++++++++++++++++ .../build-managers/gradle/init-build.gradle | 8 + .../build-managers/gradle/init-deps.gradle | 10 + .../tools/build-managers/gradle/setup-hook.sh | 70 +++++ .../build-managers/gradle/update-deps.nix | 122 +++++++++ pkgs/top-level/all-packages.nix | 15 +- 10 files changed, 1080 insertions(+), 4 deletions(-) create mode 100644 doc/languages-frameworks/gradle.section.md create mode 100644 pkgs/development/tools/build-managers/gradle/README.md create mode 100644 pkgs/development/tools/build-managers/gradle/compress-deps-json.py create mode 100644 pkgs/development/tools/build-managers/gradle/fetch-deps.nix create mode 100644 pkgs/development/tools/build-managers/gradle/init-build.gradle create mode 100644 pkgs/development/tools/build-managers/gradle/init-deps.gradle create mode 100644 pkgs/development/tools/build-managers/gradle/setup-hook.sh create mode 100644 pkgs/development/tools/build-managers/gradle/update-deps.nix diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md new file mode 100644 index 000000000000..b2058ef87491 --- /dev/null +++ b/doc/languages-frameworks/gradle.section.md @@ -0,0 +1,189 @@ +# Gradle {#gradle} + +Gradle is a popular build tool for Java/Kotlin. Gradle itself doesn't +currently provide tools to make dependency resolution reproducible, so +nixpkgs has a proxy designed for intercepting Gradle web requests to +record dependencies so they can be restored in a reproducible fashion. + +## Building a Gradle package {#building-a-gradle-package} + +Here's how a typical derivation will look like: + +```nix +stdenv.mkDerivation (finalAttrs: { + pname = "pdftk"; + version = "3.3.3"; + + src = fetchFromGitLab { + owner = "pdftk-java"; + repo = "pdftk"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; + }; + + nativeBuildInputs = [ gradle ]; + + # if the package has dependencies, mitmCache must be set + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + # defaults to "assemble" + gradleBuildTask = "shadowJar"; + + # will run the gradleCheckTask (defaults to "test") + doCheck = true; + + installPhase = '' + mkdir -p $out/{bin,share/pdftk} + cp build/libs/pdftk-all.jar $out/share/pdftk + + makeWrapper ${jre}/bin/java $out/bin/pdftk \ + --add-flags "-jar $out/share/pdftk/pdftk-all.jar" + + cp ${finalAttrs.src}/pdftk.1 $out/share/man/man1 + ''; + + meta.sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; +}) +``` + +To update (or initialize) dependencies, run the update script via +something like `$(nix-build -A .mitmCache.updateScript)` +(`nix-build` builds the `updateScript`, `$(...)` runs the script at the +path printed by `nix-build`). + +If your package can't be evaluated using a simple `pkgs.` +expression (for example, if your package isn't located in nixpkgs, or if +you want to override some of its attributes), you will usually have to +pass `pkg` instead of `pname` to `gradle.fetchDeps`. There are two ways +of doing it. + +The first is to add the derivation arguments required for getting the +package. Using the pdftk example above: + +```nix +{ lib +, stdenv +# ... +, pdftk +}: + +stdenv.mkDerivation (finalAttrs: { + # ... + mitmCache = gradle.fetchDeps { + pkg = pdftk; + data = ./deps.json; + }; +}) +``` + +This allows you to `override` any arguments of the `pkg` used for +the update script (for example, `pkg = pdftk.override { enableSomeFlag = +true };`), so this is the preferred way. + +The second is to create a `let` binding for the package, like this: + +```nix +let self = stdenv.mkDerivation { + # ... + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; +}; in self +``` + +This is useful if you can't easily pass the derivation as its own +argument, or if your `mkDerivation` call is responsible for building +multiple packages. + +In the former case, the update script will stay the same even if the +derivation is called with different arguments. In the latter case, the +update script will change depending on the derivation arguments. It's up +to you to decide which one would work best for your derivation. + +## Update Script {#gradle-update-script} + +The update script does the following: + +- Build the derivation's source via `pkgs.srcOnly` +- Enter a `nix-shell` for the derivation in a `bwrap` sandbox (the + sandbox is only used on Linux) +- Set the `IN_GRADLE_UPDATE_DEPS` environment variable to `1` +- Run the derivation's `unpackPhase`, `patchPhase`, `configurePhase` +- Run the derivation's `gradleUpdateScript` (the Gradle setup hook sets + a default value for it, which runs `preBuild`, `preGradleUpdate` + hooks, fetches the dependencies using `gradleUpdateTask`, and finally + runs the `postGradleUpdate` hook) +- Finally, store all of the fetched files' hashes in the lockfile. They + may be `.jar`/`.pom` files from Maven repositories, or they may be + files otherwise used for building the package. + +`fetchDeps` takes the following arguments: + +- `attrPath` - the path to the package in nixpkgs (for example, + `"javaPackages.openjfx22"`). Used for update script metadata. +- `pname` - an alias for `attrPath` for convenience. This is what you + will generally use instead of `pkg` or `attrPath`. +- `pkg` - the package to be used for fetching the dependencies. Defaults + to `getAttrFromPath (splitString "." attrPath) pkgs`. +- `bwrapFlags` - allows you to override bwrap flags (only relevant for + downstream, non-nixpkgs projects) +- `data` - path to the dependencies lockfile (can be relative to the + package, can be absolute). In nixpkgs, it's discouraged to have the + lockfiles be named anything other `deps.json`, consider creating + subdirectories if your package requires multiple `deps.json` files. + +## Environment {#gradle-environment} + +The Gradle setup hook accepts the following environment variables: + +- `mitmCache` - the MITM proxy cache imported using `gradle.fetchDeps` +- `gradleFlags` - command-line flags to be used for every Gradle + invocation (this simply registers a function that uses the necessary + flags). + - You can't use `gradleFlags` for flags that contain spaces, in that + case you must add `gradleFlagsArray+=("-flag with spaces")` to the + derivation's bash code instead. + - If you want to build the package using a specific Java version, you + can pass `"-Dorg.gradle.java.home=${jdk}"` as one of the flags. +- `gradleBuildTask` - the Gradle task (or tasks) to be used for building + the package. Defaults to `assemble`. +- `gradleCheckTask` - the Gradle task (or tasks) to be used for checking + the package if `doCheck` is set to `true`. Defaults to `test`. +- `gradleUpdateTask` - the Gradle task (or tasks) to be used for + fetching all of the package's dependencies in + `mitmCache.updateScript`. Defaults to `nixDownloadDeps`. +- `gradleUpdateScript` - the code to run for fetching all of the + package's dependencies in `mitmCache.updateScript`. Defaults to + running the `preBuild` and `preGradleUpdate` hooks, running the + `gradleUpdateTask`, and finally running the `postGradleUpdate` hook. +- `gradleInitScript` - path to the `--init-script` to pass to Gradle. By + default, a simple init script that enables reproducible archive + creation is used. + - Note that reproducible archives might break some builds. One example + of an error caused by it is `Could not create task ':jar'. Replacing + an existing task that may have already been used by other plugins is + not supported`. If you get such an error, the easiest "fix" is + disabling reproducible archives altogether by setting + `gradleInitScript` to something like `writeText + "empty-init-script.gradle" ""` +- `enableParallelBuilding` / `enableParallelChecking` / + `enableParallelUpdating` - pass `--parallel` to Gradle in the + build/check phase or in the update script. Defaults to true. If the + build fails for mysterious reasons, consider setting this to false. +- `dontUseGradleConfigure` / `dontUseGradleBuild` / `dontUseGradleCheck` + \- force disable the Gradle setup hook for certain phases. + - Note that if you disable the configure hook, you may face issues + such as `Failed to load native library 'libnative-platform.so'`, + because the configure hook is responsible for initializing Gradle. diff --git a/pkgs/development/tools/build-managers/gradle/README.md b/pkgs/development/tools/build-managers/gradle/README.md new file mode 100644 index 000000000000..f52779132c81 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/README.md @@ -0,0 +1,245 @@ +# Gradle Setup Hook + +## Introduction + +Gradle build scripts are written in a DSL, computing the list of Gradle +dependencies is a turing-complete task, not just in theory but in +practice. Fetching all of the dependencies often requires building some +native code, running some commands to check the host platform, or just +fetching some files using either JVM code or commands like `curl` or +`wget`. + +This practice is widespread and isn't considered a bad practice in the +Java world, so all we can do is run Gradle to check what dependencies +end up being fetched, and allow derivation authors to apply workarounds +so they can run the code necessary for fetching the dependencies our +script doesn't fetch. + +"Run Gradle to check what dependencies end up being fetched" isn't a +straightforward task. For example, Gradle usually uses Maven +repositories, which have features such as "snapshots", a way to always +use the latest version of a dependency as opposed to a fixed version. +Obviously, this is horrible for reproducibility. Additionally, Gradle +doesn't offer a way to export the list of dependency URLs and hashes (it +does in a way, but it's far from being complete, and as such is useless +for nixpkgs). Even if did, it would be annoying to use considering +fetching non-Gradle dependendencies in Gradle scripts is commonplace. + +That's why the setup hook uses mitm-cache, a program designed for +intercepting all HTTP requests, recording all the files that were +accessed, creating a Nix derivation with all of them, and then allowing +the Gradle derivation to access these files. + +## Maven Repositories + +(Reference: [Repository +Layout](https://cwiki.apache.org/confluence/display/MAVENOLD/Repository+Layout+-+Final)) + +Most of Gradle dependencies are fetched from Maven repositories. For +each dependency, Gradle finds the first repo where it can successfully +fetch that dependency, and uses that repo for it. Different repos might +actually return different files for the same artifact because of e.g. +pom normalization. Different repos may be used for the same artifact +even across a single package (for example, if two build scripts define +repositories in a different order). + +The artifact metadata is specified in a .pom file, and the artifacts +themselves are typically .jar files. The URL format is as follows: + +`////-[-].` + +For example: + +- `https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom` +- `https://oss.sonatype.org/content/groups/public/com/tobiasdiez/easybind/2.2.1-SNAPSHOT/easybind-2.2.1-20230117.075740-16.pom` + +Where: + +- `` is the repo base (`https://repo.maven.apache.org/maven2`) +- `` is the group ID with dots replaced with slashes + (`org.slf4j` -> `org/slf4j`) +- `` is the artifact ID (`slf4j-api`) +- `` is the artifact version (`2.0.9` for normal + artifacts, `2.2.1-SNAPSHOT` for snapshots) +- `` is the artifact version - can be either `` + or `--` (`2.0.9` for normal + artifacts, and either `2.2.1-SNAPSHOT` or `2.2.1-20230117.075740-16` + for snapshots) + - `` - `` without the `-SNAPSHOT` suffix + - `` - artifact build timestamp in the `YYYYMMDD.HHMMSS` + format (UTC) + - `` - a counter that's incremented by 1 for each new + snapshot build +- `` is an optional classifier for allowing a single .pom to + refer to multiple .jar files. .pom files don't have classifiers, as + they describe metadata. +- `` is the extension. .pom + +Note that the artifact ID can contain `-`, so you can't extract the +artifact ID and version from just the file name. + +Additionally, the files in the repository may have associated signature +files, formed by appending `.asc` to the filename, and hashsum files, +formed by appending `.md5` or `.sha1` to the filename. The signatures +are harmless, but the `.md5`/`.sha1` files are rejected. + +The reasoning is as follows - consider two files `a.jar` and `b.jar`, +that have the same hash. Gradle will fetch `a.jar.sha1`, find out that +it hasn't yet downloaded a file with this hash, and then fetch `a.jar`, +and finally download `b.jar.sha1`, locate it in its cache, and then +*not* download `b.jar`. This means `b.jar` won't be stored in the MITM +cache. Then, consider that on a later invocation, the fetching order +changed, whether it was because of a running on different system, +changed behavior after a Gradle update, or any other source of +nondeterminism - `b.jar` is fetched before `a.jar`. Gradle will first +fetch `b.jar.sha1`, not find it in its cache, attempt to fetch `b.jar`, +and fail, as the cache doesn't have that file. + +For the same reason, the proxy strips all checksum/etag headers. An +alternative would be to make the proxy remember previous checksums and +etags, but that would complicate the implementation - however, such a +feature can be implemented if necessary. Note that checksum/etag header +stripping is hardcoded, but `.md5/.sha1` file rejection is configured +via CLI arguments. + +**Caveat**: Gradle .module files also contain file hashes, in md5, sha1, +sha256, sha512 formats. It posed no problem as of yet, but it might in +the future. If it does pose problems, the deps derivation code can be +extended to find all checksums in .module files and copy existing files +there if their hash matches. + +## Snapshots + +Snapshots are a way to publish the very latest, unstable version of a +dependency that constantly changes. Any project that depends on a +snapshot will depend on this rolling version, rather than a fixed +version. It's easy to understand why this is a bad idea for reproducible +builds. Still, they can be dealt with by the logic in `gradle.fetchDeps` +and `gradle.updateDeps`. + +First, as you can see above, while normal artifacts have the same +`base-version` and `version`, for snapshots it usually (but not +necessarily) differs. + +Second, for figuring out where to download the snapshot, Gradle consults +`maven-metadata.xml`. With that in mind... + +## Maven Metadata + +(Reference: [Maven +Metadata](https://maven.apache.org/repositories/metadata.html), +[Metadata](https://maven.apache.org/ref/3.9.8/maven-repository-metadata/repository-metadata.html) + +Maven metadata files are called `maven-metadata.xml`. + +There are three levels of metadata: "G level", "A level", "V level", +representing group, artifact, or version metadata. + +G level metadata is currently unsupported. It's only used for Maven +plugins, which Gradle presumably doesn't use. + +A level metadata is used for getting the version list for an artifact. +It's an xml with the following items: + +- `` - group ID +- `` - artifact ID +- `` + - `` - the very latest base version (e.g. `2.2.1-SNAPSHOT`) + - `` - the latest non-snapshot version + - `` - the version list, each in a `` tag + - `` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + +V level metadata is used for listing the snapshot versions. It has the +following items: + +- `` - group ID +- `` - artifact ID +- `` + - `` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + - `` - info about the latest snapshot version + - `` - build timestamp (UTC, `YYYYMMDD.HHMMSS`) + - `` - build number + - `` - the list of all available snapshot file info, + each info is enclosed in a `` + - `` - classifier (optional) + - `` - file extension + - `` - snapshot version (as opposed to base version) + - `` - snapshot build timestamp (UTC, `YYYYMMDDHHMMSS`) + +## Lockfile Format + +The mitm-cache lockfile format is described in the [mitm-cache +README](https://github.com/chayleaf/mitm-cache#readme). + +The nixpkgs Gradle lockfile format is more complicated: + +```json +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames/gdx-controllers": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + } + } +} +``` + +`!comment` is a human-readable description explaining what the file is, +`!version` is the lockfile version (note that while it shares the name +with mitm-cache's `!version`, they don't actually have to be in sync and +can be bumped separately). + +The other keys are parts of a URL. Each URL is split into three parts. +They are joined like this: `/.`. + +Some URLs may have a `#` in them. In that case, the part after `#` is +parsed as `#/[/SNAPSHOT][/].` and +expanded into +`//-[-].`. + +Each URL has a value associated with it. The value may be: + +- an SRI hash (string) +- for `maven-metadata.xml` - an attrset containing the parts of the + metadata that can't be generated in Nix code (e.g. `groupId`, which is + challenging to parse from a URL because it's not always possible to + discern where the repo base ends and the group ID begins). + +`compress-deps-json.py` converts the JSON from mitm-cache format into +nixpkgs Gradle lockfile format. `fetch.nix` does the opposite. + +## Security Considerations + +Lockfiles won't be human-reviewed. They must be tampering-resistant. +That's why it's imperative that nobody can inject their own contents +into the lockfiles. + +This is achieved in a very simple way - the `deps.json` only contains +the following: + +- `maven-metadata.xml` URLs and small pieces of the contained metadata + (most of it will be generated in Nix, i.e. the area of injection is + minimal, and the parts that aren't generated in Nix are validated). +- artifact/other file URLs and associated hashes (Nix will complain if + the hash doesn't match, and Gradle won't even access the URL if it + doesn't match) + +Please be mindful of the above when working on Gradle support for +nixpkgs. diff --git a/pkgs/development/tools/build-managers/gradle/compress-deps-json.py b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py new file mode 100644 index 000000000000..6397892835ad --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py @@ -0,0 +1,163 @@ +import json +import sys + +from typing import Dict, Set + +# this compresses MITM URL lists with Gradle-specific optimizations +# specifically, it splits each url into up to 3 parts - they will be +# concatenated like part1/part2.part3 or part1.part2 +# part3 is simply always the file extension, but part1 and part2 is +# optimized using special heuristics +# additionally, if part2 ends with /a/b/{a}-{b}, the all occurences of +# /{a}/{b}/ are replaced with # +# finally, anything that ends with = is considered SHA256, anything that +# starts with http is considered a redirect URL, anything else is +# considered text + +with open(sys.argv[1], "rt") as f: + data: dict = json.load(f) + +new_data: Dict[str, Dict[str, Dict[str, dict]]] = {} + +for url, info in data.items(): + if url == "!version": + continue + ext, base = map(lambda x: x[::-1], url[::-1].split(".", 1)) + if base.endswith(".tar"): + base = base[:-4] + ext = "tar." + ext + # special logic for Maven repos + if ext in ["jar", "pom", "module"]: + comps = base.split("/") + if "-" in comps[-1]: + # convert base/name/ver/name-ver into base#name/ver + + filename = comps[-1] + name = comps[-3] + basever = comps[-2] + ver = basever + is_snapshot = ver.endswith("-SNAPSHOT") + if is_snapshot: + ver = ver.removesuffix("-SNAPSHOT") + if filename.startswith(f"{name}-{ver}"): + if is_snapshot: + if filename.startswith(f"{name}-{ver}-SNAPSHOT"): + ver += "-SNAPSHOT" + else: + ver += "-".join( + filename.removeprefix(f"{name}-{ver}").split("-")[:3] + ) + comp_end = comps[-1].removeprefix(f"{name}-{ver}") + else: + ver, name, comp_end = None, None, None + if name and ver and (not comp_end or comp_end.startswith("-")): + base = "/".join(comps[:-1]) + "/" + base = base.replace(f"/{name}/{basever}/", "#") + base += f"{name}/{ver}" + if is_snapshot: + base += "/SNAPSHOT" + if comp_end: + base += "/" + comp_end[1:] + scheme, rest = base.split("/", 1) + if scheme not in new_data.keys(): + new_data[scheme] = {} + if rest not in new_data[scheme].keys(): + new_data[scheme][rest] = {} + if "hash" in info.keys(): + new_data[scheme][rest][ext] = info["hash"] + elif "text" in info.keys() and ext == "xml": + # nix code in fetch-deps.nix will autogenerate metadata xml files groupId + # is part of the URL, but it can be tricky to parse as we don't know the + # exact repo base, so take it from the xml and pass it to nix + xml = "".join(info["text"].split()) + new_data[scheme][rest][ext] = { + "groupId": xml.split("")[1].split("")[0], + } + if "" in xml: + new_data[scheme][rest][ext]["release"] = xml.split("")[1].split( + "" + )[0] + if "" in xml: + latest = xml.split("")[1].split("")[0] + if latest != new_data[scheme][rest][ext].get("release"): + new_data[scheme][rest][ext]["latest"] = latest + if "" in xml: + new_data[scheme][rest][ext]["lastUpdated"] = xml.split("")[ + 1 + ].split("")[0] + else: + raise Exception("Unsupported key: " + repr(info)) + +# At this point, we have a map by part1 (initially the scheme), part2 (initially a +# slash-separated string without the scheme and with potential # substitution as +# seen above), extension. +# Now, push some segments from "part2" into "part1" like this: +# https # part1 +# domain1/b # part2 +# domain1/c +# domain2/a +# domain2/c +# -> +# https/domain1 # part1 +# b # part2 +# c +# https/domain2 # part1 +# a # part2 +# c +# This helps reduce the lockfile size because a Gradle project will usually use lots +# of files from a single Maven repo + +data = new_data +changed = True +while changed: + changed = False + new_data = {} + for part1, info1 in data.items(): + starts: Set[str] = set() + # by how many bytes the file size will be increased (roughly) + lose = 0 + # by how many bytes the file size will be reduced (roughly) + win = 0 + # how many different initial part2 segments there are + count = 0 + for part2, info2 in info1.items(): + if "/" not in part2: + # can't push a segment from part2 into part1 + count = 0 + break + st = part2.split("/", 1)[0] + if st not in starts: + lose += len(st) + 1 + count += 1 + starts.add(st) + win += len(st) + 1 + if count == 0: + new_data[part1] = info1 + continue + # only allow pushing part2 segments into path1 if *either*: + # - the domain isn't yet part of part1 + # - the initial part2 segment is always the same + if count != 1 and "." in part1: + new_data[part1] = info1 + continue + # some heuristics that may or may not work well (originally this was + # used when the above if wasn't here, but perhaps it's useless now) + lose += (count - 1) * max(0, len(part1) - 4) + if win > lose or ("." not in part1 and win >= lose): + changed = True + for part2, info2 in info1.items(): + st, part3 = part2.split("/", 1) + new_part1 = part1 + "/" + st + if new_part1 not in new_data.keys(): + new_data[new_part1] = {} + new_data[new_part1][part3] = info2 + else: + new_data[part1] = info1 + data = new_data + +new_data["!comment"] = "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual." # type: ignore +new_data["!version"] = 1 # type: ignore + +with open(sys.argv[2], "wt") as f: + json.dump(new_data, f, sort_keys=True, indent=1) + f.write("\n") diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 32bd64d2f0e3..7567b3e3dba1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -130,6 +130,7 @@ rec { ''; }; }; + passthru.jdk = defaultJava; meta = with lib; { inherit platforms; @@ -179,4 +180,43 @@ rec { hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; + + wrapGradle = { + lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook + }: + gradle-unwrapped: + lib.makeOverridable (args: + let + gradle = gradle-unwrapped.override args; + in symlinkJoin { + name = "gradle-${gradle.version}"; + + paths = [ + (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { + name = "setup-hook.sh"; + files = [ + (mitm-cache.setupHook) + (substituteAll { + src = ./setup-hook.sh; + # jdk used for keytool + inherit (gradle) jdk; + init_script = ./init-build.gradle; + }) + ]; + })) + gradle + mitm-cache + ]; + + passthru = { + fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; + inherit (gradle) jdk; + }; + + meta = gradle.meta // { + # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook + # and passthru + priority = (gradle.meta.priority or 0) + 1; + }; + }) { }; } diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix new file mode 100644 index 000000000000..f4485609f65f --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -0,0 +1,222 @@ +{ mitm-cache +, lib +, pkgs +, stdenv +, callPackage +}: + +let + getPkg = attrPath: + lib.getAttrFromPath + (lib.splitString "." (toString attrPath)) + pkgs; +in +# the derivation to fetch/update deps for +{ pkg ? getPkg attrPath +, pname ? null +, attrPath ? pname +# bwrap flags for the update script (this will be put in bash as-is) +# this is relevant for downstream users +, bwrapFlags ? "--ro-bind \"$PWD\" \"$PWD\"" +# deps path (relative to the package directory, or absolute) +, data +# redirect stdout to stderr to allow the update script to be used with update script combinators +, silent ? true +, useBwrap ? stdenv.isLinux +} @ attrs: + +let + data' = builtins.removeAttrs + (if builtins.isPath data then lib.importJSON data + else if builtins.isString data then lib.importJSON "${dirOf pkg.meta.position}/${data}" + else data) + [ "!comment" "!version" ]; + + parseArtifactUrl = url: let + extension = lib.last (lib.splitString "." url); + splitUrl = lib.splitString "/" url; + artifactId = builtins.elemAt splitUrl (builtins.length splitUrl - 3); + baseVer = builtins.elemAt splitUrl (builtins.length splitUrl - 2); + filename = builtins.elemAt splitUrl (builtins.length splitUrl - 1); + filenameNoExt = lib.removeSuffix ".${extension}" filename; + verCls = lib.removePrefix "${artifactId}-" filenameNoExt; + in rec { + inherit artifactId baseVer filename extension; + isSnapshot = lib.hasSuffix "-SNAPSHOT" baseVer; + version = + if isSnapshot && !lib.hasPrefix "SNAPSHOT" verCls + then builtins.concatStringsSep "-" (lib.take 3 (lib.splitString "-" verCls)) + else baseVer; + classifier = + if verCls == version then null + else lib.removePrefix "${version}-" verCls; + # for snapshots + timestamp = builtins.elemAt (lib.splitString "-" version) 1; + buildNum = builtins.elemAt (lib.splitString "-" version) 2; + }; + + parseMetadataUrl = url: let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + vMeta = lib.hasSuffix "-SNAPSHOT" xmlBase; + splitBase = lib.splitString "/" xmlBase; + in + if vMeta then { + vMeta = true; + baseVer = builtins.elemAt splitBase (builtins.length splitBase - 1); + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 2); + } else { + vMeta = false; + baseVer = null; + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 1); + }; + + extractHashArtifact = afterHash: let + nameVer = builtins.match "([^/]*)/([^/]*)(/SNAPSHOT)?(/.*)?" afterHash; + artifactId = builtins.elemAt nameVer 0; + version = builtins.elemAt nameVer 1; + isSnapshot = builtins.elemAt nameVer 2 != null; + cls = builtins.elemAt nameVer 3; + in rec { + inherit artifactId version isSnapshot; + baseVer = + if !isSnapshot then version + else builtins.head (builtins.match "(.*)-([^-]*)-([^-]*)" version) + "-SNAPSHOT"; + classifier = + if cls == null then null + else lib.removePrefix "/" cls; + clsSuf = + if classifier == null then "" + else "-${classifier}"; + }; + + # replace base#name/ver with base/name/ver/name-ver + decompressNameVer = prefix: let + splitHash = lib.splitString "#" (builtins.concatStringsSep "/" prefix); + inherit (extractHashArtifact (lib.last splitHash)) artifactId baseVer version clsSuf; + in + if builtins.length splitHash == 1 then builtins.head splitHash + else builtins.concatStringsSep "/${artifactId}/${baseVer}/" (lib.init splitHash ++ [ "${artifactId}-${version}${clsSuf}" ]); + + # `visit` all elements in attrs and merge into a set + # attrs will be passed as parent1, parent1 will be passed as parent2 + visitAttrs = parent1: prefix: attrs: + builtins.foldl' + (a: b: a // b) + {} + (lib.mapAttrsToList (visit parent1 attrs prefix) attrs); + + # convert a compressed deps.json into an uncompressed json used for mitm-cache.fetch + visit = parent2: parent1: prefix: k: v: + # groupId being present means this is a metadata xml "leaf" and we shouldn't descend further + if builtins.isAttrs v && !v?groupId + then visitAttrs parent1 (prefix ++ [k]) v + else let + url = "${decompressNameVer prefix}.${k}"; + in { + ${url} = + if builtins.isString v then { hash = v; } + else { + text = let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + meta = parseMetadataUrl url // v; + inherit (meta) groupId vMeta artifactId baseVer; + + fileList = builtins.filter (x: lib.hasPrefix xmlBase x && x != url) (builtins.attrNames finalData); + jarPomList = map parseArtifactUrl fileList; + sortedJarPomList = + lib.sort + (a: b: lib.splitVersion a.version < lib.splitVersion b.version) + jarPomList; + + uniqueVersionFiles = + builtins.map ({ i, x }: x) + (builtins.filter ({ i, x }: i == 0 || (builtins.elemAt sortedJarPomList (i - 1)).version != x.version) + (lib.imap0 (i: x: { inherit i x; }) sortedJarPomList)); + uniqueVersions' = map (x: x.version) uniqueVersionFiles; + releaseVersions = map (x: x.version) (builtins.filter (x: !x.isSnapshot) uniqueVersionFiles); + latestVer = v.latest or v.release or (lib.last uniqueVersions'); + releaseVer = v.release or (lib.last releaseVersions); + + # The very latest version isn't necessarily used by Gradle, so it may not be present in the MITM data. + # In order to generate better metadata xml, if the latest version is known but wasn't fetched by Gradle, + # add it anyway. + uniqueVersions = + uniqueVersions' + ++ lib.optional (!builtins.elem releaseVer uniqueVersions') releaseVer + ++ lib.optional (!builtins.elem latestVer uniqueVersions' && releaseVer != latestVer) latestVer; + + lastUpdated = v.lastUpdated or + (if vMeta then builtins.replaceStrings ["."] [""] snapshotTs + else "20240101123456"); + + # the following are only used for snapshots + snapshotTsAndNum = lib.splitString "-" latestVer; + snapshotTs = builtins.elemAt snapshotTsAndNum 1; + snapshotNum = lib.last snapshotTsAndNum; + + indent = x: s: builtins.concatStringsSep "\n" (map (s: x + s) (lib.splitString "\n" s)); + containsSpecialXmlChars = s: builtins.match ''.*[<>"'&].*'' s != null; + in + # make sure all user-provided data is safe + assert lib.hasInfix "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}" url; + assert !containsSpecialXmlChars groupId; + assert !containsSpecialXmlChars lastUpdated; + if vMeta then '' + + + ${groupId} + ${artifactId} + ${baseVer} + + + ${snapshotTs} + ${snapshotNum} + + ${lastUpdated} + + ${builtins.concatStringsSep "\n" (map (x: indent " " '' + ${ + lib.optionalString + (x.classifier != null) + "\n ${x.classifier}" + } + ${x.extension} + ${x.version} + ${builtins.replaceStrings ["."] [""] x.timestamp} + '') sortedJarPomList)} + + + + '' + else + assert !containsSpecialXmlChars latestVer; + assert !containsSpecialXmlChars releaseVer; + '' + + + ${groupId} + ${artifactId} + + ${latestVer} + ${releaseVer} + + ${builtins.concatStringsSep "\n" (map (x: " ${x}") uniqueVersions)} + + ${lastUpdated} + + + ''; + }; + }; + + finalData = visitAttrs {} [] data'; +in + mitm-cache.fetch { + name = "${pkg.pname or pkg.name}-deps"; + data = finalData // { "!version" = 1; }; + passthru = lib.optionalAttrs (!builtins.isAttrs data) { + updateScript = callPackage ./update-deps.nix { } { + inherit pkg pname attrPath bwrapFlags data silent useBwrap; + }; + }; + } diff --git a/pkgs/development/tools/build-managers/gradle/init-build.gradle b/pkgs/development/tools/build-managers/gradle/init-build.gradle new file mode 100644 index 000000000000..3c3ee8162449 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-build.gradle @@ -0,0 +1,8 @@ +gradle.projectsLoaded { + rootProject.allprojects { + tasks.withType(AbstractArchiveTask) { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/init-deps.gradle b/pkgs/development/tools/build-managers/gradle/init-deps.gradle new file mode 100644 index 000000000000..2cb577efaec9 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-deps.gradle @@ -0,0 +1,10 @@ +gradle.projectsLoaded { + rootProject.allprojects { + task nixDownloadDeps { + doLast { + configurations.findAll{it.canBeResolved}.each{it.resolve()} + buildscript.configurations.findAll{it.canBeResolved}.each{it.resolve()} + } + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/pkgs/development/tools/build-managers/gradle/setup-hook.sh new file mode 100644 index 000000000000..a16742414b12 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/setup-hook.sh @@ -0,0 +1,70 @@ +gradleConfigureHook() { + if [ -z "${GRADLE_USER_HOME-}" ]; then + GRADLE_USER_HOME="$(mktemp -d)" + fi + export GRADLE_USER_HOME + export TERM=dumb + gradleFlagsArray+=(--no-daemon --console plain --init-script "${gradleInitScript:-@init_script@}") + if [ -n "${MITM_CACHE_CA-}" ]; then + if [ -z "${MITM_CACHE_KEYSTORE-}" ]; then + MITM_CACHE_KEYSTORE="$MITM_CACHE_CERT_DIR/keystore" + MITM_CACHE_KS_PWD="$(head -c10 /dev/random | base32)" + echo y | @jdk@/bin/keytool -importcert -file "$MITM_CACHE_CA" -alias alias -keystore "$MITM_CACHE_KEYSTORE" -storepass "$MITM_CACHE_KS_PWD" + fi + gradleFlagsArray+=(-Dhttp.proxyHost="$MITM_CACHE_HOST" -Dhttp.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Dhttps.proxyHost="$MITM_CACHE_HOST" -Dhttps.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Djavax.net.ssl.trustStore="$MITM_CACHE_KEYSTORE" -Djavax.net.ssl.trustStorePassword="$MITM_CACHE_KS_PWD") + else + gradleFlagsArray+=(--offline) + fi + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + fi + if ! [[ -v enableParallelChecking ]]; then + enableParallelChecking=1 + fi + if ! [[ -v enableParallelUpdating ]]; then + enableParallelUpdating=1 + fi +} + +gradle() { + command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@" +} + +gradleBuildPhase() { + runHook preBuild + + gradle ${enableParallelBuilding:+--parallel} ${gradleBuildTask:-assemble} + + runHook postBuild +} + +gradleCheckPhase() { + runHook preCheck + + gradle ${enableParallelChecking:+--parallel} ${gradleCheckTask:-test} + + runHook postCheck +} + +gradleUpdateScript() { + runHook preBuild + runHook preGradleUpdate + + gradle ${enableParallelUpdating:+--parallel} ${gradleUpdateTask:-nixDownloadDeps} + + runHook postGradleUpdate +} + +if [ -z "${dontUseGradleConfigure-}" ]; then + preConfigureHooks+=(gradleConfigureHook) +fi + +if [ -z "${dontUseGradleBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=gradleBuildPhase +fi + +if [ -z "${dontUseGradleCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=gradleCheckPhase +fi diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix new file mode 100644 index 000000000000..5d6222fb11c4 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix @@ -0,0 +1,122 @@ +{ lib +, runtimeShell +, srcOnly +, writeTextFile +, writeShellScript +, path +, bubblewrap +, coreutils +, curl +, jq +, mitm-cache +, nix +, openssl +, procps +, python3 +}: + +lib.makeOverridable +({ pkg, pname, attrPath, bwrapFlags, data, silent, useBwrap }: +let + keep = [ "MITM_CACHE_HOST" "MITM_CACHE_PORT" "MITM_CACHE_ADDRESS" "MITM_CACHE_CA" "MITM_CACHE_CERT_DIR" ]; + gradleScript = writeShellScript "gradle-commands.sh" '' + set -eo pipefail + export http_proxy="$MITM_CACHE_ADDRESS" + export https_proxy="$MITM_CACHE_ADDRESS" + export SSL_CERT_FILE="$MITM_CACHE_CA" + export NIX_SSL_CERT_FILE="$MITM_CACHE_CA" + export GRADLE_USER_HOME="$(${coreutils}/bin/mktemp -d)" + export IN_GRADLE_UPDATE_DEPS=1 + trap "${coreutils}/bin/rm -rf '$GRADLE_USER_HOME'" SIGINT SIGTERM ERR EXIT + cd "$(${coreutils}/bin/mktemp -d)" + ${coreutils}/bin/mkdir out + export out="$PWD/out" + trap "${coreutils}/bin/rm -rf '$PWD'" SIGINT SIGTERM ERR EXIT + source "$stdenv/setup" + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} configurePhase gradleUpdateScript" genericBuild + ''; + source = srcOnly (pkg.overrideAttrs (old: { + mitmCache = ""; + gradleInitScript = ./init-deps.gradle; + })); + sourceDrvPath = builtins.unsafeDiscardOutputDependency source.drvPath; + nixShellKeep = lib.concatMapStringsSep " " (x: "--keep ${x}") keep; +in +writeTextFile { + name = "fetch-deps.sh"; + executable = true; + # see pkgs/common-updater/combinators.nix + derivationArgs.passthru = + { supportedFeatures = lib.optional silent "silent"; } + // lib.optionalAttrs (attrPath != null) { inherit attrPath; }; + text = '' + #!${runtimeShell} + set -eo pipefail + export PATH="${lib.makeBinPath [ + bubblewrap coreutils curl jq mitm-cache openssl + procps python3.pkgs.ephemeral-port-reserve + ]}:$PATH" + outPath="${ + # if this is an absolute path in nix store, use path relative to the store path + if lib.hasPrefix "${builtins.storeDir}/" (toString data) + then builtins.concatStringsSep "/" (lib.drop 1 (lib.splitString "/" (lib.removePrefix "${builtins.storeDir}/" (toString data)))) + # if this is an absolute path anywhere else, just use that path + else if lib.hasPrefix "/" (toString data) + then toString data + # otherwise, use a path relative to the package + else "${dirOf pkg.meta.position}/${data}" + }" + + pushd "$(mktemp -d)" >/dev/null + MITM_CACHE_DIR="$PWD" + trap "rm -rf '$MITM_CACHE_DIR'" SIGINT SIGTERM ERR EXIT + openssl genrsa -out ca.key 2048 + openssl req -x509 -new -nodes -key ca.key -sha256 -days 1 -out ca.cer -subj "/C=AL/ST=a/L=a/O=a/OU=a/CN=example.org" + export MITM_CACHE_HOST=127.0.0.1 + export MITM_CACHE_PORT="''${mitmCachePort:-$(ephemeral-port-reserve "$MITM_CACHE_HOST")}" + export MITM_CACHE_ADDRESS="$MITM_CACHE_HOST:$MITM_CACHE_PORT" + # forget all redirects - this makes the lockfiles predictable + # not only does this strip CDN URLs, but it also improves security - since the redirects aren't + # stored in the lockfile, a malicious actor can't change the redirect URL stored in the lockfile + mitm-cache \ + -l"$MITM_CACHE_ADDRESS" \ + record \ + --reject '\.(md5|sha(1|256|512:?):?)$' \ + --forget-redirects-from '.*' \ + --record-text '/maven-metadata\.xml$' >/dev/null 2>/dev/null & + MITM_CACHE_PID="$!" + # wait for mitm-cache to fully start + for i in {0..20}; do + ps -p "$MITM_CACHE_PID" >/dev/null || (echo "Failed to start mitm-cache" && exit 1) + curl -so/dev/null "$MITM_CACHE_ADDRESS" && break + [[ "$i" -eq 20 ]] && (echo "Failed to start mitm-cache" && exit 1) + sleep 0.5 + done + trap "kill '$MITM_CACHE_PID'" SIGINT SIGTERM ERR EXIT + export MITM_CACHE_CERT_DIR="$PWD" + export MITM_CACHE_CA="$MITM_CACHE_CERT_DIR/ca.cer" + popd >/dev/null + useBwrap="''${USE_BWRAP:-${toString useBwrap}}" + if [ -n "$useBwrap" ]; then + # bwrap isn't necessary, it's only used to prevent messy build scripts from touching ~ + bwrap \ + --unshare-all --share-net --clearenv --chdir / --setenv HOME /homeless-shelter \ + --tmpfs /home --bind /tmp /tmp --ro-bind /nix /nix --ro-bind /run /run --proc /proc --dev /dev \ + --ro-bind ${toString path} ${toString path} --bind "$MITM_CACHE_CERT_DIR" "$MITM_CACHE_CERT_DIR" \ + ${builtins.concatStringsSep " " (map (x: "--setenv ${x} \"\$${x}\"") keep)} \ + --setenv NIX_BUILD_SHELL bash ${bwrapFlags} ''${BWRAP_FLAGS:-} \ + -- ${nix}/bin/nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + else + NIX_BUILD_SHELL=bash nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + fi${lib.optionalString silent " >&2"} + kill -s SIGINT "$MITM_CACHE_PID" + for i in {0..20}; do + # check for valid json + if jq -e 1 "$MITM_CACHE_DIR/out.json" >/dev/null 2>/dev/null; then + exec ${python3.interpreter} ${./compress-deps-json.py} "$MITM_CACHE_DIR/out.json" "$outPath" + fi + sleep 1 + done + exit 1 + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d26f1cdcd4af..1f6c9df2fc42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18575,10 +18575,17 @@ with pkgs; inherit jdk11 jdk17 jdk21; }; gradleGen = gradle-packages.gen; - gradle_6 = callPackage gradle-packages.gradle_6 { }; - gradle_7 = callPackage gradle-packages.gradle_7 { }; - gradle_8 = callPackage gradle-packages.gradle_8 { }; - gradle = gradle_8; + wrapGradle = callPackage gradle-packages.wrapGradle { }; + + gradle_6-unwrapped = callPackage gradle-packages.gradle_6 { }; + gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { }; + gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { }; + gradle-unwrapped = gradle_8-unwrapped; + + gradle_6 = wrapGradle gradle_6-unwrapped; + gradle_7 = wrapGradle gradle_7-unwrapped; + gradle_8 = wrapGradle gradle_8-unwrapped; + gradle = wrapGradle gradle-unwrapped; grcov = callPackage ../development/tools/misc/grcov { }; From 27d8261b6d9e72d6fbaad5e18c87b9ba394e4e39 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 30 Jun 2024 13:06:26 +0700 Subject: [PATCH 163/562] openjfx: move derivations into separate dirs --- .../openjdk/openjfx/{11.nix => 11/default.nix} | 0 .../openjdk/openjfx/{15.nix => 15/default.nix} | 0 .../openjdk/openjfx/{17.nix => 17/default.nix} | 0 .../openjdk/openjfx/{19.nix => 19/default.nix} | 0 .../openjdk/openjfx/{20.nix => 20/default.nix} | 0 .../openjdk/openjfx/{21.nix => 21/default.nix} | 0 .../openjdk/openjfx/{22.nix => 22/default.nix} | 0 pkgs/top-level/java-packages.nix | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/compilers/openjdk/openjfx/{11.nix => 11/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{15.nix => 15/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{17.nix => 17/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{19.nix => 19/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{20.nix => 20/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{21.nix => 21/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{22.nix => 22/default.nix} (100%) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/11.nix rename to pkgs/development/compilers/openjdk/openjfx/11/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/15.nix rename to pkgs/development/compilers/openjdk/openjfx/15/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17.nix rename to pkgs/development/compilers/openjdk/openjfx/17/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/19.nix rename to pkgs/development/compilers/openjdk/openjfx/19/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/20.nix rename to pkgs/development/compilers/openjdk/openjfx/20/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/21.nix rename to pkgs/development/compilers/openjdk/openjfx/21/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/22.nix rename to pkgs/development/compilers/openjdk/openjfx/22/default.nix diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index c80d6c28f840..fcea99ac50f9 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -3,13 +3,13 @@ with pkgs; let - openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; - openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; - openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; - openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; - openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21.nix { }; - openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22.nix { }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15 { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { }; + openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19 { }; + openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20 { }; + openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { }; + openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { }; in { inherit openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22; From e6f8a3babaadc3e1560e5143610cf1098fee4a77 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 30 Jun 2024 13:07:05 +0700 Subject: [PATCH 164/562] openjfx: convert to gradle setup hook --- .../compilers/openjdk/openjfx/11/default.nix | 138 ++++++--------- .../compilers/openjdk/openjfx/11/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/15/default.nix | 127 +++++--------- .../compilers/openjdk/openjfx/15/deps.json | 92 ++++++++++ .../compilers/openjdk/openjfx/17/default.nix | 130 +++++--------- .../compilers/openjdk/openjfx/17/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/19/default.nix | 160 +++++++----------- .../compilers/openjdk/openjfx/19/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/20/default.nix | 134 +++++---------- .../compilers/openjdk/openjfx/20/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/21/default.nix | 134 +++++---------- .../compilers/openjdk/openjfx/21/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/22/default.nix | 114 +++++-------- .../compilers/openjdk/openjfx/22/deps.json | 152 +++++++++++++++++ 14 files changed, 1336 insertions(+), 605 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/openjfx/11/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/15/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/17/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/19/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/20/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/21/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/22/deps.json diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix index 22b844bb1d67..58bd8678c0de 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11/default.nix @@ -1,107 +1,71 @@ -{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby , openjdk11-bootstrap , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "11"; update = ".0.20"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradle_7.override { - java = openjdk11-bootstrap; - }); + jdk = openjdk11-bootstrap; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}-${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - substituteInPlace buildSrc/linux.gradle \ - --replace ', "-Werror=implicit-function-declaration"' "" - - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11-bootstrap.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + substituteInPlace buildSrc/linux.gradle \ + --replace ', "-Werror=implicit-function-declaration"' "" + + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -110,18 +74,16 @@ in makePackage { postFixup = '' # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - # Remove licenses, otherwise they may conflict with the ones included in the openjdk rm -rf $out/modules_legal/* ''; - disallowedReferences = [ openjdk11-bootstrap ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; # Uses a lot of RAM, OOMs otherwise requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11/deps.json b/pkgs/development/compilers/openjdk/openjfx/11/deps.json new file mode 100644 index 000000000000..7c8167124430 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/11/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.1.0": { + "jar": "sha256-vG3+7tCrp0MCqSCBH/1snkVlvviTzMOvg2Iz36s8UTo=", + "pom": "sha256-d7ysnMSDKiKSGJgng2ASB8yYvldcyIRDNtWuBzkbPuE=" + }, + "org/apache/lucene#lucene-grouping/7.1.0": { + "jar": "sha256-5wh/sGDRWa1xvW7p6W8BYGpaM1OgxJofHQ49oPUaTlo=", + "pom": "sha256-738k/3YjlZSfxMiDl1npJhD8mx8Nifmbtw+haHNh2Ec=" + }, + "org/apache/lucene#lucene-parent/7.1.0": { + "pom": "sha256-l7M9mcedTRIoIuWDY0cGvGmfRCvp3tksZiKdEn+WoAc=" + }, + "org/apache/lucene#lucene-queries/7.1.0": { + "jar": "sha256-qamOR/ueclsDerV+wZts4QVBIoTLXl2aGs99Xv8TSTY=", + "pom": "sha256-pvMWrRvMdKy3f3mP/AIKy9aD3nx5OUrFNgAdE6vktVY=" + }, + "org/apache/lucene#lucene-queryparser/7.1.0": { + "jar": "sha256-HNuCsiqq3bGJW9OjSVinyaOgb/0NZ6sskNvDegRshlQ=", + "pom": "sha256-K7m67AcL6g3a5aj1rrDOZlJpBeA4THS+18OrIJ52hdM=" + }, + "org/apache/lucene#lucene-sandbox/7.1.0": { + "jar": "sha256-wZA9Xag+IIZp2NkzdJeeFAIUNYsq32c1sa488kkJW+E=", + "pom": "sha256-WL5E6wSMD0If6eul+30xhr7gk7g72F4w5EKbbctVZMU=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.1.0": { + "pom": "sha256-3NW0Q/KK2QPk/wfTMigGxTF4BWuctNQU+2gMyArhGsU=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/15/default.nix b/pkgs/development/compilers/openjdk/openjfx/15/default.nix index 77c8e4678d6c..bc032a349a76 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg_4-headless, python3, ruby , withMedia ? true @@ -6,115 +6,80 @@ }: let + pname = "openjfx-modular-sdk"; major = "15"; update = ".0.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_6.override { - java = openjdk11_headless; - }); + jdk = openjdk11_headless; + gradle = gradle_6; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11_headless.home} - '' + args.gradleProperties or ""); - - env.NIX_CFLAGS_COMPILE = toString [ - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - - # gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - "-fcommon" - ]; - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + # avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + export NIX_CFLAGS_COMPILE="-DGLIB_DISABLE_DEPRECATION_WARNINGS $NIX_CFLAGS_COMPILE" + # gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + export NIX_CFLAGS_COMPILE="-fcommon $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; - stripDebugList = [ "." ]; postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk11_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk11_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/15/deps.json b/pkgs/development/compilers/openjdk/openjfx/15/deps.json new file mode 100644 index 000000000000..efc8ffa4331f --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/15/deps.json @@ -0,0 +1,92 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.8.2": { + "jar": "sha256-oqosO7K3LadsPmpxUx8e79w1BJSBm68rHYDXFG4CD54=", + "pom": "sha256-3znTTR9YMLLYqSeQxmtXmDWLCz4BRS3IWzciqIGtkj4=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.2": { + "jar": "sha256-gUOKydZ4BQxUbSqEEsxyg6XSD9hcNxQhhEfHWBZZT10=", + "pom": "sha256-MPuqRu1exVS+3nILqReeEqTnQVHh+IaSBJbYREuwVZE=" + }, + "org/apache/lucene#lucene-grouping/7.7.2": { + "jar": "sha256-nKhrWw/YSbq50xpk7RvP8cdTGrHP1z/E/tJDBmX7rUo=", + "pom": "sha256-UezgO9APIm2uObABf5OZPPfXbSju8LQl+MzborrBs3w=" + }, + "org/apache/lucene#lucene-parent/7.7.2": { + "pom": "sha256-fXiTJSgZw4Sx0lvUA6Go85DYUF+VQOHigRcZymjP7zQ=" + }, + "org/apache/lucene#lucene-queries/7.7.2": { + "jar": "sha256-n8XsO17OwtKV0/xM+Dc5LfuWntYegaMr0/3SH4DbfHk=", + "pom": "sha256-D4rAB9QDQb6gD3/s7m1Ewu7ZXQTi66KEf2CBJJLOcoQ=" + }, + "org/apache/lucene#lucene-queryparser/7.7.2": { + "jar": "sha256-v9lKUL8FAf0H5prk9J28FJzjaUoFZrsWTXxui+VeK9Q=", + "pom": "sha256-DmVV70KT9yjEqJhOuuNUK+N7KThK/gcQjPy+R/AS3Us=" + }, + "org/apache/lucene#lucene-sandbox/7.7.2": { + "jar": "sha256-dqY72JMAjr7tJJeePyUIXIkJ/0vEEv33iAJfntoKvhE=", + "pom": "sha256-zwJCiBB2rdYRwEPZZPtrduPRnAQn7/r/Qhc6ZQ+Bk5s=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.2": { + "pom": "sha256-a0oZeEo3uKoSdf5mCEZKHZvSlLVv6WgRIgfkDEKETqc=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix index 00fa6af725e5..b61ad29c4a85 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17/default.nix @@ -1,104 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand +, ffmpeg_4-headless, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "17"; update = ".0.11"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - java = openjdk17_headless; - }); + jdk = openjdk17_headless; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk17_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -107,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk17_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/development/compilers/openjdk/openjfx/17/deps.json new file mode 100644 index 000000000000..a9fa40a91be1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/19/default.nix b/pkgs/development/compilers/openjdk/openjfx/19/default.nix index 38720efaba54..4aaf71114f59 100644 --- a/pkgs/development/compilers/openjdk/openjfx/19/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/19/default.nix @@ -1,121 +1,81 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, fetchpatch, writeText , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "19"; update = ".0.2.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk19_headless; + gradle = gradle_7; - icuVersionWithSep = s: "68${s}2"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; - }; - - patches = [ - # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; - hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; - }) - # ditto - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; - hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; - }) - ]; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk19_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + patches = [ + # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; + hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; + }) + # ditto + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; + hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; + }) + ]; - gradleProperties = '' + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -124,16 +84,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk19_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk19_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/19/deps.json b/pkgs/development/compilers/openjdk/openjfx/19/deps.json new file mode 100644 index 000000000000..04a58b347da9 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/19/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-68-2/icu4c-68.2-data-bin-l": { + "zip": "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/20/default.nix b/pkgs/development/compilers/openjdk/openjfx/20/default.nix index 0aa7b262e834..277ee7ad70c4 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20/default.nix @@ -1,108 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "20"; update = ".0.2"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk20_headless; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx20u"; - rev = repover; - hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk20_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx20u"; + rev = repover; + hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -111,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk20_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk20_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/20/deps.json b/pkgs/development/compilers/openjdk/openjfx/20/deps.json new file mode 100644 index 000000000000..a9fa40a91be1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/20/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix index ee262eb8b950..dfb1a76b6976 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21/default.nix @@ -1,108 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "21"; update = ".0.3"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk21_headless; + gradle = gradle_7; - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx21u"; - rev = repover; - hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx21u"; + rev = repover; + hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -111,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk21_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/development/compilers/openjdk/openjfx/21/deps.json new file mode 100644 index 000000000000..ec1816339f40 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/21/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix index c34ff0466895..ce9d49c14bbb 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix @@ -1,8 +1,7 @@ { stdenv , lib +, pkgs , fetchFromGitHub -, fetchurl -, runCommand , writeText , openjdk21_headless , gradle @@ -24,90 +23,57 @@ }: let + pname = "openjfx-modular-sdk"; major = "22"; update = ".0.1"; build = "-ga"; repover = "${major}${update}${build}"; + jdk = openjdk21_headless; - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx22u"; - rev = repover; - hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-2I7LvYcudlB4DKJ/wEiTjY6nICUxUY52euosUqOA+Bs="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx22u"; + rev = repover; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; }; -in -makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -116,16 +82,14 @@ makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk21_headless openjdk21_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json new file mode 100644 index 000000000000..9ce577967ae2 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/22/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 89cb3894ffa6b4548b792d403188d9c1d9fa4297 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 28 Jun 2024 10:49:44 +0700 Subject: [PATCH 165/562] ghidra: convert to gradle setup hook --- .../tools/security/ghidra/build-extension.nix | 14 +- pkgs/tools/security/ghidra/build.nix | 84 +- pkgs/tools/security/ghidra/deps.json | 754 ++++++++++++++++++ 3 files changed, 767 insertions(+), 85 deletions(-) create mode 100644 pkgs/tools/security/ghidra/deps.json diff --git a/pkgs/tools/security/ghidra/build-extension.nix b/pkgs/tools/security/ghidra/build-extension.nix index 373f35784e54..ce84287a8bd6 100644 --- a/pkgs/tools/security/ghidra/build-extension.nix +++ b/pkgs/tools/security/ghidra/build-extension.nix @@ -23,21 +23,13 @@ let gradle ]; - buildPhase = args.buildPhase or '' - runHook preBuild - + preBuild = '' # Set project name, otherwise defaults to directory name echo -e '\nrootProject.name = "${pname}"' >> settings.gradle - - export GRADLE_USER_HOME=$(mktemp -d) - gradle \ - --offline \ - --no-daemon \ - -PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra - - runHook postBuild ''; + gradleFlags = [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ]; + installPhase = args.installPhase or '' runHook preInstall diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 3c739602514c..3a1fca3c393b 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -4,7 +4,6 @@ lib, callPackage, gradle_7, - perl, makeBinaryWrapper, openjdk17, unzip, @@ -76,69 +75,6 @@ let HERE ''; - # Adds a gradle step that downloads all the dependencies to the gradle cache. - addResolveStep = '' - cat >>build.gradle < - subProject.buildscript.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") - } - subProject.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "config \''${configuration.name}") - } - } - } - } - void resolveConfiguration(subProject, configuration, name) { - if (configuration.canBeResolved) { - logger.info("Resolving project {} {}", subProject.name, name) - configuration.resolve() - } - } - HERE - ''; - - # fake build to pre-download deps into fixed-output derivation - # Taken from mindustry derivation. - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches; - - postPatch = addResolveStep; - - nativeBuildInputs = [ - gradle - perl - ] ++ lib.optional stdenv.isDarwin xcbuild; - buildPhase = '' - runHook preBuild - export HOME="$NIX_BUILD_TOP/home" - mkdir -p "$HOME" - export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'" - export GRADLE_USER_HOME="$HOME/.gradle" - - # First, fetch the static dependencies. - gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk17} -I gradle/support/fetchDependencies.gradle init - - # Then, fetch the maven dependencies. - gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk17} resolveDependencies - runHook postBuild - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - runHook preInstall - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/maven/$x/$3/$4/$5" #e' \ - | sh - cp -r dependencies $out/dependencies - runHook postInstall - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-66gL4UFlBUo2JIEOXoF6tFvXtBdEX4b2MeSrV1b6Vg4="; - }; in stdenv.mkDerivation (finalAttrs: { inherit @@ -187,20 +123,20 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; - buildPhase = '' - runHook preBuild - export HOME="$NIX_BUILD_TOP/home" - mkdir -p "$HOME" - export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'" + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - ln -s ${deps}/dependencies dependencies + gradleFlags = [ "-Dorg.gradle.java.home=${openjdk17}" ]; - sed -i "s#mavenLocal()#mavenLocal(); maven { url '${deps}/maven' }#g" build.gradle - - gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17} buildGhidra - runHook postBuild + preBuild = '' + export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home" + gradle -I gradle/support/fetchDependencies.gradle init ''; + gradleBuildTask = "buildGhidra"; + installPhase = '' runHook preInstall diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json new file mode 100644 index 000000000000..994b25ef434e --- /dev/null +++ b/pkgs/tools/security/ghidra/deps.json @@ -0,0 +1,754 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://archive.eclipse.org": { + "tools/cdt/releases/8.6/cdt-8.6.0": { + "zip": "sha256-gbfRnVfEowCfR2FpmnLo1kK14dklHSu5jfQ4seKPi6k=" + } + }, + "https://files.pythonhosted.org/packages": { + "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": { + "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io=" + }, + "2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any": { + "whl": "sha256-gc8eM91mfdIX3FahIzJnluZ5m4Vp8sbvt4wWN1yvmys=" + }, + "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": { + "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA=" + }, + "83/1c/25b79fc3ec99b19b0a0730cc47356f7e2959863bf9f3cd314332bddb4f68/pywin32-306-cp312-cp312-win_amd64": { + "whl": "sha256-NyV3lMGtOe6b5lLaBGLcLjlMgVnf2ROopOjrb9NG2g4=" + }, + "8d/14/619e24a4c70df2901e1f4dbc50a6291eb63a759172558df326347dce1f0d/protobuf-3.20.3-py2.py3-none-any": { + "whl": "sha256-p8ptSIqo/38ynUxUWy262KwxRk8dixyHrRNGcXcx5Ns=" + }, + "90/c7/6dc0a455d111f68ee43f27793971cf03fe29b6ef972042549db29eec39a2/psutil-5.9.8": { + "tar.gz": "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw=" + }, + "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": { + "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8=" + }, + "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": { + "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU=" + } + }, + "https://ftp.postgresql.org": { + "pub/source/v15.3/postgresql-15.3": { + "tar.gz": "sha256-CG04Uz4odHlmpNXx546kMuM6ePIdy5EzAQ7LUYn62Yw=" + } + }, + "https://github.com": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x64": { + "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x86": { + "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x64": { + "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x86": { + "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x64": { + "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x86": { + "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x64": { + "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x86": { + "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x64": { + "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x86": { + "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/lib/java-sarif-2.1-modified": { + "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" + }, + "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": { + "zip": "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg=" + } + }, + "https://repo.maven.apache.org/maven2": { + "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { + "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", + "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { + "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", + "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + }, + "com/beust#jcommander/1.64": { + "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", + "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + }, + "com/formdev#flatlaf/3.2.1": { + "jar": "sha256-fYMX/hOyYIiZTWZmOvjofBI5DugIf3unS2hjj0pV9EA=", + "module": "sha256-kU7FLZBJj8ctFju0F1UhHnW7yfy3ip5wTZn/Mvfzywg=", + "pom": "sha256-uKf+YYO269HIAaqwdGnF2UFRQFSftLdpkqyALuJeGtE=" + }, + "com/github/rotty3000#phidias/0.3.7": { + "jar": "sha256-yNB2DOOw7RRT1DW83THjTwvjrAkCTn4amLijzr9Ka7U=", + "pom": "sha256-FY+kDQZfFCR5B7aSIiRY152eFjsTz1tfrHvgIkLMK60=" + }, + "com/github/tomnelson#jungrapht-layout/1.4": { + "jar": "sha256-owQBKdw57SMms2yhXGNEIu5XmkYXhmj5lELjiz5gcJk=", + "pom": "sha256-TO0lLb8YrUWTvoW6bWycCdvB7tZEjZtZneziavTnyN4=" + }, + "com/github/tomnelson#jungrapht-visualization-parent/1.4": { + "pom": "sha256-s5gyFq8VA62ryVOkKXKO1kpORbvDj++2wgOiiUPCq+w=" + }, + "com/github/tomnelson#jungrapht-visualization/1.4": { + "jar": "sha256-lwU6HdLNqyY/tWEfG8grhiswmflR480FZOPiPRk/Tdg=", + "pom": "sha256-YE8saHqHsq0L90QETPJmynWuKdPPCa383C5WEjDOtoY=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.2.0": { + "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", + "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.2.0": { + "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.7.0": { + "jar": "sha256-29oheMFO1rk6GEsay/ONchBwAiUmaMERz0EeyjfkHKY=", + "pom": "sha256-6BYywu6apI5+zwVHUSwcOGVgwNRqlY7lBVD3693xNRc=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/19.0": { + "pom": "sha256-O3b/Q+zfEPdNo25KritHDJ0GPgU8XKAm9VEq6U8cPhA=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.0.1-jre": { + "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + }, + "com/google/guava#guava-parent/27.1-android": { + "pom": "sha256-1oF79aZ2AKOTpoA9UfR8159KXth1cqg3K++S4nNRgXI=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/19.0": { + "pom": "sha256-rdwGTafxB3/fTckOWqqIfNeQhQ0bdP4ubiXV94VRrGM=" + }, + "com/google/guava#guava/27.0.1-jre": { + "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", + "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + }, + "com/google/guava#guava/27.1-android": { + "pom": "sha256-KUYNJundBml2Ak+RJoMlzxHzkScNiPi1MewGQqNbwNw=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/protobuf#protobuf-bom/3.17.3": { + "pom": "sha256-bf431vImF9VqQUzNrf+NmFhaH3kXEr6HbCYWZxDR2N0=" + }, + "com/google/protobuf#protobuf-bom/3.21.8": { + "pom": "sha256-+7Ds/DyjGFddtifjOuRUwT1qTcp68UXRTT9m4IY8PPo=" + }, + "com/google/protobuf#protobuf-gradle-plugin/0.8.18": { + "jar": "sha256-RP2JrzepsvHdQcCUqbtzPAe/f8eg4jhooQuvbjUfpeA=", + "pom": "sha256-Gwqekab09LYqWmB4wibudwqo3FdnueRzwvwY8KOImAQ=" + }, + "com/google/protobuf#protobuf-java/3.17.3": { + "jar": "sha256-SsVJsZJpQUGVgEnwYKHIJqMzQvYZ4QjO2MF9mHf14+0=", + "pom": "sha256-Km8izVJli4uxTBANs+F5NT+MNR0ENzo79voKOzlGStw=" + }, + "com/google/protobuf#protobuf-java/3.21.8": { + "jar": "sha256-C4WBrYENLfrv0Nz78VabFFBEhlAjjX4v1rF2yTLQjJU=", + "pom": "sha256-OJBUBuApx6MYaW8O4RnFXM7HizN+oR5MMZWfDgardAg=" + }, + "com/google/protobuf#protobuf-parent/3.17.3": { + "pom": "sha256-T09Q5moqvM/o7SCbU/q3C4k+NfQ77FqB98GESbY+hrE=" + }, + "com/google/protobuf#protobuf-parent/3.21.8": { + "pom": "sha256-bHKyrDl1sAnR5FdQlVnp+onyV4vShD3LTWo+XPgRFws=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/h2database#h2/2.2.220": { + "jar": "sha256-l4q4YwGNP5ZeOIgFccNik+qLEKgIYZQVnE1dILUPClc=", + "pom": "sha256-tbp8XBcINbyupnWMWfo8EOvNepx5LiWzm4a559X72Mo=" + }, + "com/jcraft#jsch/0.1.55": { + "jar": "sha256-1JKxWm0uo/HMOcQiyVPEDBIokHPb6DYNmMD2+ex0/EQ=", + "pom": "sha256-dHx0jR8BBx6j0PhHb2jUqCOjE7dycB2FUck+qqV/n5k=" + }, + "com/opencsv#opencsv/5.4": { + "jar": "sha256-n94e8+VEQE406u4V5L97p0uANV15gJOwUk1jpZk2JCs=", + "pom": "sha256-uGQpmn0KIQIKgxaZQ499P4VAirJKNOkR+qmf9oTrdv0=" + }, + "com/oracle/labs/olcut#olcut-config-protobuf/5.2.0": { + "jar": "sha256-xmqG5GT9gi9xzu6JuSU3l8Pc/fZWxNsr+W2kceuXs8o=", + "pom": "sha256-JCBA8xgQ+I6pnGF7RUBrhmdtOvJa7jzZIoysQpd0zmk=" + }, + "com/oracle/labs/olcut#olcut-core/5.2.0": { + "jar": "sha256-5T6OCQrUJo0iqlPgaCu76rHIHiyoRBP6Q2AqQWP2vhk=", + "pom": "sha256-G912ta/r+7rg+FHQjJ46WmgwP40cMHY4rxuChHVvCgM=" + }, + "com/oracle/labs/olcut#olcut/5.2.0": { + "pom": "sha256-SRIriefVQhUkr5IsQrsnF0x7vhL2oKKWwiEJgIUW/B4=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "javax/help#javahelp/2.0.05": { + "jar": "sha256-/PSSLTj/hRhPHSMoMXu2CCbhTalIq9YG7j1bjGpw3r0=", + "pom": "sha256-uIEr4lGsoTl/S2pCO/Tt06KERONFOyIDtTSTNrmVgik=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "kr/motd/maven#os-maven-plugin/1.7.0": { + "jar": "sha256-lDBTUBpCnlPRxNYhUu7BJfo2Yg4NxmtzkKiVCXz96s4=", + "pom": "sha256-xPVqjuqlJp76BdsB4xMJBf9b24frKuPnZhVOmuoYO6Y=" + }, + "msv#isorelax/20050913": { + "jar": "sha256-NCcVJDHPf5Z/kuaeXKwWFHxdj7S05ainL1KReI78/4w=", + "pom": "sha256-u54IxYm/b2BxTQ+dMcLtdwPK9nf+muOSFrzKt3SkfNk=" + }, + "msv#msv/20050913": { + "jar": "sha256-FL46VQ5QhDO0/hB3XVQOnrWLPvBO10Vrx8fShckMh6I=", + "pom": "sha256-eoaknOHugXmjgCLiMZHkjPW1fkEEr2tXSJ3bjN7GoNY=" + }, + "msv#relaxngDatatype/20050913": { + "jar": "sha256-TUWpPrXNwyYxlmZzyVS4P8m2CgaBu93O+ixJdtBM3fI=", + "pom": "sha256-F/kF72gZZRismj53oNXlGY1g9D/8kEsiCcoEZhfyLfk=" + }, + "msv#xsdlib/20050913": { + "jar": "sha256-a476GP9XDAkW2nAsRpBrnooTnhwF2/Hk2L3rokTBsrM=", + "pom": "sha256-Ti8Z4AifVdrd/gOXbyhwCXvAaJcWVQ/p3r10KwrKZ5Y=" + }, + "net/java/dev/javacc#javacc/5.0": { + "jar": "sha256-cRExYbyM9mQVFVQcKBgCi4fHjsLo/6p1MXaG7giWe4k=", + "pom": "sha256-lBZg1Hgi+cDYDUDqBtSYH83CuHzGJTgbVF79fmtEnO8=" + }, + "net/java/dev/jna#jna-platform/5.14.0": { + "jar": "sha256-rkys6zhAcwwlN/m3+1WgG6ulgChrQSKVFIi87lWMJEk=", + "pom": "sha256-bLoOBPnuyxZIYAB5O7J+EDsPTQSF4FVOK0wK7RPS7RY=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/java/dev/timingframework#timingframework/1.0": { + "jar": "sha256-dGHpJGw7BRkWRaf5TBBGgMwxhlu02RIIKsAv93Egz0s=", + "pom": "sha256-EHm33r9dRb/PyG6euBCvHRhqN11glaDpHKKM2a8pwtA=" + }, + "net/sf/jung#jung-algorithms/2.1.1": { + "jar": "sha256-7ROOL2srLxOvYaE/F4i85vHeiFjELucKfUHmKDk3owo=", + "pom": "sha256-INw/C+7taPkCw/AtO6qJ8eI0xNSWeyIS15HBjw/a6Qs=" + }, + "net/sf/jung#jung-api/2.1.1": { + "jar": "sha256-bLc1ljw21RVdDeXxmgNIW5om5nVQ4WCz3YkAmm9RaU4=", + "pom": "sha256-3vtMVoVkg6Trdxnh4WiqYKtjnkPJJRKGZYNzLyPxOgs=" + }, + "net/sf/jung#jung-graph-impl/2.1.1": { + "jar": "sha256-SRHaBNd7T3u0ZaZa48w6AAyuTVK1h5EePAtMS2Q0k8E=", + "pom": "sha256-DXLiLd6PiBAEu7aagzjuxtnpGTlg9BRDOBlhYPhJqLQ=" + }, + "net/sf/jung#jung-parent/2.1.1": { + "pom": "sha256-os5T0/ynH/HQQ3FfmhowSo5KrhwGRa2QOMrkxSE2i+Q=" + }, + "net/sf/jung#jung-visualization/2.1.1": { + "jar": "sha256-kzuibCMIw79FZsOCiXm2itdCJyRXFxLlrw3odr3/oq4=", + "pom": "sha256-ayUROtpk+JgoOQmGsyWE0nNsBE+7iVz1Bo6BQWo9l+w=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", + "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-dbcp2/2.9.0": { + "jar": "sha256-iHcgkSxcu83/bg4h1QNJN1Vfj/xZc4Hv+Pp38zzm1k4=", + "pom": "sha256-XtPwH1ee+0xru81m9VnpwV6ZwUCVeeAZG7pUHF/meYY=" + }, + "org/apache/commons#commons-lang3/3.11": { + "pom": "sha256-mA1mXYP+0EZlE08FeOUHRCoOdQaRBzeEORsKeYhySnU=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-lang3/3.9": { + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/51": { + "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-pool2/2.11.1": { + "jar": "sha256-6gUF7nUV5YsawOaG5NGl2ffYCOJRphvDcaoFlbmWP4M=", + "pom": "sha256-wbsCmUpK34loDfepitujPFUnaDAUJy1liFuzA27NSMM=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apache/commons#commons-text/1.8": { + "pom": "sha256-9s/bqlnHCtfj/r5xTgkRmQFWrAkFKV2PKjt1HgXlmhI=" + }, + "org/apache/commons#commons-text/1.9": { + "pom": "sha256-n5IWz8lE3KeC5jEdYnV/13Fk/mfaKbWPAVaH+gn0QFA=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.69": { + "jar": "sha256-QIN20Xqqh4nnrNBV/kBCiaEfozX9fGinUykEn7fSjtI=", + "pom": "sha256-WrvkytLCMJR0ZvsgmiJn48xqDTgKajGRWVnTqtm4F2w=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcutil-jdk15on/1.69": { + "jar": "sha256-KeQOJGbQQNgqbw6ZY10LwrujqUJRz3k5zwtpMhyu/Ak=", + "pom": "sha256-p2e8fzQtGTKJfso8i6zHAEygOAv6dSnyOpc0VJZcffw=" + }, + "org/checkerframework#checker-compat-qual/2.5.2": { + "pom": "sha256-da9ztewybj29yUayH9RoAtXafGEsO/Hlh1N0yY1+pP0=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/checkerframework#checker-qual/3.31.0": { + "module": "sha256-UYkl4iqnmMH71voXwYN0aR8f57G+fdNw1Omv7us7Ds8=", + "pom": "sha256-Q1ecPr5H54NYp/MvlnN471YXWyKUszUYNYTwvSNZUjE=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.3.2": { + "jar": "sha256-+dWXnFx7oxN8d/QYR16wIYn4/Ip1+nP/w/8dEv6UVWc=", + "pom": "sha256-ywU3vsxjUsFUcz22+v0JAPlYRgOgsLnPjyJFVjEs2+E=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/jacoco#org.jacoco.agent/0.8.11": { + "jar": "sha256-0+2F3qeKntVYRqdzjjoMoVxwLGYe5LyMv+Aqi59KmcA=", + "pom": "sha256-FuBen0liG4fFPmk1AUDzxG1C2WbGepM730sGOiscj8U=" + }, + "org/jacoco#org.jacoco.ant/0.8.11": { + "jar": "sha256-gdfriJDZvjCpOWEsKVYDVBBjUpzdA6UyZaunRHS3C3w=", + "pom": "sha256-ftED2VnQzue6v7Ewf6bkUbFpb/01JwYVU7VQ3lUgHYU=" + }, + "org/jacoco#org.jacoco.build/0.8.11": { + "pom": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws=" + }, + "org/jacoco#org.jacoco.core/0.8.11": { + "jar": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c=", + "pom": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E=" + }, + "org/jacoco#org.jacoco.report/0.8.11": { + "jar": "sha256-g5MpWuJGgO0QytgzOQcED5KLhxMySRWBylvHhOLLT74=", + "pom": "sha256-jjtzR3nV4/1oPsAVQT1S+WGYTFDLkEX9orI7/160I4E=" + }, + "org/jdom#jdom-legacy/1.1.3": { + "jar": "sha256-Ar1hpyXor5sBdrQ78pgW0MdIuKuVE4W9EnvjdIkyWgo=", + "pom": "sha256-bWWTi3CxFyMBy0LY5l7gVzpXHtOfOvEBOp5ukp/flow=" + }, + "org/jgrapht#jgrapht-core/1.5.1": { + "jar": "sha256-pNgQy2Pgp3p1PRRwlP6p3ULoLPxXqiifn4UinyYEO7Q=", + "pom": "sha256-KknxKWxTwJ4OCiVdogMgVq3fKlu6WFyAF3Eg/IELQRM=" + }, + "org/jgrapht#jgrapht-io/1.5.1": { + "jar": "sha256-hsf8ZswZB7/CazZtTdKSzQ2ihr3h/QiKEcDZcp1tzFw=", + "pom": "sha256-jMvAH5otyMV0llX6FSck3dJ8FIIpxWeV+CC7V6GEp4g=" + }, + "org/jgrapht#jgrapht/1.5.1": { + "pom": "sha256-X9k28p0qw4blfbTL+JtZLFth3GpA03qhUw9eVLNQx9I=" + }, + "org/jheaps#jheaps/0.13": { + "jar": "sha256-Y0FCkMNJf4rA8QIgkgcIjexG/UdH4PVqJsaTCOhcZBU=", + "pom": "sha256-SH2xJbFxCY4/qDOFNaxZR2kirCxFK1ehTTz2YfIohDA=" + }, + "org/jline#jline-builtins/3.20.0": { + "jar": "sha256-prFPiYOXb7Sd67PZ6KFb+V9yTXFp8TFaYu+lin+omeI=", + "pom": "sha256-9T2EkbSNrQfnIR8M5BIhS5un25YmYZAxsqhvgMgrZrE=" + }, + "org/jline#jline-parent/3.20.0": { + "pom": "sha256-cXjGACAsS8Jux6S2IlXu829wVsrSpeYjnFdL7qXCEMo=" + }, + "org/jline#jline-reader/3.20.0": { + "jar": "sha256-rNHJTR4iiqe3li9psh7Tqf2CjrOmPkuvkIaVTmJq8fA=", + "pom": "sha256-2fF+3XIcAqExcgN21sB4eHgutrb6/rX/QkBKtXFD4TY=" + }, + "org/jline#jline-style/3.20.0": { + "jar": "sha256-C7ERYF4BAM6E05YfMLQNqgiOnC7FxnHn75D0L2rdBrY=", + "pom": "sha256-48nFXt7Ob0ru5jplYjiaS++NA1j6iq3GdKPeZR4w4ao=" + }, + "org/jline#jline-terminal-jansi/3.20.0": { + "jar": "sha256-wX/++o8GDa79OPJXRAcOQI9LrFPD6BOuoZKMxgcmD+Q=", + "pom": "sha256-Q3JhhBr0j5oZT9WygHJSCKds+jzKFgBAx6QoDrAn2+s=" + }, + "org/jline#jline-terminal/3.20.0": { + "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=", + "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.8.0-M1": { + "module": "sha256-vgUUcTA6UD9MIkZwdbJ0kEE3fd1tWoywc53tZ9kW2C0=", + "pom": "sha256-dxREMv/Gi9mKeQqxBpYZ2RAyz8Dk4TwIFjqgPaNv1uI=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/osgi#org.osgi.core/5.0.0": { + "jar": "sha256-tEDGv/KGMyr89crgZ7YGli52HA3wDl/Yp0bwsxJlYZs=", + "pom": "sha256-4AHZl0MYUeq4uTOLW32f5eaOGutDpYV5JLChWIbuNjk=" + }, + "org/osgi#org.osgi.util.promise/1.3.0": { + "jar": "sha256-cFPFfn19iP7GuQl5o68SXh0ruEcmijKKLx7WWtCkwYU=", + "pom": "sha256-rcyK9ce+Z7BSEF4Mncq43ibaxvGbxamrcpRqMydscQA=" + }, + "org/ow2#ow2/1.3": { + "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.6": { + "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + }, + "org/ow2/asm#asm-commons/9.6": { + "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-debug-all/5.0.3": { + "jar": "sha256-KWk1asHkD+QUGUjFY2kCOPXXnXaux/2HNTaGejMe3oE=", + "pom": "sha256-nJnXpVVyW8L4N5l3k1zboW1ofZyTtuByXhlhgNSQyZU=" + }, + "org/ow2/asm#asm-parent/5.0.3": { + "pom": "sha256-wu2r9BKKU030uLSwubVi6U8kK6lawk3GFIVDK4oYjjI=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/postgresql#postgresql/42.6.2": { + "jar": "sha256-gmKXVPMJwLVx0dQLp0+wU4VfhjdSpGyjB8ez5YYMSy4=", + "pom": "sha256-/5dcZtbZSN/YKp6SbsER7eldPkyRo6DYaQ8xox45NMY=" + }, + "org/python#jython-standalone/2.7.3": { + "jar": "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ=", + "pom": "sha256-moD1I2PkBVnKxMjaKsX4uil3ksbpEmN7dIUfKjMHDNI=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-nop/1.7.25": { + "jar": "sha256-bLEnE49Btahp+ezdBhrRd5mg4/5yBGAHlxVOsEMu6xI=", + "pom": "sha256-ogpNV7z++b2sp9EVliwN58lEa+TUZre9MNXxmkWc9Jk=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/smali#baksmali/2.5.2": { + "jar": "sha256-HtI2Jm19xJB6reCxmjT3fvrCU0K2PIrOUuV5A5lBs4k=", + "module": "sha256-g+59x3oek4+5BtaNfUPiRX8s+Im7HecuqtcJJDVfpbU=", + "pom": "sha256-8FzZiasE/SboahreXCGauEgovqfebryA/Bd7YtJ1k4g=" + }, + "org/smali#dexlib2/2.5.2": { + "jar": "sha256-WlyJgti9fW47saBxMEnjx4txnsMrIPa2GYhc7DCg3WE=", + "module": "sha256-5XDKZe/asrKMAq2P34W9hSIGZrkkuJXKW+r1fXKGiDw=", + "pom": "sha256-BWB6NSDN841drl0MQZZRKjhWpA3rlTny/OCGNalut44=" + }, + "org/smali#util/2.5.2": { + "jar": "sha256-T1gKnP8+u4PLP9IL7Ijjfk8YN5bKZScymSYRYgKC2uo=", + "module": "sha256-rRt+JSAWcAXJFp2Gv8z/JvXF+b8Ls/qyRMtIIWU9wmE=", + "pom": "sha256-IKx+12/5cPUQB6IPrIvbon7IeUT9Kb2oxnQJZ5LJFFE=" + }, + "org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/tribuo#tribuo-classification-core/4.2.0": { + "jar": "sha256-+vv5OnIrmrVC7oeaX09lF5bkyuobZ5gNVWL+jdjbqeY=", + "pom": "sha256-gLgGCPTPN93HLmioPGBRyupwvqF+96hTCfWeqdpzBPE=" + }, + "org/tribuo#tribuo-classification-tree/4.2.0": { + "jar": "sha256-uVozLZJI7RKVgxdkTNQ9cubdit4KJPnKTlLaB72sY6c=", + "pom": "sha256-OrTlGe48n3lzd3MirS7EaR5j1kovRxiR4A1BGQdY2jw=" + }, + "org/tribuo#tribuo-classification/4.2.0": { + "pom": "sha256-SqINxWFbgU86wjq3xB+s+LpCKbPuzSwa/KeL3/kntcU=" + }, + "org/tribuo#tribuo-common-tree/4.2.0": { + "jar": "sha256-34iqIWT+X60ITLIxl7LgodbBPk7QbuXCGXausNuVfOk=", + "pom": "sha256-DbCNldwWEPdn/AehmZqXlhVxALozjH4JA2jMVN5NIHU=" + }, + "org/tribuo#tribuo-common/4.2.0": { + "pom": "sha256-GAZzLdQd51aq3tY2v7qZSD00J72diyAvEEJcr84iykk=" + }, + "org/tribuo#tribuo-core/4.2.0": { + "jar": "sha256-NFwzfcKHjsdQJJgqqwZycZtznnGOc9eisu/ottXQCb8=", + "pom": "sha256-XkjLxuPn9x+wYPSWdPTXbCLcKEe9flflVCY7+5gYpZ0=" + }, + "org/tribuo#tribuo-data/4.2.0": { + "jar": "sha256-m8EQCFnODOBCDNbfbOdna25DxSKEXUKGz5FIUmgtYz0=", + "pom": "sha256-SMm4+bX7Nd5toLwWhuMLStMkS6UWMCNw1fqGd1ixruA=" + }, + "org/tribuo#tribuo-math/4.2.0": { + "jar": "sha256-7NZdhI/2SIAXBLm6D3CmRtQDAgy97SYf1zVIGkeWVRI=", + "pom": "sha256-iCAlohj3F9hakTNsztSg+08CsjFcppZy0oqCc3uWhVE=" + }, + "org/tribuo#tribuo-util-onnx/4.2.0": { + "jar": "sha256-ohcAq4nLB1/OT8UkA1n5HMj4t/JCiS1lsD+oda0s3Vs=", + "pom": "sha256-Q19d8ELZieF6QHPjcFa++ChKUrw3zIZeF5Xvi7U5KUw=" + }, + "org/tribuo#tribuo-util-tokenization/4.2.0": { + "jar": "sha256-b0TzDZ0g6amwscMHAbcrPeXtofbXbZXanWkHQmVXdoI=", + "pom": "sha256-6GAT6tT7c0apQghWqMAX/g7aAlhmu0w935AK2JLi/Tg=" + }, + "org/tribuo#tribuo-util/4.2.0": { + "pom": "sha256-saxG0eBU4acgcz0cMeBMaIxxJb+mIN7RpEQ9BdNMma8=" + }, + "org/tribuo#tribuo/4.2.0": { + "pom": "sha256-mMQFMwnY7vg2fAbCAmyDHkqwS3nOny0hrGrrKE2dNZQ=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + } + }, + "https://sourceforge.net/projects": { + "pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": { + "zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk=" + }, + "yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09": { + "zip": "sha256-Ta5zKlNYRq5d+rdT6CpNX5OtmgWgZeIXK7l3ShsVRTo=" + } + }, + "https://storage.googleapis.com": { + "google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2": { + "jar": "sha256-AO0Djrarr23eyNICo+16gbUhRY9M1FmUgRXP0C/1nW0=" + } + } +} From 6d3d9669766d4ea0af819de52d20708386456565 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 6 Dec 2023 06:28:22 +0700 Subject: [PATCH 166/562] jabref: convert to gradle setup hook --- pkgs/applications/office/jabref/default.nix | 88 +- pkgs/applications/office/jabref/deps.json | 2143 +++++++++++++++++++ 2 files changed, 2159 insertions(+), 72 deletions(-) create mode 100644 pkgs/applications/office/jabref/deps.json diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 286ab63cbd0a..96ff199f964d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -9,18 +9,9 @@ , gtk3 , jdk , gradle -, perl , python3 }: -let - versionReplace = { - easybind = { - snapshot = "2.2.1-SNAPSHOT"; - pin = "2.2.1-20230117.075740-16"; - }; - }; -in stdenv.mkDerivation rec { version = "5.13"; pname = "jabref"; @@ -47,36 +38,12 @@ stdenv.mkDerivation rec { }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2/ -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; postPatch = '' - # Pin the version - substituteInPlace build.gradle \ - --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ - 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' - # Disable update check substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \ --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ @@ -85,30 +52,6 @@ stdenv.mkDerivation rec { # Find OpenOffice/LibreOffice binary substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \ --replace '/usr' '/run/current-system/sw' - - # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326 - cat <> build.gradle - task downloadDependencies { - description "Pre-downloads *most* dependencies" - doLast { - configurations.getAsMap().each { name, config -> - println "Retrieving dependencies for $name" - try { - config.files - } catch (e) { - // some cannot be resolved, just log them - project.logger.info e.message - } - } - } - } - EOF - ''; - - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle ''; nativeBuildInputs = [ @@ -124,19 +67,13 @@ stdenv.mkDerivation rec { python3 ]; - buildPhase = '' - runHook preBuild + gradleFlags = [ + "-PprojVersion=${version}" + "-Dorg.gradle.java.home=${jdk}" + ]; - export GRADLE_USER_HOME=$(mktemp -d) - gradle \ - --offline \ - --no-daemon \ - -PprojVersion="${version}" \ - -PprojVersionInfo="${version} NixOS" \ - -Dorg.gradle.java.home=${jdk} \ - assemble - - runHook postBuild + preBuild = '' + gradleFlagsArray+=(-PprojVersionInfo="${version} NixOS") ''; dontWrapGApps = true; @@ -178,6 +115,13 @@ stdenv.mkDerivation rec { ln -sf $out/bin/JabRef $out/bin/jabref ''; + gradleUpdateScript = '' + runHook preBuild + + gradle nixDownloadDeps -Dos.arch=amd64 + gradle nixDownloadDeps -Dos.arch=aarch64 + ''; + meta = with lib; { description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; diff --git a/pkgs/applications/office/jabref/deps.json b/pkgs/applications/office/jabref/deps.json new file mode 100644 index 000000000000..6b510245eb29 --- /dev/null +++ b/pkgs/applications/office/jabref/deps.json @@ -0,0 +1,2143 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io/com/github/sialcasa": { + "mvvmFX#mvvmfx-parent/f195849ca9": { + "pom": "sha256-5nTE66pGjgRswUpwK3guGpZb5iI4/2kmYy+wtGIsSz0=" + }, + "mvvmFX#mvvmfx-validation/f195849ca9": { + "jar": "sha256-Q3dcLohYshPQP3jWb0/Wh6IENg4CGn9Tl8tVvRHVhO0=", + "pom": "sha256-MplYnkdrZQ8ptd0PuUqUcWe6SwKaoM4VdOOV1KMAPvs=" + } + }, + "https://oss.sonatype.org/content/groups/public/com": { + "tobiasdiez#easybind/2.2.1-20230117.075740-16/SNAPSHOT": { + "jar": "sha256-eubEgC/aixBe3Ho3QWBsJltPkWwmSRFGdlpx/0dl158=", + "module": "sha256-tgPZPbaK5Hy7JDPg3Yo5dh/zn+av+bgvbmklypPYZqc=", + "pom": "sha256-NudbADyHMI49AKmZi2KOYbTzRW/uuPdiYDDJcwEEPhA=" + }, + "tobiasdiez/easybind/2.2.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.tobiasdiez", + "lastUpdated": "20230117075740" + } + } + }, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/4.0.0": { + "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=", + "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=", + "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE=" + }, + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": { + "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc=" + }, + "com/github/andygoossens#gradle-modernizer-plugin/1.9.2": { + "jar": "sha256-PTzh7ej2aFWPPQCOs+nbNiAcYgbDlZDmciyr1XlHnBk=", + "module": "sha256-fpPjWPi71bCrOGIfkBU2QZfSguUT85C+oWjfvKqfbss=", + "pom": "sha256-/jLkdoa/L/1ARpoP52+JmSmawj38yVpzyzDGf/hsKr4=" + }, + "com/github/andygoossens/modernizer#com.github.andygoossens.modernizer.gradle.plugin/1.9.2": { + "pom": "sha256-d45Z81rXBHHqcW+H8U+oFW1SuaUyJ4MlEFG6DnrRSy0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.7.3": { + "jar": "sha256-a0aS+ROiGx+2Axae54uo8+SrKvnXYq+cqIt5EmwcCtE=", + "pom": "sha256-hGDJUBJ8o1mHZhYeOLT/jWO01p+4MQoW4As1E1ABDBE=" + }, + "kr/motd/maven#os-maven-plugin/1.7.1": { + "jar": "sha256-9Hru+Ggh5SsrGHWJeL0EXwPXIikuMudHCCEixiKJUuA=", + "pom": "sha256-S3WABEIrljPdMY8p54Tx0YC9ilkgzVCvGTCGH21qVHY=" + }, + "me/champeau/jmh#jmh-gradle-plugin/0.7.2": { + "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=", + "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=", + "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8=" + }, + "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": { + "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/beryx#badass-jlink-plugin/3.0.1": { + "jar": "sha256-dgjXY18yKiLff//d+IiBuTngqBDuUmoqTFPFN7/WT4Y=", + "module": "sha256-b3ksJpweGUNdCWcOtY12cyOFm2Hpt9YcZLPMdHK8Qgo=", + "pom": "sha256-OwPpihIF17Spe7jcvlkCs6AW4D+FACDzkjuIWomh2zM=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.0.1": { + "pom": "sha256-MRg/jaYel0ILAf4NarvkrGfgYY5PxAEyfBu8HvoBCqw=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/javamodularity#moduleplugin/1.8.15": { + "jar": "sha256-TtYKjxlMndPuoesswP//5xo9gr+lr6YYszce8WDEdGI=", + "module": "sha256-rVmC0YlFvQQqTzjgQ+m2X90tdaek+LtlZ8ivt57NSPo=", + "pom": "sha256-BH+RV4mcE+kqwL9wlgswRdu77RoUOL6Y34YGIcjgk3A=" + }, + "org/javamodularity/moduleplugin#org.javamodularity.moduleplugin.gradle.plugin/1.8.15": { + "pom": "sha256-FL6DuFvFUx4otorZSr54f4wPPdBGThV0XPJc9Nbjc1k=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { + "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", + "pom": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.0": { + "jar": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4=", + "pom": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso=" + }, + "org/openjdk/jmh#jmh-core/1.37": { + "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=", + "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o=" + }, + "org/openjdk/jmh#jmh-parent/1.37": { + "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk=" + }, + "org/openjfx#javafx-plugin/0.1.0": { + "jar": "sha256-Xq7sB5m0QGRrDKTP2iGaMttr4rpXktAyoNpKOlw4j6s=", + "module": "sha256-rf+3RA0kntF8BJOD1nBp+UU7F3gncMAFtoKkNBbYNmE=", + "pom": "sha256-NMjfVSfrWjXl8AmjzeH3oInEzkoOclgC8uy+UDu9PLY=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.1.0": { + "pom": "sha256-1tASf/Q2PQAXPDV6mByec+/wPDCl0Ohq2CtgVPrvqEE=" + }, + "org/openrewrite#plugin/6.11.2": { + "jar": "sha256-dAt66QGZroKUlK4Jfib2q09UNzq0d3eC9yAUMyfL9fs=", + "module": "sha256-iA8IW7839ZimMSQz43weQHNo+4bEU9yqx6kC8n6u6n0=", + "pom": "sha256-RimWO6LSfL3l71E84EzahIQGwql6NevGzjV13W2fCYM=" + }, + "org/openrewrite#rewrite-bom/8.23.1": { + "pom": "sha256-8u0Wv2wmF542ps1nOlVp7peJ4Mrqlf0LCiEtVKJcTyI=" + }, + "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/6.11.2": { + "pom": "sha256-bWFob6WyvE+GbjsVgCm5iv3ZYtn6iw3k5xG+e10m4H4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "at/favre/lib#hkdf/1.1.0": { + "jar": "sha256-gexMVudA1EC8lCb6YAyu5Ku26fTO/1dunOznw4F8WgY=", + "pom": "sha256-HCRX381QzRlXEdO38sd7YLFf+8YukrOvxTujzKawfHg=" + }, + "com/dlsc#dlsc-maven-parent/1.2.0": { + "pom": "sha256-p8CBi7FQmIk6zmfeQXEziZyrn6ANUKNxDMQFmdaoQyA=" + }, + "com/dlsc/gemsfx#gemsfx/2.6.0": { + "jar": "sha256-aquYe1ejruKNQJPgtvxrm9RSicErcfs6qiYL//9zk24=", + "pom": "sha256-edvfx3x1xd6lOE8D6aJDizzq1e5ZJBCtls2Q2TzmZ8M=" + }, + "com/dlsc/gemsfx#parent/2.6.0": { + "pom": "sha256-nSHYQq+N0GgUmQ06p5Vtnsu+3BAua3y5Rser3CqNOZ8=" + }, + "com/dlsc/pickerfx#parent/1.2.0": { + "pom": "sha256-4lUHLdlg6zdXzIFKUCAi2JZ6qsn/65YQVIi1nVn6Bz4=" + }, + "com/dlsc/pickerfx#pickerfx/1.2.0": { + "jar": "sha256-Bb9i2x4nDgVrgCvnEgA2USFljBvuotFqgTGE8H9ZLSU=", + "pom": "sha256-9+Gvj6sKVXhyzq9XmHKtd4E3hsvr15iqGS8QD0BV6VQ=" + }, + "com/dlsc/unitfx#unitfx-parent/1.0.10": { + "pom": "sha256-z1bPD/5QLEIs94RW+7gVoiZHEnArhkw4YuLNaubj5wo=" + }, + "com/dlsc/unitfx#unitfx/1.0.10": { + "jar": "sha256-Sxhrmeu47j3uesKeevLS+/dkeQQ8cj+q1Zaad+WhnBg=", + "pom": "sha256-6v50YYv2uOH3NAVfC75ayZ7hfLkWxfW8AJppE0uCOb8=" + }, + "com/fasterxml#aalto-xml/1.3.2": { + "jar": "sha256-3PLV9FMFbDzoSMr/QXkCG/uDte+zo9d5Qzxb1wl2Bos=", + "pom": "sha256-5G98AijEtoWJ2njFJgySfvR5nydr9g5sGqxDOpjK9hw=" + }, + "com/fasterxml#oss-parent/35": { + "pom": "sha256-r8Be0hBk6srI3jACUwyxkiCL0RTrJIQX2tGIbL9UBW4=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/44": { + "pom": "sha256-PplVTpaDtHlO11OM10Rsk4wZtswb8F+dFIBzkGuQ/iI=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.16.1": { + "pom": "sha256-jiOFFhGXyf4S3JlltMi1fz0QMhdRIgW1tgudxnW86o0=" + }, + "com/fasterxml/jackson#jackson-base/2.17.0": { + "pom": "sha256-w9lEq1Kiy2/0VJ3O6wTUIajeYyo8yl3UVPq8f1KsMeI=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.4.20221013": { + "pom": "sha256-y2P4/5jHzL5THjdkviyR0nW4/P4pcs1nqn8KeBojmjY=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.0": { + "pom": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU=" + }, + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.16.1": { + "jar": "sha256-pHMHceakld03k6Qs24zmvduWx34V9AyY/Y2aeuCecoY=", + "module": "sha256-oBBBBbhXmkrFKxTH+2qLPxPfU9iPT8lCoZrJy/6E9Zo=", + "pom": "sha256-xt/2p4sBSYkppprzZObLeK73LSpFJUuS1klbKhmOwSk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.17.0": { + "jar": "sha256-hWJWmgAdRuhOojgCJX4zyPaLJOtHweDv0TOgNyxRKVk=", + "module": "sha256-RkPjPFKL6kG0/F7A4vivbBzVlQAr4voTzE+pF2JXf7w=", + "pom": "sha256-yHz4sMhDRDpM7E5pp4kTM10OR7FqGdI8IcI4JuCS+Mk=" + }, + "com/fasterxml/jackson/core#jackson-core/2.16.1": { + "jar": "sha256-9fjvkGCeZP7ILrkI5JfcfYGy65g/5Qm4cCkqGTzeTfs=", + "module": "sha256-S6CAt7eaIxoJv7AoTCyURJ7OumQzJlWRwe2CDWBzpuI=", + "pom": "sha256-Hu0WEE2ArswTfEH+FuSj/1q5or+ossScV3L+Sl/S5s4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.17.0": { + "jar": "sha256-Vb4TD2poA4CIomGFbE44POeZV6D8GinsshOp79bvQ4k=", + "module": "sha256-PSDo4ew+imyoB/J3vL2UM//DSs27X9PcJIWs8lKXlIc=", + "pom": "sha256-lR2zV/nEmlyId8CJYMSoroa9jJqohwYmZL0E96/+6pU=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.16.1": { + "jar": "sha256-uvio6+6PRe9ozdXi3Tkjs+KWwJN7luwLSAaqOjG8zR0=", + "module": "sha256-tDy1vynzVFuW6QV0jyU5FpXGIHEwMnxFGT/R3DdI2f8=", + "pom": "sha256-fIprQo6kaI0BIGlWzMr7I6ySj8adcXp2vdd0M0jSjbg=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.17.0": { + "jar": "sha256-0O1bVMsbC7sIKOJM51KkOgBtwYizTjpK4yOKzHtjdBg=", + "module": "sha256-fHs6Ikpqvls4uhoi/kVMCyVh80uyfnI8FwkluK0Akhs=", + "pom": "sha256-itZM7RCQyt5O90sVYbmWOkUeM/Sc8/oCp4y7LaCvzxc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-csv/2.16.1": { + "jar": "sha256-7aBbHqTiDzaafnPVGbA8SFSX7HzJJDYiaPBvvXr3ob0=", + "module": "sha256-wlMG3ZnsfpOimIdHqKgy+8UNxwm8NDxyzndbzQ8/h3U=", + "pom": "sha256-nsHgPUHXk2//3LgE0sHQXCyDul7npvXYWwm0PkmH9Fs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-smile/2.16.1": { + "jar": "sha256-N2d0Ty435uZyw6mBdOaFZ5B9GOpcRRsgOhnnsK2TQ1Q=", + "module": "sha256-Gstdx7Rb/kYEdBemRyijrWm2FsdTIcFpwGPD0CvhK0I=", + "pom": "sha256-vWoXuvgb1M2uGZBp+MoPm7JGwV3YtkzsdDIBxtz+9qk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.16.1": { + "jar": "sha256-uOc/oXHRJ2gyq78g67TfWX43dAX4de05gIzumsyj06w=", + "module": "sha256-1w5SJRr2K5qfp47uA3tqJu4ZmTAphVNh8+EQKN5aR68=", + "pom": "sha256-khKEVzDdd22UE76t2JQRSQ9UG4/a7wMdIL380dRH0uA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.0": { + "jar": "sha256-RrZazgNrAXQ3ELz8nn8EHt7S/IK6DT2D4ZsyyBjBi0w=", + "module": "sha256-IT9a3fdRMt9CITThwUAswirxt0EiJfk/f1TuDlrt0Jc=", + "pom": "sha256-eGjm/vOpdpC6N9WO4lfw5PejOaU1BHPwhI5scuRh2Mk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.16.1": { + "pom": "sha256-2o7LvtR1bqPGKjNOR734F+omCJ8l2otbxdxcKZ6YCSs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.1": { + "pom": "sha256-1DusfWR8CD8XI4P8YinkAOSJY6TuCfTqD2LZAySVvJQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.0": { + "pom": "sha256-xjxXKeuXzo1Qwi/kmg09d/89qYr4WHk4qeES3dGthQI=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.16.1": { + "jar": "sha256-qapcgPjdp3rY8DUApcAhq/cgrNYKrk4pOp6MKIXW3Cs=", + "module": "sha256-ixUB9M569HwUmHZVBPzhXhaUduYJr1DnxpxmLMPk+ZI=", + "pom": "sha256-8s/ApppgZcY1xfzBr2GTy/HQqrqljrTK2k0u1lrGFBU=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.1": { + "jar": "sha256-YoGXBoKo2j3brFS7IDybrfHCb1B/PsqkjvEDGFebya0=", + "module": "sha256-kUcpUsDym3P6oCNeMXzrabXy+we+thRESrukR2sK+Yw=", + "pom": "sha256-yd4rhj3RPkYjfRhcHmYEmE9uY0cYWeoNot/E6fLwj/E=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.17.0": { + "jar": "sha256-lOovIk42YywC2x5mgSfDAYysuFmvwV3fb0xYWRepM5Y=", + "module": "sha256-DXg7+bYOzm6sjx8tuukW4HsxVYQX9y/OPkqrL4yW1MM=", + "pom": "sha256-amzpD+KlIb5thcfoIh9k0eP4jxwaDwl67LZXRLFdypk=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.16.1": { + "jar": "sha256-YJYSSYlrXkm+pFZex7hgEA/zhyruHY5Bat4vgS8/yjY=", + "module": "sha256-0pECVhl8P5iyv7Lk9OGSDyjab+Xe2ng/1FXeMZ7QMfI=", + "pom": "sha256-zdtENElgsf6mNk1EYmApfXTO3fDhL2NjmWP0ci83HQQ=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.16.1": { + "jar": "sha256-mzM+fmkFOAf0Kp2S/B5dpAWTjsxGgxRrix65xpZ/6o4=", + "module": "sha256-WY9Np7a+PbFBVD4KBS25ZROVBDlrxP/Sy41H4XKzLuM=", + "pom": "sha256-D2U6eU8WV+XpMaADp6NLfP+xlbXv07OcqfrEh0yPcsU=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.16.1": { + "pom": "sha256-iv0eHmPCIXlw+WhHArnWX1F7ctlKxmUgFB3j7WgfAtM=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.16.1": { + "pom": "sha256-GIciU1hZ78rlq3XDBi3DLg3ejh6qbBgh9ZBSxCA8RKU=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.17.0": { + "pom": "sha256-3AfGDsVkRInNBomkZKm5ap3V9qP7WePRyjPUbR2iv08=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + "com/github/docker-java#docker-java-api/3.3.6": { + "jar": "sha256-OoHkFFKR//tn68dcDhmlZBaTPpEtjyF8N4lAQk0jKbE=", + "pom": "sha256-XeM/4+u6ofcEmOMLFKkS2eD1eZpIGhevE10a5snqmyk=" + }, + "com/github/docker-java#docker-java-parent/3.3.6": { + "pom": "sha256-jdqBOGg4fuv3fOS/85xmT8ggtSDUHTOksZByq9bLWnI=" + }, + "com/github/docker-java#docker-java-transport-zerodep/3.3.6": { + "jar": "sha256-/f1MfYHq+GWebOa9u5hiKGGdnHtlTb1chavQRPHeAzA=", + "pom": "sha256-D7UCE9aHUCOHnIts1pH1ZR5ynFBiSXipDrmhQYq8Tpc=" + }, + "com/github/docker-java#docker-java-transport/3.3.6": { + "jar": "sha256-MhUpuq96t/UMPppW83ttvNnvSgothGYRDiAqbgf4hZg=", + "pom": "sha256-8HHKdfDnP5fCS/rKO+385yPOEa2FEk3I0eGDBv7T0qQ=" + }, + "com/github/hypfvieh#dbus-java-core/4.2.1": { + "jar": "sha256-Onuf1UOhvpTemQCcNqwYA/CNbRI1dwbI9QQIVTFUadE=", + "pom": "sha256-IXRgXAmRRZPObYk10FKvENIo1SuN2V1IYRhnE1zsjIY=" + }, + "com/github/hypfvieh#dbus-java-parent/4.2.1": { + "pom": "sha256-eeJ6xZ6OgExWBdEMu45x2CHxorciTuc4B4LcV14Cdds=" + }, + "com/github/hypfvieh#dbus-java-transport-native-unixsocket/4.2.1": { + "jar": "sha256-u2fem9CBSBI7kYRY78eAVRRr1a4VOEh89KAY3Q9kSDc=", + "pom": "sha256-MnkIfkz4UMIYm8dSl7nnBVBSgRC+ML6Nb/eFxmGVpkU=" + }, + "com/github/javakeyring#java-keyring-parent/1.0.4": { + "pom": "sha256-bByWW9rbWaDYGa9MtdDFiZ2GBt6bgtgRt9NWcGxTv0k=" + }, + "com/github/javakeyring#java-keyring/1.0.4": { + "jar": "sha256-7c0NsZ5aIWJl2gNGFbi+8TgBaNSJFT85CtxIRJPJqlo=", + "pom": "sha256-/wQyxT//a1/dcnAG08orA7lEUjl7g4+PFUby92u0OSM=" + }, + "com/github/tomtung#latex2unicode_2.13/0.3.2": { + "jar": "sha256-sOJRyPXdNuZ1TOunDNRjBZ4pfgy9Iw3Jcc/bG1BY89Q=", + "pom": "sha256-wRAxRUgycqScz7gHpv5MuKR31ENvyQT2kRoLUEvieAo=" + }, + "com/github/vatbub#mslinks/1.0.6.2": { + "jar": "sha256-ue5zrbUjLnWQDg//nc7Cbzj+puROqxPbbudzEh9oRCA=", + "pom": "sha256-hdVzY9II1Vxt0ZWTsws8qLZIAW3h2/sNsfcEz9dxNzU=" + }, + "com/github/weisj#jsvg/1.2.0": { + "jar": "sha256-kS832F3qr1t0dwD1vTdhqTsUpRYZAOdDbP84a2F2EYo=", + "pom": "sha256-L1qCkk25xJTbGD3ukkL1S2/TI6/bd0oX5GMlHfPle2A=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10": { + "pom": "sha256-+1OsCwbBkRbKYaw0S03+inwpzE+Bs1POiJSTpQOQBPs=" + }, + "com/google/code/gson#gson/2.10": { + "jar": "sha256-DN0WPONZiiD8BO7nGxQLJPbyo7NfCkmdu92YUug/v68=", + "pom": "sha256-rGnZ8lQmDK6rOZjqrWDzVVmcJRIeGVFWv9/8ijVfxr0=" + }, + "com/google/errorprone#error_prone_annotations/2.10.0": { + "jar": "sha256-oknU0l37htQebIL8M131gBifDJ/uq9xTIz/B5QYHJKE=", + "pom": "sha256-1oDcn1eKd6bc2ZKywyUOsWinIUzyf48MrB8GUmcQwMw=" + }, + "com/google/errorprone#error_prone_annotations/2.26.1": { + "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", + "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + }, + "com/google/errorprone#error_prone_parent/2.10.0": { + "pom": "sha256-B4kah8SQ+QDBIJe+6V7By24HHIp9+BBmY4fgx3Lwifo=" + }, + "com/google/errorprone#error_prone_parent/2.26.1": { + "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.1.0-jre": { + "pom": "sha256-D73wcsyo4Fa6MVQrt18MFJCRRABYbUukIuz8fR38ecY=" + }, + "com/google/guava#guava/33.1.0-jre": { + "jar": "sha256-NGrsDrjImHNgyKJk5w/xDC+6dgRG6yfoqwfnjnh6df4=", + "module": "sha256-6qUNmCgORsANUYq/FUgp3pm1lm0bb+KLffHVvZB+dKg=", + "pom": "sha256-VXQa0W+Yzubm3Ard3UOAacxeP/KaJuMXXU/qKHaSVLc=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/googlecode/plist#dd-plist/1.28": { + "jar": "sha256-iO2Ocw9zhil0hRdsQ4cUbGkUo4wOWPwpbooBzcO2IeE=", + "pom": "sha256-64AZrY6Ql2ztM0sYOyPxPxnQi9uuteSrKEpFoos4aIs=" + }, + "com/h2database#h2-mvstore/2.2.224": { + "jar": "sha256-EMeCk8sHu+6zewzCyRmnkJ6VyeTu8EZ/Ib+WGySSIUw=", + "pom": "sha256-csQffdVNSrUhROTkmFBYBJZfpifX6UYnqjN8RUtD9KY=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/konghq#unirest-java-parent/3.14.5": { + "pom": "sha256-LMc4Plsi7+Umtd0r7KhgCYl2G4jebQffDBf+a7UPJ8A=" + }, + "com/konghq#unirest-java/3.14.5": { + "jar": "sha256-8MwzkiHp51loG9FDX1kY9GC+rexHRcJ6hxmvbaJtReU=", + "pom": "sha256-qIJBno0orj+m1wqfldT6jQH4IicdBcI1egKu6r6v6pE=" + }, + "com/oracle/ojdbc#ojdbc10/19.3.0.0": { + "jar": "sha256-+iJonNP7sDf07IZBJevngyXzgR/FDPGUxr1w/n5RRWg=", + "pom": "sha256-pfJtJo9fU2k9CvaVIXdzZ1/ktv5lXFVm+gZihXltP9Y=" + }, + "com/oracle/ojdbc#ons/19.3.0.0": { + "jar": "sha256-bj8kNwBxbE+i6d36oIyTlK1v2jpkDTvvA5Qfe1c9+dc=", + "pom": "sha256-iS3lC3HfR+jb7pTomhpPLDYC+7rk/LFu+sxtdq6LnlI=" + }, + "com/oracle/ojdbc#osdt_cert/19.3.0.0": { + "jar": "sha256-+qDMpZTTVNW7H16sPa+hVoOHonV2gTqb1yPW/YdEvow=", + "pom": "sha256-7BCuWrL03nbJmeAWpivQ4f49t9YwMLE1FQ6/ZzOWuog=" + }, + "com/oracle/ojdbc#osdt_core/19.3.0.0": { + "jar": "sha256-x6kMB6Euc9A8Ht1qAuaZABIT5pj+D1IloncczUarC2M=", + "pom": "sha256-8ydgabF5+h8t8AXptZtyzyQp2Sfcke7yDKOuMEGKeZw=" + }, + "com/oracle/ojdbc#simplefan/19.3.0.0": { + "jar": "sha256-UTjWWO3/DgEG8FWfaMcvuQ8c00OBSSmVt10AEuqeEvI=", + "pom": "sha256-8kMWnRLNjdURbYO+vsySNSiNGGFySLkjOa3FIX/W5wE=" + }, + "com/oracle/ojdbc#ucp/19.3.0.0": { + "jar": "sha256-I9jevkCnZN901e2n6MHOmywZCjT3OcpNdR6qlBFNMcw=", + "pom": "sha256-+SvQTVeVmp5ZlqjFSYluZRJ5ucW5VAE2EMpjN1zbItU=" + }, + "com/puppycrawl/tools#checkstyle/10.15.0": { + "jar": "sha256-RI7oAzg3HwsbSuEhPw7bJI0rYEJnpb75l+ARDVxP8aE=", + "pom": "sha256-UMoBscqFa2DqEzp9dA2RLUYqIhTpjpCzkBU5hf14K1A=" + }, + "com/salesforce/maven#MavenBase/1.0.19": { + "pom": "sha256-K6DjALx2Etaz4MDWYiw7Jv0M1s2s2JmuRWsyaw6F8c8=" + }, + "com/salesforce/maven#MavenParent/1.0.19": { + "pom": "sha256-3OlrnKlw7dinNuI9yiDal9CakdYh1mzNzGylQAdehoU=" + }, + "com/squareup/okhttp3#okhttp/3.12.0": { + "jar": "sha256-cXh/LFmeBEHHpEE5g7/dk9QLVuG63F4EE9akxIW6PzU=", + "pom": "sha256-mklEjyDeMUc8RtcixQDFXhIPp4mCm7Sv3Aa7syzOqag=" + }, + "com/squareup/okhttp3#parent/3.12.0": { + "pom": "sha256-hkeC3bfMW1sPSzZ04ChLv+jVVbXVlozkN+epQvLpDKc=" + }, + "com/squareup/okio#okio-parent/1.15.0": { + "pom": "sha256-NOCaPqKqzXId85lHDQWkeuza2AEmmiEhlf+/nSEFbbI=" + }, + "com/squareup/okio#okio/1.15.0": { + "jar": "sha256-aT+jGafohDMAYCsgQCO3Z08Qbry1d/LdWAchK2YRi9I=", + "pom": "sha256-8cELFIDRq3X7BRoHsnPjfNolJel+Fgfug+aDO3Dhv84=" + }, + "com/squareup/retrofit2#parent/2.6.1": { + "pom": "sha256-hrrYjK2fQEK3mI3+nR5e8t6Uh4FK8sPDB6ilhdSmAp4=" + }, + "com/squareup/retrofit2#retrofit/2.6.1": { + "jar": "sha256-b+36izjQWs9OUt3ku9dK7W2+A0h8XSZ/4Ehteih+lxI=", + "pom": "sha256-6rtyWWf0U2/HGFSh5UW2EBKnbbnxSM/S/rTBLH6a3Xg=" + }, + "com/sun/activation#all/1.2.2": { + "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" + }, + "com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "com/sun/istack#istack-commons-runtime/4.0.1": { + "jar": "sha256-n5ERX0SThIhvVyvWLIgS7hAEJz1LXIXKxlF5rUwWmQ8=", + "pom": "sha256-OPtqwbPZtUmt8h99yEzRXBu3x1zOtYEm6b0Wy+bd7u8=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons-tools/4.0.1": { + "jar": "sha256-NEhuoD6CKWZ9cS4RLhZK3u11NMqBcYuw5lMHK362B4Y=", + "pom": "sha256-doe2Z9DL1OB5n8wqq9N64pJ7ORg4AATZR79eHV172M4=" + }, + "com/sun/istack#istack-commons/4.0.1": { + "pom": "sha256-zDvPJtQsLgI6SpDkfzMXk+DZR2uvJyetndyLvnNSFsI=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/3.0.2": { + "pom": "sha256-jUSIUplsdYMRpbs9oecjTGqGefTRO1InWxSp9RevjBA=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.3": { + "pom": "sha256-SkQftgU/yfRooSve6hy48Efq9kNzA34/BJrUMEJ/0PA=" + }, + "com/sun/xml/bind/external#relaxng-datatype/3.0.2": { + "jar": "sha256-wYsnDxQPFerIy77dRsx3cn4C92haLi237BIgSZkNFms=", + "pom": "sha256-8jwf3cYFxiEYtS/1SkTfU9CP4ypQSPtWKfn/yZ9bQQI=" + }, + "com/sun/xml/bind/external#rngom/3.0.2": { + "jar": "sha256-qo64ztOBV2dT3QBxZXliuNjmDmMnYwmmb1TPn4o80xM=", + "pom": "sha256-twSdFXrnU0PYywdBPmPIV4Q9TXsBXokXv0H5S7dP4ro=" + }, + "com/sun/xml/bind/mvn#jaxb-codemodel-parent/3.0.2": { + "pom": "sha256-sMPbw6G+mLHxcPIoNWNEFzSKK+S0oDwLtNu7hD2Dt2o=" + }, + "com/sun/xml/bind/mvn#jaxb-external-parent/3.0.2": { + "pom": "sha256-ExwRX0kx+YQ8rtDHeOD0Rb75zr+WvtiZNXh1DoyVYoE=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/3.0.2": { + "pom": "sha256-HfAhd4Qlf3/Dq0XIzuIU7CBYrnbEH7zZz4OU1emMlnM=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.3": { + "pom": "sha256-6WIwlX8fVlh/nP25dKNr7XcH6JYWtakKknss99NHZ28=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/3.0.2": { + "pom": "sha256-mFAJ3lm0JVXoj+4X8tRGfYT2widkb4Pm/Bsx80a4690=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.3": { + "pom": "sha256-PjQHp7FdgRMzJfEsVXN8xGeoyhGh5DsTotS9+HBW2no=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/3.0.2": { + "pom": "sha256-DVq8zIBaLrvyXD8uwbPkLc3rFuqckFuYVnRiAWjBoKs=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.3": { + "pom": "sha256-hU4ErXwT/9tlUbKQ6apsCN10JQdTvMgB4HZVB9EYfXw=" + }, + "com/sun/xml/dtd-parser#dtd-parser/1.4.5": { + "jar": "sha256-pM1q3c7ULi+HDcyhcW9FnaUfBvL+SUMNLRKPFHyOkp0=", + "pom": "sha256-sKYTLhmm4ALSU5VPat87YaJjVvz3f16PzEOpz9senUA=" + }, + "com/tngtech/archunit#archunit-junit5-api/1.2.1": { + "jar": "sha256-zAxo/vGa3fpBwaGDYIsQdd6+/iueLzzcAfQJYZT2u0g=", + "pom": "sha256-jpvGRO2Ygl/Jv1w/+Shsg2OMODLXAs+TcsZkhhQO3IU=" + }, + "com/tngtech/archunit#archunit-junit5-engine-api/1.2.1": { + "jar": "sha256-60XLhCUj2ne8DlDQRPvWftuwaEwAjsApGJGzTBSCqPc=", + "pom": "sha256-fBFqW8OgjDIiAIYwBl6aFQH/5GMMYXx53Ljmtp4ySWI=" + }, + "com/tngtech/archunit#archunit-junit5-engine/1.2.1": { + "jar": "sha256-bGwGyDAtt5rkq9xKpWEPqZURFfaTgbNCy2O3qBmgefQ=", + "pom": "sha256-LW4u2WZKQaaZxS5vbhjZpcojmXAOUjR6f6nAS3IMwDg=" + }, + "com/tngtech/archunit#archunit/1.2.1": { + "jar": "sha256-eLPLD4NQmPImSlnnkdiF+AitgNJCXvKY3Cz+0DPGueg=", + "pom": "sha256-GA8sOPoquiEKfyUHxdC1B1FghhfbFK/mvS8iqm/lDbU=" + }, + "com/vladsch/flexmark#flexmark-ext-emoji/0.64.8": { + "jar": "sha256-AS0ttRRjr9hHAmJ+ST/tzkLrfesbrjCd3O/RgasoPL4=", + "pom": "sha256-N1dSYA7KUGOae9HyFnK282sDFbYCoOcKDzoGRZZxQKk=" + }, + "com/vladsch/flexmark#flexmark-ext-gfm-strikethrough/0.64.8": { + "jar": "sha256-/GytAm+9A2s//QRIJkNgpfG1cnVu80J/8CJxW3/F8cM=", + "pom": "sha256-29iSNA0WNyOaf2bF5SGSELfNQX0f13HOk6llsD9xgog=" + }, + "com/vladsch/flexmark#flexmark-ext-ins/0.64.8": { + "jar": "sha256-W2G4PDHLC9MnPL8SrtOIe2O4vcbfoXsD7PR5zxzhdr0=", + "pom": "sha256-TPZAzDnlBtzCvF7Sk0ZOiet9u3X8chhlgre2M8ziWyE=" + }, + "com/vladsch/flexmark#flexmark-ext-superscript/0.64.8": { + "jar": "sha256-RXkzMk0cqfKDvBWhhCd3xt8DhfMY/M6t5N5BYhOV5AI=", + "pom": "sha256-+JfvOutkMsN/uIgBcgUxFtEa84rkcJyQiqcBVM0mGh4=" + }, + "com/vladsch/flexmark#flexmark-ext-tables/0.64.8": { + "jar": "sha256-zfgtJuES6WrefjcBOK6xaSC34tQR0gxsFcsaz6zR7x8=", + "pom": "sha256-+Lnuh0FZExL8I1PkfMjMbZIud2RInYOrrX0V8zU33PU=" + }, + "com/vladsch/flexmark#flexmark-ext-wikilink/0.64.8": { + "jar": "sha256-8y73ee77TDuA1b6/PEt61yBvxG4IOlkBz1Hbe0U1/3k=", + "pom": "sha256-Vr+s6mEz9k+F30Ir6iY/9USKNWCxfSIXw8LSvJRPtbo=" + }, + "com/vladsch/flexmark#flexmark-html2md-converter/0.64.8": { + "jar": "sha256-PySpCo/t1nCPBr5yu8n19SEavEnDXulZGM57C0FlHmI=", + "pom": "sha256-UrrKRFXJePTvC0NK2oOfmHQy9JaQFS7yDkxvHmYb7TA=" + }, + "com/vladsch/flexmark#flexmark-java/0.64.8": { + "pom": "sha256-QHv3UvN2KqkIxfxNZkuJOZTRt4OqIKKWakP4bBVetDM=" + }, + "com/vladsch/flexmark#flexmark-jira-converter/0.64.8": { + "jar": "sha256-zMHDqWWaEEt1pTojIenB1M7bBazYZ9Q2bYuOFke9N90=", + "pom": "sha256-aO668VQ27ex78DMIQgcN0iOqcXQcaX17yQKVEdlG4II=" + }, + "com/vladsch/flexmark#flexmark-util-ast/0.64.8": { + "jar": "sha256-pTQvZExqXzfVAvIlw6DLaZwmNiHILnINnAjrpanzuNM=", + "pom": "sha256-M5IPcD8naQ/qq7CKQ07O8g073bpMbcF9m1EYACUHITM=" + }, + "com/vladsch/flexmark#flexmark-util-builder/0.64.8": { + "jar": "sha256-r7nIjZ9lJFHnXxqwaa193XkdcS6yEcUdjSqDSUJAh10=", + "pom": "sha256-ERKthdmLh0tJeVT6eySR9AXb4B2kso0x9XVMzFtqL6E=" + }, + "com/vladsch/flexmark#flexmark-util-collection/0.64.8": { + "jar": "sha256-Ax/wFAjQ9UxiNdsY1FHcbmsVuFmw7B5A/zQpqCN1CCo=", + "pom": "sha256-xHLCQN7mFbkqISQcG0Lzm/44ZYlcMChulWI82UBecms=" + }, + "com/vladsch/flexmark#flexmark-util-data/0.64.8": { + "jar": "sha256-g861mJqwIFBUvxtCRG9Vy22hTBCqfCvaBdaiUEZw81M=", + "pom": "sha256-26l1Ca96vWwSBNwLP2K0hpzxqON8np1mNW4QqyTkhfE=" + }, + "com/vladsch/flexmark#flexmark-util-dependency/0.64.8": { + "jar": "sha256-5BrbXoFEaZtht41Q6wBO633oT5DExjYmYJ5s7l6ii0I=", + "pom": "sha256-0EkP+0Tt80pQprn6nrXD3XPT9weOH03oruUhmyIURVY=" + }, + "com/vladsch/flexmark#flexmark-util-format/0.64.8": { + "jar": "sha256-bJrIdoZHTt8BF7P4ONncs7ll+nK+SZjSF3tZgBNnn3M=", + "pom": "sha256-q+B6AP/rbr+L6DoCzOTSdpHnRUlRvnatteV9qmJiSOE=" + }, + "com/vladsch/flexmark#flexmark-util-html/0.64.8": { + "jar": "sha256-WxnmUGr/eRPHStclr3wrip8jlY5jJL8HEMWmRaRmMBc=", + "pom": "sha256-QSOT8DUt+GmWg4KaaRDOIX7RtSyaucYZIg1OM9W0n7o=" + }, + "com/vladsch/flexmark#flexmark-util-misc/0.64.8": { + "jar": "sha256-dEcsqBqQgOUeoaTxHCcImOPWwkLJInX6tH65k4Bsjys=", + "pom": "sha256-7kzBaZZgo0M+YJAy20ar+0yTTlGmP3pYOewfi2qVwOE=" + }, + "com/vladsch/flexmark#flexmark-util-options/0.64.8": { + "jar": "sha256-JIn0HpyvHZ+AYYM7MRslQDkly7Yx//K4wGkZKATW/Ig=", + "pom": "sha256-GA5DN4dxzcVhlDhgQ8XX9Dsq7EW9N9CJwmYV0As5i2A=" + }, + "com/vladsch/flexmark#flexmark-util-sequence/0.64.8": { + "jar": "sha256-biKXb+TpuN6U/VKZkeyy15zEgqrZSYU2dHCpO+HYJjE=", + "pom": "sha256-bOq0Eg9oVbt9IeVyDhVuogqWkeURN9ZGj0uQZzUvg+8=" + }, + "com/vladsch/flexmark#flexmark-util-visitor/0.64.8": { + "jar": "sha256-2bMAKoM6B4xF4TlWizBtqwrBF/+QRsah+eGAwBVFY/w=", + "pom": "sha256-+kWiyg+uR7+nw6GXwiuhe2QiNZhZTDimzlknPlOQwXY=" + }, + "com/vladsch/flexmark#flexmark-util/0.64.8": { + "jar": "sha256-HiTIkdrJUyu3Ir5xIscCb7R4aMPeNsAkAO7Y6a1TVyc=", + "pom": "sha256-g4Eg9qTozQub7BiGcCnXjxFNV3zcvOppRr65fsmM5/g=" + }, + "com/vladsch/flexmark#flexmark/0.64.8": { + "jar": "sha256-MTOHjRCPDhlk19Qn83mnQz4bcaRfnzwfq37QrAMB07A=", + "pom": "sha256-wwO7cco5tSiAann47wLaSpTxklt11Bh3ojRNsbwiWpI=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.6.0": { + "jar": "sha256-aeEjcFms1W8PhlTc3gnYoUEu7oKRi+9VZNUfj7J1cRs=", + "pom": "sha256-x3AmC5U07xOUD6CHpbAZasVKZNDc1IXermbErapsF1g=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-codec#commons-codec/1.16.1": { + "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-digester#commons-digester/2.1": { + "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", + "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-validator#commons-validator/1.7": { + "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", + "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + }, + "de/rototor/jeuclid#jeuclid-core/3.1.11": { + "jar": "sha256-YQbzzUZZnxpEzHn2z937hwY8CpX4z2+Z3g4uUIO/Opk=", + "pom": "sha256-vS3A6dN1Fn8TOTnQdApdXprF/gWGTWGs4RJxfYC4vG4=" + }, + "de/rototor/jeuclid#jeuclid-parent/3.1.11": { + "pom": "sha256-+T/FFx4EcsyDQLfOyXomFjolaNMpCEQFthjooVF1sNE=" + }, + "de/rototor/snuggletex#snuggletex-core/1.3.0": { + "jar": "sha256-7w3dJvbdYAa7KBc+GclddBNORETGdloYAG4L05LcKxs=", + "pom": "sha256-5ydOkNQLsH8QV1/YDte8jAhqgRA+HVhMALqxrjKphbs=" + }, + "de/rototor/snuggletex#snuggletex-jeuclid/1.3.0": { + "jar": "sha256-XALsqU5bJFi/oQuYVVZQ443GGlUauebI5JN0v76dlhk=", + "pom": "sha256-IbGfKgTq1ykaBhEdpQ8OmkmcyOtNY361+AOhCrYhP/I=" + }, + "de/rototor/snuggletex#snuggletex/1.3.0": { + "pom": "sha256-9oYkdlBlNa7G36UyTmJQk8fYwY47yqx1nvlDDbeK/0Q=" + }, + "de/sandec#JMemoryBuddy/0.5.1": { + "jar": "sha256-4Exc1XGjH2m7lnM0bQYhA9SPVJ/6wVu/bFyuqBhFOb4=", + "pom": "sha256-2Iq74jW0dpXz85Q9xT1rkh3MJXDqZgw3PuOTc4XL8bE=" + }, + "de/saxsys#mvvmfx-parent/1.8.0": { + "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs=" + }, + "de/saxsys#mvvmfx/1.8.0": { + "jar": "sha256-BCQbjfnK7uHeBTsMRi/m4cLeMXLw6fVCsDh5CsUJHV4=", + "pom": "sha256-mASw53q9WQLcBOAT5LhQETFo2rjEV0kEZNK3XBud9JM=" + }, + "de/swiesend#secret-service/1.8.1-jdk17": { + "jar": "sha256-A7ouzaiq01ipF9I23oVP10b25szZp0ti98UkdzMwo0Y=", + "pom": "sha256-29pS9ELRHsCI5GAHXeBCgn0JEB93W8IoQoAZAtM3z+Y=" + }, + "de/undercouch#citeproc-java/3.0.0": { + "jar": "sha256-ah2CFCjGIXZiGS9pLR3sgs25vWTFz7O+R5V+Luo/EPk=", + "module": "sha256-0WU5hgCyIOsiGiDXydX+yX3ZBOO7p5hBVuhfWOv4mbo=", + "pom": "sha256-0LpxAQH7jCteBQxlLPYr+KmZT+6PBv+jzi2BLdkABMk=" + }, + "dev/failsafe#failsafe-parent/3.3.2": { + "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ=" + }, + "dev/failsafe#failsafe/3.3.2": { + "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=", + "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs=" + }, + "eu/lestard#doc-annotations/0.2": { + "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=", + "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4=" + }, + "info/debatty#java-string-similarity/2.0.0": { + "jar": "sha256-h2dZheY30jG1eD0f6gvZR+cSZ79VetyTzj2uyKUZvSI=", + "pom": "sha256-dgQpbIuuApGPJvekSKGwnzjluw2W1XhuTi3yF2B+9No=" + }, + "info/picocli#picocli/4.7.5": { + "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", + "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/classgraph#classgraph/4.8.168": { + "jar": "sha256-IjPyDp2MY0qa8oQkYQAEHGdnDdb+OzWroXKHWACWWmg=", + "pom": "sha256-98UQqlWYvLu+nMT8dqy/mnD0Z3rQkaJy46weuS31zvw=" + }, + "io/github/fastfilter#fastfilter/1.0.2": { + "jar": "sha256-OPiCTQfIyTL6UMwBdfMsD/8vr7ORPNL5VxrDScljEUk=", + "pom": "sha256-Z+W0AfZs90NI+mBkUbg7wuoYwrWGEKikE23e0Y6IeT4=" + }, + "io/github/fastfilter#fastfilter_java/1.0.2": { + "pom": "sha256-YEBDeouTEBGJJsGgqK4aRWTisn1dFfM+jF6XgGGTGAw=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, + "io/micrometer#micrometer-core/1.9.17": { + "jar": "sha256-w1DP3HbAg1bxKmDoQPLb6u6nVAcS1YtUvs1sMCqGFHo=", + "pom": "sha256-A5aSALpYr0jxc6v17OILwK8Ic1BF+/4zAl9P2aiGqxY=" + }, + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" + }, + "io/quarkus/gizmo#gizmo/1.0.11.Final": { + "jar": "sha256-pUv7ttzOkpgTRZWzzR35YbxzJGiCXybuUpbytfiMC5k=", + "pom": "sha256-/9w5IIbOwtuB0m4uvTYDRxHokpwoQ1uUdpGWCFNrOP0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.2": { + "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", + "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": { + "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": { + "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=", + "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "javax/measure#unit-api/2.1.2": { + "jar": "sha256-XZ8donteeopyNap7V0jbSjSa0D0poaIAKaiFqYni9jo=", + "pom": "sha256-Iwbk9m8ncc0FSEyu2lnyfIWPbl3kHVuFCOlzo2mBUHY=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.12": { + "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", + "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.12": { + "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.9": { + "pom": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14=" + }, + "net/bytebuddy#byte-buddy/1.14.12": { + "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", + "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + }, + "net/bytebuddy#byte-buddy/1.14.9": { + "jar": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8=", + "pom": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU=" + }, + "net/harawata#appdirs/1.2.2": { + "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", + "pom": "sha256-B+NZycEfUgyvAn17z9nAlpNf6AEj0lC1vr+vw8HDdWw=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.14.0": { + "jar": "sha256-rkys6zhAcwwlN/m3+1WgG6ulgChrQSKVFIi87lWMJEk=", + "pom": "sha256-bLoOBPnuyxZIYAB5O7J+EDsPTQSF4FVOK0wK7RPS7RY=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/jcip#jcip-annotations/1.0": { + "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", + "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" + }, + "net/jodah#typetools/0.6.1": { + "jar": "sha256-7+iqots4OhUeMYgQQAgEw5kr3lQ+dKTXLeon7VR0yvo=", + "pom": "sha256-HxvbdkwDDZ3Q3MGAxHfDKgtwRuK6GDmAsSJXVeLegZ8=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "net/sf/saxon#Saxon-HE/12.4": { + "jar": "sha256-V1+LaW47b5qno78BYRuL8bhFdrVc4pvBZlalOhR+9EE=", + "pom": "sha256-op6LTcFteBhLSANZRkoazPbahWpP31vyugKtTistHBs=" + }, + "net/synedra#validatorfx/0.5.0": { + "jar": "sha256-XfN+TrBpGSzyguSXe8pCcbaitVuzIhhUbsHzB/YlxgY=", + "module": "sha256-/Tug0IOZVKYfG8oVdC20pC7lKUQngFYyF4Q5HjNcUo8=", + "pom": "sha256-nEf1KmxKSozF0fdU1cQuGIyRvoiA9PxUb50jG6FE70E=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.11.1": { + "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0=" + }, + "org/antlr#antlr4-master/4.13.1": { + "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg=" + }, + "org/antlr#antlr4-runtime/4.11.1": { + "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=", + "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ=" + }, + "org/antlr#antlr4-runtime/4.13.1": { + "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=", + "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE=" + }, + "org/antlr#antlr4/4.13.1": { + "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=", + "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/6": { + "pom": "sha256-Eu21CW4T9Aw2LQvUCQJYn6lYZQUSP6Jnmc5QsRb6W7M=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-compress/1.24.0": { + "pom": "sha256-g1qmZTLHql7G6F+FKJ2NP6raDGmLmLmxpBC4pUmcMMU=" + }, + "org/apache/commons#commons-compress/1.26.1": { + "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + }, + "org/apache/commons#commons-csv/1.10.0": { + "jar": "sha256-LQbmoHpja693etjmWSVvIRkQnd4jVRybgMVCLUJLgIw=", + "pom": "sha256-JDVBrVAeQ+8Jus96hsh/fD7QGNNKgj/19U5ajFgRCU8=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-math3/3.2": { + "jar": "sha256-YmipoOo+dp/Ek6IURmZMDvZo5IyT0SZ5H28/dXl4/uI=", + "pom": "sha256-LNDbe843DBQEAlzAE8Efj9SfPzw0Cm0tz5nTY9eUimk=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/28": { + "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/45": { + "pom": "sha256-nIhiPs+pHwEsZz7kYiwO60Nn5eDSItlg92zSCLGk/aY=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/51": { + "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/61": { + "pom": "sha256-0+wtNYSB/lEmDBNbtg+lIRwvXhhaFOp/eNA6Fr2QmNc=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-parent/66": { + "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" + }, + "org/apache/commons#commons-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/commons#commons-text/1.3": { + "jar": "sha256-gYWzpTEQktg+0fGEwtCTsxBdcmu9doZ8MrNRFUK7mag=", + "pom": "sha256-3usrqXAeSV3DHTJjPrhrlLJLCpbg3Gf7h+cGLxUwJ6o=" + }, + "org/apache/geronimo/genesis#genesis-default-flava/2.0": { + "pom": "sha256-CObhRvTiRSZt/53YALEodd0jZ9P2ejSrZgoSbIESFfg=" + }, + "org/apache/geronimo/genesis#genesis-java5-flava/2.0": { + "pom": "sha256-58U1i7u8J9qlsyf2O8EmUKdd3J+axtS/oSeJvh8sKds=" + }, + "org/apache/geronimo/genesis#genesis/2.0": { + "pom": "sha256-ue0vndQ0YxFY13MI7lZIYiwinM7OFyLF43ekKWkj2uY=" + }, + "org/apache/httpcomponents#httpasyncclient/4.1.5": { + "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", + "pom": "sha256-beSudsiSFXUj62TD2bFNvHSnWGNrQO5MxkVqwRmYKXU=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-asyncclient/4.1.5": { + "pom": "sha256-6QGB4oDAJx/zE3QTQ+bwVAX66IJwL0WkzibewBbNnJ8=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.14": { + "pom": "sha256-IJ7ZMctXmYJS3+AnyqnAOtpiBhNkIylnkTEWX4scutE=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcomponents-parent/12": { + "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E=" + }, + "org/apache/httpcomponents#httpcore-nio/4.4.13": { + "jar": "sha256-cfz76GkALEhWPMWXn8c0VxyNDRZ8zOQpcMky8zeYHxk=", + "pom": "sha256-8yDynYbZgAPg8NxA1UNj3vuLpGJr5RoNMVhbyXYqFsw=" + }, + "org/apache/httpcomponents#httpcore/4.4.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "org/apache/httpcomponents#httpcore/4.4.14": { + "jar": "sha256-+VYgnkUMsdDFF3bfvSPlPp3Y25oSmO1itwvwlEumOyg=", + "pom": "sha256-VXFjmKl48QID+eJciu/AWA2vfwkHxu0K6tgexftrf9g=" + }, + "org/apache/httpcomponents#httpmime/4.5.13": { + "jar": "sha256-BudU2ZJFuY3MKGDctD0g5zfWUNor8gd6EF9orMvVxcw=", + "pom": "sha256-k0GN8hCu7VBQJUjbzysXwPHZFEMDDnL+++7RZSscKN0=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": { + "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.1.3": { + "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=", + "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": { + "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=", + "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": { + "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.1.3": { + "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=", + "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64=" + }, + "org/apache/logging#logging-parent/10.6.0": { + "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" + }, + "org/apache/logging/log4j#log4j-api/2.23.1": { + "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=", + "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE=" + }, + "org/apache/logging/log4j#log4j-bom/2.23.1": { + "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.23.1": { + "jar": "sha256-eTeoQFUVaRAjTjtCho9V5o/0t77Ltv/RAUb3L1v1TdU=", + "pom": "sha256-BVZJuX0nP8asOjx61a/Y3tPA/OAEeyur7RKZ3Bpzk4I=" + }, + "org/apache/logging/log4j#log4j/2.23.1": { + "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4=" + }, + "org/apache/lucene#lucene-analysis-common/9.10.0": { + "jar": "sha256-vOhhPw3pPYblt1Z+ulUb5K+Ac3ObC9mpvXpCJc/cQk0=", + "pom": "sha256-Srvab0oxxV8FIKvqyytdhZ9wBJzavpC6fkFeEpFtMS4=" + }, + "org/apache/lucene#lucene-core/9.10.0": { + "jar": "sha256-r8GtQCslhKfBx86SjYu0bLuAD1xmzuiqhrdIGrF/sLU=", + "pom": "sha256-PJXUTXgwFjqAngE5GonrCS0gQUnZ0k4t3JsatJsKBHQ=" + }, + "org/apache/lucene#lucene-highlighter/9.10.0": { + "jar": "sha256-7ybMHN8UOfqqIE6Vy522/GnBet2umIRyJtWINNKn8Do=", + "pom": "sha256-2dp1xDusYvIVdF1tMe07XAw4Zs+crm0HfEHBxrbbs+Y=" + }, + "org/apache/lucene#lucene-memory/9.10.0": { + "jar": "sha256-OKPssbAQnWHOet9MFp3TZIXhqZP/2bMXiPjG9wTZQbk=", + "pom": "sha256-PXwz38GDkdhWHYDEGhKbYd2dJw5OAbQL593wtjsuvvM=" + }, + "org/apache/lucene#lucene-queries/9.10.0": { + "jar": "sha256-BkR8kzqupa4toz6JPM/RpBy0GgACueUi48UTO8E/nBE=", + "pom": "sha256-9KRvTeo+5jnkr/uWw+ptSlC9IF7T94+I7b0mjF4jNAk=" + }, + "org/apache/lucene#lucene-queryparser/9.10.0": { + "jar": "sha256-4vDlFZm22vZcQrhQ7xs5thfXlLYXasgdP/hZchHL7Ig=", + "pom": "sha256-EB74pcAiq+IzQtQCU+nVmjfacjBTydGi4GO5AELX2b8=" + }, + "org/apache/lucene#lucene-sandbox/9.10.0": { + "jar": "sha256-/VdPTmheCtOC7wdUYNLg4hFp8fr/gVeaMqWf3IIxl5U=", + "pom": "sha256-0hLxwbL4qXWtYp8nvFg61n3mBTTT6d8zyCAg9ep88ok=" + }, + "org/apache/maven#maven-parent/34": { + "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" + }, + "org/apache/maven/doxia#doxia-core/1.12.0": { + "jar": "sha256-XknNgnvrvOpYKdOziD0XrRzhXr1jlK61CtUNff2Tn80=", + "pom": "sha256-sDiPdIoIheE+fCxFOSH4u53U+1sZBb50VoVHbPNFbqM=" + }, + "org/apache/maven/doxia#doxia-logging-api/1.12.0": { + "jar": "sha256-mFMGFiwKn0wwnUYQlEfzDwK/b8m8FqPgOdWeHavQGS8=", + "pom": "sha256-ndmbQ1AiOEZYUxBpTERjGLFpK6dG7XFzdtWWGaJxI7Q=" + }, + "org/apache/maven/doxia#doxia-module-xdoc/1.12.0": { + "jar": "sha256-6HMboApO3TSyDv+eSnKcIEXGLLeWw+SRaSYH3kR2qwE=", + "pom": "sha256-+2nZW+S1WvLzsKm2jj6OYgY+aVlMH86+cFpaTbCZbSU=" + }, + "org/apache/maven/doxia#doxia-modules/1.12.0": { + "pom": "sha256-q4/2u0eTz7pZsU+zg/81GjSbEJHQccZrH8vKco1QW9w=" + }, + "org/apache/maven/doxia#doxia-sink-api/1.12.0": { + "jar": "sha256-XcpqqqnnDYoHZuFD3c+dsJ3l/eD7zHjLY11052TfzKU=", + "pom": "sha256-JrUf3babXKbgRM2ii40cGje2+v0M+5v7FakZ3lfGcdU=" + }, + "org/apache/maven/doxia#doxia/1.12.0": { + "pom": "sha256-LQKgvWTzMbdnzudFWzGTxvuCEQFDoRmFiryWh5il/Ck=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/apache/pdfbox#xmpbox/3.0.2": { + "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", + "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + }, + "org/apache/xbean#xbean-reflect/3.7": { + "jar": "sha256-EE5em7WmafhnIvMigZYHAPfsjjIJ71GyPrm20j0WKcs=", + "pom": "sha256-l5XBUyLF0ZrzNu69nhZPp9WJfEsASn1m4hY1oXPnSKk=" + }, + "org/apache/xbean#xbean/3.7": { + "pom": "sha256-6nFxMt6EBLYvyQl6HzIVxwXVJdRXvppfEmU63GjDOrc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.13.2": { + "jar": "sha256-2LaYBfg9lmaqZ9vjqbk3RoFgdo30B6I9eHR1LyzFuKw=", + "pom": "sha256-aMUxi7Y+vrPoWy/olYk5tQBiVfjxG7JEL4gH7DvSZ6c=" + }, + "org/assertj#assertj-parent-pom/2.2.5": { + "pom": "sha256-TeW1pTWrd9GKtRYTfuTfTKVQlYCSpb+VqkefdSIEBkY=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/checkerframework#checker-qual/3.19.0": { + "jar": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=", + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/groovy#groovy-bom/3.0.21": { + "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" + }, + "org/codehaus/groovy#groovy/3.0.21": { + "jar": "sha256-XPNzDAwsFcKT93UN1xFO0npnH8lAFlu64DeKKB9bLV4=", + "pom": "sha256-uOnopeJGLS/MFGzkHalgebiTHnDbPqudWdaJhj0Jaxc=" + }, + "org/codehaus/plexus#plexus-classworlds/2.6.0": { + "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=", + "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o=" + }, + "org/codehaus/plexus#plexus-component-annotations/2.1.0": { + "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=", + "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA=" + }, + "org/codehaus/plexus#plexus-container-default/2.1.0": { + "jar": "sha256-bc6xJGsYgVO9y2+WLVQ9Ud22csygfK2Up4+6vJ7fCjk=", + "pom": "sha256-i4wg5jC9zHlcyYUCTEwQRcFHvhFgUsLJdeMMYI9/O0U=" + }, + "org/codehaus/plexus#plexus-containers/2.1.0": { + "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc=" + }, + "org/codehaus/plexus#plexus-utils/3.3.0": { + "jar": "sha256-dtF0eSVA4nda+U0D0Q+y08d24s0KwOv0J9PlcAcruc4=", + "pom": "sha256-ecl5IHP97jzb69YadrqMLdEWJKn4XRKLrla9oZ4gR1w=" + }, + "org/codehaus/plexus#plexus/5.1": { + "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + }, + "org/codehaus/woodstox#stax2-api/4.2": { + "jar": "sha256-ut9ggaC7Um/SwBlR3++tkbaEa23Q6wBIWH4w0d0zTmg=", + "pom": "sha256-YhW0dL03FPG5z0216ig39LqvO42vkSEOh+qM6mWlCXw=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/controlsfx#controlsfx/11.2.1": { + "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=", + "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc=" + }, + "org/eclipse/angus#angus-activation-project/2.0.1": { + "pom": "sha256-wxdtWY0dwW67QG/aGoexTEUBqjNfBa584+Rq6p6NsbU=" + }, + "org/eclipse/angus#angus-activation/2.0.1": { + "jar": "sha256-siZ2GBWGjt+JZMHXHm0tVKsjjCeIUHBhtOBjOTO0wTE=", + "pom": "sha256-Z8XrD/f1JeoaGY8C2v7nfg0qUxudkIBxvEBhOGrgQO8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { + "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.9.0.202403050737-r": { + "pom": "sha256-RLRxOI58JtkpSnpPJNmX7DTzaSFvMjVInkAbKlUdS1U=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.9.0.202403050737-r": { + "jar": "sha256-YgmsZpG+KgYyDwIADYm+1z7fBfRdZe+aFVFHURq3fzw=", + "pom": "sha256-d5jTR1SE+88OZAOlETeAHPEey2CRi2+vtyIRUiU5Ews=" + }, + "org/functionaljava#functionaljava/5.0": { + "jar": "sha256-N3rRQOfSa6BPrfIZsJ1+HHS8AjL6QBCyDBx52xH5Zw4=", + "pom": "sha256-R9OA2YVT2vdCc5tRC/3ElIp0GHftyypTlvwpGZaJzgk=" + }, + "org/fxmisc/flowless#flowless/0.7.2": { + "jar": "sha256-VsrfwuST8d5gGZhYCx7WJW/BWO+MWjN55KRdwGckzw8=", + "module": "sha256-l0+zKTCi9FClhhTqRgzUDE/UV25NKK6Ca8YTk6hMZjE=", + "pom": "sha256-CouO13pqSfjRGZIu1DGJ+Uh3swjL1fQf5GIh3ucsi7Y=" + }, + "org/fxmisc/richtext#richtextfx/0.11.2": { + "jar": "sha256-jeYtdfz5uFsvvp6ONe/GZAjIxdC1n6bcB/uLSBsoJCE=", + "module": "sha256-V2XP/R3VuYQkk0Xpet9SwCiRewJwzji40UE77kLOz6A=", + "pom": "sha256-Vahb2I6AB9CPU/POrDa9wNxLJPruAmqXwraXmfklEzw=" + }, + "org/fxmisc/undo#undofx/2.1.1": { + "jar": "sha256-25cIxYqOLbRX+9Z/BRXkqVlVygsLj06no9y7/L0Z0tc=", + "pom": "sha256-t2MMyZwGJaE4Mvzmb+wLKb0OmuwHD76DO461Jy3BhHU=" + }, + "org/fxmisc/wellbehaved#wellbehavedfx/0.3.3": { + "jar": "sha256-4pEAWo4yM7A2RQ0SbLzScNW0Ujl3GZSVGcM8i6CeJXw=", + "pom": "sha256-RxdpNVcNIb1oX5VaJavPbwFwmrtaN3Wsj6iVA3fKSZ0=" + }, + "org/gaul#modernizer-maven-annotations/2.7.0": { + "jar": "sha256-noNA0HwiJuKKj10RVBiy4qsCE58vOWbc2RY/pZAuJn8=", + "pom": "sha256-yoJ5IPQ10QCcug70IeWcw5F0GoYJ/vV0nTZgG/D2k7Q=" + }, + "org/gaul#modernizer-maven-parent/2.7.0": { + "pom": "sha256-gAUSdml5uc61hhNSs3ZhZDJ/HNSPc2skbJX/x3U+Eo0=" + }, + "org/gaul#modernizer-maven-plugin/2.7.0": { + "jar": "sha256-QcjLKxfxDnw79Q50lq1L/nMEp/3ZFERxhWChsr5EZPc=", + "pom": "sha256-RjjOCZYGJo+Joi0e4qgp3FOg/Z9NtiYBjca5EKDSO+k=" + }, + "org/glassfish/grizzly#grizzly-bom/4.0.1": { + "pom": "sha256-mm2yNlYQGV49O4GXFx4OVMM5gUNX5vmaJPW8QGP9uwQ=" + }, + "org/glassfish/grizzly#grizzly-framework/4.0.1": { + "jar": "sha256-9vSRqXbwNZL2hsao4PxPIFRgXR0wF/t9j/Sd6aL7dp0=", + "pom": "sha256-2dwKWG7j+v93SUXK9+wVK8QXzBxUD4w5mPLESqMNCaE=" + }, + "org/glassfish/grizzly#grizzly-http-server/4.0.1": { + "jar": "sha256-gLG79NRUkndw789LIfoy0y2M2ugJKMK5b+gkCwttFcQ=", + "pom": "sha256-m6yXc7fb67qrxiRBjoloRX5SEdwBTGbhjMsN4y7+P0Y=" + }, + "org/glassfish/grizzly#grizzly-http-servlet/4.0.1": { + "jar": "sha256-1ZEIjRLmYpUNHCul35Hi2t0/k/HCPdkCJkEvwlBY8Xw=", + "pom": "sha256-fqD4CtPGql+VUxdrv5GLN76A4CHMeqo9LkuV2ySvXmk=" + }, + "org/glassfish/grizzly#grizzly-http/4.0.1": { + "jar": "sha256-SPcpFdeqWmqaaIMJPCnS/poMGz0MwJkJQtGV4ZiDqA8=", + "pom": "sha256-2lhHmLixD4gckYv9UsHWb2U1hN4xEcNzNshf3sGheGc=" + }, + "org/glassfish/grizzly#grizzly-project/4.0.1": { + "pom": "sha256-1bwcO6NciLv/9nlRP8YlLya9crqSrzzSseLvq7kbjGg=" + }, + "org/glassfish/hk2#external/3.1.0": { + "pom": "sha256-oh3tpD6bZO1uigyuzMX6dGyOcLU2bkRx+McV2r7j/Zw=" + }, + "org/glassfish/hk2#hk2-api/3.1.0": { + "jar": "sha256-kgJ30r2mEOLMU6BKT1s4+0hLAwzenI6MXAoS8SbW/5k=", + "pom": "sha256-I+ad5ZlFefvsnR1FOKI12knh2rfMwXPcTZymGcRs+Jo=" + }, + "org/glassfish/hk2#hk2-locator/3.0.5": { + "jar": "sha256-sFInfb3K74EPG0KxDpQWwj58z6DBlbClNE2AzBeGMew=", + "pom": "sha256-fbjs2dCxJgwgfvn0l6mzoGnYJSMxN6BAThJFWeH7PQw=" + }, + "org/glassfish/hk2#hk2-parent/3.0.5": { + "pom": "sha256-4wc+GDpLY13Hl4Q2wq1v9Xl+CK+8nB+jLTMpHMqcVuk=" + }, + "org/glassfish/hk2#hk2-parent/3.1.0": { + "pom": "sha256-yOhpECjfgN2wyP5MGb7QmL/XVRF5VQemBeN/uEVr7e4=" + }, + "org/glassfish/hk2#hk2-utils/3.1.0": { + "jar": "sha256-17fKc3GmdocxY+B/e1CMFzKkA2unAep/6CNJ+EnvuOc=", + "pom": "sha256-KC/8KZjCw5ScuWuRABq1WMXQg8vf6eS9HG8s8elYKC4=" + }, + "org/glassfish/hk2#osgi-resource-locator/1.0.3": { + "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", + "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + }, + "org/glassfish/hk2/external#aopalliance-repackaged/3.1.0": { + "jar": "sha256-RMv2jdXiSe/CJK18RWwdiYtx0ISvvC0hfoQ2RLlrp5s=", + "pom": "sha256-I+QCQveDcaQIPtCaMpEUPM21vRwbpVP9iEDlEMjPBwA=" + }, + "org/glassfish/jaxb#codemodel/3.0.2": { + "jar": "sha256-aTwDgiR2QDufy2V4z2sHsgx/nQ02otJ8zPDAjcWH7ic=", + "pom": "sha256-5osyFiDUZnkRXhg3kAvguBEK5FTzjguChwtcj9mYErk=" + }, + "org/glassfish/jaxb#jaxb-bom/3.0.2": { + "pom": "sha256-BioTMvjLS+0N2c1Yu0zAdQH6RMkNqhf+wQefRQudVwM=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.3": { + "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" + }, + "org/glassfish/jaxb#jaxb-core/3.0.2": { + "jar": "sha256-+aNguTlZdkOyZ241/El6+1YdIOilExKKXABwNm2xG70=", + "pom": "sha256-YMLhqbt6sWupylJsRx4DMNtXyHOeLAutDZkOntbHzo4=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.3": { + "jar": "sha256-1tdcQidSaE+/BN10ohaY/q4OSkBsKJK1rwLSPcl7KsY=", + "pom": "sha256-crhKVGcO3sRAUgH3Heo7C/aYJbrkFjNtfzFAbGnHoyc=" + }, + "org/glassfish/jaxb#jaxb-runtime/3.0.2": { + "jar": "sha256-ezo3hLnG40Oo04/BCGArqBAXfwPy2NHnJYsc73/Z1Mc=", + "pom": "sha256-AY2B8CPynufFVdb1lyBuLUwvuAttvBhUWuite6+LGQc=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.3": { + "jar": "sha256-eV4tvdPmTIun5TLjX4MTZgOTGo6aO1/+sF+fSDratuA=", + "pom": "sha256-sloOI7PxuK4yG6wnNyC3TCIqN0DdHj3h6W1ItF8ukW0=" + }, + "org/glassfish/jaxb#jaxb-xjc/3.0.2": { + "jar": "sha256-qLkrrDG2MaGQwgzh9qDutnKVUjP/dAIe/lCcph0nO3c=", + "pom": "sha256-2tovgbYhAbOknTPrHeF+KQZCBo7uk5bzS7XDZ4p7qKk=" + }, + "org/glassfish/jaxb#txw2/3.0.2": { + "jar": "sha256-tLz5T7CnWUVuJSFyRRO67JS3jpMSdUSvFi48/wjZM0M=", + "pom": "sha256-aZ+oKsMHb9ZNujfkw8DSJValP4R1ALK+EN/HKUI+eLk=" + }, + "org/glassfish/jaxb#txw2/4.0.3": { + "jar": "sha256-3welGAG5leRK7JqV74ddlfu43ih0QX3mBm2E9zHLnpw=", + "pom": "sha256-i4TetIZ5zAQrPL7GjXA9+c6May+SOdqKKOPKqp7a1Nk=" + }, + "org/glassfish/jaxb#xsom/3.0.2": { + "jar": "sha256-RXBjIzVKYGMj/xEwy1deRMbU16rEQ5VkF018ys5syQo=", + "pom": "sha256-4WK6+AKxr6D6VE2rOuYoVvK7AvnoWVvAwYjrfaatfoM=" + }, + "org/glassfish/jersey#project/3.1.5": { + "pom": "sha256-qG4HZUqPTqHoQgJUPobD7SafpkgyqXLO2C08p5JkCek=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.5": { + "jar": "sha256-CRUFmLl8UkVc5WpQbdEL5TbM6uEgrbYKUZFBVhkbSvE=", + "pom": "sha256-YO+rDTz6F6XsD7Tq2FkbRjhM1KgJhwuIkpWKsJ7IziM=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/3.1.5": { + "jar": "sha256-NmJ3F780m9H9NbOSPFvUBEyRNQL9UPE/vw6dnqTBvDQ=", + "pom": "sha256-PN56Lc1NRb9jJmpPSMAtHP23D8eOUAa/MKaNOJhSeOo=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.5": { + "jar": "sha256-0HhdH6ximojUY358LM52rhvfhWnT6MFWJaDCsn+r53k=", + "pom": "sha256-S8Rp8T3VEcgew+RO5FmhKSNSf993i62d7GU1cYNWiSc=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet/3.1.5": { + "jar": "sha256-GDEXWGACsiKhBXGo3twMaIlWXGboQmH8nktnPXCv7OQ=", + "pom": "sha256-bYYCMI286FDIaQVca8hy56G75XJ+cpkPDZitrkAh5cI=" + }, + "org/glassfish/jersey/containers#project/3.1.5": { + "pom": "sha256-w0lqpSIlKKZlfbQpB8W21Xic+vEgpLAM8vMj7AiynZg=" + }, + "org/glassfish/jersey/core#jersey-client/3.1.5": { + "jar": "sha256-4muCTOuB4MpLc8eBBEj7VWbvDBeshxrdk6ksKR5QUkM=", + "pom": "sha256-5Ij1g6kL9sbEMHOPxl2vcu6tzDLiKtP7e8lKYv0C3Ew=" + }, + "org/glassfish/jersey/core#jersey-common/3.1.5": { + "jar": "sha256-xyWPN0Qz31g+ULvlWD/W1mlDk6MikVAk9xnSGiGNwBI=", + "pom": "sha256-/knk2CpaOF6H9YzdvJKUG+MWpOhfnorIlUORB9yuyho=" + }, + "org/glassfish/jersey/core#jersey-server/3.1.5": { + "jar": "sha256-qbleTsxoqwZCycSmUEgmMO3smVvRp0DWIjYWooKwXnY=", + "pom": "sha256-M24ILdVc0GTsiV42nLKSbawHHDwrva37cQCGCHuY4aI=" + }, + "org/glassfish/jersey/inject#jersey-hk2/3.1.5": { + "jar": "sha256-DJSWz8a0+bIjxEyDtN8+3qeSTOTVK/+1XPGA6exLTus=", + "pom": "sha256-3jrHm4cU7g1lUp0Cp62C5duJ52Runw7sq+2tNenvad4=" + }, + "org/glassfish/jersey/inject#project/3.1.5": { + "pom": "sha256-aRrGuMI0wACq6GFyQwpKF6sLZlzSHGijpf+13gg0SEU=" + }, + "org/glassfish/jersey/media#jersey-media-jaxb/3.1.5": { + "jar": "sha256-2Iuyf13SKPAPBh76KOkQvK5V7SdqPWhGSntF34Rj9s0=", + "pom": "sha256-jWmzTdb7VDDtvUIP3/3tU/n7fBCm4tloba213xBqtfw=" + }, + "org/glassfish/jersey/media#project/3.1.5": { + "pom": "sha256-B3StBF40WyM4BI1aabYx1qBEkSWqO3EIFTCny6WY5x8=" + }, + "org/glassfish/jersey/test-framework#jersey-test-framework-core/3.1.5": { + "jar": "sha256-GmwP8JuRO4+DFQjA3d8k+pg+2XVFdYEXWBf3DLGGCTs=", + "pom": "sha256-RL34Nhr024shPxcP1pRA+UVp4PxlbFrEDJJGU2HT/PQ=" + }, + "org/glassfish/jersey/test-framework#project/3.1.5": { + "pom": "sha256-tR7CLcyzmCwMtbZPWIi7XRZBpRex1ukrHs0GlrXWiAM=" + }, + "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/3.1.5": { + "jar": "sha256-BFgys+mtbHeTEeUEW0WOWOFoNesKi2k+sT9jeDx7xL4=", + "pom": "sha256-vSgHhW2X3Ybj7N5tOAyKuFtmbvhfxLQ9SpakI9DQT6g=" + }, + "org/glassfish/jersey/test-framework/providers#project/3.1.5": { + "pom": "sha256-+wR6Cq8ol1omU6F9ut6avXmwygNpXG0eNONob5qdnHg=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-library/2.2": { + "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", + "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/hdrhistogram#HdrHistogram/2.1.12": { + "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", + "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + }, + "org/jabref#afterburner.fx/2.0.0": { + "jar": "sha256-PhxWSKv8xpaYIdi3BnPwxMV5qp8IBP/9/gwn1UTZDIM=", + "module": "sha256-j0p3hue1SGir/mBWqjTFp/vJ7uk9vWg8B07GwyBIjm0=", + "pom": "sha256-b1tEN8KM1NC5yV5HQ6wNwU9fQPQzpbHCqMJNxvnDH14=" + }, + "org/jacoco#org.jacoco.agent/0.8.10": { + "jar": "sha256-MtYiEcCjI/UIIqdQpkfBIrKxtVn2NTPqLjJMAyQ4E3A=", + "pom": "sha256-8Dj11h4Ka6MZsFBzsoShXIa7d0fko0lrJ/N6cRgLHNc=" + }, + "org/jacoco#org.jacoco.ant/0.8.10": { + "jar": "sha256-p8jdZ0GsszfMB3GpvxdqpnwJpSpt4BHreg9eeMm9WHI=", + "pom": "sha256-8J92Wz8N61zalBSG1r4ldS+XhC4/4yVTfWnoG7wTey8=" + }, + "org/jacoco#org.jacoco.build/0.8.10": { + "pom": "sha256-49ew2Y3rqhRTOTwiA4GSEsUofrvEZ90LSiKtBGa9bDs=" + }, + "org/jacoco#org.jacoco.core/0.8.10": { + "jar": "sha256-54lmfZOnUDk47peK5Pu8mhvM2jtUYpmyTYVQ2BbYDgg=", + "pom": "sha256-k6Dt1RSc77OOYvS+NIF5FJBoCbxPM7shEoPcQ31x6ok=" + }, + "org/jacoco#org.jacoco.report/0.8.10": { + "jar": "sha256-PjXBT3hTx8iNvgTPCG7gU6Vzn0GemACZCbvt7N3d1Qw=", + "pom": "sha256-aoWwNquHV1jv3g+Y30EAhum51X2CYYiosUVgVC3yuuI=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/javassist#javassist/3.29.2-GA": { + "jar": "sha256-qQ3bJRNd+eV+qb1OIk4hlVSSl1j5uumWXyn4HWCjKT8=", + "pom": "sha256-Ehu5fA3qc0LXSJInrCe/8J2hJ6TkS14Vy09YyeccbIk=" + }, + "org/jbibtex#jbibtex/1.0.20": { + "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=", + "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo=" + }, + "org/jboss#jandex/2.4.2.Final": { + "jar": "sha256-PyzlXH1x50RYFIjcUQWAaqgITAjm6RagGbq4+GmJlPA=", + "pom": "sha256-6l4By7dQ+V1+DkR9PLk0NadCgZU9ldZTKzyEgHwo10c=" + }, + "org/jboss#jboss-parent/12": { + "pom": "sha256-nlb1shiYpucR6FdiGsHvts88PeFlpKowfbmYgmrU/98=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jetbrains#annotations/24.0.1": { + "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=", + "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA=" + }, + "org/jetbrains#annotations/24.1.0": { + "jar": "sha256-J6dw3HzlBQCRi7jDwGYMmCkGMOx5a1489rkPQDswM8Y=", + "pom": "sha256-Ljf9cCCkNkueXZ93xbZ0Kjvqkn3VYMoeOQ3IFcnFCCA=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.22": { + "pom": "sha256-GICVqDQdZtIs9LSZRMAFThWpS7j7m06rL2YabLjD4X4=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": { + "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=", + "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": { + "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=", + "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": { + "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=", + "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jooq#jool/0.9.15": { + "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=", + "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M=" + }, + "org/jsoup#jsoup/1.17.2": { + "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=", + "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0=" + }, + "org/jspecify#jspecify/0.3.0": { + "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=", + "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=", + "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.5.1": { + "pom": "sha256-eHThBkE5sx4sWkZrPcEClwk2IWK98B8PSqq3OKuTLTM=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.2": { + "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", + "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", + "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + }, + "org/junit/jupiter#junit-jupiter/5.10.2": { + "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", + "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", + "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/junit/platform#junit-platform-launcher/1.10.2": { + "jar": "sha256-rtT0L7kK2ps0fCMfE2VvwJEhuiDattxkamvZ1Nox5Ko=", + "module": "sha256-/1YhIQJQJSv9rbYiu+LqZuzsMahnc2zqSz1K3yGcp/8=", + "pom": "sha256-WjEXCOeQa7l0YpwayHC8EWV0ZbmJ2koHfkVBa9mHJeQ=" + }, + "org/kohsuke#pom/21": { + "pom": "sha256-C8qSPq0O1GSp1AglUITbhghxsjIMrdDduczkbkwFvi4=" + }, + "org/kohsuke#wordnet-random-name/1.5": { + "jar": "sha256-AgxW1yGfqdgrfi/Puj0kyX8HYYsqaVfZMIetcHK5khA=", + "pom": "sha256-RG4Gql8gAlAWNo2W9yX5sXUss+w6sp4WzLydoyMZpwA=" + }, + "org/kordamp/ikonli#ikonli-bootstrapicons-pack/12.3.1": { + "jar": "sha256-OgLyfRuGyubrnLgLOarbBmxaD9H+ppi5ce3nK9BdMe4=", + "pom": "sha256-d0wPeMVNPKNg7wDAltsvKlndf7EV5RqC2c7cfGAgRxM=" + }, + "org/kordamp/ikonli#ikonli-core/12.3.1": { + "jar": "sha256-GN0LOvW716ZKvvWvdGzkm71mvYDx+4l0PR46D4sP5Ws=", + "pom": "sha256-MXGJdHSQH1Jt2wccCwJQtouDW3A73/Src5rEJEObYWo=" + }, + "org/kordamp/ikonli#ikonli-javafx/12.3.1": { + "jar": "sha256-tx7z81LDaeDn8IwU74nKv4hC9JWh5smUkDfZXvSpDYo=", + "pom": "sha256-7dl4yXjxkoOOVUh0EJibs/8oxpX70JBPNsT0E2GXzEQ=" + }, + "org/kordamp/ikonli#ikonli-material-pack/12.3.1": { + "jar": "sha256-G8TzVs+yhQv6nEGB2qLb8zcI505bZGNRUIJpMs5hxVA=", + "pom": "sha256-gAcPK4qbi/U63F7pO7qDGY5TL0PE8UhVEi0yFE66Sj8=" + }, + "org/kordamp/ikonli#ikonli-materialdesign-pack/12.3.1": { + "jar": "sha256-FeIubWaDNfbf3LTQ5KqJix+/uD3AMxvvRXoe2kJggtE=", + "pom": "sha256-j/6Z8wpYyG7I7ihokW5DMLRQ7kGJQcRn0K9t9phGlsA=" + }, + "org/kordamp/ikonli#ikonli-materialdesign2-pack/12.3.1": { + "jar": "sha256-1Qfh07ZoZNeiol957eMgvssfduFtIAsGdW9KzmWCEMQ=", + "pom": "sha256-GkIkc7zZStCyfgXp8HNHJPjcCXtbdAKBE8Bug1+/0OM=" + }, + "org/latencyutils#LatencyUtils/2.0.3": { + "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", + "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig=" + }, + "org/libreoffice#libreoffice/7.6.4": { + "jar": "sha256-mTOuf6lh4qeFo1Iat1cVdyuuNUA2zeigI5mnc4OeGDY=", + "pom": "sha256-fNpYEKQpmEYPgNrKCZ6YAJtcY0bqKgVJLsE7NPQZQbU=" + }, + "org/libreoffice#unoloader/7.6.4": { + "jar": "sha256-1j+kVLLB04iy9GZeJhEpHZ8/YxWzy1QPA1sBzzUMbXQ=", + "pom": "sha256-0Agwh7BhqHsyN8Q+dMWdNDgv5EoioiCbf/mmdfLX55s=" + }, + "org/mariadb/jdbc#mariadb-java-client/2.7.9": { + "jar": "sha256-8siZYGTKh2mS9ZDXjqJfbE+siK0pdt/0cp2BbrrNbsU=", + "pom": "sha256-Dh+6B9VnA7GEygOL/cvLxOMHeOUC52dF9fRB/SASFBg=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.11.0": { + "jar": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA=", + "pom": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/openjdk/jmh#jmh-core/1.36": { + "jar": "sha256-+Ql0430NqIhrXAXm4+fiBVaQDXR8WkHBAjtHwzAepzw=", + "pom": "sha256-mBI0JlrAQfFmsXxa3GsdRZ6JTKv/6vawnAB08PQDguQ=" + }, + "org/openjdk/jmh#jmh-generator-asm/1.36": { + "jar": "sha256-dGCxG4I97nSz4ZYX011ZEbASRTA9bjHDD4NBfPwvVLU=", + "pom": "sha256-V7u+h4OU+LP8G4DEEWHdSItCwNez1wpeR09CcbHqOkk=" + }, + "org/openjdk/jmh#jmh-generator-bytecode/1.36": { + "jar": "sha256-M3ZUL4lQvNcGxRbOBiDR34IjCecJK4+TOJFygxgdWF0=", + "pom": "sha256-URABHSX7lGay8Am/99fsCmLop6uvBomb+2tjBbBOKUQ=" + }, + "org/openjdk/jmh#jmh-generator-reflection/1.36": { + "jar": "sha256-qccnYOEsGZ4qLCjxoSbr8MxbUcC1jUZHJZb8Mvf5JTQ=", + "pom": "sha256-msCIMyyp0UcTCJk55zzaHn/0Q8fIx3usiFsIo7eHUUY=" + }, + "org/openjdk/jmh#jmh-parent/1.36": { + "pom": "sha256-O2PObo/vrLMgN24F6fuzuuhqiJI5AIdZGJoLDVylxdY=" + }, + "org/openjfx#javafx-base/19": { + "pom": "sha256-Aey9z45qdPR7FVUFTzHW8Vsh7yUi+IC47nVoMCG4e5U=" + }, + "org/openjfx#javafx-base/22": { + "pom": "sha256-XPr4AKyei29O5+mOaRZvN0PAo+xyLhx8idLaEzmgQIE=" + }, + "org/openjfx#javafx-base/22/linux": { + "jar": "sha256-guS1JYZGAz4MvYzoYKBZWGDIwNeOrfXKWQ9FNps7PQ8=" + }, + "org/openjfx#javafx-base/22/linux-aarch64": { + "jar": "sha256-V/RTupEwEyrt1pOsAzUdsTU/869RxG/7lUUnp71Jygk=" + }, + "org/openjfx#javafx-controls/22": { + "pom": "sha256-8AZSRCn/IPdz+tfjwXq9/qkkzMeqGamSoeQZPl/kCA8=" + }, + "org/openjfx#javafx-controls/22/linux": { + "jar": "sha256-4E5POGe18PR56yKJsDgwPOn7TR3vImvJHCkYlpvzW2s=" + }, + "org/openjfx#javafx-controls/22/linux-aarch64": { + "jar": "sha256-lrubCX8JhvuuwvMnReQ2C5s81ACnFGtJYwpoQtrks3E=" + }, + "org/openjfx#javafx-fxml/22": { + "pom": "sha256-N2R+Lpsq+3hcJKu2GjjD5p02av/TUyv6J+jIrm92tPI=" + }, + "org/openjfx#javafx-fxml/22/linux": { + "jar": "sha256-K5X/HQ+4GUIrIU2Xs423Bc2alyMK41P0kr3UiJujqdY=" + }, + "org/openjfx#javafx-fxml/22/linux-aarch64": { + "jar": "sha256-6O1DY40U+OTRIkabO7E4SP8WJpgQ+HzeAgwEQstngZc=" + }, + "org/openjfx#javafx-graphics/22": { + "pom": "sha256-snXDI9Pbr1/anOegMkG/JEvfeJ5GFON+pMPjww4P858=" + }, + "org/openjfx#javafx-graphics/22/linux": { + "jar": "sha256-ACrpnQ8ML2Clh72fkRaP7lvZ2AJ4H0eXV1lWz0icJLs=" + }, + "org/openjfx#javafx-graphics/22/linux-aarch64": { + "jar": "sha256-+9uVZeikBGWUwCjtAHX/UIU2XW8K5a855qOlV+InMWo=" + }, + "org/openjfx#javafx-media/22": { + "pom": "sha256-vEijYpt55oTHD6hTfzwpQh5HX2+r0TObedWHcpMN5XA=" + }, + "org/openjfx#javafx-media/22/linux": { + "jar": "sha256-kVG0rkkTRjBQ2WvTTIQOov6iPaJ471BRyvDn8ldkTRo=" + }, + "org/openjfx#javafx-media/22/linux-aarch64": { + "jar": "sha256-ijZAJ9fOc6n4rfSkkxf86PNqTndJGJPmaYmpZt2PHjY=" + }, + "org/openjfx#javafx-swing/22": { + "pom": "sha256-wPQryYkBk3076g85BuQT1HvgXNsaWu7FbRw5JD2DM5w=" + }, + "org/openjfx#javafx-swing/22/linux": { + "jar": "sha256-JTdrxDkPNwbv3wlfQLGAZt9DWkNlufS99GGOWFZexZA=" + }, + "org/openjfx#javafx-swing/22/linux-aarch64": { + "jar": "sha256-4VmmNrLKX0uia0YqDEg/5OUXHIrp8HYcHk1Nml9ZhbQ=" + }, + "org/openjfx#javafx-web/22": { + "pom": "sha256-iart37SyLvVtJt/pOmmrx1NXNSxi1Y+1EkMPWM/q0BU=" + }, + "org/openjfx#javafx-web/22/linux": { + "jar": "sha256-aodN6LOSTA7EKlLTUfIxBgAmwAjLKG8vCqy4PHc/KBk=" + }, + "org/openjfx#javafx-web/22/linux-aarch64": { + "jar": "sha256-kZ35kB0DE4sbhHFpQl4JkHO/1HKexPGy1GKdecJtSqc=" + }, + "org/openjfx#javafx/19": { + "pom": "sha256-3uMYnD1+670gSRMKUACQBOKE7GIJ5pDv/UhQAgcDMVs=" + }, + "org/openjfx#javafx/22": { + "pom": "sha256-ZO+kxQXukz+S0/4hqQ7RVKKs1Dhif6hKHYG7jRZWN58=" + }, + "org/openrewrite#rewrite-bom/8.21.0": { + "pom": "sha256-Azkt40r0B5flheYgsf23SFMWWIlmazmzaDVw1FLuew8=" + }, + "org/openrewrite#rewrite-core/8.21.0": { + "jar": "sha256-6GSDE7y3VWH6HJz3LwkdsFniahLoImye+8+nuRsI76k=", + "pom": "sha256-A/ew4svumksQ5JEhZ0b7LuijjcUa/JkjlA+d/kcSJBo=" + }, + "org/openrewrite#rewrite-gradle/8.21.0": { + "jar": "sha256-XTHPQ9DTaKc4TnQiagPCyBFQTaLfCXOH2z5i9qObeXc=", + "pom": "sha256-Y1eifRHVGfN6a6H/zd4RkoBc+U4sF10ozzespNEpJvs=" + }, + "org/openrewrite#rewrite-groovy/8.21.0": { + "jar": "sha256-DdOshMdDc28F8L33l/WcSHOJGD2HMTE7uaK2/L/b5NQ=", + "pom": "sha256-i/8dIEtMZ/b13X/xrzg1tWYevCpsEq6MteAQTpQE7VU=" + }, + "org/openrewrite#rewrite-java-11/8.21.0": { + "jar": "sha256-63noiYXGCPXvh5C63ZFgE+X0DvI0ep2R0N28MNOrrcs=", + "pom": "sha256-qux8ai9mgiRqmpAAVg71TGZtbwJyownpOglc9dOfIv0=" + }, + "org/openrewrite#rewrite-java-17/8.21.0": { + "jar": "sha256-YYmKR/DtaGPZwkVE2FgoBpuQ3t3BXVgrjYBnYL6hWaw=", + "pom": "sha256-yDjkf7A+AjW8nEw6Iib2ItX9tNbHhhz6XY8qqDov21g=" + }, + "org/openrewrite#rewrite-java-21/8.21.0": { + "jar": "sha256-vzeB1BuAq69JMnA14hGapmmRpFSczMH0nlnoCTRy9ow=", + "pom": "sha256-r6aBMHJ1c+5ylW0IOBqOMDfsa/32V4ZwpVrAWcuWHKY=" + }, + "org/openrewrite#rewrite-java-8/8.21.0": { + "jar": "sha256-z6Of1uCO1N/o3P067MMmN4XJ8pg+Z2DA30eSUs3LF7U=", + "pom": "sha256-7IQKBZa1bUslZiP/yByco2SfqixQoQVq12orrFHPDqk=" + }, + "org/openrewrite#rewrite-java/8.21.0": { + "jar": "sha256-4zpbtRptMY7tffzefDhMW8tFv16SnZz0o+EGgMeWoZE=", + "pom": "sha256-uylbeYK6uPlJwhN+EOrJbqvT0EorJmX+tg6kFfmHyv8=" + }, + "org/openrewrite#rewrite-kotlin/1.13.0": { + "jar": "sha256-RaOAjSzUP0bDYILxlv3vM3WMWDO0+LXIHoFwIRvGGJU=", + "pom": "sha256-n3bzjLFeL0EgpMIyWKbm15pLtd8yLbrc6VhZszsRJOQ=" + }, + "org/openrewrite#rewrite-maven/8.21.0": { + "jar": "sha256-8SfV+EbDpE4Fd3OygACuHm4g4YRosHMdtBuoZkbNl3Q=", + "pom": "sha256-kBLtw6s/7iHpVsBeu+CNjzQhSZgCz35bGQqJ8nLjbf4=" + }, + "org/openrewrite#rewrite-properties/8.21.0": { + "jar": "sha256-xKVI0BqeyFYGiZHDg5V2PAk56idauyEPmvcqmfmEqTU=", + "pom": "sha256-Q+MMeQxF+rOUx/urik29d7MVO5n3DTifk1WDaxg+4bM=" + }, + "org/openrewrite#rewrite-templating/1.6.3": { + "jar": "sha256-gUQATASLXMbZTtHoGAAxH5A+zHydEcZSubaIgMgRHE4=", + "module": "sha256-srYqszmlwMhSsBOwQgXg2tLxanpkleLg+L5JTItfyQ8=", + "pom": "sha256-JlYrXvlmF1b3jE5wQlhMPXqo3UCazWYIF2DfVsPA69Y=" + }, + "org/openrewrite#rewrite-xml/8.21.0": { + "jar": "sha256-vyVYEE7bPfGbrUZ5Tb6zBRDUqKsyQjsWCvcn/cxW+w4=", + "pom": "sha256-Ed1qEe2ACbkIwi76pitZNljilzTTq2JAMLZBRQdBVPs=" + }, + "org/openrewrite#rewrite-yaml/8.21.0": { + "jar": "sha256-C8j00wnD4IHxPpPz8m+ckOtKS+o4jn+GcQcfCDbSBa4=", + "pom": "sha256-l/ku9K9CAgKXwrB/7npvHsSZ3yBQoYK34GP0LIxtUQE=" + }, + "org/openrewrite/meta#rewrite-analysis/2.5.0": { + "jar": "sha256-/wYl8HtENRIN5D1Qnej6SKJrMHGC6O0qAqO9+PIKEXA=", + "pom": "sha256-KJ/UbupGTtq8FE3q3ao/J4pM04i3t3PFlsBMj5s0EUA=" + }, + "org/openrewrite/recipe#rewrite-github-actions/2.1.7": { + "jar": "sha256-+U58BXTuyk4b3glUSQNpazuJLDVWgVfgpx5imSpByQY=", + "pom": "sha256-9tN8nQx7IKgMwlNmh0Qhu6dFQBAqmOXW2HuG9y/+3cQ=" + }, + "org/openrewrite/recipe#rewrite-java-dependencies/1.6.0": { + "jar": "sha256-xEXEsREh7neaM4sehHO5FP2AmadbLdoVhDpBWe4dJMw=", + "pom": "sha256-ju9CTQl7Uu6MX3zAlr8QGXcDPfJpjCteGMNflvPun6s=" + }, + "org/openrewrite/recipe#rewrite-logging-frameworks/2.5.0": { + "jar": "sha256-XkUkAscaFk1HfLoxBS6KoVDPXW2XnkO84pc401lkPPw=", + "pom": "sha256-Fr1EBxgNTmopE+Yv9mBXXkLPgwi+3b48TYTCBlhXljU=" + }, + "org/openrewrite/recipe#rewrite-migrate-java/2.11.0": { + "jar": "sha256-G7KiDLRYWfiH61uT1KFByn5tSgoX7Lili3G1vtnGmtQ=", + "pom": "sha256-1AUeb7KAgDV/Ny3jgzw3F8aGVlg4pS5GJ3JrGtwwzao=" + }, + "org/openrewrite/recipe#rewrite-recipe-bom/2.8.1": { + "pom": "sha256-UhsIRURzoOk+BXcbmOqz/WgEB8mPtt4x6KVvnvUpnGg=" + }, + "org/openrewrite/recipe#rewrite-static-analysis/1.4.2": { + "jar": "sha256-jQ+HQhy5s65fr8DJVx9zBwelxwc7NENwgkxYbEnP3WY=", + "pom": "sha256-JWhucQZ6NSPReV1ZAjkjBbyTEL6hZhHJpRY/JN4mMBo=" + }, + "org/openrewrite/recipe#rewrite-testing-frameworks/2.6.0": { + "jar": "sha256-yZeGKnv0lO04nA2wYX2RDbXQHdJ4FKOVtjz1azcPLdA=", + "pom": "sha256-PTCTctbxw43Bf4rNg5LD0Etp2oCT/T64CA80/bpZo/I=" + }, + "org/openrewrite/tools#java-object-diff/1.0.1": { + "jar": "sha256-jc8DgdMGxSI86kwKy4Sv1WkexutB4Lajbdooigx+xNw=", + "pom": "sha256-WB1ijMi/jOggPdk0mFEiFkhqZeiG6KM7lLgZgdWrEe4=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.6": { + "jar": "sha256-2Sgy18N+3AfGDiVZrGEYsx1kLjN6ZnHty3up+uaO27s=", + "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + }, + "org/ow2/asm#asm-bom/9.5": { + "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + }, + "org/ow2/asm#asm-commons/9.5": { + "jar": "sha256-cu7p+6+53o2UY/IN1YSkjO635RUq1MmHv74X3UgRya4=", + "pom": "sha256-im5GDu34zHuF0zx1YhPmpfeHX0qDg9U10ZnzIR7CNVw=" + }, + "org/ow2/asm#asm-tree/9.5": { + "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", + "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-util/9.6": { + "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm/9.0": { + "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=", + "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=", + "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, + "org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/postgresql#postgresql/42.7.3": { + "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=", + "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU=" + }, + "org/reactfx#reactfx/2.0-M5": { + "jar": "sha256-ux/CCc2cBXsXpIAz03lPk3unpWazwIstuIh3cnaf3Wc=", + "pom": "sha256-FdCXejrnQDKd3KigR9gDgnVo5WO+1MLABshBr3/mftE=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/rnorth/duct-tape#duct-tape/1.0.8": { + "jar": "sha256-Mc7xLd7JedH4bXz3CMQaF9pSPQXGhf1mQunQsq3bckA=", + "pom": "sha256-Jjb2bevm4SQ3Yy8jpnubyWGwNjMAnlJSeju8hx9AabQ=" + }, + "org/scala-lang#scala-library/2.13.8": { + "jar": "sha256-oIgrglFBkMK6x9GkWYcqdfAF/A8+iLK8A5A2cUbjXbc=", + "pom": "sha256-SucLPLDCFdaa6sKMkhLmgR+euXiVZ4I0BgiTNCCIDVI=" + }, + "org/slf4j#jul-to-slf4j/2.0.12": { + "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", + "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.12": { + "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", + "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + }, + "org/slf4j#slf4j-bom/2.0.12": { + "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.32": { + "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", + "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" + }, + "org/testcontainers#testcontainers/1.19.7": { + "jar": "sha256-xjfgJnjOvRKjAZqw/QWu9actBCkfC3OPGASZciMSgGw=", + "pom": "sha256-cKoV/o9xafOk76fPgfcIpIHMucsuCUe2Qh9ZKwjTDkU=" + }, + "org/testfx#testfx-core/4.0.16-alpha": { + "jar": "sha256-d0OENQCPIFYHClNrpQE9YxtPjBJv/1tTpJgh0Ml6dVE=", + "pom": "sha256-WgPqJdnH2bzqrnSheRJYPpZEpfUPENk20ovgMHzuyhs=" + }, + "org/testfx#testfx-junit5/4.0.16-alpha": { + "jar": "sha256-QFZZthIlFxY+GwQdr3WL6q7Y2PQKmtRXEkhiUTrSbZI=", + "pom": "sha256-US6tI6KaaXRc4VgL44P/L1XE+2ts0tAoOjJCOo1sQcQ=" + }, + "org/tinylog#slf4j-tinylog/2.7.0": { + "jar": "sha256-UdOqc6mGv8mFPuqRzXGHe5eJHwHIX2m0Kie1u5YpXeI=", + "pom": "sha256-m/aklJduXebZ9Qqm8D2J3IVeBnG9MGvvgJdAMbEkHys=" + }, + "org/tinylog#tinylog-api/2.7.0": { + "jar": "sha256-61ER4CprUyS1/U5DTL5rkxGb4FrS26PSHPAEWzqXVAw=", + "pom": "sha256-tSUMtY3N/tHm3xrll9xpKdNfukezTEmqKOS4iTyhjSQ=" + }, + "org/tinylog#tinylog-impl/2.7.0": { + "jar": "sha256-N+Uy9wagG7dqmEVMzXHR/6LoPyvv4cMJ5cZ+PEdL7bo=", + "pom": "sha256-mfmyIjpFEnD+OiS3DkfSXS46HWyYW0AxzReI/l1jt8Q=" + }, + "org/xerial/snappy#snappy-java/1.1.10.5": { + "jar": "sha256-Dz8YV+0zEWWD9IC031wCGINsR7+8nGIhwNc/NW3s83s=", + "pom": "sha256-ZfW4PkjZ5JRIKtA/GEyeV680jXj0rr4AzWr9xnaB7Y0=" + }, + "org/xmlresolver#xmlresolver/5.2.2": { + "jar": "sha256-78kr1+0ys+VwleCz6HIFHM+73MmAgx7zPonjgWGoUiI=", + "module": "sha256-GwTrOc/sj9X44KtqVSGymabUTza3o8Vx+6lr5Tp26AU=", + "pom": "sha256-4VopIlQ7OlXDF3TxDoPbdOk7L6kLPWMV3TocQqkfAHQ=" + }, + "org/xmlresolver#xmlresolver/5.2.2/data": { + "jar": "sha256-FzkEvb14O6D6ySxbzAXaXQnwzn7tJDRmZuoKI5Rh+bQ=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-matchers/2.9.1": { + "jar": "sha256-uAyzm0wip1yGgQbGJoG/K64aWB9D82s1x74qz52d1GY=", + "pom": "sha256-EuxNwYrSDy5ojDCKgHWYl4ZE8T2bsTrqkDKlUEvQIK0=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "pt/davidafsilva/apple#jkeychain/1.1.0": { + "jar": "sha256-DBAKBPcAbxpuRxOFMF2IORIFaO29gPV7eHtxq415sXM=", + "module": "sha256-jMj9dmUna3xQ+fSqQtV4t40JKzy8ts0F/TKffE36A40=", + "pom": "sha256-McjawxJZPkNy5BS90l5/ggozTuwD/itb0p4daocwRKg=" + }, + "tech/units#indriya/2.1.2": { + "jar": "sha256-KGUPPEehW1AM1XkXaZKqWfbcQwqEKQqd7Svhly0r/eA=", + "pom": "sha256-ydZchn1fU9Z4XogcMASiwBCmk9EcCT8y03eiwHWxz9c=" + }, + "tech/uom#uom-parent/2.1": { + "pom": "sha256-iIrWpNud30ZNQcX1Jf0E95C5yTmoEPEWskVBw6ndFpM=" + }, + "tech/uom#uom-parent/2.1.1": { + "pom": "sha256-rNe3raemg444OLgoG3V4Hoo+mKSZm79kjwsNiBHXSe0=" + }, + "tech/uom/lib#uom-lib-common/2.1": { + "jar": "sha256-YYJfVNYd2pvalSU7QHZTvhz5/ZuUHaNGLJSjsW8rHIg=", + "pom": "sha256-ZyShzOK9EVWuZmGJ5j6Hzyu2tScCqxqLZsgY18dufvg=" + }, + "tech/uom/lib#uom-lib/2.1": { + "pom": "sha256-x71alqfCcTCj8zlti6X9PO7yPTE9k8wAexFAKlJzjbY=" + } + }, + "https://sandec.jfrog.io": { + "artifactory/repo/one/jpro/jproutils#tree-showing/0.2.2": { + "jar": "sha256-UL0OKkyxsS6fmZUT19xz7XRE6xGDirJwOPh/42G7wk0=", + "module": "sha256-MIj5KRKf67jwt1J/uusje3MSfHk6PB4wVAPLpTn3xC8=", + "pom": "sha256-fP6x7y/1WE9jjIYlE+o+8IyFw0gTyzvHDOPTUyQLTMw=" + } + } +} From 83d8edbedeb471dc472bd46359a486597b37aa9f Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 10 Dec 2023 07:14:15 +0700 Subject: [PATCH 167/562] signald: convert to gradle setup hook --- ...g-during-gradle-build-inside-Nix-FOD.patch | 42 -- .../0002-buildconfig-local-deps-fixes.patch | 71 --- .../instant-messengers/signald/default.nix | 89 +-- .../instant-messengers/signald/deps.json | 528 ++++++++++++++++++ 4 files changed, 546 insertions(+), 184 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch delete mode 100644 pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch create mode 100644 pkgs/applications/networking/instant-messengers/signald/deps.json diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch deleted file mode 100644 index 4a49ff991e6b..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 26 Feb 2022 12:33:13 +0100 -Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD - ---- - build.gradle | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..01e444d 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -82,6 +82,9 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -+ maven { -+ url "https://plugins.gradle.org/m2/" -+ } - mavenCentral() - } - -@@ -101,6 +104,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -170,4 +175,4 @@ allprojects { - runtime { - options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] - modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file -+} --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch deleted file mode 100644 index bf583de53ba2..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 26 Feb 2022 12:36:15 +0100 -Subject: [PATCH 2/2] buildconfig/local deps fixes - ---- - build.gradle | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..24415d8 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - -+buildscript { -+ repositories { -+ maven { -+ url(uri("@deps@")) -+ } -+ } -+ dependencies { -+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" -+ } -+} -+ - plugins { -- id 'com.github.gmazzo.buildconfig' version '3.0.3' -- id 'org.beryx.runtime' version '1.12.7' - id 'application' - } -+apply plugin: "com.github.gmazzo.buildconfig" - - compileJava.options.encoding = 'UTF-8' - -@@ -82,7 +92,10 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -- mavenCentral() -+ mavenLocal() -+ maven { -+ url uri("@deps@") -+ } - } - - dependencies { -@@ -101,6 +114,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -166,8 +181,3 @@ allprojects { - } - } - } -- --runtime { -- options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] -- modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 425e4b45ec61..44e849092ca8 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, perl, makeWrapper, substituteAll, jre_minimal +gradle, git, makeWrapper, jre_minimal }: -# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` -# can be removed again! - let pname = "signald"; version = "0.23.2"; @@ -16,8 +13,6 @@ let sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; - gradleWithJdk = gradle.override { java = jdk17_headless; }; - jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -37,76 +32,19 @@ let ]; }; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradleWithJdk perl ]; - patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh -x - - # WARNING: don't try this at home and wear safety-goggles while working with this! - # We patch around in the dependency tree to resolve some spurious dependency resolution errors. - # Whenever this package gets updated, please check if some of these hacks are obsolete! - - # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), - # but gradle doesn't detect such renames, only fetches the latter and then fails - # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. - pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null - cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar - popd &>/dev/null - - # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required - # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. - # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 - # the only relevant change is in the code itself (and in the tests/docs), so this seems - # binary-compatible. - cp -v \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = { - x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; - aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - }; - in stdenv.mkDerivation { inherit pname src version; - patches = [ - (substituteAll { - src = ./0002-buildconfig-local-deps-fixes.patch; - inherit deps; - }) - ]; - - passthru = { - # Mostly for debugging purposes. - inherit deps; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) + gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; - gradle --offline --no-daemon distTar - - runHook postBuild - ''; + gradleBuildTask = "distTar"; installPhase = '' runHook preInstall @@ -120,10 +58,19 @@ in stdenv.mkDerivation { runHook postInstall ''; - nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; + nativeBuildInputs = [ git gradle makeWrapper ]; doCheck = true; + gradleUpdateScript = '' + runHook preBuild + + SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps + ''; + meta = with lib; { description = "Unofficial daemon for interacting with Signal"; longDescription = '' @@ -138,6 +85,6 @@ in stdenv.mkDerivation { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/deps.json b/pkgs/applications/networking/instant-messengers/signald/deps.json new file mode 100644 index 000000000000..c3ec7f1e80d0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/deps.json @@ -0,0 +1,528 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org": { + "signald#libsignal-client-aarch64-apple-darwin/0.21.1": { + "jar": "sha256-GZyZBUokXraIAXXRoGMFoU48FzUym80J0XU2o/fbEgE=", + "module": "sha256-Z6k9Pt5ac5il2uK2ngQn0Mc8utSRChIl+pO7UeOmbJs=", + "pom": "sha256-b2SOa4rB+2SGAohZpsv7ZNUKPrcCBIONBiflsaLJA7A=" + }, + "signald#libsignal-client-aarch64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-qkF5S7OwiRTABFoAWsXn2WsRCKe+GIcDeX+ENFjbhQg=", + "module": "sha256-Y/ir3VC1oORyDy19ZOctnIcDxgm+tbZSbKKz9VcBh3E=", + "pom": "sha256-E5pDb3MphJnKuE6xfizHrJ4qWXu4Tfv1hWPzynRkx+g=" + }, + "signald#libsignal-client-x86_64-apple-darwin/0.21.1": { + "jar": "sha256-Xc+eIRMlTTReDigOlcPxD4sIm44cwKoJ63tGBxx10pk=", + "module": "sha256-g2GHQh5ThVjmHn7Fiq4j0cPQDpZWl4Lx8kNq8E754fQ=", + "pom": "sha256-AHphg71FAR4tLhOXJP0TfHtSRothQmXL9h6/Vy2fg2I=" + }, + "signald#libsignal-client-x86_64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-b9C1XUATmYS+QyZZT0twxY8e5VBYPX4PGc4KwMuz3MY=", + "module": "sha256-LdJQ1bGMcVuW5gMxwXNfco0fk9EqKUR3/dcXK9/f+uI=", + "pom": "sha256-vQvRDMrMPzs26mkIGyWealXU9n+F1zUsYi+0mGmB4Pc=" + }, + "signald#signal-service-java-aarch64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-AWLSsBwoo2bA95cX7cUZr8djin+pzrg7uQklKB5HaX8=", + "module": "sha256-Kx4rUnEcn7UqES53q7SBDzM1SrPYRW9hLyy8bTUpGqE=", + "pom": "sha256-lIWISMl3ZO1DTH0UvwrFWsWNvTT2T/l8XMnbVu64b90=" + }, + "signald#signal-service-java-aarch64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-rnh3En9Apq4zZPNCWCpat3bJwjegnWmfKclyWq9WV38=", + "module": "sha256-+ul/buZ1z6UMjhTWY4wrhz9sYrOOiOvbuLg3qSpxJKI=", + "pom": "sha256-4Bt4nts4B+MZJMVAjrxB5b85TaHhEfcslDDegkCVy7Y=" + }, + "signald#signal-service-java-x86_64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-Hkig/2S8txhBKyyzRcloqwc5rMhDELTbRSzy4XGg7Sw=", + "module": "sha256-e/U5v2nGOG3VbIHh0GDFBdIRo+qp3SyiTcsrum9T7gk=", + "pom": "sha256-B+8twiic8oQYWENG9d9ETv4eyYfdEuT6U0aNj87rB48=" + }, + "signald#signal-service-java-x86_64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-+p3jm8+Bg96BUIQdGT6LHczAhMfSqQVm5OlP5g+bEEs=", + "module": "sha256-GKfQ5h9vzUQL+1pNejIPyb1yjhtVn8CkkAGyaUr5RBM=", + "pom": "sha256-MCAEHWahZHEhR7FP7tDKII+FZM41e3Sc3fVuWwN8GhI=" + } + }, + "https://plugins.gradle.org/m2": { + "com/github/gmazzo#gradle-buildconfig-plugin/3.0.3": { + "jar": "sha256-ql6AIOvktizdRYn07XFhq1wkSlIJ5eWey7lFOP312to=", + "pom": "sha256-EVUqzLXaH59nxdNJoUjwxAP6MJKT85Vcc1qOvY1XH8I=" + }, + "com/github/gmazzo/buildconfig#com.github.gmazzo.buildconfig.gradle.plugin/3.0.3": { + "pom": "sha256-U2RlL3aMVri6eXtNL2AEDerbGlzB6lvG0gfFF88d7W4=" + }, + "com/github/gundy#semver4j/0.16.4": { + "jar": "sha256-3vm0Il+jchnhj4HQHw5S1z3KElejj1R1vp3Vj4dzZRA=", + "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" + }, + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "com/squareup#javapoet/1.11.1": { + "jar": "sha256-nL8hB75JnsbpWv02tY48oSKiQWbN03VzLlEmfWQFjpA=", + "pom": "sha256-+fP8Lz85koufe74oEXW3R9O1Wgkh8wLi4g0J7o5Bw+w=" + }, + "com/squareup#kotlinpoet/1.0.1": { + "jar": "sha256-vqGIRbA8fGXPkfc5iLoBlQuuZ5nDxRgrVo/nHN2JSqE=", + "pom": "sha256-R0rbJYzTlWjOYNanxzBoFzo6BhZ25AGBBVKnXiPuxdU=" + }, + "de/undercouch#gradle-download-task/4.0.2": { + "jar": "sha256-lSy/zF8hvuzLWSXMW6ZIrwmDklhEHdRNCH1kpX006Ho=", + "pom": "sha256-YvKRaNwv+1gMRKpgIfZVBRqcsKSN/Ue8fk6MpvljrbA=" + }, + "org/antlr#antlr4-master/4.5.2-1": { + "pom": "sha256-U1i0eNglVatXr9f8cjHWA7QPl3vnyjn0DF7FTnZ+tnQ=" + }, + "org/antlr#antlr4-runtime/4.5.2-1": { + "jar": "sha256-6DFBMAS87tfZFcOhdZJ7Haq8SXS3uKb4e7zohtNVA5g=", + "pom": "sha256-k7rJtrxxTVWZBO1DJCeCqMvlQ86/AQS7PswXhqnLZh4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/beryx#badass-runtime-plugin/1.12.7": { + "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", + "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk=" + }, + "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": { + "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { + "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", + "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.4.31": { + "jar": "sha256-SNfgjtYPscadJ/VyBaihHEcdaBM55nlEpL0L8sLht5A=", + "pom": "sha256-6ezdB6SaaAPWXoSb5064ff36iLtElaSDK1zJJbvv2BY=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.4.31": { + "jar": "sha256-E11Hgji/ecK6L8FKIgRG3uj3TmiyP5ELwuTRmBorcG0=", + "pom": "sha256-GkmFH2YJ3/XRCK5UUb76mNEcNYUsz7XZiOmqeBiUw4I=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.4.31": { + "jar": "sha256-2AXnlC+1fSIUHUODV8TAIv8bIa78+yRd3SLqa3SGKrQ=", + "pom": "sha256-DIaSpl7cpUpc/Pp9s+9OLx9nafNTf4jrMwWvw4PBwhw=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.4.31": { + "jar": "sha256-X0oOX3T+lrzUzRQxfISlbnsGpqwW2z2+cMOwaAdzOZ4=", + "pom": "sha256-DWc4Z/LPQirjQPVloRWgPrtcdVxVe9bZyiiGTcw4iyQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.4.31": { + "jar": "sha256-Ybrn0tzI82KaPrIUkKmsVTU8Io+iPdfids7u3jeHisE=", + "pom": "sha256-Yhlloc7kdCcFwWEjv1oN7mTkLZohXrDEvHMj40tEWxs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.4.31": { + "jar": "sha256-fQJ+9Vrx3JC8BiRn8sjBbAwMlhZ2JdtAnyEhCSjtZAk=", + "pom": "sha256-edI2i+n6TYGBCdixMynI1WMVJSzTV69R9YzgT6f0izw=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.4.31": { + "jar": "sha256-l9xXBLT9JbFamx7X/9hJiqWAeHf7ar5Ni2bW0Qs5zzY=", + "pom": "sha256-L94ntYnr0Y2EFnb7sh4/pi2ZD25eqqbKq1K0vgDj5+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.4.31": { + "jar": "sha256-fAuO07UHXmM0/+rpg6Io9LFEUmMenUl9FhwMKiMN4mI=", + "pom": "sha256-MggUaX5sg1nwXU46eBVdL3MetImMyyXfUCKz+VT1vMc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.4.31": { + "jar": "sha256-9ATALOZ7ahMo2s4i2TW+/cZmBdzdziaVEBvkZshZJqk=", + "pom": "sha256-6EvVpsF+h0q9cIlbQcWI9I/mmzcq6rQTTVW8V2Dzp8s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.4.31": { + "jar": "sha256-/MsDW9vopXkf6e2zvUknrFByoMf9/UzFWDukRv8dfc8=", + "pom": "sha256-UQ2wwA85guaiBXihK97GuNB7d8Mdag2amJJw1Jl71kQ=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.4.31": { + "jar": "sha256-kfrQtCl0p9WBHjCmHwVwbhdrFEI1cXxt5+geOngQKPI=", + "pom": "sha256-jkm6uEPdhV8xXIfjkMUpqcojkSHYv/uFs6z6L2BgNpc=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.4.31": { + "jar": "sha256-t/j6k4MVJ2wTV7xr+VUDTUZ+20JCuxKjlscPNqxI0/k=", + "pom": "sha256-BnvN9hLIGnhfkdeSR4VpM6ulX9gUEAk8US6Qp+VOs4c=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.4.31": { + "jar": "sha256-7Gb0SktBsyUsvAkcnXwJa8i7WaIRGCt913xmlPCXfzw=", + "pom": "sha256-SZt/nSwkShmt9lDZOmOKIUYYm555w57W2jok/N1EQOU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.4.31": { + "jar": "sha256-0t+NwkUxRqwnvOwBiQxM9rBNGIZbFtnTFWYcqoc4c5I=", + "pom": "sha256-08xMx05y+9GrwJI5/eU/y2DkqAiZqokUfHIqzjN3MRY=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.4.31": { + "jar": "sha256-oWYNbJIDA+MEgTI51PjKD/gB8iQl1C3454+twFe6fAY=", + "pom": "sha256-v1odNDN3icu4zbwipO9OGBnUod+yoRdRjnRc+PrrBVE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.4.31": { + "jar": "sha256-/A0P+l0IOsnJS8f4aUmgV+L5cRISs/xyt0X2eLPM/6o=", + "pom": "sha256-ZwY1ME+KCaH0smigpfb/klIwc7DNootBdASK6tfLHyk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.4.31": { + "jar": "sha256-V5YvRDcadGtnghiggCqHEsYlUgbemmnt4hXjqksERwg=", + "pom": "sha256-FYKrEwto/LuJsukVVzwfmfi6O8aP3UUfazYtbFM1MYc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.4.31": { + "jar": "sha256-dqWZ2IsWforJCHm22qcixq00UrpxTJq6Gb0ZZUS5fxw=", + "pom": "sha256-hRnj56xe5wBSfuEEiOtDLxqhBtzN3nwGw7qyWKHdvU4=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.4.31": { + "jar": "sha256-742OP5+fXt4dcNPcIXRsiQySCi9APVaeHNW1KIE6XMA=", + "pom": "sha256-0JWe1skYAwhX/3VMyTLA44GDawd4IsoChO5uftTyItY=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.4.31": { + "jar": "sha256-K8ihVTz6jLbeitaN50bY+thxQbF3SfCLpQcMaUxr2W0=", + "pom": "sha256-4VfHncwf0BzZaSstV21gbs9q8hGHhv6gTa/IBLpm93c=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.3.8": { + "jar": "sha256-+Mi3SF1KV1445elJRVOdHU7M0yKKGZ4amqCU6MJhdO4=", + "pom": "sha256-JP+mW9+32JM0nLLnj7NxSkkN0KnAc3V0S7E26YBIB/0=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.1": { + "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", + "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" + }, + "org/ow2/asm#asm-commons/9.1": { + "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", + "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" + }, + "org/ow2/asm#asm-tree/9.1": { + "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", + "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" + }, + "org/ow2/asm#asm-util/9.1": { + "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", + "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" + }, + "org/ow2/asm#asm/9.1": { + "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", + "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.0": { + "pom": "sha256-tZryboho1AOOURYUvXa7t0A2NXOVGWAvEOfaCTFYKw8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.1": { + "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.0": { + "pom": "sha256-SfD44IeIL07MwxErYBt91RKZRyOklDo3oQ7LgHMiZso=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", + "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", + "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.1": { + "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", + "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", + "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", + "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", + "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.0": { + "module": "sha256-CsCosk9G8UO74qeQCyh914XgMRuf7s92MG2Is1aJBl0=", + "pom": "sha256-UbvlEh00Ij7Yc8nN6DWTvDl+mCSkknNvv7wuA65QrhA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.1": { + "jar": "sha256-EwRbLsSlXKVS8JF5N83Qt7rp1a5AnJVfbw0We5HIYkE=", + "module": "sha256-fYt0DCgjZAjWkDDdCewOQgy08dBIZEhM/muNxnJro8g=", + "pom": "sha256-k3qvGFoaW0g5TmkQusBVM+iPu8ICREy5aZ2D4BpNprc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.0": { + "pom": "sha256-6tGzXPQ8iianI2wDCKi/w+5InCkyiOBRPqvLXnIyS4o=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/protobuf#protobuf-bom/3.21.11": { + "pom": "sha256-b8t65uskGL00Pp3E4ED3nFk+9W957j0NKiEZzk/nr7Q=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-javalite/3.21.11": { + "jar": "sha256-2HsppVT9lD3WH0lPJjeyDeKI27EsS87oXp/k4q2JRFM=", + "pom": "sha256-RnCf68zs39yLZXU+9Bs5E7cPC2Ipu7U5XYCYXtziW/U=" + }, + "com/google/protobuf#protobuf-javalite/3.21.12": { + "jar": "sha256-z2eKs/vJkvS0ZUqGwDVXwhkE1jUgK2doj8suykQsLUA=", + "pom": "sha256-JX9QiTSYkVb912RUQ9uf4lbX06pEx93oMCfYHW6MutQ=" + }, + "com/google/protobuf#protobuf-parent/3.21.11": { + "pom": "sha256-kZpCn8dl43GYT5jpgoEcn6jMTqxgt0tEJM/NgMruCG8=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.12.54": { + "pom": "sha256-MzfHf0YxCWHoxuXPv4zgRDIXpDNqhqRneipt5U8mqHo=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.12.54": { + "jar": "sha256-sjeB0pk7ailmUzsvWOEfM5L8FB+J6NVYNdo4Nl3guuk=", + "pom": "sha256-/SZ9HcfjYSkf+MEAbrBvTv2isfEt/jhTXZVf/sDBl/E=" + }, + "com/kohlschutter#kohlschutter-parent-multirelease/1.5.1": { + "pom": "sha256-m8IGSgNZlu+KoTo39gEtr+wrj7Ixf0gK0vYOcUu/BTM=" + }, + "com/kohlschutter#kohlschutter-parent/1.5.1": { + "pom": "sha256-QOM4M3T7g/qqpHW7scFy920D5DLYbpgsnfTO+ZQDh40=" + }, + "com/kohlschutter/junixsocket#junixsocket-common/2.6.1": { + "jar": "sha256-k9Eg4tSd31v97oJYdi/IdLJsZX8Cf41szBoFUVa/zeE=", + "pom": "sha256-RRjCFVtlyk9jbQJRRBK1kIFdbAsYKMsV8vUlXcA2Qzo=" + }, + "com/kohlschutter/junixsocket#junixsocket-native-common/2.6.1": { + "jar": "sha256-Yfu9bP0rbfZcDnsZsW/091XWyx0zO1ZvQoZAfxLxhnA=", + "pom": "sha256-t4zAQTztX2+M2jYiG5Yg0Bq4PPJMlwN2vEqH31S4jAQ=" + }, + "com/kohlschutter/junixsocket#junixsocket/2.6.1": { + "pom": "sha256-crOETfvf8/Nc6WPPHBro4cxJa/SoJMYFYb6QQvVHtfQ=" + }, + "com/squareup/okhttp3#logging-interceptor/4.10.0": { + "jar": "sha256-JzuiGGNsNPegkcBZ0VlgBUPgPqi+7yxfxWUltHOWFg4=", + "module": "sha256-/MsMrtTFnKXjEketzz+Zu9FeWn8NI8me4UbeMd0BhSI=", + "pom": "sha256-t/v3nfpIMFDEygZTdhoh0A1YWBkVUHo9nVGctmJgv98=" + }, + "com/squareup/okhttp3#okhttp/4.10.0": { + "jar": "sha256-dYDxT6FpEgbjcIGtP5IGOxYDsyjaC7MW8v7wLgVi5+w=", + "module": "sha256-bDBwggtZH17IwpSEl7Wmt0L0krcVvKz0t1EVs6j/qxU=", + "pom": "sha256-x/kgsofIOOHYHipj+Gd7svqZE3BYorEeZTWv3pyBoOU=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "info/picocli#picocli/4.7.0": { + "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=", + "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient/0.16.0": { + "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", + "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" + }, + "io/prometheus#simpleclient_common/0.16.0": { + "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", + "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" + }, + "io/prometheus#simpleclient_hotspot/0.16.0": { + "jar": "sha256-E08VbP60TL04ZAZYBu9dtVQ8aK9XjR1+5ZKD4umFP3M=", + "pom": "sha256-0haTfecjEg+3pMiLksW+oZEa+4i6dtDUjxdprYW2dek=" + }, + "io/prometheus#simpleclient_httpserver/0.16.0": { + "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", + "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" + }, + "io/prometheus#simpleclient_tracer/0.16.0": { + "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" + }, + "io/prometheus#simpleclient_tracer_common/0.16.0": { + "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", + "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" + }, + "io/prometheus#simpleclient_tracer_otel/0.16.0": { + "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", + "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" + }, + "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", + "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" + }, + "io/reactivex/rxjava3#rxjava/3.0.13": { + "jar": "sha256-WYq69x28lw3Qcn5tX094bcmZ31uXLL8mExajLhVbLGk=", + "module": "sha256-khiPWj8bL7xUkxB3AKetrnAsHXc8TO02auitkjj2q+g=", + "pom": "sha256-yZCmX0c2tGOe0X1nhMqUdtPClRuGUqAKVnbAKHw24OQ=" + }, + "io/sentry#sentry/6.11.0": { + "jar": "sha256-77Huk5ks2xQSGMB71siYkzkvwzzcAaqHZjOuJNc8Wa4=", + "pom": "sha256-gOTkmRGslV0gUJp3OFODNyge4TUUFCIslXFpoyfWIfc=" + }, + "org/apache#apache/24": { + "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU=" + }, + "org/apache/logging#logging-parent/5": { + "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI=" + }, + "org/apache/logging/log4j#log4j-api/2.19.0": { + "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=", + "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU=" + }, + "org/apache/logging/log4j#log4j-bom/2.19.0": { + "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c=" + }, + "org/apache/logging/log4j#log4j-core/2.19.0": { + "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=", + "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk=" + }, + "org/apache/logging/log4j#log4j/2.19.0": { + "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/checkerframework#checker-qual/3.5.0": { + "jar": "sha256-cpmQs/GKlWBvwlc4NraVi820TLUr+9G3qpwznP81paQ=", + "pom": "sha256-KDazuKeO2zGhgDWS5g/HZ7IfLRkHZGMbpu+gg3uzVyE=" + }, + "org/flywaydb#flyway-core/9.10.2": { + "jar": "sha256-OAf+3K2+ykuLiUCW0R2+zX8qosfO2QrDmM9/fgWzhT4=", + "pom": "sha256-2xICRB2Ebg6wWLppHmJbvq4p7Dj7HgmRtdsbhrxoeSE=" + }, + "org/flywaydb#flyway-parent/9.10.2": { + "pom": "sha256-HPI2yGyMqSFnUC8Fjw/IUagPpXG5UvEWUGhAqcIbOHg=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", + "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.10": { + "pom": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", + "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.10": { + "pom": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", + "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", + "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.0": { + "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", + "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", + "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.0": { + "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", + "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", + "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.0": { + "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", + "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", + "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" + }, + "org/junit/jupiter#junit-jupiter/5.9.0": { + "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", + "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", + "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" + }, + "org/junit/platform#junit-platform-commons/1.9.0": { + "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", + "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", + "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" + }, + "org/junit/platform#junit-platform-engine/1.9.0": { + "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", + "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", + "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/postgresql#postgresql/42.5.1": { + "jar": "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4=", + "pom": "sha256-R8t/RdAe0XyJ5mNlrU4v8anBR5AX35QhAPSgjLYyIRw=" + }, + "org/reactivestreams#reactive-streams/1.0.3": { + "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", + "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + }, + "org/slf4j#slf4j-api/2.0.5": { + "jar": "sha256-9KKXRQkpGsxJ/aSnmw1Z4V4rUkCV1kIcZjkbkjh69Mk=", + "pom": "sha256-nvLaYxSfXZ7M9608lTzfwSTrbRR79444YA9Z9gXF1G4=" + }, + "org/slf4j#slf4j-nop/2.0.5": { + "jar": "sha256-qY7YTal6RbnblFVrKH4vWW6h3qz4j4qw0ivRt+jvANk=", + "pom": "sha256-uCIqkKiTH/PY63GgELA8JGCqBWfKaWQvUCXulWd/Ga4=" + }, + "org/slf4j#slf4j-parent/2.0.5": { + "pom": "sha256-FwsRsEgVAFw7TMbfeckYQ+C5UPhbWP++jUg+0hkTuYs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/xerial#sqlite-jdbc/3.40.0.0": { + "jar": "sha256-46G5CXh7M7s34E8lLzfkq0ekieHB1FqAmgmCw3lEXBA=", + "pom": "sha256-fI0dETimo05pNXbQe29U4h840iC4YtnhQFyy4KqIpDo=" + } + } +} From da8cbf47787aa513e67c3af7978047bc9f8e9eaf Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 10 Dec 2023 15:44:47 +0700 Subject: [PATCH 168/562] mindustry: convert to gradle setup hook --- pkgs/games/mindustry/default.nix | 167 ++++++++---------- pkgs/games/mindustry/deps.json | 294 +++++++++++++++++++++++++++++++ 2 files changed, 366 insertions(+), 95 deletions(-) create mode 100644 pkgs/games/mindustry/deps.json diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 8489d32a8ed7..12125d761098 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv , fetchpatch , makeWrapper , makeDesktopItem @@ -6,13 +7,13 @@ , fetchFromGitHub , gradle , jdk17 -, perl # for arc , SDL2 , pkg-config -, stb , ant +, curl +, wget , alsa-lib , alsa-plugins , glew @@ -42,7 +43,6 @@ let buildVersion = makeBuildVersion version; jdk = jdk17; - gradleWithJdk = gradle.override { java = jdk; }; selectedGlew = if enableWayland then glew-egl else glew; @@ -65,22 +65,29 @@ let rev = "v0.9"; hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; }; - freetypeSource = fetchurl { - # This is pinned in Arc's extensions/freetype/build.gradle - url = "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz"; - hash = "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw="; - }; - glewSource = fetchurl { - # This is pinned in Arc's backends/backend-sdl/build.gradle - url = "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.zip"; - hash = "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ="; - }; - SDLmingwSource = fetchurl { - # This is pinned in Arc's backends/backend-sdl/build.gradle - url = "https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz"; - hash = "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E="; + + desktopItem = makeDesktopItem { + name = "Mindustry"; + desktopName = "Mindustry"; + exec = "mindustry"; + icon = "mindustry"; + categories = [ "Game" ]; }; +in +assert lib.assertMsg (enableClient || enableServer) + "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; +stdenv.mkDerivation { + inherit pname version; + + unpackPhase = '' + cp -r ${Mindustry} Mindustry + cp -r ${Arc} Arc + chmod -R u+w -- Mindustry Arc + cp -r ${soloud} Arc/arc-core/csrc/soloud + chmod -R u+w -- Arc/arc-core/csrc/soloud + ''; + patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch # Fix build with gradle 8.8, remove on next Arc release @@ -96,69 +103,45 @@ let extraPrefix = "Arc/"; stripLen = 1; }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch"; + hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58="; + name = "always-use-local-arc-1.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch"; + hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs="; + name = "always-use-local-arc-2.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch"; + hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8="; + name = "always-use-local-arc-3.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) ]; - unpackPhase = '' - cp -r ${Mindustry} Mindustry - cp -r ${Arc} Arc - chmod -R u+w -- Mindustry Arc - cp ${stb.src}/stb_image.h Arc/arc-core/csrc/ - cp -r ${soloud} Arc/arc-core/csrc/soloud - chmod -R u+w -- Arc - ''; - - desktopItem = makeDesktopItem { - name = "Mindustry"; - desktopName = "Mindustry"; - exec = "mindustry"; - icon = "mindustry"; - categories = [ "Game" ]; - }; - - cleanupMindustrySrc = '' + postPatch = '' # Ensure the prebuilt shared objects don't accidentally get shipped rm -r Arc/natives/natives-*/libs/* rm -r Arc/backends/backend-*/libs/* + cd Mindustry + # Remove unbuildable iOS stuff - sed -i '/^project(":ios"){/,/^}/d' Mindustry/build.gradle - sed -i '/robo(vm|VM)/d' Mindustry/build.gradle - rm Mindustry/ios/build.gradle + sed -i '/^project(":ios"){/,/^}/d' build.gradle + sed -i '/robo(vm|VM)/d' build.gradle + rm ios/build.gradle ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version unpackPhase patches; - postPatch = cleanupMindustrySrc; - - nativeBuildInputs = [ gradleWithJdk perl ]; - # Here we download dependencies for both the server and the client so - # we only have to specify one hash for 'deps'. Deps can be garbage - # collected after the build, so this is not really an issue. - buildPhase = '' - pushd Mindustry - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon resolveDependencies - popd - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = "sha256-hbWLsWorEo+1BBURvrFMXpxvZjJBZ1p7HVlJN5e5JZc="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; -in -assert lib.assertMsg (enableClient || enableServer) - "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; -stdenv.mkDerivation rec { - inherit pname version unpackPhase patches; - - postPatch = cleanupMindustrySrc; + __darwinAllowLocalNetworking = true; buildInputs = lib.optionals enableClient [ SDL2 @@ -167,33 +150,26 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config - gradleWithJdk + gradle makeWrapper jdk ] ++ lib.optionals enableClient [ ant copyDesktopItems + curl + wget ]; desktopItems = lib.optional enableClient desktopItem; - buildPhase = with lib; '' - export GRADLE_USER_HOME=$(mktemp -d) + gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ]; - # point to offline repo - sed -ie "1ipluginManagement { repositories { maven { url '${deps}' } } }; " Mindustry/settings.gradle - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle - sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle - sed -ie "s#wget.*freetype.* -O #cp ${freetypeSource} #" Arc/extensions/freetype/build.gradle - sed -ie "/curl.*glew/{;s#curl -o #cp ${glewSource} #;s# -L http.*\.zip##;}" Arc/backends/backend-sdl/build.gradle - sed -ie "/curl.*sdlmingw/{;s#curl -o #cp ${SDLmingwSource} #;s# -L http.*\.tar.gz##;}" Arc/backends/backend-sdl/build.gradle - - pushd Mindustry + buildPhase = with lib; optionalString enableServer '' + gradle server:dist '' + optionalString enableClient '' - pushd ../Arc - gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} - gradle --offline --no-daemon jnigenJarNativesDesktop -Pbuildversion=${buildVersion} + gradle jnigenBuild + gradle jnigenJarNativesDesktop glewlib=${lib.getLib selectedGlew}/lib/libGLEW.so sdllib=${lib.getLib SDL2}/lib/libSDL2.so patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ @@ -204,9 +180,7 @@ stdenv.mkDerivation rec { cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ popd - gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} - '' + optionalString enableServer '' - gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} + gradle desktop:dist ''; installPhase = with lib; let @@ -247,9 +221,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests = { - nixosTest = nixosTests.mindustry; - }; + postGradleUpdate = '' + # this fetches non-gradle dependencies + cd ../Arc + gradle preJni + ''; + + passthru.tests.nixosTest = nixosTests.mindustry; meta = with lib; { homepage = "https://mindustrygame.github.io/"; @@ -261,9 +239,8 @@ stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno fgaz thekostins ]; - platforms = if enableClient then platforms.x86_64 else platforms.linux; - # Hash mismatch on darwin: - # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin; + platforms = platforms.all; + # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin + broken = enableClient && stdenv.isDarwin; }; } diff --git a/pkgs/games/mindustry/deps.json b/pkgs/games/mindustry/deps.json new file mode 100644 index 000000000000..eca1452addf7 --- /dev/null +++ b/pkgs/games/mindustry/deps.json @@ -0,0 +1,294 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.savannah.gnu.org": { + "releases/freetype/freetype-2.10.4": { + "tar.gz": "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw=" + } + }, + "https://github.com": { + "nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0": { + "zip": "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ=" + } + }, + "https://jitpack.io/com/github": { + "Anuken#jabel/0.9.0": { + "jar": "sha256-uFYvq/P7dVZNH8xfSZPmm57JI+h47A7YqOaN3bsFLuo=", + "module": "sha256-r0Hiyh4MXzQkBudNhixHcXf1QOr4GWU841ypzRa0w/g=", + "pom": "sha256-2Zp//AsIqW7/+5ybmtConz5ykh3ZYrFBi6SzLuKTz8A=" + }, + "Anuken#rhino/73a812444ac388ac2d94013b5cadc8f70b7ea027": { + "jar": "sha256-g2+szbtgsHvalu5F4kygVDN89kk0zvzVSw3EOcAL11I=", + "module": "sha256-BbXoWzXoJGKhH6kA6EiluDHhfs3th9X+ojLLZuGISOg=", + "pom": "sha256-ngLvPqdMq7ayWlDHf7qr8MGYsDh+uMK6OYcDX9y5bXk=" + }, + "Anuken#steamworks4j/0b86023401880bb5e586bc404bedbaae9b1f1c94": { + "jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=", + "pom": "sha256-ktvhk8s3T1zswrYWuXz+cWHRyK3YbkikD5Sv/gjcfz4=" + }, + "libgdx/gdx-jnigen#gdx-jnigen-gradle/dffc32eecbf77aad264991ea44f1767a58cbee9d": { + "jar": "sha256-nuUxM4zDV48+8Z+Rsn2dhEhkH4wOcfG62lz84BUhDH0=", + "module": "sha256-OU9DEb3A9A7OtnJ6jQkS32KImMlNn9NX7eKMX4YVh5E=", + "pom": "sha256-0THLPDNZDZe9PbIEPl71pGwL7E6Oq2Y5LiVevltdbP8=" + }, + "libgdx/gdx-jnigen#gdx-jnigen/28dd11fa4c33a7ae9e58897912b52ba7d53d54fe": { + "jar": "sha256-fPszziBPrTDACbBuL6OxJ2oK1iA4izBk4TMHK53b+GQ=", + "module": "sha256-0RR9vgSqD1ISADHSO5OV7rxi+6HM9h0ZO4kEYw/Ao4Y=", + "pom": "sha256-vnz59i+3/wY9RizYWGMOuebfrZO4HrpOYV73ShIFH2g=" + }, + "libgdx/gdx-jnigen#gdx-jnigen/dffc32eecbf77aad264991ea44f1767a58cbee9d": { + "jar": "sha256-bd8xr4/YgvQbvdFkayXdJKpMvYwE9XlISof20vsfcSU=", + "module": "sha256-zQ1DewRtrsdTgxXINq7pOa+UJwnDNrGsVKnX0K/AWRQ=", + "pom": "sha256-HWFvvs+x6DyJioqkRDDVvf0GCKfxPTjhdec8JC2PZvA=" + } + }, + "https://plugins.gradle.org/m2/org/jetbrains/kotlin": { + "jvm#org.jetbrains.kotlin.jvm.gradle.plugin/1.6.0": { + "pom": "sha256-FeMDwR4tRlKdxOmvd853pFyge29WJvHjkFslMyVlJAg=" + }, + "kapt#org.jetbrains.kotlin.kapt.gradle.plugin/1.6.0": { + "pom": "sha256-EPl8xsN9xufqKiw5ptVSBLiMrZkniaiGvLSaH/RURV8=" + } + }, + "https://raw.githubusercontent.com": { + "nothings/stb/e140649ccf40818781b7e408f6228a486f6d254b/stb_image": { + "h": "sha256-jlsNcX38ioNMl+8gLSDnjQg9AJWG4XMcmFgX0BVdVow=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/github/gundy#semver4j/0.16.4": { + "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" + }, + "com/github/gundy#semver4j/0.16.4/nodeps": { + "jar": "sha256-P1nspRY3TM1P01UWJb9Q+KSxkfcAUI985IZkYKYSivA=" + }, + "com/github/javaparser#javaparser-core/3.14.14": { + "jar": "sha256-Z4GYXisXFCvQfhp75Zt5NIXLAms3ZnN30WYQrpgUi24=", + "pom": "sha256-70ERyN/Uh+Zp5w1Qzz2z8O3YuTLKvjXmYzuzzuuGpIo=" + }, + "com/github/javaparser#javaparser-parent/3.14.14": { + "pom": "sha256-RwgtW3eLzkmjEnRtUWHJ48yhfYwh2eO+MTF68Io2FDc=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "com/google/errorprone#error_prone_annotations/2.3.4": { + "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=", + "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0=" + }, + "com/google/errorprone#error_prone_parent/2.3.4": { + "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/29.0-jre": { + "pom": "sha256-alf54C9436L0vaNBYGWmRCauG2beIoz24Zbi4ZElU78=" + }, + "com/google/guava#guava/29.0-jre": { + "jar": "sha256-sixftm1h57lSJTHQSy+RW1FY6AqgtA7nKCyL+wew2iU=", + "pom": "sha256-kCfpNAmJA9KH8bphyLZfAdHR4dp6b7zAS/PeBUQBRCY=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/squareup#javapoet/1.12.1": { + "jar": "sha256-g/D9S66+w78p7jrSwCSzBl3e+CWlqin33PXBifn6KWI=", + "pom": "sha256-pxrD2PJ8ua0yyHtdiVnyLWca60YMejVdCfV35MV+TF8=" + }, + "de/undercouch#gradle-download-task/4.1.1": { + "jar": "sha256-6wi1cOQI1GRnBecKlJYU1DnqKxFFXxZSqwMw3olU2rk=", + "pom": "sha256-heZgcmDbvbXoXxmIhAsNmsS+kRnd6QobrKjqd1ZGQVo=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/checkerframework#checker-qual/2.11.1": { + "jar": "sha256-AVIkpLHcbebaBTJz1Np9Oc/qIOYwOBafxFrA0dycWTg=", + "pom": "sha256-zy4MkNj3V0VfSiWOpglzkFNmO9XaannZvVP5NaR955w=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { + "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", + "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.6.0": { + "jar": "sha256-TPrz8BIFF78dbY07r8+uHomMZ9P3yLdocIG/uBk8ftQ=", + "pom": "sha256-hlMj+0VThiKBTO4p4gN1AamL/eUwVzg2+gCBPvSVcR4=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.6.0": { + "jar": "sha256-hnP///sAqxYDPZD2x/7BC10xDKQPvkNRmrQRi/yEF5w=", + "pom": "sha256-G0C/0FxYRRS55Z1YnjPCZb456Z6gRvhHxe411uUFjiM=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.6.0": { + "jar": "sha256-4kp7cGukVhi07kOWa2JQETbQBgsDL46fGNGD2gWxv0M=", + "pom": "sha256-93xRil6Ux4dnVflhEApdtQuSQFTH8GQqSIMeJagk8pE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.6.0": { + "jar": "sha256-A2aEPNLe/dWDxrFrELwyuF8oxb+VEPEORMiG9b0kw4g=", + "pom": "sha256-KlWcBwvS5YxY2x5/z2T7t92+hHciXec9Zu4AAQiocCQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.6.0": { + "jar": "sha256-avdSCvhKRCxqvxvXKFunG6xzZWYLLQj9BMhOw1NjPUk=", + "pom": "sha256-Oc+l/Aqzv3VwSfj9Dx6bNbYrebnTJdLPlwLVqaDY/jc=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.6.0": { + "jar": "sha256-bBsv3jMVh50Ml35fJRU5fngpvQrfiSHkxf262DLrwqE=", + "pom": "sha256-gatFLaX29bavP6ggpywNKNCfVUTU7EXafxFDG6Xtkhg=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.6.0": { + "jar": "sha256-INCHBqoXdi/lqwOpFtYsm37iEdIIRKiqvg24PZ2QKEo=", + "pom": "sha256-dTHQzBNuWUgjMpvMExxPHv4XP8OVr4Lus4/SZhbckfY=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.6.0": { + "jar": "sha256-yGksM4gmxIQlv8h/q2nLef4tT1+B/wWMkpQYvw2pfRU=", + "pom": "sha256-HP5CdZvSCiU6S36NvQ5yll5nReE1Duzd6lOZsjy40Wg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.6.0": { + "jar": "sha256-ne9NHPDZV3pRGiqk9/MQ7MwkJDsFwCpxelExxMj5ll4=", + "pom": "sha256-aZyyu6C03O/rmbelzYHM8MLOPWi8AVgZCAli7mflbUs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.6.0": { + "jar": "sha256-twN61m6wybWbrcqiONHFQmcVt5eqdwk0cwe3XBrawWo=", + "pom": "sha256-G6PfHEnY5ZBuWyGdFyCRd7nnb4M9xPFuwbjPjRA/qN4=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.6.0": { + "jar": "sha256-/GqznpDYIibZuLzOAYdhZOW6/RrAogPz8DB4yxtIMB8=", + "pom": "sha256-elUGa/rRTIyZqq8GCHV+uKfl7LzODzC9J+56qWtWoAk=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.6.0": { + "jar": "sha256-x8gRYmPShf5TjnwZaEHiNaqPe52fasNhP4jeU7Jh2MM=", + "pom": "sha256-htOIK0/IKs3DheQpnn76HaZQvzUG/lqg+F5FzNwmmss=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/1.6.0": { + "jar": "sha256-oLD9fer0/hCwZxNVJYvGN1nj0kpxFc7/h7x0G/p86ew=", + "pom": "sha256-a9fh1Kc7At/mYvqDdkrikRPrWqItrdGKVn8cfpdCQhs=" + }, + "org/jetbrains/kotlin#kotlin-project-model/1.6.0": { + "jar": "sha256-OBNdP5lfxQXWBK7S6CrFuoWLKmo+R2iZw7i+R/0iK2g=", + "pom": "sha256-sMn75G5kDHVwJEMc9+p5PdmN2nbRFe9K5OXz1B9nH9Q=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.0": { + "jar": "sha256-xhYYhCCSIdt/XdsDG7SAo8RruQ1bZdfMAWexSaqpxJQ=", + "pom": "sha256-hcz47mWEylEpbV8yn+zAIerbRbxqLDu9qMrmAvWO4lQ=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.6.0": { + "jar": "sha256-3coPdlxBbnek2IFvPS327alT9hr4EXN4RqIgMyJaDlc=", + "pom": "sha256-GsP9ZI4oCa3h+13heKISaNPXurUYNV7dTEmAXMsx1c4=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.6.0": { + "jar": "sha256-FmmbBwr8RCIwDJ7WboHpi2X3xpH6qFK41EGV5QndbSI=", + "pom": "sha256-9l4xIUhL0lNnX9BqxOiCkuDk8zV7kBKjRYKlc02OOVA=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.6.0": { + "jar": "sha256-LNHG9q9pwWt5NNfY1nwYM0m0NPRQSC1yKalgcTb6BEc=", + "pom": "sha256-4jtqC3HdlDRIRzwooThIk8LMx6tK9hMwCVuFEmBYMvo=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.6.0": { + "jar": "sha256-5L1IkGdG5M0Z4BZEVZncomg6mU2gasOMrTg6rEgzjag=", + "pom": "sha256-ZX90rM8Q8WYXJBIvDgLIBkMFyuLSgAxZQmqIQG80cPE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.6.0": { + "jar": "sha256-X2p+onTLbGxDcglKNXLfKjkqpTifFVO4JIc9YtYANlI=", + "pom": "sha256-nzZY4pTKV2EytPaUIOpJsp3twftsDl0HqygOq75tCzY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.0": { + "jar": "sha256-ZEpyV8I7UaH9UGiWDkCSLj5SwhnxHs4+BAo6vHSCPyI=", + "pom": "sha256-iZ6XwgKLX3or2vZ1H6KgG2h+PuKngXZ8iiJ8v/tsAYQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.0": { + "jar": "sha256-EV2uowsNSEr88jYCN7nZU39IpKLwPzzCoWV338bpA0I=", + "pom": "sha256-cSpt3XF8zVsNUOdMM16TqbGRBSzXu4KWBSAJu4XJRBI=" + }, + "org/jetbrains/kotlin#kotlin-tooling-metadata/1.6.0": { + "jar": "sha256-X3m1R/gM66SC1vcYRLI0ReEJ9oXrdEgQRGeM11worXc=", + "pom": "sha256-yYlWnKkvPwTPHmuhScQ8SVao2dyXk5vkmPHfUvQMwsU=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.6.0": { + "jar": "sha256-rbeHTvdxKKs7CVP/SeyAEjnIN/5xMcMUfO+duLvfVzk=", + "pom": "sha256-PGMhnFxVPRyfo2HTbtzZsDXL6QzpS86hqhR4F3IvY5w=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.6.0": { + "jar": "sha256-qWMcC3gjxpuNM1AqKGPnV0MI2fnBLj8o9LW79sKkH3Q=", + "pom": "sha256-YJjHylRvWZ35UdQOKaAdqT9NepB1l5Uy7hSSmzjE42g=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { + "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", + "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", + "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit/jupiter#junit-jupiter-api/5.7.1": { + "jar": "sha256-znuYW8Rp4mJXWaTrxFUzxwWBoFo0gnjB1kCOmy414xQ=", + "module": "sha256-AiFvaghBm7NdVHeGPZ0hpoxXWRqol7qYGmHFVFZWzX4=", + "pom": "sha256-1Vvisj13FDKXB3IEMgey5mpnJK4CvVGStyFuS3AbxiM=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.7.1": { + "jar": "sha256-VmFsk1CzYk92z/72skznuyIpFb/VaI+W089M7zTwd8s=", + "module": "sha256-2A5S75X2XNxQT8Mb4KArJYnJ78JzpCVcs2NyPOVMr/8=", + "pom": "sha256-gRF+OjoCDf3W8wkcXseU0stJhAcxrPQogxxWmQEvTLs=" + }, + "org/junit/jupiter#junit-jupiter-params/5.7.1": { + "jar": "sha256-jv/df4pLpVWLVoGE3uCACLJEPIbGc++B3lhh+8fvBhM=", + "module": "sha256-TUOYtYCpnIVNnxF6bk44o9GOZSJ2obzmeaDDx5nGFL0=", + "pom": "sha256-UIPD5bw9OhjVY6M0fVPi3f35ONdh60TbsL9PQgX+6Sw=" + }, + "org/junit/platform#junit-platform-commons/1.7.1": { + "jar": "sha256-fFRr6GhkcY+6zrefqE/x06UWUA/EKPGyHQYcLg+8Wks=", + "module": "sha256-5abLDsz80tAuaGvyt2OnBCTQiB2/+uvjp/kxShhT+TE=", + "pom": "sha256-t8GENMTUsn5yO9SKr5ercK7IwMra1MFTkvvdFEykpQo=" + }, + "org/junit/platform#junit-platform-engine/1.7.1": { + "jar": "sha256-N99anNbbwfdUuitG+WuIdKg2YOF5a/OMc48CLc+Gwj8=", + "module": "sha256-S2knc2Ouooq1DFpnYZ++q/jAgk5JOOYmC6wEjlvrga8=", + "pom": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA=" + }, + "org/lz4#lz4-java/1.8.0": { + "jar": "sha256-10ozNPs1GVAJszipUfkYID1rvKPR01kDPcM+3Rytye8=", + "pom": "sha256-DbittR4TJFSlxAbeuy8aDfgfk91Z++IMuUcQKZRokDQ=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://www.libsdl.org": { + "release/SDL2-devel-2.0.20-mingw": { + "tar.gz": "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E=" + } + } +} From ac7944dab491b0129b18cbb3788a943f49ab26f9 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 14 Dec 2023 18:55:39 +0700 Subject: [PATCH 169/562] shattered-pixel-dungeon: convert to gradle setup hook --- .../games/shattered-pixel-dungeon/default.nix | 2 +- pkgs/games/shattered-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../default.nix} | 9 +- .../experienced-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../games/shattered-pixel-dungeon/generic.nix | 45 +--- .../default.nix} | 4 +- .../rat-king-adventure/deps.json | 238 +++++++++++++++++ .../{rkpd2.nix => rkpd2/default.nix} | 4 +- .../shattered-pixel-dungeon/rkpd2/deps.json | 252 ++++++++++++++++++ .../default.nix} | 9 +- .../shorter-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../default.nix} | 4 +- .../summoning-pixel-dungeon/deps.json | 177 ++++++++++++ .../disable-git-version.patch | 0 pkgs/top-level/all-packages.nix | 10 +- 15 files changed, 1444 insertions(+), 66 deletions(-) create mode 100644 pkgs/games/shattered-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{experienced-pixel-dungeon.nix => experienced-pixel-dungeon/default.nix} (71%) create mode 100644 pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{rat-king-adventure.nix => rat-king-adventure/default.nix} (85%) create mode 100644 pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json rename pkgs/games/shattered-pixel-dungeon/{rkpd2.nix => rkpd2/default.nix} (84%) create mode 100644 pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json rename pkgs/games/shattered-pixel-dungeon/{shorter-pixel-dungeon.nix => shorter-pixel-dungeon/default.nix} (69%) create mode 100644 pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{summoning-pixel-dungeon.nix => summoning-pixel-dungeon/default.nix} (90%) create mode 100644 pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{ => summoning-pixel-dungeon}/disable-git-version.patch (100%) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index dd58a3d9db3a..f5a8ceb20984 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix rec { hash = "sha256-1msmjKDEd/pFMqLB4vJgR6GPC9z4CnNew2hlemLw2d0="; }; - depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; + depsPath = ./deps.json; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix similarity index 71% rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix index 72ce4f790ad4..ec379dfef033 100644 --- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "experienced-pixel-dungeon"; version = "2.18"; @@ -13,13 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-jOKHBd9LaDn3oqLdQWqAcJnicktlbkDGw00nT8JveoI="; }; - postPatch = '' - substituteInPlace build.gradle \ - --replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" - ''; - - depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30="; - desktopName = "Experienced Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index fdd87ba2bd19..7f2f3a14a4d2 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -2,10 +2,10 @@ { pname , version , src -, depsHash , meta , desktopName , patches ? [ ./disable-beryx.patch ] +, depsPath ? null , lib , stdenv @@ -53,30 +53,18 @@ let keywords = [ "roguelike" "dungeon" "crawler" ]; }; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches postPatch; - nativeBuildInputs = [ gradle perl ] ++ attrs.nativeBuildInputs or []; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon desktop:release - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = depsHash; - }; + depsPath' = if depsPath != null then depsPath else ./${pname}/deps.json; in stdenv.mkDerivation (cleanAttrs // { inherit pname version src patches postPatch; + mitmCache = gradle.fetchDeps { + inherit pname; + data = depsPath'; + }; + + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ gradle perl @@ -86,18 +74,7 @@ in stdenv.mkDerivation (cleanAttrs // { desktopItems = [ desktopItem ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle - gradle --offline --no-daemon desktop:release - - runHook postBuild - ''; + gradleBuildTask = "desktop:release"; installPhase = '' runHook preInstall @@ -131,8 +108,6 @@ in stdenv.mkDerivation (cleanAttrs // { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 - broken = stdenv.isDarwin; mainProgram = pname; } // meta; }) diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix similarity index 85% rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix rename to pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix index c376545ffcef..fcdf31cf94ff 100644 --- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "rat-king-adventure"; version = "1.5.3"; @@ -13,8 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-Q/smIObu7khcRnwdT8m7+WstpPE1tbDFJcZ4OGYJ338="; }; - depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; - desktopName = "Rat King Adventure"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json new file mode 100644 index 000000000000..231b9de37158 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json @@ -0,0 +1,238 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { + "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", + "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", + "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { + "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { + "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.11.0": { + "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", + "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", + "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0": { + "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { + "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" + }, + "com/badlogicgames/gdx#gdx/1.11.0": { + "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", + "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", + "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.2": { + "jar": "sha256-DKa7jeeMTIY2ycrjhvrAU4LdMp9y1xCU+62wL89aEAQ=", + "pom": "sha256-Y0QV6aRkzGOr46Gb6+AYM2OdS95sUt2zIoaOQduz724=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.2": { + "jar": "sha256-oJnxlAyrkj1QtnHH4uK6HkXq44+mxdzq6piktPUqTl0=", + "pom": "sha256-ZAhAV2hHVAbq8aLVysozRiKXIYdZmkssHWSOf+rarn8=" + }, + "com/badlogicgames/jamepad#jamepad/2.0.20.0": { + "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", + "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", + "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1": { + "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", + "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { + "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { + "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { + "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { + "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { + "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { + "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { + "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1": { + "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", + "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { + "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { + "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { + "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { + "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { + "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { + "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { + "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" + }, + "org/lwjgl#lwjgl-openal/3.3.1": { + "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", + "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { + "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { + "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { + "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { + "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { + "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { + "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { + "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1": { + "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", + "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { + "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { + "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { + "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { + "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { + "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { + "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { + "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1": { + "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", + "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { + "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { + "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { + "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { + "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { + "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { + "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { + "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1": { + "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", + "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": { + "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": { + "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": { + "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": { + "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { + "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" + }, + "org/lwjgl#lwjgl/3.3.1": { + "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", + "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux": { + "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { + "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { + "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos": { + "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { + "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows": { + "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { + "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix similarity index 84% rename from pkgs/games/shattered-pixel-dungeon/rkpd2.nix rename to pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix index 5f73a825fca4..9efa5fde80ff 100644 --- a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "rkpd2"; version = "2.0.6"; @@ -13,8 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-jwH0nEsv3agUCZt5Mhuv1JSeELOKfrsj3cnmAJsV9sM="; }; - depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; - desktopName = "Rat King Pixel Dungeon 2"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json b/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix similarity index 69% rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix index 7d775e7e6ed5..a53f27fb14d0 100644 --- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "shorter-pixel-dungeon"; version = "1.4.0"; @@ -13,13 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-iG90T/Ho8/JY3HgkACiBnGdbUGsVRlfxXbcNFHhzZi4="; }; - postPatch = '' - substituteInPlace build.gradle \ - --replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" - ''; - - depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30="; - desktopName = "Shorter Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix similarity index 90% rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix index 5e7ed1b817e0..291b4b386cc5 100644 --- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix @@ -4,7 +4,7 @@ , substitute }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "summoning-pixel-dungeon"; version = "1.2.5a"; @@ -21,8 +21,6 @@ callPackage ./generic.nix rec { substitutions = [ "--subst-var-by" "version" version ]; })]; - depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; - desktopName = "Summoning Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json new file mode 100644 index 000000000000..57ca57ed36a4 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json @@ -0,0 +1,177 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.10.0": { + "jar": "sha256-d++ydeqgB5DWDTfjfoOywrohsQc+9HWIoNytlE2wQPA=", + "pom": "sha256-uMxeWteXeontAQkrkwVjHaMmig33+nOtRB+p+98MMR0=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.10.0": { + "pom": "sha256-IwJUobNWR3huT995tgEnT1WlvDUHweu5MNQLnYQtHmI=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.10.0/natives-desktop": { + "jar": "sha256-seXxOGFJ8yzo5P0nArn9cefzkiXnhthi9HJRSw1u7UM=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.10.0": { + "jar": "sha256-/w9zEsBjV6vsBm1JKWuPZVS0D6HMPla5wgiVdBaWoSU=", + "pom": "sha256-U8Gwv4iBQJv5t6rf5NBhZEUbfChBfKhJECjEj36UtHU=" + }, + "com/badlogicgames/gdx#gdx-parent/1.10.0": { + "pom": "sha256-AYAdm3Dejy2nDDIhir83qOiJLpQBa/LUOzq5vzMVM4A=" + }, + "com/badlogicgames/gdx#gdx-platform/1.10.0": { + "pom": "sha256-3jAHeUCQqrP43j+EUMT8baNr3cdnl9E+8r+RsiQzPQw=" + }, + "com/badlogicgames/gdx#gdx-platform/1.10.0/natives-desktop": { + "jar": "sha256-CUvIkr+UISzmdLtaO+sUyYUwwf9vac1OQ4uTpvVWask=" + }, + "com/badlogicgames/gdx#gdx/1.10.0": { + "jar": "sha256-/7SbBnEeNLGhdd8XMRsPOuDoW/RsVpoTfsANKRuyyuE=", + "pom": "sha256-vhyhtPolCV13nAxCdpMKDe/64+lYsnhuycZtx/LxN9Y=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3": { + "jar": "sha256-7yec2u7eTKNE51alb4WoXL0Dn3kxARl1Zy3BuQC1nI8=", + "pom": "sha256-DY2qM/0T4KBNt+H+299oliGWkx/20Y4giZN9r5Fx7y4=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux": { + "jar": "sha256-Y99GHednfhZY0TcK5wUBqGx6Qv9H9mkpKNTVvNHmxYk=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux-arm32": { + "jar": "sha256-E9pTVkPR4RvpMcdKDDa5hdoIJuF2ckSu140IdxwSa3M=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux-arm64": { + "jar": "sha256-5IkX7vQXhQb20mbEUowS+vlhs3nyN/d3lhTPXc9R0jM=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-macos": { + "jar": "sha256-ZOZIODO8lNp/Oc9x75lo/7/zSE8FS+Mz8Cc34eMUidA=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-windows": { + "jar": "sha256-GSct3hyelmZGtmayqmtZXr9Zj+dRnNtKsGwbM9jga6w=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-windows-x86": { + "jar": "sha256-tva+jC2llyvp41zzlr7sRnXoudkYPBVHXEb8lnKgTU4=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3": { + "jar": "sha256-b3kNvndetWvmOOnZezVTE8DK83TxNUWZZnB1ahXL/m8=", + "pom": "sha256-rl4zlsr8aV3BVRgNcIGkkFAlYUlBzd8Iz5llXvG02bI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux": { + "jar": "sha256-kET+UTHXjN63S7ezybOhsVX6dTDjtMK5HLMC7rTCnS0=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux-arm32": { + "jar": "sha256-UAuvqQH46bc9lep28RfStuf9fc7YjiqISgCrIf9NlqI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux-arm64": { + "jar": "sha256-gPCtzfusC3iQexpywu2A1BW2uGWvrd2qTBA3Rymys98=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-macos": { + "jar": "sha256-b/7STgWbCRdgdU1rCrWuWUkNBMIJ+EuEpXHxy9ZS5EE=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-windows": { + "jar": "sha256-y9QXTlytKkDRJpMrA9jTlrmzJIQTXV4/KoofNKpLIiQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-windows-x86": { + "jar": "sha256-y/Qtr6UVizabe8U01zYEw5VQdbRI9yMAT/P7HpAd4Qo=" + }, + "org/lwjgl#lwjgl-openal/3.2.3": { + "jar": "sha256-mxv99go/57psSJdkEdMRV1+yt6fnRX5VidFYhxmCD7A=", + "pom": "sha256-E9O+StiSkp6SE78rHUkMbrY3JLjehQ6zrntaKjdmG+8=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux": { + "jar": "sha256-7d0+6RfFkO0g/JssVGO3PRI7LhUCwvlNb3NU7OVT7Xc=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux-arm32": { + "jar": "sha256-oZyXuR9FBUx+7DrViWz/qhIekPD4j3H8X3lo5aL5Hns=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux-arm64": { + "jar": "sha256-YX4XOLZsxZEqmE2shuCDVnuPUHCADFQgsGW2Fk0fyvY=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-macos": { + "jar": "sha256-1tCCMsvvMw3llL6cQZmpY0q1vsagUTXQt20ygnR/yS0=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-windows": { + "jar": "sha256-PePin8ODpITjfpIYrezKb6EqNUZV3bu4y+ryuMT2FA4=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-windows-x86": { + "jar": "sha256-mY6z6IVtwnHCNL5lCh/Urqr/CIFl2Q9SEgURSODtHxw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3": { + "jar": "sha256-ELzDdQbgHRR31l8fzwqmcslet4UmWyi38yHIOBCT7aI=", + "pom": "sha256-hQ+jXJN9DPfjsxVKW1ujkDFWF1Cino0aoBNphk0wLLA=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux": { + "jar": "sha256-Rm6LrhgYxMWEdx7gk8inNeJvVvslqB3eVnUWCqovoEU=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux-arm32": { + "jar": "sha256-FsLVHzvUR4FzhcdTByx4YIsrMCpsZASW1WH93+d1ZAw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux-arm64": { + "jar": "sha256-2OMYjUTPv4k33/CcuPClU/hwHw635mSjzKcLcGFtVOw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-macos": { + "jar": "sha256-5LTQzZE41SJxwdXBjkPJrF020acnxH5e5AMctFznMMo=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-windows": { + "jar": "sha256-wI494xYyFjrF90b6lF8ZJBQuCFIL2cgbfdG129GwuLs=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-windows-x86": { + "jar": "sha256-POzFHWcd92u2DMmu95hM9EVAoKc1i4brAXy7gNj3G3s=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3": { + "jar": "sha256-eklNyHUeXvjLec5xaMfbVmZIE3grkZK7ETDkMpuRQBE=", + "pom": "sha256-9JHY/FlAu9WYtNNtbchR///Ugeqj6pE80de/GCJoLI0=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-linux": { + "jar": "sha256-s9m98zg+6BfMJ5VcWGTYC6NuhtjvSqLH+G3NL6c96Rg=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-macos": { + "jar": "sha256-Oq75QsQaT+7i1rdrzurx/2vd3/AxWm3domCvBvjrHUQ=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-windows": { + "jar": "sha256-Q/M1D+EtGrpiB6b28cq72ujoB110OqCcz2hQ8kh6MTo=" + }, + "org/lwjgl#lwjgl/3.2.3": { + "jar": "sha256-+ZKMO0tUBkOhu9WShtPHF15HCEkmGgwpqBOJ9SJlrYs=", + "pom": "sha256-IL2EdryHg3IwMY1rmvYuN1cL2qIqEqJAwwIs0k+t/W0=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux": { + "jar": "sha256-ACgQEp/GrEzfzfGQ4YpkOlAhtjAPSJwQJrvF0AFAyi4=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux-arm32": { + "jar": "sha256-RrY5yizuoll7Z8yeAEgz0OgnEd92q15SzenGTwGdRNY=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux-arm64": { + "jar": "sha256-Pbazlfu2icsYvSetIAVfS8aV7pNZHXHR6kXzEoHG8AM=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-macos": { + "jar": "sha256-XFIMRlqEA0uLwj4dfs1iG7mcQ3zSVOpGtTGXRI0bgSg=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-windows": { + "jar": "sha256-vfUZuaqQ95mVQROhXfqEsnPuR4GHaz7N6/GSzk+Iomw=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-windows-x86": { + "jar": "sha256-Trduz48tvJzT+iexpL+XhOqRxK/DhpEHRhPVv3o03I8=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch similarity index 100% rename from pkgs/games/shattered-pixel-dungeon/disable-git-version.patch rename to pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6c9df2fc42..960ee975b231 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36825,11 +36825,11 @@ with pkgs; }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; - rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2.nix { }; - rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure.nix { }; - experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix { }; - summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix { }; - shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix { }; + rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { }; + rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { }; + experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon { }; + summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { }; + shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; From f9c2c4a8be1816dff9ad1697d29e795ae839f921 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:19:41 +0700 Subject: [PATCH 170/562] jextract: convert to gradle setup hook --- pkgs/by-name/je/jextract/package.nix | 52 +++------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index 187a0e91f93a..891eac01ae79 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -1,41 +1,12 @@ { lib , stdenv , fetchFromGitHub -, emptyDirectory -, writeText , makeBinaryWrapper , gradle , jdk22 , llvmPackages }: -let - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with empty directory...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${emptyDirectory}' } - } - } - } - ''; -in - stdenv.mkDerivation { pname = "jextract"; version = "unstable-2024-03-13"; @@ -52,27 +23,14 @@ stdenv.mkDerivation { makeBinaryWrapper ]; - env = { - ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk22_home = jdk22; - }; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --console plain --init-script "${gradleInit}" assemble - - runHook postBuild - ''; + gradleFlags = [ + "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pjdk22_home=${jdk22}" + ]; doCheck = true; - checkPhase = '' - runHook preCheck - gradle --console plain --init-script "${gradleInit}" verify - runHook postCheck - ''; + gradleCheckTask = "verify"; installPhase = '' runHook preInstall From 6d513fb246368da5acd51e2eef9d427a1af08223 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 10:27:48 +0700 Subject: [PATCH 171/562] jextract-21: convert to gradle setup hook --- pkgs/by-name/je/jextract-21/package.nix | 52 +++---------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix index efff21c27c07..ec2ad3b1485d 100644 --- a/pkgs/by-name/je/jextract-21/package.nix +++ b/pkgs/by-name/je/jextract-21/package.nix @@ -1,41 +1,12 @@ { lib , stdenv , fetchFromGitHub -, emptyDirectory -, writeText , makeBinaryWrapper , gradle , jdk21 , llvmPackages }: -let - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with empty directory...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${emptyDirectory}' } - } - } - } - ''; -in - stdenv.mkDerivation { pname = "jextract"; version = "unstable-2023-11-27"; @@ -52,27 +23,14 @@ stdenv.mkDerivation { makeBinaryWrapper ]; - env = { - ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk21_home = jdk21; - }; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --console plain --init-script "${gradleInit}" assemble - - runHook postBuild - ''; + gradleFlags = [ + "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pjdk21_home=${jdk21}" + ]; doCheck = true; - checkPhase = '' - runHook preCheck - gradle --console plain --init-script "${gradleInit}" verify - runHook postCheck - ''; + gradleCheckTask = "verify"; installPhase = '' runHook preInstall From d895bc0049f00e06132f7b108e6cbf2cc8c3bfea Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 10:53:21 +0700 Subject: [PATCH 172/562] jadx: convert to gradle setup hook --- pkgs/tools/security/jadx/default.nix | 89 +--- pkgs/tools/security/jadx/deps.json | 695 +++++++++++++++++++++++++++ 2 files changed, 704 insertions(+), 80 deletions(-) create mode 100644 pkgs/tools/security/jadx/deps.json diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index df7bb1ca839c..a857ed571416 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -5,108 +5,37 @@ , jdk , quark-engine , makeWrapper -, perl , imagemagick , makeDesktopItem , copyDesktopItems , desktopToDarwinBundle }: -let +stdenv.mkDerivation (finalAttrs: { pname = "jadx"; version = "1.4.7"; src = fetchFromGitHub { owner = "skylot"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; hash = "sha256-3t2e3WfH/ohkdGWlfV3t9oHJ1Q6YM6nSLOgmzgJEkls="; }; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; - - nativeBuildInputs = [ gradle jdk perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - export JADX_VERSION=${version} - gradle --no-daemon jar - - # Apparently, Gradle won't cache the `compileOnlyApi` dependency - # `org.jetbrains:annotations:22.0.0` which is defined in - # `io.github.skylot:raung-common`. To make it available in the - # output, we patch `build.gradle` and run Gradle again. - substituteInPlace build.gradle \ - --replace 'org.jetbrains:annotations:23.0.0' 'org.jetbrains:annotations:22.0.0' - gradle --no-daemon jar - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - - # Work around okio-2.10.0 bug, fixed in 3.0. Remove "-jvm" from filename. - # https://github.com/square/okio/issues/954 - mv $out/com/squareup/okio/okio/2.10.0/okio{-jvm,}-2.10.0.jar - ''; - - outputHashMode = "recursive"; - outputHash = "sha256-QebPRmfLtXy4ZlyKeGC5XNzhMTsYI0X36My+nTFvQpM="; - }; -in stdenv.mkDerivation (finalAttrs: { - inherit pname version src; - nativeBuildInputs = [ gradle jdk imagemagick makeWrapper copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; # Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted` __darwinAllowLocalNetworking = true; - buildPhase = '' - # The installDist Gradle build phase tries to copy some dependency .jar - # files multiple times into the build directory. This ends up failing when - # the dependencies are read directly from the Nix store since they are not - # marked as chmod +w. To work around this, get a local copy of the - # dependency store, and give write permissions. - depsDir=$(mktemp -d) - cp -R ${deps}/* $depsDir - chmod -R u+w $depsDir + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; - gradleInit=$(mktemp) - cat >$gradleInit < - settings.pluginManagement { - repositories { - maven { url '$depsDir' } - } - } - } - EOF - - export GRADLE_USER_HOME=$(mktemp -d) - export JADX_VERSION=${version} - gradle --offline --no-daemon --info --init-script $gradleInit pack - ''; + gradleBuildTask = "pack"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/security/jadx/deps.json b/pkgs/tools/security/jadx/deps.json new file mode 100644 index 000000000000..500404ebb6aa --- /dev/null +++ b/pkgs/tools/security/jadx/deps.json @@ -0,0 +1,695 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://dl.google.com/dl/android/maven2/com/android": { + "tools#r8/4.0.48": { + "jar": "sha256-932anr2p4yCS6sTdjhFkSnNi36YO1qOp0NMt5XC79SQ=", + "pom": "sha256-5mEMufgumNH5nOgSUcnnlm/Pgrzr0GR3pbpkzzNJ+xA=" + }, + "tools/build#aapt2-proto/7.3.1-8691043": { + "jar": "sha256-1eLz4eHrBiJLaHX15RPHKmUYI0J0VxgWDK8ZHUapZmQ=", + "module": "sha256-XHobthipLvWcPWDPgEmPFkYKa/L+qvxK6EfT+2xZ7aw=", + "pom": "sha256-90SV2eV+uTBEowjJ0SDPlOucHbxK9gieeWPwVgf0OWI=" + }, + "tools/build#apksig/7.4.1": { + "jar": "sha256-bWoTpRrDgGwRr18JZwkgVeNaZ99qdL/xVE2fVRjFrVU=", + "pom": "sha256-PnV6UitSV0bqvN4mcNzsyAKOqmcQyUe74DnIE+nSajM=" + } + }, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.13.0": { + "pom": "sha256-4qHufTD0GGdheUdAEOYkVE6BP0MHAO4oBjQvKukFMNQ=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.32.0": { + "jar": "sha256-i8SQYGLclmwFaGL8kmCsfQWTZguEOtZcEbFW6dzLZKE=", + "module": "sha256-a8dLFqcxDey2fs8H1vXOG9x6+bh5Hek+TwfziyxosQo=", + "pom": "sha256-7wDQM9CMLJ7yFDwmJVav40DYs4doI9Zw0pzrct/nhBQ=" + }, + "com/diffplug/spotless#spotless-lib/2.32.0": { + "jar": "sha256-S6xhJrXWaIZdgFrGGqDiUoi5EN6zPydHZO543raRsuw=", + "module": "sha256-h6cE9aXpl+52z2PjA5+orSSKMx7xV4tfiX7VQ2AZYhM=", + "pom": "sha256-a+Uybvhc5iiiuHq8mwLN+kw1rfeqdZ4a/C2ytQut5Fw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.13.0": { + "jar": "sha256-Js7wl5w5CHH1wWX6KGAeEAlgkuyW1zWKC/XM2oYJbEk=", + "module": "sha256-i9cKqqO2WIEYk+jSq+bMAxo87Hcbgyto8Dl0JH9kOig=", + "pom": "sha256-NpfHbxQP9djFACOzYUHhMOffXzQD2biONjNpzNeBZmw=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/github/ben-manes#gradle-versions-plugin/0.45.0": { + "jar": "sha256-RpBMEWJmqzmQy6JpyFGsSUppwhIbz5nkPKU4blLUJaM=", + "module": "sha256-RyWDjnWYFyb1ogLMtL31WY2c34mAdiApHtWi7XAJR4c=", + "pom": "sha256-8TEb3zGSUlFQ0qtWZCgpqnnfiCrp6GNt+97S+d78NDk=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.45.0": { + "pom": "sha256-TF+vdABxshvnS8Py3jamb3OZ8ISsA2DTFzt5iYWyh7Q=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.2": { + "pom": "sha256-lW5FCF5S6l7zLTRnHruE6xxBqDxFSa8m5oY18QYXmNM=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp/4.9.3": { + "jar": "sha256-k+zWy6Gdh9zP5WbshI2RqueZ488WwAcJNY6mm9kichk=", + "module": "sha256-gyf+V2cjmG3tSvpeDZ4TKuMCzPVvITwNuCGnQE1A+O8=", + "pom": "sha256-ZN87m63dAOqkvHJ2Qf0VfGXzlGXmjq7KpaHQQX/C8mk=" + }, + "com/squareup/okio#okio/2.10.0": { + "jar": "sha256-on8JHTSqRS43In4s+oWAnykBKo7yUBqbWhJal45Py8E=", + "module": "sha256-EcvqvDp2XJqAMkL6ICShGFPrCGXaU2xLBa/c27I0Y3A=", + "pom": "sha256-S5YGC20aK5bpDkKtcVitvjRpMWuA/qCBfGwzmT7hzHI=" + }, + "com/squareup/okio#okio/2.8.0": { + "module": "sha256-F7qrcnA4ml+mOrEoEYZNCgDzgWEbxOsEL6G9WRjtCWU=", + "pom": "sha256-JiFAaP1Mf0N6yP6FdoAqmp3BUcRXWCgHrZryry6MlIE=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.2": { + "jar": "sha256-v3BcwupcAYCqhwoPqAs5vxOhTScSjh6zpLZ0vjT1jpA=", + "pom": "sha256-H6qwvkF9ezxBqXzKCsqKWwtkBvw7Etfyjiw0Ex3/k0o=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/beryx#badass-runtime-plugin/1.13.0": { + "jar": "sha256-ekslb9N9F6TK7Ms2hpeKmzRYW7WbXxmhmCzwYX+q86g=", + "module": "sha256-FdSu+57WOootchnvCNjEY6VztDoF2UiBAeUmgx3pmMA=", + "pom": "sha256-0bql4D6Gy4kd5e9l0OYNlowgT6/5EQ2TWFmX3EoZW9E=" + }, + "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.13.0": { + "pom": "sha256-xlrrkFABYYEdS2cOwaKcaTL5gk5hI00vWQNCJaDSSRg=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.1.202206130422-r": { + "pom": "sha256-3mX8du2PRKV3he4WSRjcPU9V7j/qake8fLG6oZ7xvIM=" + }, + "org/eclipse/jgit#org.eclipse.jgit/5.13.1.202206130422-r": { + "jar": "sha256-1nk2WmyOVcFJZwEJn15XZUM/aNy2WXWUFrpbIi61BVw=", + "pom": "sha256-PMS+v5yTZXjq4rbST7KpEtiZk6VP0OL7wcirwEmHhRU=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.21": { + "jar": "sha256-Hh9XIJ9yOMP9FzWhuTOaVlZVB9yiSfg3G/WdkfYBrqo=", + "pom": "sha256-2nHh493COI1nVkFnLi8DFtucnSEvlG8CbUoOahM2p/M=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.21": { + "jar": "sha256-GDvsWc2fOhSVexkOjIec8RlL0fEGsKe24cu4eQ0kI2M=", + "pom": "sha256-W8FW7nP9PC2sil7FSNWBtjMzNUfC/r7Zz2VH//FSa6I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.21": { + "jar": "sha256-8bBjTbuUFyA4RjAguy3UXKJoSfjOKdYlrLDxVp0R2+4=", + "pom": "sha256-ARzSjruf3oFrA1nVrhCjZ07A/yxTEMBBLCDv6Oo9oG4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.21": { + "jar": "sha256-2rRUibR3NtWfzkS4BnbxlHqba8qxD9YOh4qDvYKmlUw=", + "pom": "sha256-g2oReaCNJJFGl9JhLgO4SKCHyAy0sMoj+c+rJH86dcQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.21": { + "jar": "sha256-c5xSZnK7M3Vzso9jr6gwbrCIsMOgln9W1sifSjASpJI=", + "pom": "sha256-zkJyW6Ab2DbNqmZ9l032hL9vjxXng5JjMgraf/quHzQ=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "ch/qos/logback#logback-classic/1.3.5": { + "jar": "sha256-nWi52vL7uYoJsEReDGSsMJ2dDhVraFELY3kTl8l+MuQ=", + "pom": "sha256-7HWshxo9E2HbsPjbbSUDW6uJpeqXPxhKse+pHO7oRsU=" + }, + "ch/qos/logback#logback-core/1.3.5": { + "jar": "sha256-sfDsOT8vW7rx3sthYk3hg4ZjTDGX6e7WnRwSNN3XVvM=", + "pom": "sha256-HgdGJT8D995vW70VQzaqTXWGlCEPac//bo61+O/DVSg=" + }, + "ch/qos/logback#logback-parent/1.3.5": { + "pom": "sha256-EYAKLQpLzUQpZNpWHBGhHxbkS4n+prEKiRoQkigHn1s=" + }, + "com/beust#jcommander/1.81": { + "jar": "sha256-nYtCl5yZ89qpkQL+m6H7JfUiJstIz1i8GKy5MTLkGgU=", + "module": "sha256-yQiuLdCRx1kB8zhnWrOWNOGfmyFjaUZwwSLiir5aDoI=", + "pom": "sha256-8CBdB5nUsdc0JS/Z+g3T63x1H1/762eyVeQStV/i41U=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/fifesoft#rsyntaxtextarea/3.3.2": { + "jar": "sha256-TAslPpJ8Ho8zUkhBcNA98Iu39QORc6vAXP+dERwyqks=", + "module": "sha256-ctL5lETQWlYoNVrzcGQm8Ea+Yzpm4a+wdt2xLTdoi9Y=", + "pom": "sha256-KwgwlBEYFM9LGWtMEA75Nc2ztgJ9Z9HAtWLPc0LRNgk=" + }, + "com/formdev#flatlaf-extras/3.0": { + "jar": "sha256-wAud4HI/J1PtR7c1t6RLVK6rJt6bO5dTIYgftTVTx1E=", + "module": "sha256-FkTiG6Si+TVfX7Ap9WZoo5KsEqUpSQ1nu2VWJoKmoek=", + "pom": "sha256-B1lbUVRfuH8a1+CDuKEjm/h7/P64KAc4bOaFP59vCWI=" + }, + "com/formdev#flatlaf-intellij-themes/3.0": { + "jar": "sha256-N3qzctH/ln9MPMO0us78YYWgYnehChoUOlwqITjZObA=", + "module": "sha256-sKyuEQ8TM+zDL3YDcQrw4HjM1OV+uBLrZG/Wnd6sRv8=", + "pom": "sha256-dSGPJNAI5MRhs8b6JQ5w1c0yJ6ChWzcXexL/z3fF33Y=" + }, + "com/formdev#flatlaf/3.0": { + "jar": "sha256-lpsnqmEscOy4VmTlXYxfdnimGI+dt8UUKoH25HXhmGc=", + "module": "sha256-ndu+u4qmfA+PJfYcWspgGYHiWjZ2fM9YuuaMopWgUxs=", + "pom": "sha256-p4oaUVQeiMBghuMPw5BvUdWOUCDETbd52rsS8JEuTPk=" + }, + "com/formdev#svgSalamander/1.1.4": { + "jar": "sha256-4PGk2RzE9s4I6LRBsbMmuJjiUDZqn0xIk3EoTHhNMhE=", + "pom": "sha256-ndRWBiO6S1ETmg3EnarIjL5dJIzUgrPzoLJfYZutUvk=" + }, + "com/github/akarnokd#rxjava2-swing/0.3.7": { + "jar": "sha256-umWvI1GP+Ucha7S+kDC7AavSQkHOEy3oPoUdC81S7n4=", + "pom": "sha256-VCbDiy18y9Z5qiBuF6TPrxPrk3IPPnjPjdckAjfNnLE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/errorprone#error_prone_annotations/2.5.1": { + "jar": "sha256-/4Bia6rxKgk0K+/U6Ey6nVBmL1/Nf3qbNJCmt8+H5mw=", + "pom": "sha256-mDrX/g+m9vkeLSBHf1CJ7Mw/TY7GxR1utFWDlw4nnTw=" + }, + "com/google/errorprone#error_prone_annotations/2.7.1": { + "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=", + "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU=" + }, + "com/google/errorprone#error_prone_parent/2.5.1": { + "pom": "sha256-oXp2d0gqOlGkX14IFAByrNMyzLEvI4mbAFLYCnKcLlI=" + }, + "com/google/errorprone#error_prone_parent/2.7.1": { + "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/30.1.1-jre": { + "pom": "sha256-BCK9Rcokl7+hiq0mmDJJZe1w2gkHuKfUWberO17tODQ=" + }, + "com/google/guava#guava-parent/31.0.1-jre": { + "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g=" + }, + "com/google/guava#guava/30.1.1-jre": { + "jar": "sha256-RM4inOJtiAvzr8Niu/zsNNfmkD0ZW7sdufO24NmDTwY=", + "pom": "sha256-bRjJGIrUt4Vft/6m8Xk3VLQfoXR4Ea4ePXU9b8ydzFk=" + }, + "com/google/guava#guava/31.0.1-jre": { + "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=", + "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-java/3.21.12": { + "jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=", + "pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/jakewharton/android/repackaged#dalvik-dx/11.0.0_r3": { + "jar": "sha256-N1gaVv3tFexviLRtPHcEzHAKM3H5519BshIeMod2m6k=", + "pom": "sha256-p1xwnmYDV+amCkqI5dm/UQEH5TJ2JzabwfgDDzmJONE=" + }, + "com/puppycrawl/tools#checkstyle/9.3": { + "jar": "sha256-BGPjBJgPVGC5ZPSBzMJaEPslO2AQDBnlD8mSiSiVl38=", + "pom": "sha256-p9y0ZmVtZ/oKUNkE/d8U/GtTmEa4FO3/djXHRdW9MDQ=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "hu/kazocsaba#image-viewer/1.2.3": { + "jar": "sha256-wqNLddLK8alfjMGXGam6MNEJZhi9sIez22/8ELrAUik=", + "pom": "sha256-7Wev/h7E7cGYGKhqSZqe8DfWujf3GFvTBbs62otf+qw=" + }, + "info/picocli#picocli/4.6.2": { + "jar": "sha256-R1TZbq9TFPNaKH2lxnhIsoUGeGj8ptH1Ehp09n8GW2E=", + "pom": "sha256-3q4p2lxR4/6dla9ujzkVbCvBt0niQtATbp4jIINIF5k=" + }, + "io/github/skylot#jdwp/2.0.0": { + "jar": "sha256-Z01piJwpSc+I/MIGr38ur7FTMWsy5GzO8Tz5FRw3jqw=", + "module": "sha256-0bY96BmtAR3paWge0wxaULPc3FclHTTfnEtnw+6nU3Q=", + "pom": "sha256-2tG6+z2xh4vm/awirm/tYaXN38OXwJruNuP8HKOEIMU=" + }, + "io/github/skylot#raung-asm/0.0.3": { + "jar": "sha256-o+NOaprRhicntyd7Q2w/jkx0ll3ixsNBNDEB7t23S0w=", + "module": "sha256-Xr/NftSYTE6eV44X6knVOvrHRbSNYS6cnGgQo1Hqr94=", + "pom": "sha256-sU7Vq9Zy3OCw4QwPAe8EgZYLBchyl5xDszVfcstSBYc=" + }, + "io/github/skylot#raung-common/0.0.3": { + "jar": "sha256-I/bEZ+qWVPA5ii/V+TpjeEZd2M4fzTYInDM5dNcnICg=", + "module": "sha256-tvEtR3+g69ui7+wp1I+H6QcEHOPDuvQwk0FhH7RSuCU=", + "pom": "sha256-yfInb1qT0ikQ2BkEr/0OArStnwhVBsFTyl4k5vVtfVU=" + }, + "io/github/skylot#raung-disasm/0.0.3": { + "jar": "sha256-j9HSGFHXDY2hfhwJxf0M5ME8zWlnBX1Vtlw8qYP5DaI=", + "module": "sha256-1Vdekft2GEATZ0KC32uKD6viK6ANyilFQD4qIe/QtJI=", + "pom": "sha256-/iYlIgpujopppbkOu/wMVWFIkRjBadAkvBf/3q1y9Y4=" + }, + "io/reactivex/rxjava2#rxjava/2.2.21": { + "jar": "sha256-Wd9lQahAAY8PTImark9MH0OD9MFv61JoYV++OE0oUBw=", + "pom": "sha256-slvs5QSD3po+Hf0lARwthTMCFu+Kgbhvar69vfmw8Sc=" + }, + "net/bytebuddy#byte-buddy-agent/1.12.19": { + "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=", + "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs=" + }, + "net/bytebuddy#byte-buddy-parent/1.12.19": { + "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0=" + }, + "net/bytebuddy#byte-buddy-parent/1.12.21": { + "pom": "sha256-/2bYhmBxN+IJXyDJDuCT88gDKRZO/wkaBoi9zjfj5rI=" + }, + "net/bytebuddy#byte-buddy/1.12.19": { + "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" + }, + "net/bytebuddy#byte-buddy/1.12.21": { + "jar": "sha256-9vRcIjen8TLBZ0WtKlLEzd5YAosR7oCwnw1CL0kw1oU=", + "pom": "sha256-letCyJ/QT2IYfdM7nN8E0t8bh2s3XBatMsClocwaBws=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/saxon#Saxon-HE/10.6": { + "jar": "sha256-bQjfguTthrarsaAse3SiaPz8XgBOg7tP8AbsOlCb01Y=", + "pom": "sha256-otbdpDjoZKuTXzG0O1MFLE6HEalQVkJxkZBRPnb0Ekg=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#antlr4-master/4.9.3": { + "pom": "sha256-VlzAVNO631DKCgcX2uMRJootZwn93ckKxKQ8YtAZNbk=" + }, + "org/antlr#antlr4-runtime/4.9.3": { + "jar": "sha256-ExpllJabxPMh1lLqKjO8DjeMoxJoXvh3kbLGCynQHqU=", + "pom": "sha256-T35E5OoGKfo6dZsRFv65+yiBTpX3keHu7dIMEoideqQ=" + }, + "org/antlr#stringtemplate/3.2.1": { + "jar": "sha256-9mznLpZeUwHLDwIOVNK6atdv65Gzy/ww278AwGpt9tc=", + "pom": "sha256-tF6CZVqlpI8z0TpD5DRUJrFWM1s14kta6hLbWCPBahY=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-build/3.24.2": { + "pom": "sha256-1/yMSqgAWDsmxGfrD67eCvXnynkMS+TU0jVDFYPSbq0=" + }, + "org/assertj#assertj-core/3.24.2": { + "jar": "sha256-3z0LNI8f6Aa93csQ+krmPGZ56YiNS8cFXwmEhReXaqM=", + "pom": "sha256-f7mxojdOtQ7SubWYRcaScxEeoYOaQpj5QAqA4rLFyA4=" + }, + "org/assertj#assertj-parent/3.24.2": { + "pom": "sha256-DFAETrW96ehEI7yhOv9dX0PTdSqzxj9zva5p/EqxoKw=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.8.0": { + "jar": "sha256-yIwual/a658m/Ph5JkBC3oqe6dN24kd4OP6qvPpE3aY=", + "pom": "sha256-fm1Z4tO8AbHwT6NmcZOm1BcBmbFPulOnqONr92AiOac=" + }, + "org/eclipse/jdt#ecj/3.32.0": { + "jar": "sha256-B+A0xEoBnAxjlKBu57XDROVRj2CDwP0Eby2P0WpnYOI=", + "pom": "sha256-nHgB0Qv3Z4qRIwZCCOcFiSsd99CTbaLUoO3TyIqXtHU=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-library/2.2": { + "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", + "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/jetbrains#annotations/24.0.0": { + "jar": "sha256-/xEvVM6HS4romc/WjwMV2WyfQGozi47KgMdtEOLlovc=", + "pom": "sha256-q4eN2sP6teB48NqVHqvWf77d09KvFzn+t/lHFgJ1Xws=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.2": { + "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=", + "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=", + "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.2": { + "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=", + "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=", + "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8=" + }, + "org/junit/platform#junit-platform-commons/1.9.2": { + "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=", + "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=", + "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck=" + }, + "org/junit/platform#junit-platform-engine/1.9.2": { + "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=", + "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=", + "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/4.10.0": { + "jar": "sha256-vBSafXSmWCf6rVb9zTfy9T9DbuOcKfCIJ2+hs4S/g3o=", + "pom": "sha256-Dzw6IxhyvrM1D0WynDIPI/KTKMjDgCrbs5WIbS+OsyU=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.4": { + "jar": "sha256-e1+MXjvzQbW7Vw0m83nj/evcMnMhhxWcQkeRZAU/Nz0=", + "pom": "sha256-fZtgkidiP2x+9v13+gbaWG0Na6wRTPPnICDaiFPYdZw=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm-util/9.4": { + "jar": "sha256-PXkyuT/1UFZkHnz7YB+WvNXNBx4bBQPHilAUIyKXoj4=", + "pom": "sha256-ugQzwHsMD2mA8suPgEH/WcgemEgeEBliEFFi43IvH5I=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/reactivestreams#reactive-streams/1.0.3": { + "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", + "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/slf4j#slf4j-api/2.0.6": { + "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", + "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" + }, + "org/slf4j#slf4j-parent/2.0.6": { + "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" + }, + "org/smali#baksmali/2.5.2": { + "jar": "sha256-HtI2Jm19xJB6reCxmjT3fvrCU0K2PIrOUuV5A5lBs4k=", + "module": "sha256-g+59x3oek4+5BtaNfUPiRX8s+Im7HecuqtcJJDVfpbU=", + "pom": "sha256-8FzZiasE/SboahreXCGauEgovqfebryA/Bd7YtJ1k4g=" + }, + "org/smali#dexlib2/2.5.2": { + "jar": "sha256-WlyJgti9fW47saBxMEnjx4txnsMrIPa2GYhc7DCg3WE=", + "module": "sha256-5XDKZe/asrKMAq2P34W9hSIGZrkkuJXKW+r1fXKGiDw=", + "pom": "sha256-BWB6NSDN841drl0MQZZRKjhWpA3rlTny/OCGNalut44=" + }, + "org/smali#smali/2.5.2": { + "jar": "sha256-E2xcRlPWUxvXtvEPNfhpHLlkMucn0wtNVXmCbuAelBk=", + "module": "sha256-3ubU7dlRzZ7W5xd4wA81AoCJw7e+/HIwojoeqxalV3s=", + "pom": "sha256-NSyCM7StGa2AyNSrKY8jvdMHeHrE/phZDs30CODcZOY=" + }, + "org/smali#util/2.5.2": { + "jar": "sha256-T1gKnP8+u4PLP9IL7Ijjfk8YN5bKZScymSYRYgKC2uo=", + "module": "sha256-rRt+JSAWcAXJFp2Gv8z/JvXF+b8Ls/qyRMtIIWU9wmE=", + "pom": "sha256-IKx+12/5cPUQB6IPrIvbon7IeUT9Kb2oxnQJZ5LJFFE=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "tools/profiler#async-profiler/2.9": { + "jar": "sha256-bE6ZPCjPKIKWTKyCoPlugaMlhABDiEUmVlAXsvYsW6Q=", + "pom": "sha256-oDKflhfii6+4Rj+/btPUskpJc5oVvhlwRVB27V1SgU8=" + } + } +} From 7b1a794bc2accf0345465b0aae424ffc22fb0356 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 11:33:33 +0700 Subject: [PATCH 173/562] cie-middleware-linux: convert to gradle setup hook --- .../security/cie-middleware-linux/default.nix | 77 +++----- .../security/cie-middleware-linux/deps.json | 185 ++++++++++++++++++ 2 files changed, 216 insertions(+), 46 deletions(-) create mode 100644 pkgs/tools/security/cie-middleware-linux/deps.json diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index d88295915094..11c0567bb6f0 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -34,35 +34,6 @@ let # Shared libraries needed by the Java application libraries = lib.makeLibraryPath [ ghostscript ]; - # Fixed-output derivation that fetches the Java dependencies - javaDeps = stdenv.mkDerivation { - pname = "cie-java-deps"; - inherit src version; - - nativeBuildInputs = [ gradle ]; - - buildPhase = '' - # Run the fetchDeps task - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon -b cie-java/build.gradle fetchDeps - ''; - - installPhase = '' - # Build a tree compatible with the maven repository format - pushd "$GRADLE_USER_HOME/caches/modules-2/files-2.1" - find -type f | awk -F/ -v OFS=/ -v out="$out" '{ - infile = $0 - gsub(/\./, "/", $2) - system("install -m644 -D "infile" "out"/"$2"/"$3"/"$4"/"$6) - }' - popd - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-fxrjo4iduXzTgMqmQGwdI1vLMA4EZLObsHyKGZ6b14I="; - }; - in stdenv.mkDerivation { @@ -101,26 +72,40 @@ stdenv.mkDerivation { # libraries and the Java application builds. preConfigure = "pushd libs"; - postBuild = '' + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + gradleFlags = [ + "-Dorg.gradle.java.home=${jre}" + "--build-file" "cie-java/build.gradle" + ]; + + gradleBuildTask = "standalone"; + + buildPhase = '' + runHook preBuild + + ninjaBuildPhase + pushd ../.. + gradleBuildPhase popd - # Use the packages in javaDeps for both plugins and dependencies - localRepo="maven { url uri('${javaDeps}') }" - sed -i cie-java/settings.gradle -e "1i \ - pluginManagement { repositories { $localRepo } }" - substituteInPlace cie-java/build.gradle \ - --replace 'mavenCentral()' "$localRepo" + runHook postBuild + ''; - # Build the Java application - export GRADLE_USER_HOME=$(mktemp -d) - gradle standalone \ - --no-daemon \ - --offline \ - --parallel \ - --info -Dorg.gradle.java.home=${jre} \ - --build-file cie-java/build.gradle + doCheck = true; - pushd libs/build + checkPhase = '' + runHook preCheck + + mesonCheckPhase + pushd ../.. + gradleCheckPhase + popd + + runHook postCheck ''; postInstall = '' @@ -144,7 +129,7 @@ stdenv.mkDerivation { install -Dm644 LICENSE "$out/share/licenses/cieid/LICENSE" ''; - passthru = { inherit javaDeps; }; + preGradleUpdate = "cd ../.."; meta = with lib; { homepage = "https://github.com/M0Rf30/cie-middleware-linux"; diff --git a/pkgs/tools/security/cie-middleware-linux/deps.json b/pkgs/tools/security/cie-middleware-linux/deps.json new file mode 100644 index 000000000000..b9145f453e10 --- /dev/null +++ b/pkgs/tools/security/cie-middleware-linux/deps.json @@ -0,0 +1,185 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.3.0": { + "jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=", + "pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + } + } +} From e7aa9a3aebe3bc5dfa64a409c4e7901e3f1e86a0 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 12:07:02 +0700 Subject: [PATCH 174/562] mucommander: convert to gradle setup hook --- .../file-managers/mucommander/default.nix | 79 +- .../file-managers/mucommander/deps.json | 1064 +++++++++++++++++ 2 files changed, 1078 insertions(+), 65 deletions(-) create mode 100644 pkgs/applications/file-managers/mucommander/deps.json diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 308035b094a1..0a6ca746caee 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -2,20 +2,22 @@ , stdenv , fetchFromGitHub , gradle_7 -, perl , makeWrapper -, writeText , jdk , gsettings-desktop-schemas }: let + gradle = gradle_7; +in +stdenv.mkDerivation (finalAttrs: { + pname = "mucommander"; version = "1.3.0-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; }; @@ -23,72 +25,19 @@ let # there is no .git anyway substituteInPlace build.gradle \ --replace "git = grgit.open(dir: project.rootDir)" "" \ - --replace "id 'org.ajoberstar.grgit' version '3.1.1'" "" \ - --replace "revision = git.head().id" "revision = '${version}'" + --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "mucommander-deps"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon tgz - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - # reproducible by sorting - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | LC_ALL=C sort \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - # copy maven-metadata.xml for commons-codec - # thankfully there is only one xml - cp $GRADLE_USER_HOME/caches/modules-2/resources-2.1/*/*/maven-metadata.xml $out/commons-codec/commons-codec/maven-metadata.xml - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E="; + nativeBuildInputs = [ gradle makeWrapper ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; }; -in -stdenv.mkDerivation rec { - pname = "mucommander"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl makeWrapper ]; + __darwinAllowLocalNetworking = true; - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}' } - } - } - } - ''; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - - gradle --offline --init-script ${gradleInit} --no-daemon tgz - ''; + gradleBuildTask = "tgz"; installPhase = '' mkdir -p $out/share/mucommander @@ -107,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "mucommander"; }; -} +}) diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/applications/file-managers/mucommander/deps.json new file mode 100644 index 000000000000..264328bca01d --- /dev/null +++ b/pkgs/applications/file-managers/mucommander/deps.json @@ -0,0 +1,1064 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { + "jediterm#jediterm-core/3.17": { + "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", + "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" + }, + "jediterm#jediterm-ui/3.17": { + "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", + "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" + }, + "pty4j#purejavacomm/0.0.11.1": { + "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", + "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" + } + }, + "https://plugins.gradle.org/m2": { + "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { + "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { + "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", + "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ant#ant/1.6.5": { + "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", + "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" + }, + "avalon-framework#avalon-framework/4.1.5": { + "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", + "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" + }, + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { + "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", + "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { + "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", + "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { + "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", + "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { + "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", + "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" + }, + "biz/aQute/bnd#biz.aQute.repository/6.4.0": { + "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", + "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" + }, + "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { + "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", + "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" + }, + "ch/qos/logback#logback-classic/1.2.3": { + "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", + "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" + }, + "ch/qos/logback#logback-core/1.2.3": { + "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", + "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" + }, + "ch/qos/logback#logback-parent/1.2.3": { + "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" + }, + "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { + "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", + "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" + }, + "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { + "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", + "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" + }, + "com/athaydes/osgiaas#osgiaas-common/0.7": { + "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", + "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" + }, + "com/beust#jcommander/1.64": { + "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", + "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/dropbox/core#dropbox-core-sdk/5.2.0": { + "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", + "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", + "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" + }, + "com/fasterxml#oss-parent/25": { + "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" + }, + "com/fasterxml#oss-parent/33": { + "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml/jackson#jackson-base/2.10.0": { + "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" + }, + "com/fasterxml/jackson#jackson-base/2.9.6": { + "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" + }, + "com/fasterxml/jackson#jackson-bom/2.10.0": { + "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" + }, + "com/fasterxml/jackson#jackson-bom/2.9.6": { + "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" + }, + "com/fasterxml/jackson#jackson-parent/2.10": { + "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" + }, + "com/fasterxml/jackson#jackson-parent/2.7": { + "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" + }, + "com/fasterxml/jackson#jackson-parent/2.9.1.1": { + "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { + "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", + "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.10.0": { + "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", + "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" + }, + "com/fasterxml/jackson/core#jackson-core/2.7.9": { + "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", + "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" + }, + "com/fasterxml/jackson/core#jackson-core/2.9.6": { + "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", + "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.10.0": { + "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", + "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" + }, + "com/fifesoft#rsyntaxtextarea/3.3.3": { + "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", + "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", + "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/formdev#flatlaf/2.2": { + "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", + "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", + "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" + }, + "com/formdev#flatlaf/2.6": { + "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", + "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", + "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" + }, + "com/github/junrar#junrar/7.5.4": { + "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", + "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", + "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" + }, + "com/github/mwiede#jsch/0.2.8": { + "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", + "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" + }, + "com/github/pcorless/icepdf#icepdf-core/7.0.1": { + "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", + "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" + }, + "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { + "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", + "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" + }, + "com/google/api-client#google-api-client-parent/1.25.0": { + "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" + }, + "com/google/api-client#google-api-client/1.25.0": { + "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", + "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" + }, + "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { + "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", + "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" + }, + "com/google/code/findbugs#jsr305/1.3.9": { + "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", + "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/30.1.1-android": { + "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" + }, + "com/google/guava#guava-parent/31.1-android": { + "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/30.1.1-android": { + "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" + }, + "com/google/guava#guava/31.1-android": { + "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", + "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-bom/1.41.8": { + "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" + }, + "com/google/http-client#google-http-client-gson/1.41.8": { + "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", + "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" + }, + "com/google/http-client#google-http-client-jackson2/1.25.0": { + "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", + "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" + }, + "com/google/http-client#google-http-client-parent/1.25.0": { + "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" + }, + "com/google/http-client#google-http-client-parent/1.41.8": { + "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" + }, + "com/google/http-client#google-http-client/1.41.8": { + "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", + "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/oauth-client#google-oauth-client-java6/1.34.0": { + "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", + "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" + }, + "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { + "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", + "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.34.0": { + "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" + }, + "com/google/oauth-client#google-oauth-client/1.34.0": { + "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", + "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/googlecode/plist#dd-plist/1.23": { + "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", + "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" + }, + "com/ibm/icu#icu4j/59.2": { + "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", + "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" + }, + "com/jamesmurty/utils#java-xmlbuilder/1.1": { + "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", + "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "com/twelvemonkeys#twelvemonkeys/3.9.4": { + "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" + }, + "com/twelvemonkeys/common#common-image/3.9.4": { + "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", + "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" + }, + "com/twelvemonkeys/common#common-io/3.9.4": { + "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", + "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" + }, + "com/twelvemonkeys/common#common-lang/3.9.4": { + "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", + "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" + }, + "com/twelvemonkeys/common#common/3.9.4": { + "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.9.4": { + "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", + "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { + "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", + "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" + }, + "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { + "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", + "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { + "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", + "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" + }, + "com/twelvemonkeys/imageio#imageio/3.9.4": { + "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.2": { + "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", + "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.17.0": { + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + }, + "commons-codec#commons-codec/1.3": { + "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", + "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" + }, + "commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "commons-codec/commons-codec/maven-metadata": { + "xml": { + "groupId": "commons-codec", + "lastUpdated": "20240427124755", + "release": "1.17.0" + } + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-el#commons-el/1.0": { + "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", + "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" + }, + "commons-httpclient#commons-httpclient/3.0.1": { + "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" + }, + "commons-httpclient#commons-httpclient/3.1": { + "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", + "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-net#commons-net/1.4.1": { + "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", + "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" + }, + "commons-net#commons-net/3.8.0": { + "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", + "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" + }, + "eu/agno3/jcifs#jcifs-ng/2.1.7": { + "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", + "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" + }, + "hsqldb#hsqldb/1.8.0.10": { + "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", + "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/grpc#grpc-context/1.27.2": { + "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", + "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" + }, + "io/opencensus#opencensus-api/0.31.0": { + "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", + "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.0": { + "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", + "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" + }, + "javax/activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" + }, + "javax/jws#javax.jws-api/1.1": { + "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", + "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" + }, + "javax/xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" + }, + "javax/xml/bind#jaxb-api/2.2.9": { + "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", + "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" + }, + "javax/xml/soap#javax.xml.soap-api/1.3.5": { + "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", + "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" + }, + "javax/xml/ws#jaxws-api/2.2.12": { + "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", + "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" + }, + "jline#jline/2.14.2": { + "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", + "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.5": { + "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", + "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" + }, + "log4j#log4j/1.2.17": { + "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", + "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" + }, + "net/iharder#base64/2.3.8": { + "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", + "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/4": { + "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jets3t#jets3t/0.7.1": { + "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", + "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" + }, + "net/java/dev/jets3t#jets3t/0.9.4": { + "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", + "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" + }, + "net/java/dev/jna#jna-platform/5.10.0": { + "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", + "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" + }, + "net/java/dev/jna#jna-platform/5.12.1": { + "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", + "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" + }, + "net/java/dev/jna#jna-platform/5.5.0": { + "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", + "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" + }, + "net/java/dev/jna#jna/5.10.0": { + "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", + "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/java/dev/jna#jna/5.5.0": { + "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", + "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" + }, + "net/sf/kosmosfs#kfs/0.3": { + "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", + "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", + "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/ajoberstar/grgit#grgit-core/5.0.0": { + "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", + "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", + "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" + }, + "org/ajoberstar/grgit#grgit-gradle/5.0.0": { + "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", + "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", + "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-compress/1.20": { + "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", + "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-vfs2-project/2.3": { + "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" + }, + "org/apache/commons#commons-vfs2/2.3": { + "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", + "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" + }, + "org/apache/felix#felix-parent/2.1": { + "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" + }, + "org/apache/felix#felix-parent/4": { + "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/felix#org.apache.felix.main/7.0.5": { + "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", + "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" + }, + "org/apache/felix#org.apache.felix.scr/2.0.12": { + "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", + "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" + }, + "org/apache/felix#org.apache.felix.shell/1.4.3": { + "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", + "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" + }, + "org/apache/hadoop#hadoop-core/0.20.2": { + "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", + "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" + }, + "org/apache/httpcomponents#httpclient/4.5": { + "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", + "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5": { + "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.1": { + "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.15": { + "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.1": { + "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", + "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" + }, + "org/apache/httpcomponents#httpcore/4.4.15": { + "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", + "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" + }, + "org/apache/httpcomponents#project/7": { + "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" + }, + "org/apache/pdfbox#fontbox/2.0.27": { + "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", + "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.27": { + "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.70": { + "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", + "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" + }, + "org/bouncycastle#bcprov-ext-jdk15on/1.70": { + "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", + "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.52": { + "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", + "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/bouncycastle#bcutil-jdk15on/1.70": { + "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", + "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.24.0": { + "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", + "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", + "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/jackson#jackson-core-asl/1.9.13": { + "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", + "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" + }, + "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { + "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", + "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/eclipse/jdt#core/3.1.1": { + "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", + "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { + "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { + "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", + "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" + }, + "org/exbin/bined#bined-core/0.2.0": { + "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", + "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" + }, + "org/exbin/bined#bined-extended/0.2.0": { + "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", + "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" + }, + "org/exbin/bined#bined-highlight-swing/0.2.0": { + "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", + "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" + }, + "org/exbin/bined#bined-operation-swing/0.2.0": { + "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", + "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" + }, + "org/exbin/bined#bined-operation/0.2.0": { + "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", + "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" + }, + "org/exbin/bined#bined-swing-extended/0.2.0": { + "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", + "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" + }, + "org/exbin/bined#bined-swing/0.2.0": { + "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", + "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" + }, + "org/glassfish#glassfish-parent/10.0-b28": { + "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" + }, + "org/glassfish#javaee-api/10.0-b28": { + "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" + }, + "org/glassfish#javax.xml.soap/10.0-b28": { + "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", + "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" + }, + "org/glassfish#pom/2": { + "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/20.1.0": { + "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", + "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { + "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", + "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { + "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", + "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" + }, + "org/jetbrains/pty4j#pty4j/0.12.3": { + "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", + "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", + "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" + }, + "org/jmdns#jmdns/3.5.5": { + "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", + "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/mortbay/jetty#jetty-parent/7": { + "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" + }, + "org/mortbay/jetty#jetty-util/6.1.14": { + "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", + "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" + }, + "org/mortbay/jetty#jetty/6.1.14": { + "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", + "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" + }, + "org/mortbay/jetty#jsp-2.1/6.1.14": { + "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", + "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" + }, + "org/mortbay/jetty#jsp-api-2.1/6.1.14": { + "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", + "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" + }, + "org/mortbay/jetty#project/6.1.14": { + "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" + }, + "org/mortbay/jetty#servlet-api-2.5/6.1.14": { + "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", + "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/osgi#osgi.core/8.0.0": { + "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", + "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" + }, + "org/ovirt/engine/api#java-sdk-parent/4.4.5": { + "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" + }, + "org/ovirt/engine/api#sdk/4.4.5": { + "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", + "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testng#testng/6.11": { + "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", + "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/unix4j#unix4j-base/0.6": { + "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", + "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" + }, + "org/unix4j#unix4j-command/0.6": { + "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", + "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" + }, + "org/unix4j#unix4j-core/0.6": { + "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" + }, + "org/unix4j#unix4j/0.6": { + "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" + }, + "org/violetlib#jnr/11": { + "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", + "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/10": { + "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", + "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" + }, + "org/yaml#snakeyaml/1.17": { + "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", + "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" + }, + "oro#oro/2.0.8": { + "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", + "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" + }, + "tomcat#jasper-compiler/5.5.12": { + "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", + "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" + }, + "tomcat#jasper-runtime/5.5.12": { + "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", + "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" + }, + "xmlenc#xmlenc/0.52": { + "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", + "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repository.jboss.org/maven2/javax": { + "activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" + }, + "xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" + }, + "xml/soap#saaj-api/1.3": { + "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", + "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" + } + } +} From 7754e3541d9a80a65c6b365b259787b0dba23c36 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 14:39:34 +0700 Subject: [PATCH 175/562] freenet: convert to gradle setup hook --- .../networking/p2p/freenet/default.nix | 60 +---- .../networking/p2p/freenet/deps.json | 240 ++++++++++++++++++ 2 files changed, 248 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/networking/p2p/freenet/deps.json diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 3ca23647251a..abcc69ec1240 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils -, substituteAll, nixosTests, perl, fetchpatch, writeText }: +, substituteAll, nixosTests, fetchpatch, writeText }: let version = "01497"; @@ -45,60 +45,17 @@ in stdenv.mkDerivation rec { inherit bash coreutils jre seednodes; }; - # https://github.com/freenet/fred/blob/next/build-offline.sh - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version patches; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-CZf5M3lI7Lz9Pl8U/lNoQ6V6Jxbmkxau8L273XFFS2E="; - outputHashAlgo = "sha256"; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } + # using reproducible archives breaks the build + gradleInitScript = writeText "empty-init-script.gradle" ""; - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } - ''; + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; - buildPhase = '' - gradle jar -Dorg.gradle.java.home=${jdk} --offline --no-daemon --info --init-script $gradleInit - ''; + gradleBuildTask = "jar"; installPhase = '' runHook preInstall @@ -108,7 +65,6 @@ in stdenv.mkDerivation rec { install -Dm555 ${wrapper} $out/bin/freenet substituteInPlace $out/bin/freenet \ --subst-var-by outFreenet $out - ln -s ${deps} $out/deps runHook postInstall ''; diff --git a/pkgs/applications/networking/p2p/freenet/deps.json b/pkgs/applications/networking/p2p/freenet/deps.json new file mode 100644 index 000000000000..83ae9f333ae5 --- /dev/null +++ b/pkgs/applications/networking/p2p/freenet/deps.json @@ -0,0 +1,240 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "io/pebbletemplates#pebble-project/3.1.5": { + "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" + }, + "io/pebbletemplates#pebble/3.1.5": { + "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", + "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java/dev/jna#jna-platform/4.5.2": { + "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", + "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" + }, + "net/java/dev/jna#jna/4.5.2": { + "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", + "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.59": { + "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", + "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-library/1.3": { + "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=", + "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/mockito#mockito-core/1.9.5": { + "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", + "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" + }, + "org/objenesis#objenesis/1.0": { + "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", + "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + } + }, + "https://mvn.freenetproject.org": { + "org/freenetproject#freenet-ext/29": { + "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/android/tools#common/22.7.2": { + "jar": "sha256-6ttGKrkD+J2cPRFUxxHwRni3mSHGgmjTQYuba/NEMk4=", + "pom": "sha256-8zhO5T3Z3fYzOUMDUs3/+WY225ZP0mzxaNvVOt8fSQg=" + }, + "com/android/tools#dvlib/22.7.2": { + "jar": "sha256-/a4X4WbglSc1P37HGgt/PZPMBhxkf8p73ZZjJjO7Z+s=", + "pom": "sha256-Q1HWW5dIC0kjSGhulIFI7Hp/AOVXbZjC9DHPIBxDSpw=" + }, + "com/android/tools#sdk-common/22.7.2": { + "jar": "sha256-l/7SZpQEdLQTNBcmSalIWvV6Qqmsmrcm2S27X6SjPpU=", + "pom": "sha256-Ln4pJV6PBhvVs706Vj7/nqu2xqmLSIHwlpzklOkrhD4=" + }, + "com/android/tools#sdklib/22.7.2": { + "jar": "sha256-qFsaBA/dxaWEWjBuaOK4qx/+LFMS4buyoosTvxOE7RU=", + "pom": "sha256-mGlFT4xtSEwnyYC4eIETnMx/7/Q+7g+MGkhtsbXUPSM=" + }, + "com/android/tools/build#builder-model/0.9.2": { + "jar": "sha256-Utfe2Ho/LgcOOyj3IdFPXtik4s6cVFlT2C3cp0XQ/pU=", + "pom": "sha256-8F2KJ7WoFcgydCbzj7DeW6zpgmAAtE4iR+vTxtcnw28=" + }, + "com/android/tools/build#builder-test-api/0.9.2": { + "jar": "sha256-+i52Ho1fu3bUsVJVeE2nx89qaGW03e1IDXpCxvjqbgo=", + "pom": "sha256-c2xEI3eXn7+LDkxMnGSI6Gg7In6VIXekA6LH+4SB2Fg=" + }, + "com/android/tools/build#builder/0.9.2": { + "jar": "sha256-Vbz5bMADnI7bU9GRVeq+1NfgGgkbZv6zrbb/acJ59Bk=", + "pom": "sha256-UaLeg+swvMwBEbTd3mkxvswC5HwpuqNgm9ErCm7kvvg=" + }, + "com/android/tools/build#gradle/0.9.2": { + "jar": "sha256-gX/QEcuyw4yF/39EWHwTsUCoRUrfk3/Do/KKZggULII=", + "pom": "sha256-DCk9CiNuuQYLtf32UJGE98BPy2xFGXbKkS0LysbBt7Y=" + }, + "com/android/tools/build#manifest-merger/22.7.2": { + "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=", + "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0=" + }, + "com/android/tools/build/gradle/maven-metadata": { + "xml": { + "groupId": "com.android.tools.build", + "lastUpdated": "20170306221012", + "release": "2.3.0" + } + }, + "com/android/tools/ddms#ddmlib/22.7.2": { + "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=", + "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY=" + }, + "com/android/tools/external/lombok#lombok-ast/0.2.2": { + "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=", + "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074=" + }, + "com/android/tools/layoutlib#layoutlib-api/22.7.2": { + "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=", + "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM=" + }, + "com/android/tools/lint#lint-api/22.7.2": { + "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=", + "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM=" + }, + "com/android/tools/lint#lint-checks/22.7.2": { + "jar": "sha256-Hrp9wZ3RAhpR3BkT5obPwe4yrP3e26H3NZf2X6ghXzM=", + "pom": "sha256-5/n3/kXskHm5S/kCh6xSbyGQ6/vJyU3LJsGhsG2+uM8=" + }, + "com/android/tools/lint#lint/22.7.2": { + "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=", + "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc=" + }, + "com/google/guava#guava-parent/15.0": { + "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js=" + }, + "com/google/guava#guava/15.0": { + "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=", + "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs=" + }, + "com/squareup#javawriter/2.2.1": { + "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=", + "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA=" + }, + "commons-codec#commons-codec/1.4": { + "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=", + "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "kxml2#kxml2/2.3.0": { + "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU=" + }, + "net/sf/kxml#kxml2/2.3.0": { + "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", + "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" + }, + "net/sf/proguard#proguard-base/4.10": { + "jar": "sha256-pCU0cXeR5+2oMDYTNzWP4siLCRmAEfnu0epVkfNUTyQ=", + "pom": "sha256-iYTsEfuzfC9fj1aDRT2mLVtGYU8VxVBxJUH9isYqnWs=" + }, + "net/sf/proguard#proguard-gradle/4.10": { + "jar": "sha256-ijb/GXYIYcPPWijb4aadk+aEfi5aadg5PQhkQv8R0Ms=", + "pom": "sha256-kZNouji8XuG6t3YYOqf2HKBaDg1syDbiOhByk59mK5E=" + }, + "net/sf/proguard#proguard-parent/4.10": { + "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache/commons#commons-compress/1.0": { + "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=", + "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/httpcomponents#httpclient/4.1.1": { + "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=", + "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1": { + "pom": "sha256-UhW2SHmMbI2bnN42QtO/taTMiUt8hBEAQ1Ln3l0RmCc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1.1": { + "pom": "sha256-R1KE5emVUm1+dxUTSgdBLOctWYUEY0I4P13kGIoCKlM=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.1": { + "pom": "sha256-T3l//Zw9FW3g2+wf0eY+n9hYSpPHBDV2VT38twb2TeQ=" + }, + "org/apache/httpcomponents#httpcore/4.1": { + "jar": "sha256-POON5R9OJGaMbRhAV6jQhUH56BXS0xnQ9GLwgwkrKc8=", + "pom": "sha256-T8hq+jjpyfqwmcz0XCvHQ9RT5qsiJJCr/oZxl1w8cyc=" + }, + "org/apache/httpcomponents#httpmime/4.1": { + "jar": "sha256-MWKVZhSOikdoiuQ7Qgq8Ps14PtFbM768AIJL8kybFao=", + "pom": "sha256-2zzZW+wQAWBeFlPyhD6FQucS+iu2cv2cjBrOhsV2c9E=" + }, + "org/apache/httpcomponents#project/4.1.1": { + "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.48": { + "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=", + "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0=" + }, + "org/bouncycastle#bcprov-jdk15on/1.48": { + "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=", + "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI=" + }, + "org/eclipse/jdt/core/compiler#ecj/4.2.2": { + "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=", + "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0=" + }, + "org/ow2#ow2/1.3": { + "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" + }, + "org/ow2/asm#asm-analysis/4.0": { + "jar": "sha256-3VOXq69XIxBJrLEBxFHlmKlHpd0YKYMneVNc/cK68U4=", + "pom": "sha256-7U8zeG58CrtuaOYcK047V7WLFOqu/ewxtwkCXja3/Hg=" + }, + "org/ow2/asm#asm-parent/4.0": { + "pom": "sha256-QFr+Cu5AfJEcXkqoCpSdtVOS8XleE8oCrnKdFV30rBg=" + }, + "org/ow2/asm#asm-tree/4.0": { + "jar": "sha256-2LAWoiBbLhQdtCbAQdKubQ1ButBQBioqUXWiWdNkF9o=", + "pom": "sha256-eskVIWBDQDSQMyuS1unIoqd5QIyy1kgdqdOjXtGKLvw=" + }, + "org/ow2/asm#asm/4.0": { + "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=", + "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + } +} From 5aa611e4d0c22a30f10790fbaa708471b63783fb Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:05:01 +0700 Subject: [PATCH 176/562] key: convert to gradle setup hook --- .../science/logic/key/default.nix | 50 +-- pkgs/applications/science/logic/key/deps.json | 387 ++++++++++++++++++ 2 files changed, 397 insertions(+), 40 deletions(-) create mode 100644 pkgs/applications/science/logic/key/deps.json diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 5a48abfc4aa4..0cd5e90cbb50 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -2,7 +2,6 @@ , fetchurl , jdk , gradle_7 -, perl , jre , makeWrapper , makeDesktopItem @@ -12,6 +11,9 @@ }: let + gradle = gradle_7; + +in stdenv.mkDerivation rec { pname = "key"; version = "2.10.0"; src = fetchurl { @@ -20,30 +22,6 @@ let }; sourceRoot = "key-${version}/key"; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src sourceRoot; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon classes testClasses - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-GjBUwJxeyJA6vGrPQVtNpcHb4CJlNlY4kHt1PT21xjo="; - }; -in stdenv.mkDerivation rec { - inherit pname version src sourceRoot; - nativeBuildInputs = [ jdk gradle_7 @@ -65,23 +43,15 @@ in stdenv.mkDerivation rec { }) ]; - # disable tests (broken on darwin) - gradleAction = if stdenv.isDarwin then "assemble" else "build"; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle - cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle - mv settings_new.gradle settings.gradle - gradle --offline --no-daemon ${gradleAction} - - runHook postBuild - ''; + # tests are broken on darwin + doCheck = !stdenv.isDarwin; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/applications/science/logic/key/deps.json new file mode 100644 index 000000000000..4d6dee8060f9 --- /dev/null +++ b/pkgs/applications/science/logic/key/deps.json @@ -0,0 +1,387 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "ca/coglinc#javacc-gradle-plugin/2.4.0": { + "jar": "sha256-RsMHTru+ENUOzWkQpiYxCkE5FlZ5Ct0JF+kBp9afidw=", + "pom": "sha256-NTSsuHwtwH2hAqOP1wn1oANHgSkM+gcjPZTLXMOiyrA=" + }, + "ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": { + "pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw=" + }, + "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.15.0": { + "pom": "sha256-jWmQF6e7GyViPR4EGOKapRwtUYEHkgNaR8PG+hgMSXU=" + }, + "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.15.0": { + "pom": "sha256-OIRMJK0goaid41C254nDEz3FeeD51kZSyQi9uCgwAxM=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.0": { + "pom": "sha256-mh4hygODDXleq/uKbALOM4QuvCPGd+xqqZ50W1FPKt4=" + }, + "com/google/guava#guava-jdk5/17.0": { + "jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=", + "pom": "sha256-+MFSYngT1FvE58wXrW7WpkmgIxroGf+44F0ZsgWj22Y=" + }, + "com/google/guava#guava-parent-jdk5/17.0": { + "pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28=" + }, + "com/mycila#license-maven-plugin-parent/3.0": { + "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o=" + }, + "com/mycila#license-maven-plugin/3.0": { + "jar": "sha256-Ul/o866FI9Be7ac2ZFxB6cMw8CV4K1s95u8Lqs8teMw=", + "pom": "sha256-kmJwjckIctcrvmfLFVITU6feJkgJzh6zLflfvqR2/IM=" + }, + "com/mycila#mycila-pom/3": { + "pom": "sha256-QCd6OyVlPuZDPEaFLacOlzbBmNlLyvbSw0cIqHOjGyY=" + }, + "com/mycila#mycila-xmltool/4.4.ga": { + "jar": "sha256-ddeyvpOBpl9vrDLzEIIhEvgFVm6fipekXY8Tz1UEnOA=", + "pom": "sha256-wMaee7roquvUQOFnjOn1AotD07ToHNQ26Y+BOkvDIrI=" + }, + "com/mycila/xmltool#xmltool/3.3": { + "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=", + "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.0": { + "jar": "sha256-Bar4oiGwbGeS7hmZYZPolH7zv3Il6nWOUYsywoNxCJA=", + "pom": "sha256-q7tz6sHPSyR/wBbmyohafaFjNk/vyYDICvjTy+jRSQI=" + }, + "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.15.0": { + "jar": "sha256-gpLVOVy+k7lGe/p64JgC70z9316oNexy6jxKahfw9ZY=", + "pom": "sha256-IAmy13nhNo/tPGzHVwS58EVRv+3tFpk4F0ltrbtDyiw=" + }, + "org/apache#apache/10": { + "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-lang3/3.4": { + "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", + "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/37": { + "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" + }, + "org/apache/commons#commons-parent/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-pool2/2.2": { + "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=", + "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/apache/maven#maven-parent/21": { + "pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244=" + }, + "org/apache/maven#maven-settings-builder/3.0.4": { + "jar": "sha256-o4pU7B5pow3fwUQ04K7Cdk/CaGaKvMDhMthmkqXc4+Q=", + "pom": "sha256-Pgs/YCZ7YHCnQbFdtbQPvYJMYdsSofTxZu1li59i7OA=" + }, + "org/apache/maven#maven-settings/3.0.4": { + "jar": "sha256-Pj3xf1315M4ee38gEcV9YdMo5lZ4VCreIEjw0PopXwk=", + "pom": "sha256-vu3/18fkmtNe+UXDQT8YGfBOQ+opSjGARxTIy7DzcrM=" + }, + "org/apache/maven#maven/3.0.4": { + "pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY=" + }, + "org/codehaus/plexus#plexus-component-annotations/1.5.5": { + "jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=", + "pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI=" + }, + "org/codehaus/plexus#plexus-components/1.1.18": { + "pom": "sha256-7128f6kYttu6cdJ+Wz16AN9iS8+iVJpyl/Nv4nX2NNc=" + }, + "org/codehaus/plexus#plexus-containers/1.5.5": { + "pom": "sha256-G8Jkgk7IdrDKb09YOBdcVBxjjLxDMmomi5rufUd4te8=" + }, + "org/codehaus/plexus#plexus-interpolation/1.14": { + "jar": "sha256-f8YzeNPoRmNhm5vtrOn5/niydsK+PGLKIkVEkpTIQXY=", + "pom": "sha256-0IFVxJffN7LD2bWw39sC7AUlsgcLW+Nzn//elC/Kya8=" + }, + "org/codehaus/plexus#plexus-utils/2.0.5": { + "pom": "sha256-Nbx9EhNhYjZXEHKyxW2hj3pXZY3otKQQBkW3BUorJzs=" + }, + "org/codehaus/plexus#plexus-utils/2.0.6": { + "jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=", + "pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/2.0.6": { + "pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w=" + }, + "org/codehaus/plexus#plexus/2.0.7": { + "pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/sonarqube#org.sonarqube.gradle.plugin/3.0": { + "pom": "sha256-1Pg7ynlN6ZPv/gtqt/HO572zNJgWc4BVkHgvv6Mj420=" + }, + "org/sonarsource/parent#parent/54": { + "pom": "sha256-QVl5Y/x9ObDgJArLTYT1dbQCQtbhR9xQsCbUzvwFMV8=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api-parent/2.15.0.2182": { + "pom": "sha256-JcR02YT0wD5P147u53D0Pqks+5Xrixf3+qyFVpNgFoY=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api/2.15.0.2182": { + "jar": "sha256-h+foNKu97912pce/pM7ztxUhsfVQ/Iu+qLCphVPjNeg=", + "pom": "sha256-H+gEKIHd2qgREtNNv0k30OM+TQFYYIJ7/R/fb0YLH9U=" + }, + "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/3.0": { + "jar": "sha256-KLTNnuKtiAHAxeXJhPNtLizGDRkhwC61jujORTpejb8=", + "pom": "sha256-2jJNuKvT65d8B0lY/9E4vdVTWwYojfN7WiRv53Uad7Y=" + }, + "org/sonatype/forge#forge-parent/4": { + "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/plexus#plexus-cipher/1.4": { + "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=", + "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0=" + }, + "org/sonatype/plexus#plexus-sec-dispatcher/1.3": { + "jar": "sha256-OwVZu4Qy8ok37+bKGT71SoUG0Addc/10BrmxFsahEGM=", + "pom": "sha256-1eZQxQ72lYwCjtAktZrwTPPTjhRTp31UK2tIS8D0ygs=" + }, + "org/sonatype/spice#spice-parent/12": { + "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4=" + }, + "org/springframework#spring-asm/3.1.3.RELEASE": { + "jar": "sha256-za8dBwQOdREzok+Zesp9mOrL/mfhsoddzoynOCUngTA=", + "pom": "sha256-f7b7uYdEDEjGc9sVsIdwqcLWySBSBEIZl5z0j0ZvcSM=" + }, + "org/springframework#spring-core/3.1.3.RELEASE": { + "jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=", + "pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M=" + }, + "org/springframework#spring-parent/3.1.3.RELEASE": { + "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "com/atlassian/commonmark#commonmark-ext-gfm-tables/0.15.2": { + "jar": "sha256-Wn3BAWFAwPHGnFV21kvjcYJcWlStc1sMaZuWLMTgpPo=", + "pom": "sha256-rRZxS5MgMZDpRiSFMrWCkDdBQkg7RhdrsD3CrijycN0=" + }, + "com/atlassian/commonmark#commonmark-parent/0.15.2": { + "pom": "sha256-PhTratCeeq+Uow5I3kexFm+QCz6Ncm+UfMWkD3HkfCU=" + }, + "com/atlassian/commonmark#commonmark/0.15.2": { + "jar": "sha256-/UmFBUzWYXaB9smSH/yTq2uGQraeV3T48InZc9HGbmo=", + "pom": "sha256-3ZVTaHcyCDS90YRnvtbgKE7UhXKdU8LcLfWEE2vmGaI=" + }, + "com/atlassian/pom#base-pom/5.0.13": { + "pom": "sha256-CN0hBF/fYQSL7zj/7FbiHuslxuLYRPwJ9rlW4JNzdUM=" + }, + "com/atlassian/pom#central-pom/5.0.13": { + "pom": "sha256-zihFbTZlB8oPkQIpQqBeOI/Zj4YqbY2zEFxcRJenTOU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/ibm/icu#icu4j/58.2": { + "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=", + "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo=" + }, + "com/miglayout#miglayout-core/5.2": { + "jar": "sha256-Zp8NqP12vlPXX1lA9IFibym1RM2ZJbfaJhEYfSaEvHo=", + "pom": "sha256-scvva6qqt3IaCLKlAZtpajfV4+wKfQzXmRo4MOJrfGA=" + }, + "com/miglayout#miglayout-parent/5.2": { + "pom": "sha256-+STS0Cl2vIQu0u/4sx4Hp2Zb/NJUY9TXmtvkEFis6Zs=" + }, + "com/miglayout#miglayout-swing/5.2": { + "jar": "sha256-g2n2guoVPvtoGj9YKsxIjoKpfub0fSU1LwgOl38TjIY=", + "pom": "sha256-52Q1kq9JpxIUc+OUOzdO3Xw/u5zJBdDGq5DOcCvkQqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { + "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" + }, + "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { + "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", + "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/javacc#javacc/4.0": { + "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=", + "pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#antlr4-master/4.7.1": { + "pom": "sha256-QSb2e/QT9si8wbGdh7mnJWdCz6ccJQxKmVMNrt6ghow=" + }, + "org/antlr#antlr4-runtime/4.7.1": { + "jar": "sha256-Q1FtGb6uNZCeBNBq9sDFjBe8lOAHDIXo3JkpymQNyR0=", + "pom": "sha256-zhOGobkOUSy3oli1Ih1C8RJh/9qaElkBzdhs3ypZ/5E=" + }, + "org/antlr#antlr4/4.7.1": { + "jar": "sha256-os3C8vjriTcogyVo3FTQgOtaFJXts7ZuUblxIqYKDYc=", + "pom": "sha256-k+AkX5wHQx6tBunpyPmO7IJUQb9PbtZr3aboypxoR5Y=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 3304e8a0e6b139cfda144ac660d0a73f6612d0a4 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:05:49 +0700 Subject: [PATCH 177/562] apksigner: convert to gradle setup hook --- pkgs/development/tools/apksigner/default.nix | 40 +------ pkgs/development/tools/apksigner/deps.json | 119 +++++++++++++++++++ 2 files changed, 124 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/tools/apksigner/deps.json diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 1df733c183b4..0a918df061a7 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -3,7 +3,6 @@ , fetchgit , jdk_headless , gradle -, perl , makeWrapper }: @@ -39,41 +38,14 @@ stdenv.mkDerivation rec { sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-cs95YI0SpvzCo5x5trMXlVUGepNKIH9oZ95AfLErKIU="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - ''; + __darwinAllowLocalNetworking = true; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon build - - runHook postBuild - ''; + doCheck = true; nativeBuildInputs = [ gradle makeWrapper ]; @@ -83,8 +55,6 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/lib/apksigner.jar" ''; - __darwinAllowLocalNetworking = true; - meta = with lib; { description = "Command line tool to sign and verify Android APKs"; mainProgram = "apksigner"; diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/development/tools/apksigner/deps.json new file mode 100644 index 000000000000..a0f5ccb9c489 --- /dev/null +++ b/pkgs/development/tools/apksigner/deps.json @@ -0,0 +1,119 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "com/google#google/1": { + "pom": "sha256-zW2xehGjHt55TMvR3w5Nl1D2QCNHMfIc/4hamZcnfoE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.2.0": { + "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", + "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + }, + "com/google/errorprone#error_prone_parent/2.2.0": { + "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.2": { + "jar": "sha256-hFw+/OY70j2WLyELE77rqwXE1YOJihsaf/uMez7X1dQ=", + "pom": "sha256-W/T2le0Rd+gFJFJbbloECl1+pLFhlrERCILGLmmlVeg=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.0.1-jre": { + "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + }, + "com/google/guava#guava/27.0.1-jre": { + "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", + "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "com/google/protobuf#protobuf-bom/3.8.0": { + "pom": "sha256-WjrGCFOIDEORPNXLY7Np626WRuHtDEgGnsmpMTd700c=" + }, + "com/google/protobuf#protobuf-gradle-plugin/0.8.11": { + "jar": "sha256-gFr+/pf6AYFXpWvxQtvuStIo0RSyq3s97le5fD4teHk=", + "pom": "sha256-RBeVBVv4AjSXKcjFWdrVcmi4C4tk6KPePK2lQmo45aA=" + }, + "com/google/protobuf#protobuf-javalite/3.8.0": { + "jar": "sha256-HSWDsgkvIdvCnJCabwV+u4bYTkxU/LHXvAAmO4AaM/g=", + "pom": "sha256-4EnZCbCH/zokFi4H0KgIFE7BnnwK6Z1Ee0dZZ83361s=" + }, + "com/google/protobuf#protobuf-parent/3.8.0": { + "pom": "sha256-cGPoFu/yyZcFW9KmbuLJtObNEvhcj8lW5UhweQmAHEU=" + }, + "com/google/protobuf#protoc/3.8.0": { + "pom": "sha256-0bqQU0Wx2o1GXQ0DCkzgiuVX0nz8krZiMvEN3ks4V9I=" + }, + "com/google/protobuf/protoc/3.8.0/protoc-3.8.0-linux-x86_64": { + "exe": "sha256-eeGGIvawJqOETt7d5Fzw4M98+8emLCho2dgtvtYSZeQ=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "junit#junit/4.13": { + "jar": "sha256-S4Uy9jvcDgZhUH+UfrMkqVTR26xjGtGciqmgD+7R2GM=", + "pom": "sha256-mg3Ew/orCG5wgiZzfvS7N4R8PLHOTiA1F8CfYwWyJn4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.2": { + "jar": "sha256-OgxJXeHOvIP2e+qhd2p5NvAvEfKt3Th5WWp4sqhryqM=", + "pom": "sha256-bXDR8vJydzDXedMqH9L7seoI51pnpQotjn0P2zoqSvM=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/bouncycastle#bcprov-jdk15on/1.68": { + "jar": "sha256-9zKkbI3n4iMvIAfGgqIdH0zIqKAUm2t71qoa/cZaD40=", + "pom": "sha256-2QfezWhfnNlx5xvfbOWXzzqVt8j/ajSCNRv9irwXz+A=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.1": { + "jar": "sha256-AfnHQstZKhUeLmK9U5eomAYoqWcAH82s1KpHRGeGhfM=", + "pom": "sha256-XivA41GARnUwxVpnqvq+XvmOBg7raY6a9tCw3N26lc0=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 346bfec1c87687d49a2d908574cc2f5bc01a0269 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:06:19 +0700 Subject: [PATCH 178/562] fastddsgen: convert to gradle setup hook --- pkgs/development/tools/fastddsgen/default.nix | 73 +++++---------- pkgs/development/tools/fastddsgen/deps.json | 93 +++++++++++++++++++ 2 files changed, 114 insertions(+), 52 deletions(-) create mode 100644 pkgs/development/tools/fastddsgen/deps.json diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index ec4523e270c2..1a38ca3050ce 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,8 +1,14 @@ -{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, gradle_7, openjdk17 }: let pname = "fastddsgen"; version = "3.3.0"; + gradle = gradle_7; + +in +stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; @@ -11,65 +17,21 @@ let hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU="; }; - gradle = gradle_7; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradle openjdk17 perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon -x submodulesUpdate assemble - ''; - - # perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - dontStrip = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-YkVRp6TXI7/5O+u0DDYiCq7DITfGJ4lT/L4hT90JOL8="; - }; -in -stdenv.mkDerivation { - inherit pname src version; - nativeBuildInputs = [ gradle openjdk17 ]; - # use our offline deps - postPatch = '' - sed -ie '1i\ - pluginManagement {\ - repositories {\ - maven { url "${deps}" }\ - }\ - }' thirdparty/idl-parser/settings.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" build.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" thirdparty/idl-parser/build.gradle - ''; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) - - # Run gradle with daemon to make installPhase faster - gradle --offline -x submodulesUpdate assemble - - runHook postBuild - ''; + gradleFlags = [ "-x" "submodulesUpdate" ]; installPhase = '' runHook preInstall - gradle --offline -x submodulesUpdate install --install_path=$out + gradle install --install_path=$out # Override the default start script to use absolute java path cat <$out/bin/fastddsgen @@ -81,6 +43,13 @@ stdenv.mkDerivation { runHook postInstall ''; + postGradleUpdate = '' + cd thirdparty/idl-parser + # fix "Task 'submodulesUpdate' not found" + gradleFlags= + gradle nixDownloadDeps + ''; + meta = with lib; { description = "Fast-DDS IDL code generator tool"; mainProgram = "fastddsgen"; diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/development/tools/fastddsgen/deps.json new file mode 100644 index 000000000000..c749fd049ad9 --- /dev/null +++ b/pkgs/development/tools/fastddsgen/deps.json @@ -0,0 +1,93 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/antlr#antlr4/4.13.0": { + "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=", + "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/junit/jupiter#junit-jupiter-api/5.5.2": { + "jar": "sha256-JJov29OTGYfAKY0AygjtJISW4PwR4EY8CMT4LgzHmxw=", + "pom": "sha256-dqFdgNhYehpaOlsULSzrNzBPvZEZi6QlSG5X920IiGA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.5.2": { + "jar": "sha256-bXd9qYduLvegM26PCY+NdKWmT4EKo6Si9fO3Zs6Xg3s=", + "pom": "sha256-Ay/vTiVjCE05fq5IGjiAEPRDQBr2JSv9N312MH9vi/4=" + }, + "org/junit/platform#junit-platform-commons/1.5.2": { + "jar": "sha256-/ESv38DyDIXnGmbnlDKBrvO8Hg/WLS1po2y2kB5oLBA=", + "pom": "sha256-O9DU3tYyqK+MpYf7Z2QBnedxsda8uJrNViQ1oQCfqto=" + }, + "org/junit/platform#junit-platform-engine/1.5.2": { + "jar": "sha256-/yC6StjADvF7rvnFVRL5wC2aaHQPfxrAGppqoCOZMfg=", + "pom": "sha256-LUuVVVwh4IXrwd299C156x1VZA3Bk7G35hACQP0vGJ8=" + }, + "org/openjdk/nashorn#nashorn-core/15.4": { + "jar": "sha256-b4FuhN/WOoHU6qeCnAgze7r/PsaD/zv2u9kNAXoA3G8=", + "pom": "sha256-aan3ueR+zPR7vO5yGtT7A5yn2bZQF05thgKq23flrCM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.3.1": { + "jar": "sha256-Rrio79S5T6y1q0s1r+MO4FRq56Q9LGTm3vVsLxaP76U=", + "pom": "sha256-be7rsjbIAyhFrcO3XuWrEiPr1T5M8+hTQsMTvaBtVH8=" + }, + "org/ow2/asm#asm-commons/7.3.1": { + "jar": "sha256-h82Ls8a/a8uzP8pIBgxQZfZuv2o9fem/GL/1G88Vbrw=", + "pom": "sha256-2jEe/3FqEUJ8JCS1iFvR+0lC2QNml2zW1aVae6DfWkA=" + }, + "org/ow2/asm#asm-tree/7.3.1": { + "jar": "sha256-+RpKiqhoxcRmW7T9E0AZqR+fi5IWUn+6KV48i1Qit4s=", + "pom": "sha256-yrFmzVNdMJgzasVcG2du7WYxZbWG+gPXmWBSO+0f8Ew=" + }, + "org/ow2/asm#asm-util/7.3.1": { + "jar": "sha256-GCEoWSdC7UiDrIK/IF8Te2v74SNMaOb+sTdZ51qFtyk=", + "pom": "sha256-DzYMMOEoeTfh1C/txvrWmCT9Vl5P//7RQS7I2HMD+8o=" + }, + "org/ow2/asm#asm/7.3.1": { + "jar": "sha256-L2fhHO7IGevYjd7lMAq6aZscurLiDCLpfPAn076TlZs=", + "pom": "sha256-6s3NUA1lJ+ljiI2u2jGSPkvCQaJUJNzDisyi5gHn/eI=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From dcf6957b32220fd783a31d36424b3366dd84bbff Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:06:50 +0700 Subject: [PATCH 179/562] jd-gui: convert to gradle setup hook --- pkgs/tools/security/jd-gui/default.nix | 83 +++------- pkgs/tools/security/jd-gui/deps.json | 210 +++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 61 deletions(-) create mode 100644 pkgs/tools/security/jd-gui/deps.json diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 7cc714d96773..a9ef78f3f5e4 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -7,8 +7,6 @@ , gradle_6 , makeDesktopItem , copyDesktopItems -, perl -, writeText , runtimeShell }: @@ -16,6 +14,8 @@ let pname = "jd-gui"; version = "1.6.6"; + name = "${pname}-${version}"; + src = fetchFromGitHub { owner = "java-decompiler"; repo = pname; @@ -23,58 +23,7 @@ let hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ="; }; - patches = [ - # https://github.com/java-decompiler/jd-gui/pull/362 - (fetchpatch { - name = "nebula-plugin-gradle-6-compatibility.patch"; - url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; - hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; - }) - ]; - - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src patches; - - nativeBuildInputs = [ jdk perl gradle_6 ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon jar - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-gqUyZE+MoZRYCcJx95Qc4dZIC3DZvxee6UQhpfveDI4="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; + gradle = gradle_6; desktopItem = makeDesktopItem { name = "jd-gui"; @@ -89,15 +38,27 @@ let }; in stdenv.mkDerivation rec { - inherit pname version src patches; - name = "${pname}-${version}"; + inherit pname version src; - nativeBuildInputs = [ jdk gradle_6 copyDesktopItems ]; + patches = [ + # https://github.com/java-decompiler/jd-gui/pull/362 + (fetchpatch { + name = "nebula-plugin-gradle-6-compatibility.patch"; + url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; + hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; + }) + ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} jar - ''; + nativeBuildInputs = [ jdk gradle copyDesktopItems ]; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + gradleBuildTask = "jar"; installPhase = let jar = "$out/share/jd-gui/${name}.jar"; diff --git a/pkgs/tools/security/jd-gui/deps.json b/pkgs/tools/security/jd-gui/deps.json new file mode 100644 index 000000000000..aea4ea642552 --- /dev/null +++ b/pkgs/tools/security/jd-gui/deps.json @@ -0,0 +1,210 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "com/bmuschko#gradle-docker-plugin/3.2.1": { + "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=", + "pom": "sha256-slOHkvEGJnUa9sjeAgdH/1E4kntOKfL69KjtOsFKzSE=" + }, + "com/fifesoft#rsyntaxtextarea/3.0.4": { + "jar": "sha256-76a7i/iJ6WnAwIGQ5AsolZbqDO3sA/7yNwGAdcsBSQU=", + "pom": "sha256-Dat8ku0cJsdYs0EjYsDXjQy4v2RB2i5q4FqGPAO3W64=" + }, + "com/netflix/nebula#gradle-ospackage-plugin/8.5.6": { + "jar": "sha256-sQK7oYx9F4OlcSgZj6/vNYr+/nIVufi783YpFCjvkGk=", + "module": "sha256-CQGrawL62gDjdBsDaCwdRtgDDQQ0aexWDIrl8jrwsYw=", + "pom": "sha256-zr2oKXDuN6bO9Ppzs81hOR+zFWseT5si55TrZ1yUdfs=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.10": { + "pom": "sha256-RncMfpQQkzv62s69yR5ekLAjxhoako27hXa2kh2DBsw=" + }, + "com/thoughtworks/xstream#xstream/1.4.10": { + "jar": "sha256-oVh/NfphdRNgfIbsnm5N5euKzfmjptf3RY+KjECwCFg=", + "pom": "sha256-pKn/aI9xPaPqwEQS5QoMml4XPmkh/kRt2wfUkB2aNBc=" + }, + "com/yuvimasory#orange-extensions/1.3.0": { + "jar": "sha256-M1gGPRjFV56evw/eRWQOqy1FJ9HummKDyTZ5zqRG3YY=", + "pom": "sha256-MBQbN96epg6iqwnPBCVAc4hHqKG8A1o7a9A2OsMvV7I=" + }, + "commons-beanutils#commons-beanutils/1.7.0": { + "jar": "sha256-JLyqIMy9x8hWzgwK6hRFZpQ0A+Lp8nvZd5zaHXaCPvQ=", + "pom": "sha256-tqymRloosCdobwJdV3AvkK0NEo4U0c/OygvYcfAIStk=" + }, + "commons-io#commons-io/2.6": { + "jar": "sha256-+HfTBGYKwqFC84ZbrfyXHex+1zx0fH+NXS9ROcpzZRM=", + "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "edu/sc/seis/gradle#launch4j/2.4.4": { + "jar": "sha256-Q3jZCBGaI9GKG9t0HAnL+KRhoNfFNSFo3PQHZmFC3FY=", + "pom": "sha256-Cfk0ecS6AgtilLVZvLVOHdRNsB+iLGDZLa0o0zHJFqs=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/sf/launch4j#launch4j/3.12": { + "pom": "sha256-rVGWVL75ed10qYwXKlR93sPNhWSAORnj296G05Srvpc=" + }, + "net/sf/launch4j#launch4j/3.12/core": { + "jar": "sha256-XUbxMJCI4cijjw9KV84ITUZBakNdG5OZW8OFKooysIU=" + }, + "net/sf/launch4j#launch4j/3.12/workdir-linux64": { + "jar": "sha256-XlgZsoDyUT9EfHBsXejU3OceVlxFMUv0+pv+0MXs57k=" + }, + "net/sf/proguard#proguard-base/6.1.0": { + "jar": "sha256-gdCEOhP5zuZehDy8c/Km8U/MeyfHxgEDyLxx3umFp24=", + "pom": "sha256-H39OO6GpBYFGL9Jn6eEWfiAcCk9h5pq1DUV/SMBQFXY=" + }, + "net/sf/proguard#proguard-gradle/6.1.0": { + "jar": "sha256-rQfrlm3lIewsMYLaYg0xpaNTTwXMjmDDlNG41EGCmvQ=", + "pom": "sha256-tEDYJgbG4nVImE2JcLeF8LWCJhvDhhecWS2VMKO6TzQ=" + }, + "net/sf/proguard#proguard-parent/6.1.0": { + "pom": "sha256-v7pHjLrr8KfIx139/iBxnls33nzAgA+iYjoFgOaJEXE=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.1": { + "jar": "sha256-grnjYxrMcIwRUhb6ePl3gNioHbt/FfjYIpGh3DqDsdA=", + "pom": "sha256-fIy/ymTpcEQNTyh/NRapbABpKgOU/KHVexKpepbw6hE=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-runtime/4.5": { + "jar": "sha256-tcQNVavm6kxWFPjxHoNy2YQ07TwRKNWLjuoduVWXN6s=", + "pom": "sha256-hRz5esL2utOZacMOx95PhBu2R1J/Rl7CDMur+yKHIpg=" + }, + "org/antlr#antlr4/4.5": { + "jar": "sha256-do7i3es2pP5kNMgFoTyVI41LZBPlL3ce0meKGEGOMNk=", + "pom": "sha256-4Mhs6hXMEO/K6UuvsOEADmv8xBgUK11ybNe8OyL+dwI=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache/ant#ant-launcher/1.10.6": { + "jar": "sha256-wDqhjaSwHJ791kGYNkvC/PL7nqWElxYVup8aCaRoUCY=", + "pom": "sha256-CGuKg9hhebR7pgMeuGiOlGiKAz/qmW8ttwltSLIn6KY=" + }, + "org/apache/ant#ant-parent/1.10.6": { + "pom": "sha256-n+ReOBBPxGOdqFs4WdeUqT7oMkIrx57D5zfA/QvWmiA=" + }, + "org/apache/ant#ant-parent/1.9.1": { + "pom": "sha256-kQ71Ysi7ahrZAOGY9U2pG4bQ0o3wG8Eah9tlbZBv1us=" + }, + "org/apache/ant#ant/1.10.6": { + "jar": "sha256-bFy9iMELt61iTlY3oDdbAQ9AZ/ZJfNj85wtaXxDTtBo=", + "pom": "sha256-AEhxs7RrtMSGoyTlA3CgnKBY72zLhOp6Ceyks/Djx1c=" + }, + "org/apache/ant#ant/1.9.1": { + "pom": "sha256-wtNC6vx3d7G97/vmCp5NeRIOvV34/PwOY7TesMcOPFQ=" + }, + "org/apache/commons#commons-compress/1.18": { + "jar": "sha256-Xy3x5GeCXkysWZbUSJDEIBwAC0PAsjz/wHgtKKC+ubA=", + "pom": "sha256-Zyxf6SvT6rQ+jVMzjK1coHO2Up3k6ys4hZo+qmyegRk=" + }, + "org/apache/commons#commons-compress/1.8": { + "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk=" + }, + "org/apache/commons#commons-lang3/3.9": { + "jar": "sha256-3i4dzc8++ReozoWGYaBnJqmpRPKOM61/ngi+pE3DwjA=", + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/bouncycastle#bcpg-jdk15on/1.62": { + "jar": "sha256-+EduQ4RO2yAOoLL7OTWVLSI/O2syOmctcxYipLkpQ+A=", + "pom": "sha256-372CfVICQmFhq7AdlCOOakMDsvzWkp5sUpWPjW3wciY=" + }, + "org/bouncycastle#bcprov-jdk15on/1.62": { + "jar": "sha256-L6CrcbFU2imsE0CXvGu6zZCYfdTEAFUWFZ5klNHVLqI=", + "pom": "sha256-cA/nligsj+84xi/Cw974WM5EmrXzwiCINjYXVth5viY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jd#jd-core/1.1.3": { + "jar": "sha256-M/YP91x33AiQXnZ2lKOPe2q3kr0uWDH0HitWNUu4Bvs=", + "pom": "sha256-n1Gs7cjKfNmu9LZ3nbLdOkFqcILMtO8Z67VHfBHG6wQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm/7.1": { + "jar": "sha256-SrL6K20sycyx6qBeoynEB7R7E+0pFfYvjEuMyWJY1N4=", + "pom": "sha256-Dyl0Lq2mWIpGxnn0maZ1Xks5OXZwBPK9nAIBnP0dMYA=" + }, + "org/redline-rpm#redline/1.2.9": { + "jar": "sha256-zEe5s3Tr9DoPAmv4amdL9uNqVr04lqyIEcUIPTW79OE=", + "pom": "sha256-k94nVXykHsKx/LMHxAhtdDtYdig/41FRUi8oaJjmfGw=" + }, + "org/slf4j#slf4j-api/1.7.5": { + "jar": "sha256-/jCCUkXSM2yFncONYMD8XzZo2/Kc1YaCjStWZ+w1W5E=", + "pom": "sha256-r6+OdAGbIw0/Vv3XyT+xBwwNyjTz0tWrXeqfxha9XKQ=" + }, + "org/slf4j#slf4j-parent/1.7.5": { + "pom": "sha256-xDvFoCLb/Z3oK+Iy3/5GIIy8feEsFDhbXagk4zHlNbs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/tukaani#xz/1.4": { + "pom": "sha256-/kqLT1R/okQ0L7r0pOgPDEg3HYXMQBtYUViRKENiWJI=" + }, + "org/tukaani#xz/1.8": { + "jar": "sha256-jHlks2/j8MvmRLBPy/+E5JHOgZF9svW/oMuo6VSK/10=", + "pom": "sha256-8p51y4jrSsv35apcCe1V6sLLrmAdY6nzdSMfRUUsEBM=" + }, + "org/vafer#jdeb/1.8": { + "jar": "sha256-N0/gKgkxTabsghngBVmOdgMjoavktxXMM84+KpvNqTI=", + "pom": "sha256-MQdFSRqXEzi0XcwhFMRt6GWvNOWLI96d2JJfEGFewBY=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + }, + "xpp3#xpp3_min/1.1.4c": { + "jar": "sha256-v8kOnjLQ6rHzl/uXS18VCoFRiDgqxB83KnFJ1bwXgAg=", + "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" + } + } +} From 9b877fd5ab7c4ca14c817552d9672a2c309689c9 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:07:17 +0700 Subject: [PATCH 180/562] pdftk: convert to gradle setup hook --- pkgs/tools/typesetting/pdftk/default.nix | 72 ++------ pkgs/tools/typesetting/pdftk/deps.json | 215 +++++++++++++++++++++++ 2 files changed, 227 insertions(+), 60 deletions(-) create mode 100644 pkgs/tools/typesetting/pdftk/deps.json diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 27d95c00c01b..9ecb87b86ff6 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }: +{ lib, stdenv, fetchFromGitLab, gradle, jre, runtimeShell }: -let +stdenv.mkDerivation rec { pname = "pdftk"; version = "3.3.3"; @@ -11,66 +11,18 @@ let hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - - nativeBuildInputs = [ gradle perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle -Dfile.encoding=utf-8 shadowJar; - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-Mx5CdiRxuql22kbLozzr9Rs2E2Svzg2zN1138Xa0pMc="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}' } - } - } - } - ''; - -in stdenv.mkDerivation rec { - inherit pname version src; - nativeBuildInputs = [ gradle ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} shadowJar - ''; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + gradleBuildTask = "shadowJar"; installPhase = '' mkdir -p $out/{bin,share/pdftk,share/man/man1} diff --git a/pkgs/tools/typesetting/pdftk/deps.json b/pkgs/tools/typesetting/pdftk/deps.json new file mode 100644 index 000000000000..b257c8e8ba1f --- /dev/null +++ b/pkgs/tools/typesetting/pdftk/deps.json @@ -0,0 +1,215 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.10.0": { + "pom": "sha256-KBM628w3hpIzn4fzKVkykdnjBnmrwpsBVCzmULjHoL4=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.29.0": { + "jar": "sha256-m0zpiqT128dYUP5tmnnoeNMYvnGPmX5epAUsiFYhuqs=", + "module": "sha256-QW44lubwZ/WXlI70QVDJk43wV6NCt31X20gqj5aWgeg=", + "pom": "sha256-hf5PLJpFEVVtzqLbzFth9+f+VlxgedC5ItVmLJCIu+8=" + }, + "com/diffplug/spotless#spotless-lib/2.29.0": { + "jar": "sha256-G/rNp1jy4JDwLBVoR3PlORR/3od/rezZsAY3v536q8c=", + "module": "sha256-Rty7wtfX0d47lSZoX66uA20b/XwrvhL3izIuD1xLVk8=", + "pom": "sha256-v0UZJkr/2hRWrbjIHLazJ5AiMBqn/tdbNKlM34Oj4bo=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.10.0": { + "jar": "sha256-p8P8jOFdk311AFsuSclmXdp2UfLSLk7Kn7G03eR79As=", + "module": "sha256-m6j/efMjDs5rZomCishSor+pbZl8JXKjre7wtrFckq0=", + "pom": "sha256-+PCTwoomONZy0ML6LCljz5WFVKoeFHuuvLIEsViM4ns=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml/jackson#jackson-base/2.11.2": { + "pom": "sha256-k0uchkLt8xBMUAKC+4EGxzxWeBw9xMdelr2NG7Ha3p0=" + }, + "com/fasterxml/jackson#jackson-bom/2.11.2": { + "pom": "sha256-2qQsw65gqJH9ssh0ZxtiPc0tH+/Kd7z7OU/rHRInfME=" + }, + "com/fasterxml/jackson#jackson-parent/2.11": { + "pom": "sha256-wbChPYz+Y7QLD66EWLmUYxae0MYPf8lj7z8FJXFQy+g=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.11.2": { + "jar": "sha256-kNYC0ZVd9QmxVpYYz/hpmUyvlIPLgqPMs5eCpc2lQSY=", + "pom": "sha256-AEEc6Dh0WAKZWB4oOuRaXtN7AFHm9WO2miVQeKtYk+4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.11.2": { + "jar": "sha256-+NdoxOiIRSK+WIHdKpGuyBLQjU8FhStDQZDiLeZZ38k=", + "pom": "sha256-QL3NBekAYAtBM3NCz1xpwln9ii+en0p5aNYebvWeOYw=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.11.2": { + "jar": "sha256-y4kLSq2O0hp7V+PI95JNvcoa7/nd0nyw/zckMDeuE0I=", + "pom": "sha256-9a5wZBwK4Svl+UaDjujKE9qIk+d7RNkNXuJfPfjhYQU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.2": { + "pom": "sha256-lW5FCF5S6l7zLTRnHruE6xxBqDxFSa8m5oY18QYXmNM=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.12": { + "jar": "sha256-sZIEMxrG4gS++vUIpo9S7GtGONnZus3b69Q1+cTVAPI=", + "pom": "sha256-BhhOmwWeCAkRgnE2r17Hj1fuTDvBn2MutWGw34+HiM4=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.2": { + "jar": "sha256-v3BcwupcAYCqhwoPqAs5vxOhTScSjh6zpLZ0vjT1jpA=", + "pom": "sha256-H6qwvkF9ezxBqXzKCsqKWwtkBvw7Etfyjiw0Ex3/k0o=" + }, + "gradle/plugin/org/mikeneck#graalvm-native-image-plugin/1.4.1": { + "jar": "sha256-hxjq0IdN8UuGNB6IOkxkp3amRd0GbzcO2o+0xaPPZSI=", + "pom": "sha256-nNX2P1cnBVME1ZPa+uqiQK5dE/nZ3xn6meED8wc0lKo=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/codehaus/groovy#groovy-xml/3.0.10": { + "jar": "sha256-vCrVETWWo6m7ZQ2mRx8biRUFQheCF0p/5g15DttinoU=", + "pom": "sha256-Zwf5O1jO4BxBc/uuhNLh2DDKQc00LZBgbNW3GKn/fSk=" + }, + "org/codehaus/groovy#groovy/3.0.10": { + "jar": "sha256-3/762oKUhlvlA1UVwDIPtnlEPShfSl+K2tzwDBEw6Ew=", + "pom": "sha256-SYKt9KbGxQVnsL489JSCXmwqJ9izhx2eGIIqdCcreao=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.0.202109080827-r": { + "pom": "sha256-oY/X0MQf2o2PHEoktQAKhmRWFHokdG7mzEcx54ihje4=" + }, + "org/eclipse/jgit#org.eclipse.jgit/5.13.0.202109080827-r": { + "jar": "sha256-2r+DafDN+M8Xt/faS9qTIMVwu3VMiOC+t7hSgSz1zSU=", + "pom": "sha256-qEF3Rc+i2V1qlxHpQT/KmE/FZmt2J7rRVAzyfUYq6BM=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.3.21": { + "jar": "sha256-zqYfe2EYleZPWFaal1f8CrDVgvEHIR4ZMODOKgrdUqc=", + "pom": "sha256-HkQzMKGrEIPdEjMesYI7zaGM06YWLtxTagNeTeHXhz0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.3.21": { + "jar": "sha256-OLojcNnwb1BDPgayyndblEc8LieF9BCSYHmreTxysDQ=", + "pom": "sha256-nOHqMzlsW/5I7IQSoM1WHsyQnXHI+TZZZ6FPnyT9uaU=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/mikeneck/graalvm-native-image#org.mikeneck.graalvm-native-image.gradle.plugin/1.4.1": { + "pom": "sha256-vxSiyLGrQgrTQ+r8tt9YEbEtbZsn+mBcM/7yz9QZeW8=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "bouncycastle#bcprov-jdk18on/1.71": { + "jar": "sha256-80M6l9eA/p+j3D1WKkHezVmy5hfOiE3pBgNJrBR1AEU=", + "pom": "sha256-u90garzosxsfGnMBORtEO6bN4X5y3udcH9LkEBFsXIc=" + }, + "junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + } + } +} From 9b470f383e4cbd4e5364658c84ea90bf98cb90c1 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 19:42:15 +0700 Subject: [PATCH 181/562] scenic-view: convert to gradle setup hook --- .../development/tools/scenic-view/default.nix | 67 +------ pkgs/development/tools/scenic-view/deps.json | 177 ++++++++++++++++++ 2 files changed, 185 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/tools/scenic-view/deps.json diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 84d47390aa15..3fc74d7e3c73 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, perl, writeText, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: let jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { enableJavaFX = true; @@ -17,57 +17,6 @@ let gradle = gradle_7; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; - - nativeBuildInputs = [ jdk perl gradle ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon build - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0d6qs0wg2nfxyq85q46a8dcdqknz9pypb2qmvc8k2w8vcdac1y7n"; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; - desktopItem = makeDesktopItem { name = pname; desktopName = pname; @@ -79,16 +28,16 @@ let in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ jdk gradle makeWrapper ]; + nativeBuildInputs = [ gradle makeWrapper ]; - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} build + __darwinAllowLocalNetworking = true; - runHook postBuild - ''; + doCheck = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/development/tools/scenic-view/deps.json new file mode 100644 index 000000000000..c0b49afdd3d8 --- /dev/null +++ b/pkgs/development/tools/scenic-view/deps.json @@ -0,0 +1,177 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/javaparser#javaparser-core/3.6.23": { + "jar": "sha256-Jd6Y4JulJ3cBiHFxQWx1BmsMkK4QyER5wIy62OwC2ko=", + "pom": "sha256-uS4cfUmFkaRUByoI4abESgjvT5YyH772jlPnQagyO84=" + }, + "com/github/javaparser#javaparser-parent/3.6.23": { + "pom": "sha256-RrplfMwXfcIrmXLTDq3vB+pK2Y7C2ZJ4mi2pyMaOEMY=" + }, + "com/github/javaparser#javaparser-symbol-solver-core/3.6.23": { + "jar": "sha256-xgZHY43ddl13bN0jDhzWlmT5BYVrnTUgHcpZFcHhhLM=", + "pom": "sha256-IxlhRqtmo5sFxOIsoQ3rcpbBvmPuI5Vpax21wO7ayiQ=" + }, + "com/github/javaparser#javaparser-symbol-solver-logic/3.6.23": { + "jar": "sha256-iUKL5AoLtSXiC5BwTUzmhE/Min2ePxCaSmIckIICKSo=", + "pom": "sha256-+c70XJwzh7J95a0unepGR18S5nLrMTuo2hl9n5KTuUs=" + }, + "com/github/javaparser#javaparser-symbol-solver-model/3.6.23": { + "jar": "sha256-Oyot02mnKEgZJIkaRC7gHztEFr9a84kGv+CXAEEHbRs=", + "pom": "sha256-l9XodywQqD1zerqsIXaufDIYN2FzS1Nshd66kOdsfV0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.0.18": { + "jar": "sha256-y0z62HC/VjoHGZ8+vqV2Pw3sRA/NoLMYZAsf6qeIZWs=", + "pom": "sha256-kUQScZLW9hLCNmgl3OrrI7DVMTC4Pgvx/+EH0UcKhIc=" + }, + "com/google/errorprone#error_prone_parent/2.0.18": { + "pom": "sha256-zxSZVSebB9TxHoF5hcEWSmnpMNc9t0QbQ6bvU7vShsQ=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.1": { + "jar": "sha256-N/Sm2S8lh2Ls9i/XcYZSK77LXaGyDevHj4NhuFbfDac=", + "pom": "sha256-i4MRE6lOCXvEnh7KTTJ/0iNAVwRU1Ey7ccJSuZ5sTD8=" + }, + "com/google/guava#guava-parent/23.4-jre": { + "pom": "sha256-EO8XbFPNj5Wd7Wr3QFFumbX8IKogHjqRmLuSGUpqOTQ=" + }, + "com/google/guava#guava/23.4-jre": { + "jar": "sha256-JmKjPwn+urUCPdv1J4DLjSpuDEmiTbgJStwOlEgBqBA=", + "pom": "sha256-Iuu7g72VwApr6oeMtbm7imAuoSpmRnsM+k+XtBTqXQ4=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.0": { + "jar": "sha256-HNnWwIn5ZnEbx9lWSXaz/+ZRAmFqUkdoHMIwlc+90aw=", + "pom": "sha256-zRUfUQeKRnd7UPgoO4gqis4MCLu+F0RrP56mPIEi/Kg=" + }, + "org/beryx#badass-jlink-plugin/2.6.5": { + "jar": "sha256-WXeNmHfVtqkDyRN2ZfzzSoHFprSdPDpxt70FDJVSWrA=", + "pom": "sha256-ytOd1e29JuGnOxYHCShfkLTAjwmT85n2Qsley3Bs4LQ=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/2.6.5": { + "pom": "sha256-n3jKnoCItgThUQZCBW3b+WsQZ+zn/SZuZwc/y/dsW/Y=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.14": { + "jar": "sha256-IGgyC9a610TDZzqwSPZ+ML749RiZb6OAAzVWYAZpkF0=", + "pom": "sha256-GHnxmgWZHj7ZWRC5ZokzM5awxGeiFdxNH5ABhAS3KiY=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.14": { + "pom": "sha256-9RVQoGsUEL1JYssOcd8Lkhpgp+9Hv6nEgloUvnIxbuo=" + }, + "org/codehaus/mojo#mojo-parent/34": { + "pom": "sha256-Pjldb7xDwJo3dMrIaUzlJzmDBeo/1UktgOJa8n04Kpw=" + }, + "org/javamodularity#moduleplugin/1.4.0": { + "jar": "sha256-DsRpRPMp5s7qu+4mT39lW3VOz+qXti1zeROvm/cnWkk=", + "pom": "sha256-ys6MmZmVjsvuHC00/yZVxHvgOrtlFInDustCNl+e33s=" + }, + "org/javassist#javassist/3.23.1-GA": { + "jar": "sha256-0rFMCXY1IzdGJPMqCdbjH8sXQIKpet21ri1YC0dP2AY=", + "pom": "sha256-TBjLCfVKXn3uusVCUbXsZaXgSuRgZ/Mb3OMzwvDujJk=" + }, + "org/openjfx#javafx-plugin/0.0.7": { + "jar": "sha256-cMNMLi/MFLDiEkJuYhbX7xktB+i4fw3O8y1drZ+6tK0=", + "pom": "sha256-JVTXrl0EsYMJcp5LkHmy8iQKXTfr1GxrC97HZ8q/svk=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.0.7": { + "pom": "sha256-SybdZ/HqOekf+cyybnONJwR1DlhFYYajVz9QadOIe1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.0": { + "jar": "sha256-6YH49lDE2QC7AzZQsY4SL6axYerdX4iXjQh1H3LuhHQ=", + "pom": "sha256-xrVEd+nVuuHnrd/y4ky/kqr/L/CP1rwFlsOTPD+twss=" + }, + "org/ow2/asm#asm-commons/7.0": { + "jar": "sha256-/tNI7wWVjj6EajrAdKEq9feTbvPSHORKYsT6CKdxkn0=", + "pom": "sha256-9MaXiGzbSlskcgVKC140Nx6bSOYgvkDD7Ujh9LbVHrQ=" + }, + "org/ow2/asm#asm-tree/7.0": { + "jar": "sha256-z9egh0+d42qZnBJ/7q37/m4E1Kce6VTXrz2FPwvkimw=", + "pom": "sha256-05590S9P9TWgg50ZScOcdkQ1WkRwIgyUt2pcFoxXoGg=" + }, + "org/ow2/asm#asm-util/7.0": { + "jar": "sha256-dfu8pEDvRj9BwrCrGoCr5n6RCsSG2mCnhjy8tbrn4UU=", + "pom": "sha256-4HvOS7VdWgb0wQ2RL8ne6Km5wE7FSbu4208g2zRwb3U=" + }, + "org/ow2/asm#asm/7.0": { + "jar": "sha256-uI72ZGizyXitDJf9bpCXnlYVW0rGkIm6ekTpqn/+ms8=", + "pom": "sha256-g/ZbEIPVzk+Lp/lUXP6f8XgkWJyafMgsOkaVgB5PX2g=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "openjfx#javafx-base/11.0.2": { + "jar": "sha256-Hy+IiY9U8aKeK1jKrrChEFBZigdSTyls2a72wAu5PQ8=", + "pom": "sha256-F/QWaIULgDukqDp+LZYDm2nwcniLvbqI4J/sgVegMpw=" + }, + "openjfx#javafx-base/11.0.2/linux": { + "jar": "sha256-hMNW8TRL/TqnS1WiOgzgeLTF5qm+iFPajeQV5ez81Bs=" + }, + "openjfx#javafx-controls/11.0.2": { + "jar": "sha256-YBBsLPUqfzHsobjQipUs9Lk7Wx2FSSp1XpeggIpp/5o=", + "pom": "sha256-WI5hxbroHQl2C2DYz7E7ERtC09RwwKCpnaBqtq/XjQM=" + }, + "openjfx#javafx-controls/11.0.2/linux": { + "jar": "sha256-wXIELPTOd/xon61lWSVrEbmcb7ic5f0bM9/DRLhqCpc=" + }, + "openjfx#javafx-fxml/11.0.2": { + "pom": "sha256-hqY8PXMIR6kmAEQ3YosWH88GXj0vrzSjwTjK4j3FDxg=" + }, + "openjfx#javafx-fxml/11.0.2/linux": { + "jar": "sha256-IsRLJbxYjfZiPgT6EnuLyCQj8flI6a/ySFr0pokOL5Q=" + }, + "openjfx#javafx-graphics/11.0.2": { + "jar": "sha256-3ukAoYanC66CZoRcVrA62aJOaXy1K6PaQhxgSQibNjg=", + "pom": "sha256-5O3+os2WNa3JLTqbp81ew6VqsbF+pKJWDRIr+97gU8g=" + }, + "openjfx#javafx-graphics/11.0.2/linux": { + "jar": "sha256-+yCVZOUN49jQVdmzzWnUahbT7xjsVRYvwTANFAip1QI=" + }, + "openjfx#javafx-media/11.0.2": { + "jar": "sha256-buLos8kx27mNmLuVqoIDP9tvQ839Vp5gYT21g0Yp0CU=", + "pom": "sha256-ea0fX/vvejwnrd8jvXYICIN23mLl1w/tQRKKMu0f0Ps=" + }, + "openjfx#javafx-media/11.0.2/linux": { + "jar": "sha256-SQgWhhxhQ6jpPDBRreX/ZcJ8h5zE0lSZmBQ3RnZDF9Y=" + }, + "openjfx#javafx-swing/11.0.2": { + "pom": "sha256-huvlJlgb5jeG3hJxPMFL23wVAwzPacjJ7lluwyUtB7M=" + }, + "openjfx#javafx-swing/11.0.2/linux": { + "jar": "sha256-5WLb2tBbKGTo3F75chsMmiyxcxWdpElqJ4K4zR5lsUw=" + }, + "openjfx#javafx-web/11.0.2": { + "pom": "sha256-VPT4QZplXM2lGzDG+canNTR6h9myctpnwMndXps/UcU=" + }, + "openjfx#javafx-web/11.0.2/linux": { + "jar": "sha256-FWUzbTr1okARbBPkPepcPZpnSWMnuCj6EL9n6unlsa8=" + }, + "openjfx#javafx/11.0.2": { + "pom": "sha256-vGfwPQ2VsXURSpjv/7E+RORq2eOsGe/w6OBjpudnWtg=" + } + } +} From 5e0160dc08caf17cb5796393bb0205aab7b33046 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 21:51:15 +0700 Subject: [PATCH 182/562] corretto: convert to gradle setup hook --- .../compilers/corretto/mk-corretto.nix | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index c26614e47641..1059935ce20f 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -31,7 +31,9 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { dontConfigure = true; - postPatch = '' + postPatch = let + extra_config = builtins.concatStringsSep " " extraConfig; + in '' # The rpm/deb task definitions require a Gradle plugin which we don't # have and so the build fails. We'll simply remove them here because # they are not needed anyways. @@ -41,35 +43,29 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { for file in $(find installers -name "build.gradle"); do substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done + + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") ''; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - buildPhase = - let - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - task = - if stdenv.isDarwin then - ":installers:mac:tar:packageBuildResults" - else ":installers:linux:universal:tar:packageBuildResults"; - extra_config = builtins.concatStringsSep " " extraConfig; - in - '' - runHook preBuild + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.isDarwin then + ":installers:mac:tar:build" + else ":installers:linux:universal:tar:packageBuildResults"; - # Corretto's actual built is triggered via `gradle`. - gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task} - - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk - - runHook postBuild - ''; + postBuild = '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + oldAttrs.postBuild or ""; installPhase = oldAttrs.installPhase + '' # The installPhase will place everything in $out/lib/openjdk and From 5969a69a11322e847f9f4ee741428cb856e04a0b Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:34:00 +0700 Subject: [PATCH 183/562] armitage: convert to gradle setup hook --- pkgs/by-name/ar/armitage/deps.json | 73 ++++++++++++++++++++++++++++ pkgs/by-name/ar/armitage/package.nix | 42 +++------------- 2 files changed, 81 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/ar/armitage/deps.json diff --git a/pkgs/by-name/ar/armitage/deps.json b/pkgs/by-name/ar/armitage/deps.json new file mode 100644 index 000000000000..d9a755c0c204 --- /dev/null +++ b/pkgs/by-name/ar/armitage/deps.json @@ -0,0 +1,73 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/junit#junit-bom/5.7.0": { + "module": "sha256-Jd5FSzrdZ2VNZpG1PedZO1ApZ7X/VJVHsQTXlh8aUr0=", + "pom": "sha256-NfsV+NC+4rWQCiKDJ2I2ZVL5o0nFbO1guhI85Hc4/wA=" + }, + "org/junit/jupiter#junit-jupiter-api/5.7.0": { + "jar": "sha256-sD944Nru0td6Cvm81mK0zblpP37nLgGlObUIuExj0YI=", + "module": "sha256-0ae65s1ErW2WcVJhQQ7vIziklENtZnKA0Tc6R8F+JBw=", + "pom": "sha256-oPgj1RPI1GkpNfJML+bnfMSnthR6nopRj3IuULv4YTg=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.7.0": { + "jar": "sha256-36Jq+UZErCYS3eZiWFL8tVCg0hyqJDJX3lTLpzi6h68=", + "module": "sha256-w2vaSCKO71xAzcmp1jA7uEg4LNsIhLNnfUkYK07HoaQ=", + "pom": "sha256-twLiUIddMx7jxriPNymfvpUfQ5kvSy5KjxROLkzyx+g=" + }, + "org/junit/platform#junit-platform-commons/1.7.0": { + "jar": "sha256-UzDuh8x1hubiUXWjTpJRYk/xL/UlJp00FdC0ylGbb+o=", + "module": "sha256-sKXHobfkCdH1zJY9muocd8NLkOFj1oQqRInGqgf/juI=", + "pom": "sha256-DNfE+b7mWZEqwdzkbxI80G9Au7c6sxa9lBHHkuPGgKI=" + }, + "org/junit/platform#junit-platform-engine/1.7.0": { + "jar": "sha256-dfIaINxZSv3IdXNnJbQIzsbQNEh00p80st0wdVACNvI=", + "module": "sha256-ZRCp+ogc70LUFIVTjbxUdJQm2x4LFOxDORXqXyRIB5o=", + "pom": "sha256-IluZxQMv0cuM7Noui1p1Jtal+B+5iimldVf39czanRI=" + }, + "org/msgpack#msgpack/0.6.12": { + "jar": "sha256-4JymXYUgSI6ApdxCaEior8z9QPSi6zuWRgQlldO9m14=", + "pom": "sha256-lEl9jwL43oFZpbfVE24BD1f12axliGES7O2GlcUFbe4=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/postgresql#pgjdbc-core-parent/1.1.2": { + "pom": "sha256-K5B1vOVrI8vfRwy80/7rwgivBf1XfNxcmjbadTRsZ50=" + }, + "org/postgresql#pgjdbc-core-parent/1.1.5": { + "pom": "sha256-XtK0rdiF6e4eY3opfLNHlPT/LtVCb/zStL3N1uJiPrc=" + }, + "org/postgresql#pgjdbc-versions/1.1.2": { + "pom": "sha256-FJIccV6cNLFOpOtn1O6cPUGtxYj1639F01f89xgv3P4=" + }, + "org/postgresql#pgjdbc-versions/1.1.5": { + "pom": "sha256-fktof5IZOQGPdV6TUwtvO/pkOH9zJIiTXAsFo2PEkFw=" + }, + "org/postgresql#postgresql/42.2.5": { + "jar": "sha256-f/pG+MYZN3zevNF3IbayHs9mWYUBeflv7D0QNc9aDNw=", + "pom": "sha256-QeLEYQz6+o+46jOfZeUECMDzGDV6eKP0hOKi8bUq0ew=" + }, + "org/postgresql#postgresql/9.4.1212": { + "jar": "sha256-DLKhWL4xrPIY4KThjI89usaKO8NIBkaHc/xECUsMNl0=", + "pom": "sha256-3WEi1R5mRIHFMgl7hzPLJAW6oqrhsgqOrr6jlLErb1A=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + } +} diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 2d07d215d0f6..ef2b5c3101c7 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , jdk11 , gradle_6 -, perl , metasploit , makeWrapper , makeDesktopItem @@ -16,6 +15,8 @@ let pname = "armitage"; version = "unstable-2022-12-05"; + gradle = gradle_6; + src = fetchFromGitHub { owner = "r00t0v3rr1d3"; repo = "armitage"; @@ -46,31 +47,10 @@ let }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches; - nativeBuildInputs = [ gradle_6 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon assemble - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-6o3HlBfmpjpmMeiRydOme6fJc8caq8EBRVf3nJq9vqo="; - }; in stdenv.mkDerivation (finalAttrs: { inherit pname version src patches; - __darwinAllowLocalNetworking = true; - desktopItems = [ (makeDesktopItem { name = "armitage"; @@ -85,25 +65,19 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ jdk11 - gradle_6 + gradle makeWrapper copyDesktopItems ] ++ lib.optionals stdenv.isDarwin [ writeDarwinBundle ]; - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - substituteInPlace armitage/build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' - substituteInPlace cortana/build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' - gradle --offline --no-daemon assemble - - runHook postBuild - ''; + __darwinAllowLocalNetworking = true; installPhase = '' runHook preInstall From 2029c93adfe222a59d4d448bf7fd26b667322fe2 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:34:48 +0700 Subject: [PATCH 184/562] freeplane: convert to gradle setup hook --- pkgs/by-name/fr/freeplane/deps.json | 1335 +++++++++++++++++++++++++ pkgs/by-name/fr/freeplane/package.nix | 77 +- 2 files changed, 1344 insertions(+), 68 deletions(-) create mode 100644 pkgs/by-name/fr/freeplane/deps.json diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json new file mode 100644 index 000000000000..335fa1d7f9f9 --- /dev/null +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -0,0 +1,1335 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://josm.openstreetmap.de": { + "nexus/content/groups/public/org/openstreetmap/jmapviewer#jmapviewer/2.18": { + "jar": "sha256-JYRmXTPOzesPfwRqrFpGtqzIfnVI9gsNzKVIIIVabuI=", + "pom": "sha256-PDVcm62fnI9tznvzKoeoQgtCXATF5WSj9cQZoDtWP4E=" + } + }, + "https://plugins.gradle.org/m2": { + "com/github/ben-manes#gradle-versions-plugin/0.50.0": { + "jar": "sha256-zFOB8mASAO0kBdROqeqrghVgkEv9yfF/jwA1p3BqT7M=", + "module": "sha256-LayqzQFyrF0lj2rckzmdWwkbwgKduaPWZcTQDk5/a+w=", + "pom": "sha256-IV/1WVj0JCsv9Q65BkCtzrLaUxPcL6jLCgGOmrzXRHE=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.50.0": { + "pom": "sha256-yP3sJnGeh1uqwkRdCtWZkUbntLwkF1FLRJlFY/0W9KU=" + }, + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.6.0": { + "pom": "sha256-uDd5wYEKi4kQq2+H/Ypgz/rcIZUoEWbEqNKKCChmCF8=" + }, + "de/jflex#cup-parent/11b": { + "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" + }, + "de/jflex#cup_runtime/11b": { + "jar": "sha256-nAtck/4MDiOdX5Kv+2cst8RRIsPj3ozalRP6jjnbvDw=", + "pom": "sha256-ju+4bQA82PuigLnCU/kt6cXKBQ4Ezxk/rLByTXL2aZ8=" + }, + "de/jflex#jflex-parent/1.7.0": { + "pom": "sha256-AugI9nJxuxzWPT9uT+XPU2RgfckzSK73cYntaPoza7Y=" + }, + "de/jflex#jflex/1.7.0": { + "jar": "sha256-xA5kYA99KeFhihwdXNaXySb/hJXhZuqUFsrhlkTjeuY=", + "pom": "sha256-KNGeqICM1UhMgeSP8SOiaRYZkAuFReSd8+fFSJuPmjI=" + }, + "gradle/plugin/org/xbib/gradle/plugin#gradle-plugin-jflex/1.2.1": { + "jar": "sha256-vV2rEjD0NhlJXg7mWLeoiqd2zMyDaeejqDh6AgqJk+E=", + "pom": "sha256-fcQapTZMLrJ/bVUHdIfF7sdHYJFsCa6p8OhWU86zXgc=" + }, + "org/apache/ant#ant-launcher/1.9.7": { + "jar": "sha256-vDdvbWy1hiKfRRrEWfrxRDsUTCbWZHYY7Jy6YOVMK3k=", + "pom": "sha256-17zdOrD/Ve2+G5bQbwbawhNexjtafDLO86Q2tJye7ic=" + }, + "org/apache/ant#ant-parent/1.9.7": { + "pom": "sha256-ddLO9kxlzL3S+vcmHlO0RHeNVtM4djFU4w+tpKQdEhU=" + }, + "org/apache/ant#ant/1.9.7": { + "jar": "sha256-ml2+P18suRhUyGgsq4AXivpBKrNaWrcYvznOAbNDXZM=", + "pom": "sha256-G5+9TzJacembJ5CA1jCE8S2ITUIIGvKY+eVT4f4M10o=" + }, + "org/owasp#dependency-check-gradle/9.0.7": { + "jar": "sha256-uIQJZPTObUzGkNKfYD2vd1I0UEFfx0r+cnpOMfvzLMo=", + "pom": "sha256-HVfxVH/PYyQOOLSEUkyTVn7pehbGUz1G/s94ILwnwm8=" + }, + "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/9.0.7": { + "pom": "sha256-VZaHG3PXQG4kbgsyu1sfrfeG60wYJjodAoc+gxGHqu0=" + }, + "org/xbib/gradle/plugin/jflex#org.xbib.gradle.plugin.jflex.gradle.plugin/1.2.1": { + "pom": "sha256-rdhfPghFWqbgA7rr8sZfkLsJ3vnoE6oH3TGltArns0w=" + }, + "se/patrikerdes#gradle-use-latest-versions-plugin/0.2.18": { + "jar": "sha256-P9Qm3NYf3dX9FvhkBJyopVQtN1FAfhLNJs/FyeFay60=", + "pom": "sha256-eGyLwlKFSQhAr7YuGbnryVVpqV2Z+T4emLr7F7eAFZs=" + }, + "se/patrikerdes/use-latest-versions#se.patrikerdes.use-latest-versions.gradle.plugin/0.2.18": { + "pom": "sha256-6DCee4xZSPaNwK2dl7lOwIsfw5lm2eXsrsNOzFbMnnI=" + } + }, + "https://repo.maven.apache.org/maven2": { + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/7.0.0": { + "jar": "sha256-pCxnvPjZxR9NzYYlTWKYdjWpaXzRDGSRtXSYOLqr6+A=", + "pom": "sha256-3Prn96stJjHK9pLazzn6yGK3GNEdCwu294+aW6gCjLo=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/7.0.0": { + "jar": "sha256-LMWmnBybMoqsR38mKt0K2MW8K355tbw5OWNCCl4EQhE=", + "pom": "sha256-x2EBfWRP4nI9Gxxlx38fGYKXT0RtqEBoianDvjp07B0=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { + "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", + "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { + "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", + "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + }, + "biz/aQute/bnd#biz.aQute.repository/7.0.0": { + "jar": "sha256-ggIaWyICKD8J9XpW0zsh+rxvemSFC5FnNdaiZI8nYzc=", + "pom": "sha256-f1ar8LnsiL40/ZCDaYYdnlQwxnu6FROItbf0shvwOTU=" + }, + "biz/aQute/bnd#biz.aQute.resolve/7.0.0": { + "jar": "sha256-nVjTmv0Y/d2LTSHnC4Ui+KUmiH4UUH2UDcfK/p8NCZo=", + "pom": "sha256-UVIg7ZyoHFkzGz/zyuQfkUGMmn0Atavq0nEYS8rNp1Y=" + }, + "com/bmuschko#gradle-docker-plugin/3.2.1": { + "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=", + "pom": "sha256-slOHkvEGJnUa9sjeAgdH/1E4kntOKfL69KjtOsFKzSE=" + }, + "com/esotericsoftware#minlog/1.3.1": { + "jar": "sha256-XU1jLPvr/gp2RFAcwwNXC2kUBhgb7mXpkWuSHHZ9fHI=", + "pom": "sha256-pRyvwguZFGMaa9scYgE0A2ZJqxjIicgy+HR7SvNZLCo=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml/jackson#jackson-base/2.16.0": { + "pom": "sha256-+bdHbsN5ihJfFMnaVG+nr4YerZOhmZssDTY7lZLCM24=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.16.0": { + "jar": "sha256-xLkOoMAHTaF+/cOqI5c1JfJdbzRyVpIWl0j1KVRzNKY=", + "module": "sha256-2muqKZlx1AlmEZSpxtRocUgz60oRJ2xUQ6AwYDRXwHY=", + "pom": "sha256-I9/hBTAQeXluc77ntCRmGlYnIMd5BaxPepf1e3KUdVc=" + }, + "com/fasterxml/jackson/core#jackson-core/2.16.0": { + "jar": "sha256-ZuLN5Mx+Vl1fziopmLZOmRd3v5+tTSIHNcUl/Y0Bwxo=", + "module": "sha256-ftx2yi4pRF7yq+ARHF1nQ1yTT4+6rSF1cHNM8lM1LSw=", + "pom": "sha256-lbpouk0OA/SgzOZ7BkHqThDgtESD6drELII97HiWgG0=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.16.0": { + "jar": "sha256-iq8XU4I75wt5gpDlgmq1v+AV01s6NqXTwuyfV9SwE4s=", + "module": "sha256-OQdNp2wUl4ioe+btq5eNC3WIIgK5J5TCSnpGmfkfc0s=", + "pom": "sha256-Mov1X2G38skAkYaIrdQBOAG6b6rVUnYAvzuiPg3IOP4=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.0": { + "jar": "sha256-fQpQIn9MvSmL55cYFVNGAL1ib5iHZZuNkcKGxi8XvQs=", + "module": "sha256-TLBgZ7zA2jx/nkzGh2q14GdqReSJb7S6zQqyGl6yiok=", + "pom": "sha256-olvftRudsqWS7lMPQRjgJ7QtdcyR3eQMNL8Juv4jrps=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.0": { + "pom": "sha256-VUFTMByvSyFND21W/AZF1zl2sHkQ4zrsdsv23Dxei20=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.0": { + "jar": "sha256-G1BqzqSGP0I7Z5arbyCbqzzDyeI6q07bZioxeEZlAoc=", + "module": "sha256-z9jtUlThaY0qypKNOreraru6nMq7vIhIKqPcPNhwFaU=", + "pom": "sha256-fx9oGz7+VaJXv0eSoavDqJF2ulY1blY/d0S4cDVnjhQ=" + }, + "com/fasterxml/jackson/module#jackson-module-afterburner/2.16.0": { + "jar": "sha256-AH0J72ftkjmBDPyyxHFmn9aZvs9rVYxLRbozZOoo1Nw=", + "module": "sha256-BTDcUZwucFQiWj30pHrMObU+kwtKlM9OJHb/Me0OTQw=", + "pom": "sha256-mCgdXXlDI2AwLhUdGDG4PzsnCsBmtGX5S1uuJSGTk7k=" + }, + "com/fasterxml/jackson/module#jackson-module-blackbird/2.16.0": { + "jar": "sha256-Xq9gCvlmWStkCam0Sqexv41JF08c8ooYC90lZSNX8o4=", + "module": "sha256-T799z+Samx1lg9ana9AY5+lAkxn1yS6A8cWqe6pHVHQ=", + "pom": "sha256-ZNjmjo9XmB7t3vjJZytzirf6RfdAlY4gGPrxSkJC4FI=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.16.0": { + "pom": "sha256-AA3F5X97SXV0GPzRcFTrRtdOFZKpzIFyBmkSyitb5Sc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.16.0": { + "pom": "sha256-n+TKeceUAqwcxUpI27ZeJ/uYannL99CvC8Dbx9Z0GLc=" + }, + "com/formdev#flatlaf/3.2.5": { + "jar": "sha256-v7FM73SLNkdhEV+mdWQJwZ+maKqMNkf6VZDtIG7PaY8=", + "module": "sha256-7nyjpAQHuvbZQKbnkvWJArhaS6OXBgPpp1/Cjt80OWM=", + "pom": "sha256-/juWnGbGpawfWP61nNMBbhvlTR+evAhtClgo1q4dEuE=" + }, + "com/github/davidmoten#sonatype-parent/0.1": { + "pom": "sha256-9Q5Goo6n4j+EMErZ/xsqWJskdSy0R9nq7eb1r4T56s4=" + }, + "com/github/javaparser#javaparser-core/3.25.7": { + "jar": "sha256-FZ9eUCTQVI7GPPnSSIrUENZGFkWBVwI17QTu9pJC0tY=", + "pom": "sha256-jdKBeIjre3q8t6ddQnehrdw3hZKEvW3Sia+u5LM817M=" + }, + "com/github/javaparser#javaparser-parent/3.25.7": { + "pom": "sha256-zRy2l5P5Klq4hkQnrk26ZsHMLFMP3zkPC0awTLl3UxA=" + }, + "com/github/package-url#packageurl-java/1.4.1": { + "jar": "sha256-jiMoAiGv0eZWHUM9+xMyUs0ocWessOylqZFmcRj/EKI=", + "pom": "sha256-/avfpMfepjVMd/Jb3dGOSO4izUuYFcvsw3ow8lQs0TM=" + }, + "com/github/robtimus#data-url/2.0.1": { + "jar": "sha256-GlsCbIWuXlJQm700u2suLNjBQV2T7MDxJ3qngKIPxX4=", + "pom": "sha256-4n9X/ib/mkG8YhVZBT+jkwxg9yaogOnUHOSNAkZtV9c=" + }, + "com/github/robtimus#robtimus-parent/1.9": { + "pom": "sha256-/vwSPTv/uO+cw6hW2FA+AmrjZHh0JTyoxfNiRWX+F2c=" + }, + "com/github/spullara/mustache/java#compiler/0.9.6": { + "jar": "sha256-xNaX/TYZy2FsxeIulTDIpP1Kjpp2lTwGVe5ifLLSIxg=", + "pom": "sha256-KsrXolfZyNPHxVnF7q8hCkeTl/8Z9EZU/5jrR/WDQJM=" + }, + "com/github/spullara/mustache/java#mustache.java/0.9.6": { + "pom": "sha256-iZ8UAXo747e/Y3TW524tFaijtMfL7S3reXF1ugyYUfw=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.3.1": { + "pom": "sha256-gvqiGq/oQRqWwbvSKjDi1jnl9PxHFreWu3Dbw3n3Oec=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/h2database#h2/2.1.214": { + "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", + "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" + }, + "com/h3xstream/retirejs#retirejs-core/3.0.4": { + "jar": "sha256-70KQSbHoKL/OCpiGl2Wn8Q19r0GssDIB/NNAT0JNDDc=", + "pom": "sha256-up8LenmgzRd045wtXk+DRkWsMCnehzDO+9sL594IURI=" + }, + "com/h3xstream/retirejs#retirejs-root-pom/3.0.4": { + "pom": "sha256-+HJ2y/4cGQfXuLiEAJsT+0HSVzTwcc2q+IMuFwjfS+M=" + }, + "com/hankcs#aho-corasick-double-array-trie/1.2.3": { + "jar": "sha256-Vk8PxpDVBwKjE1ELmnLpUFrOboEQjoT2XeT+sNokTrg=", + "pom": "sha256-Hzj4XDHuqt0cF1E+/MkGdb3pj13ICFJTttosSpVfnlg=" + }, + "com/jgoodies#jgoodies-common/1.8.1": { + "jar": "sha256-3coQwW4dx6GzmcFFgPCq4jAUhR5X0iTLlsJg5tZJ0q0=", + "pom": "sha256-ia2b+Cr1wL1uSt8Vn2CBNhe4dtHL2hZ2pIlzv2QJIvI=" + }, + "com/jgoodies#jgoodies-forms/1.9.0": { + "jar": "sha256-dVx5UBq9gG9aqDJX3Iiyylkj5pZfPL/ocxFsfJdoIQo=", + "pom": "sha256-XPoeoCxNwZ0n3Vr8pRPynGerNE0aylU9jxbxW2mOT4U=" + }, + "com/moandjiezana/toml#toml4j/0.7.2": { + "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", + "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" + }, + "com/netflix/nebula#gradle-ospackage-plugin/11.6.0": { + "jar": "sha256-SEeeOJoRhfq7FDXuIds1XR8z3hfpAagSkh3Y6EjJe30=", + "module": "sha256-UgkQbEdEMSsPf59Lnlua5pf8CJ+fiLyUmcHXhURgF60=", + "pom": "sha256-ev9oCcd0Ky5hw31rowuMaHJy3WRp2iKmq4ebp1qzGv8=" + }, + "com/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/qdox#qdox/1.12.1": { + "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=", + "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0=" + }, + "com/tngtech/archunit#archunit/1.2.1": { + "jar": "sha256-eLPLD4NQmPImSlnnkdiF+AitgNJCXvKY3Cz+0DPGueg=", + "pom": "sha256-GA8sOPoquiEKfyUHxdC1B1FghhfbFK/mvS8iqm/lDbU=" + }, + "com/twelvemonkeys#twelvemonkeys/3.10.1": { + "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + }, + "com/twelvemonkeys/common#common-image/3.10.1": { + "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", + "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + }, + "com/twelvemonkeys/common#common-io/3.10.1": { + "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", + "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + }, + "com/twelvemonkeys/common#common-lang/3.10.1": { + "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", + "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + }, + "com/twelvemonkeys/common#common/3.10.1": { + "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.10.1": { + "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", + "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + }, + "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { + "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", + "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { + "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", + "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + }, + "com/twelvemonkeys/imageio#imageio/3.10.1": { + "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + }, + "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { + "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", + "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-digester#commons-digester/2.1": { + "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", + "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.15.0": { + "jar": "sha256-oyja1zCSHRl7apsZXf+gDkHJdMLayP436E0xcGvKd5I=", + "pom": "sha256-KX6FthV950vWVQsa9fRpZTWy6nbYBenrIwDPBtzE+5w=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-io#commons-io/2.6": { + "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.0.4": { + "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", + "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-validator#commons-validator/1.7": { + "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", + "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + }, + "de/sciss#syntaxpane/1.3.0": { + "jar": "sha256-aBm3LpRQ2u5e9WMeq1pHT2BFJo2MZjugKAzQZHMtsgM=", + "pom": "sha256-aNbsZVtGv6PXgOzwYrww3uyoxJTFrptUgJmqMfddj/8=" + }, + "info/picocli#picocli/4.7.5": { + "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", + "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + }, + "io/github/gitbucket#markedj/1.0.18": { + "jar": "sha256-/i87GMhoxSVQOQSywMMOE9JJwrZSLQGivL1xqemnsII=", + "pom": "sha256-bdJVS82u894pg8lI4TGzEk8tfXQr/0js5YZDYL5mfyw=" + }, + "io/github/jeremylong#jcs3-slf4j/1.0.5": { + "jar": "sha256-WyEpqRFdF8n7ZbFD83WrDBX4UCSP1aoPMwfSzGGN8Js=", + "module": "sha256-XBWwnUNExkubH+LzjSR0Z+S3daWQikxK+fAfj9ehTs8=", + "pom": "sha256-tF+wHKhQ/1dB/wIlu0G5zmwAHcvZh6X18ecEG5fh8vk=" + }, + "io/github/jeremylong#open-vulnerability-clients/5.1.1": { + "jar": "sha256-2BjdCmCabGVGsD9fr/fqAufNiZuYTIlGhkHhPYJoVxE=", + "module": "sha256-aWu9vGm8th/wHqwnDyE1qc3QG5j653K6qgoP9NfGM2M=", + "pom": "sha256-EFcbV6v8YBe++PYLY6+/sA8hgBhfOrhHslDmlZ1j4mc=" + }, + "jakarta/transaction#jakarta.transaction-api/1.3.3": { + "jar": "sha256-CwKhlN0E7i4ZLcnalXnhCVXdborHB638kdkvEZsOZ6s=", + "pom": "sha256-ODgmwQkvt2d/h9VgJWJFsPpbL5SolTAdMh8jad22DFU=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "javax/ws/rs#javax.ws.rs-api/2.0.1": { + "jar": "sha256-OGB9Ym8iiNj7wbH4piw2nmOAbZoxOsfLxfnWyU9LRm0=", + "pom": "sha256-YkOQNGy5Tc3cTfIsHzyiJUw0pneWM4axMSRGRWu4udQ=" + }, + "javax/xml/bind#jaxb-api-parent/2.3.1": { + "pom": "sha256-zRvqpFYNxN/bgmudgJ5GTbIlJt+1QmS654pv9++wjh8=" + }, + "javax/xml/bind#jaxb-api/2.3.1": { + "jar": "sha256-iLlVoN9XiAomp0cIvDT3Tcr46/TniEOii1Dq6UVzKwY=", + "pom": "sha256-ErIM+SJ3NEXDRFwog8v2cfqYIRHpv5+HUCD5MTs4FLE=" + }, + "jline#jline/2.14.6": { + "jar": "sha256-l9GsqsgkCb5C5iLXpU066dCFF+iu/eo9K6l5EVDC8C0=", + "pom": "sha256-Hfe28I37gaJo1rk7ZZpqnjicXYwyvfB1Qji6ZIOk6YI=" + }, + "joda-time#joda-time/2.10.4": { + "jar": "sha256-rG/aiYl3V3b0KN+LWkUXzbBtkjRlq/m9oHRuwH38xlc=", + "pom": "sha256-mby5zmO1yG6E9IMctY+dwsFAmz6jY0HpD2j0OoMdQYk=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.10": { + "jar": "sha256-Z5k6idR8pY/4aIAqREjd0VDl/k5aVkXe2ZDXtNVXprk=", + "pom": "sha256-U7yX6ca/fC0OX5y6x9Xeaykk2RbPS4F+ajo1kpx5a0o=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.10": { + "pom": "sha256-xpghkGD7DlZaDyyWCU6Ssg7+FG/WFjayyeTAO9m6Sns=" + }, + "net/bytebuddy#byte-buddy/1.14.10": { + "jar": "sha256-MObgRGQ3pn2zfit/fTP1B4fd/ZcDWTGd/QVGnaoty84=", + "pom": "sha256-zVh4KEX/ju3y7YOgw+30Xu65nhTAWvii6QGGDqCAzq8=" + }, + "net/gpedro/integrations/slack#slack-webhook/1.4.0": { + "jar": "sha256-uaZg4gvqtDOShH2SLBMEXFMZ7Mq/QpK5b/kadO6NmGU=", + "pom": "sha256-LZLLX0+6gvx9mtxBkOqZ98KgQITPIObyD2VHkUIQIOE=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/anarres/jdiagnostics#jdiagnostics/1.0.7": { + "jar": "sha256-fH/lNHzi0Uf/e8Ny9LLhENYCYfsPKAnnGePFbKUu49c=", + "pom": "sha256-zSFGLf/kk8r2KVQqiDPYMZWWTkKsLaQDObaagFIcO+k=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/ant#ant-antlr/1.10.14": { + "jar": "sha256-1zfetbCZL2kb/+lAdmlad1I+HjtdUktGX5DZPi2O16I=", + "pom": "sha256-W9EwNnEP7b03cFBS+57G7RNI3lchm6ulyVNXWERrgQM=" + }, + "org/apache/ant#ant-junit/1.10.14": { + "jar": "sha256-o7U109VJ8YUKiRenwr/fNk//t51ScmfbMKEpR1yi+vg=", + "pom": "sha256-ZFiOW9XE89jIh5NFpsNQoxzIp5qovBJjGNytBL4/Pno=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-launcher/1.10.14": { + "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", + "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant-parent/1.10.14": { + "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/ant#ant/1.10.14": { + "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", + "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.21": { + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-compress/1.25.0": { + "jar": "sha256-0OyAFOu7B0n0cYAxIrIXlq/d8umOGU5DdGIuX7r2n0k=", + "pom": "sha256-ulzaSWZDqQb8t3sfE8XH3oFxM8l3pBfoqDX+KKZRjs4=" + }, + "org/apache/commons#commons-dbcp2/2.11.0": { + "jar": "sha256-WNFE1jJ7SgVMoOcaRDhFa9ZsDKjQwap5n1nc+w7Fmcw=", + "pom": "sha256-pLgH5TzLgZtfxibS/e9q36ysfePzpHGliPbfBUJUldc=" + }, + "org/apache/commons#commons-jcs3-core/3.2": { + "jar": "sha256-dH899tksRdZAndnVT08omOyvGkgpXDj4dsdUKasRxzA=", + "pom": "sha256-8e/SI40PxWsp235VmmuQsr8CaMX2szLJjW0DqvfKO80=" + }, + "org/apache/commons#commons-jcs3/3.2": { + "pom": "sha256-kTQ8zHM2CXfNRPthnJ7aJjyocYUlF554r+4LvE3AjkY=" + }, + "org/apache/commons#commons-lang3/3.13.0": { + "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", + "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + }, + "org/apache/commons#commons-lang3/3.9": { + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/51": { + "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/62": { + "pom": "sha256-dM1i1osJqtf7lCTqiCaat2q6DWUIjZVp/yc70gdCdDk=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-pool2/2.12.0": { + "jar": "sha256-bTvRjfhBDz4xsDGspYLMEJNCNYpionWevQxM3zDQb4s=", + "pom": "sha256-Nw08lR5xtA48XKda+XK14fD4ms24UwsUYncYq0pEIwA=" + }, + "org/apache/commons#commons-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/groovy#groovy-all/4.0.17": { + "module": "sha256-YtWD309HvS6BJsyMuZpiHMP08XGOYqi0PqWcjeHcPfE=", + "pom": "sha256-qfqDYNMMVc7UmDZzDV03N1ZZq69QVN4XlmC/E50Hxww=" + }, + "org/apache/groovy#groovy-ant/4.0.17": { + "jar": "sha256-dBrReQ2hGVIvjMyAjWGQMnMEx3/22xNegSW4lY9ebi0=", + "module": "sha256-bhcXqI577ugREvtP3qZ/Jyddlb3xBGd8unz4KjxaYFQ=", + "pom": "sha256-v4W0/5zMSC3Ge9yM71d1TG+YNDIuoT8O11zZqxPYGEY=" + }, + "org/apache/groovy#groovy-bom/4.0.17": { + "module": "sha256-mzIfOgQTEwXGkJ/SI2f0F45Fvfl6xtakiVSmB/4zdx8=", + "pom": "sha256-0VKgJGW/lNrN1YNbFq1UYsPn/G7HXuDDVDDI6/vKUZk=" + }, + "org/apache/groovy#groovy-cli-picocli/4.0.17": { + "jar": "sha256-YVIvNFrYwWhQ/m2s1ZpGPZ0mWGcCTtum1RIj+A2Mok0=", + "module": "sha256-OZR/kLjnaxcpAfkt5G4jnUms5lOSvEVBOrVG6FmmzvM=", + "pom": "sha256-iVtv/qX2WZtQTUP25FkEKP59SFzAeE6GfYNzTDkD7Ko=" + }, + "org/apache/groovy#groovy-console/4.0.17": { + "jar": "sha256-+sXN8nNhqmh5uLXq9zfaimvh8Vfy6WLG1mHKfdIsy40=", + "module": "sha256-vHTZDAV4MicCyA83QKHvXbXr+c4Up1qMPhpqs4p+pOs=", + "pom": "sha256-326wZvgPeOjCm44LgOhkazK7Xgq+ljVcWkfcVf6skio=" + }, + "org/apache/groovy#groovy-datetime/4.0.17": { + "jar": "sha256-2fDgwWVM3REqb7yYwjJiIw3WWLoqagKpHwp/kNtddY4=", + "module": "sha256-BBIxzENsPUQ9OKeTUlMVpfiYmurF9it4bFxgHkyKYzQ=", + "pom": "sha256-x5zAmAk6YuaOzOuL2zXEoL3o/oX44eJdBg0M+9YOHD4=" + }, + "org/apache/groovy#groovy-dateutil/4.0.17": { + "jar": "sha256-lkCoL2dLCpWbwLtNEL1G1bjg4NXH0KXgddTqaUTG5vo=", + "module": "sha256-cZZ99El3vieCQzdejWHD5ggruoQGhSy9gxJydETQzZk=", + "pom": "sha256-i1NJh3/MVBfO5mJNORtRDx9y4VWd4LWDwS+2yp/ieps=" + }, + "org/apache/groovy#groovy-docgenerator/4.0.17": { + "jar": "sha256-WEsdq21DBuA0W/H8eKH3qzcEMsu0tXPeCCn6M0Dc/gY=", + "module": "sha256-YdPdFrhB5ta8RUWJdHldjSEVt5dLbM7sDi5eOzaD2OU=", + "pom": "sha256-OImPtG2F/5f4fQhGSH6Ed8DKbx/TUwOyYOlTMohaKRs=" + }, + "org/apache/groovy#groovy-groovydoc/4.0.17": { + "jar": "sha256-5mxKRRTDDKyQHJC0uZ6yJnD7JiL5mRnfwHhFmkYYlxs=", + "module": "sha256-qufwIJqU6g+KwQwwmGmzja8oFJ0TcwAS0H4fys4FF/Y=", + "pom": "sha256-3DuMN4ZLAJtHFn+8JDBdhlAO3ltkRRwMpcNkKx7WV4I=" + }, + "org/apache/groovy#groovy-groovysh/4.0.17": { + "jar": "sha256-s0sZ9MpZkg1m5tqUnh8wjLBk5xs5FxJHmWK8Sc3aiks=", + "module": "sha256-M7Prs0L30ddt9BV3KljQ4G8iTy9s5VwztULVKaRK7eM=", + "pom": "sha256-ozFVRhxK4Yoi/dkd8VbB2fganavLjq3KfVQtgdDDOGo=" + }, + "org/apache/groovy#groovy-jmx/4.0.17": { + "jar": "sha256-jkprSs+gyWU9+DBqqbzB7LKugqW1d9i+Rg1RWpI4Ns8=", + "module": "sha256-8K1bACxtCti15NedkLWVb0N9JrAi5ZDAQdyJnl1+wdI=", + "pom": "sha256-CNaFN1g/oP78PTgrqewYiyNveozUk2LFSAM66LuIJcw=" + }, + "org/apache/groovy#groovy-json/4.0.17": { + "jar": "sha256-5/ZoGstuGNz6Di/zcygceVdNt3KVGwGu2etCLJLV1aQ=", + "module": "sha256-z1iX5xuWFRq7vEAHZFT3XrQS75VNbB6s63xHsD4KegI=", + "pom": "sha256-/ytkljka23x8GDyOmPCx5tLLc+xCGB9RCb6KGg2ofj8=" + }, + "org/apache/groovy#groovy-jsr223/4.0.17": { + "jar": "sha256-jjeeZWPeg8DGgMNzeydWJhNuQHDn7+VmSceMEpKreew=", + "module": "sha256-3fmsPmnZ9la/Vut8I6tZ3eNOqmj5YreBP3PA7lAa/z8=", + "pom": "sha256-knXR2jusvyqQuT+Vb87Z9QlWKZpWZYW2xVqQU0sfWG4=" + }, + "org/apache/groovy#groovy-macro/4.0.17": { + "jar": "sha256-DHkrtje+4hYQRYSg+MIWbMqLJe651lobQfSwfq6k3A4=", + "module": "sha256-j+dkU6DUFwbSmpi46w75RZGzNJUxiXhjSzHCmPlPoCQ=", + "pom": "sha256-szh2EBtSSGNs09PvpvZfhM5x86Cj6TzA4szD4y7pP28=" + }, + "org/apache/groovy#groovy-nio/4.0.17": { + "jar": "sha256-Wlx4ro3DWYDvSudwrV3qthr7lIeORsHCTvK2xpqjeIU=", + "module": "sha256-4hTwf+grb1uLikopkzOUYAdUrJV8YEkWCgfhqZr/NeQ=", + "pom": "sha256-S/hAZAxRVa/ELN1y2avyXWkjyjAr+VplmwF97/XP9Lo=" + }, + "org/apache/groovy#groovy-servlet/4.0.17": { + "jar": "sha256-aStIomYhl6reHTvBHZKCz8hgd0HbkojY2SyZZERD4jM=", + "module": "sha256-e5q5JbYbLBZYIPAJ68PyQxyW/fauZnsP+YL6EKUPqMc=", + "pom": "sha256-uIHtlhWEnJwu6vKFby0PjeuOaOfcxX65VFUgfY8V6lM=" + }, + "org/apache/groovy#groovy-sql/4.0.17": { + "jar": "sha256-ZdriAquQXI0OhvrGwZ3gd+gFamzEs3aWb7SGq7GpMUQ=", + "module": "sha256-NwtkYaP3hmuQYDGJgR/9QfN3tb6fOJhdW6EdS2avwyY=", + "pom": "sha256-TCWjsZnOJFMhSXnbdRgcF9sb/w0oTTDRvxxyLBUGvIA=" + }, + "org/apache/groovy#groovy-swing/4.0.17": { + "jar": "sha256-ezyRLg682DA1RY1yA+GEbUuHboNZ+Vk6y65SNPpk0W4=", + "module": "sha256-M2HxfVCfKWJVjGLf+SA8hrt+BC4DDB58XveXxETNjlU=", + "pom": "sha256-YGIp3Tq6mu5Gy0FOkzvYFQEEIp56838aJiItIoqSFHc=" + }, + "org/apache/groovy#groovy-templates/4.0.17": { + "jar": "sha256-1oF+OjDmRfzmCSz4684nMTSsJK1iP5er3lU+bYtDPB0=", + "module": "sha256-3K5vWxfaC+2hY4I8aPQHhFPruKpmwfvBnIMjwbEdkWc=", + "pom": "sha256-iz+wHVOlhD/8+K8bqwQhugSbt98iyxRYCLcnNHyXqd8=" + }, + "org/apache/groovy#groovy-test-junit5/4.0.17": { + "jar": "sha256-WxLWTWpbzkYJoT03WszsklzlJAb+BsIVyPuKcNXR4hs=", + "module": "sha256-DXyYrom2dJYCH9z4UR2H0uZW1Yiyc7VbQFwTBvDLXNs=", + "pom": "sha256-Il9nKD1jAjZhEKxRBe5t42VLAcqXzvez0Ea4n5gjYfI=" + }, + "org/apache/groovy#groovy-test/4.0.17": { + "jar": "sha256-4BODn/xw4k4JMyLlcMX4aF9CB7UYWTm3mzXnnlDZktk=", + "module": "sha256-Hm40SCtyEh0QfqtalJqZqs7qNoFO0LSVLHIweHKZD+c=", + "pom": "sha256-DQElTOV2JB6Su2gZfGbQ4AJApGkWOo9jEsEGi+GpRps=" + }, + "org/apache/groovy#groovy-xml/4.0.17": { + "jar": "sha256-d55jbIE7rWe+TCAEuGB7oZlMYvxJU37FQI8o5Yh3YLY=", + "module": "sha256-upuTtiJVZkWISbBoDVQ6veMWQytldsKXExP440b9vsg=", + "pom": "sha256-jjCHeCS0a/hbNHIUkSWzL4MiHfHAOSeJs1PlgeF67FU=" + }, + "org/apache/groovy#groovy-yaml/4.0.17": { + "jar": "sha256-inBY+ruua2pJyec/h3UgV8fnUV0rMWce+FAKrjeuMOw=", + "module": "sha256-mmuqMMKB9COnjcJFl83YZkAKu+Cqm74AzbzE+av97nc=", + "pom": "sha256-KXJjwIhCwFAnDRIJyejAvNszjPGJ+PmE4DfmjMsrLiU=" + }, + "org/apache/groovy#groovy/4.0.17": { + "jar": "sha256-UaKoWX8ocU50tAiIYMJw15shhh3RMIQdY2jYngIg10Y=", + "module": "sha256-H2fmwVACypI0euSI5kMvqKirpAdYfFsw0wZH4S6T9pM=", + "pom": "sha256-aRZKKtWmpKBLdGcEwwMNH0Z3QC+l89DvkOZaQMf+GzQ=" + }, + "org/apache/httpcomponents#httpcomponents-parent/13": { + "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.2.1": { + "pom": "sha256-Dh6u8QHwRZEp9HElsL2UpYObn1TYKyxfNVGlfM74VkE=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.2.1": { + "jar": "sha256-k1Xzh2uvgv7BPO0iwSti1XU2Iwg2QG01lFkSjk9z7VE=", + "pom": "sha256-RlsNajRmSds3SFsPpmBiG0qN+QCGP6GYcJ8ZjVR+G9s=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.2": { + "jar": "sha256-Wgh/uMYZl51JKoNUbzUd2t8ysozGoykjIp8/x3cXFXg=", + "pom": "sha256-WdDu5k/MP0VJqLoeDJnaEl9GQhxo/GPsynL8j28sPuI=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.2": { + "pom": "sha256-1/fv7GCeD91+OubrOlUAWOb5Pl0sJCTXSyHej3U291A=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.2": { + "jar": "sha256-KTMhy/WU156ooMsCFPdfFG0X8Ii+F61c4Rwv6GTfEkw=", + "pom": "sha256-EHqMsQtc5ARGTq/B9nscEy8GgxDzC4bYpMCkTakFfyU=" + }, + "org/apache/ivy#ivy/2.5.2": { + "jar": "sha256-mEKNVF6mPNmgqvJVyvQsuMtk/kMNu15wmu1TbU2u7QQ=", + "pom": "sha256-SrIWH63j2EHp2H8iVfdgfLiHCcbISPf7JdBmkd2VbkQ=" + }, + "org/apache/lucene#lucene-analyzers-common/8.11.2": { + "jar": "sha256-097wT30NLIkc8sfj38FMO1NUW+wcuHMq4DPyUWTlyTE=", + "pom": "sha256-zodQaJ1qy5V5aaW3Z2iqVh2HEA3B6ErDYnfhweswA8Q=" + }, + "org/apache/lucene#lucene-core/8.11.2": { + "jar": "sha256-iXCSX0PXiacCR+NsG6WiYHuvQZXDWv0M2HhkLJXDdAk=", + "pom": "sha256-ri4+eBO+bTd4uTPCfG0aAxwJxk+JURgMAE9vFI0nG10=" + }, + "org/apache/lucene#lucene-parent/8.11.2": { + "pom": "sha256-2KiRciKjtdDGjnmn+Bb8zM77bHvbuQf6FwsJ5HIJUuA=" + }, + "org/apache/lucene#lucene-queries/8.11.2": { + "jar": "sha256-D5MRnX0xbO8T/euqZo5xaxl+uGy+jns0XA6tJjIOY8g=", + "pom": "sha256-urVlf5EpC/zVrdDBDdto+p6AMR7o8Diloc84itrE8dM=" + }, + "org/apache/lucene#lucene-queryparser/8.11.2": { + "jar": "sha256-0s9RG6072nuRWHy6TCJ/iWSk6NoEM9BadAQ56iG7GuQ=", + "pom": "sha256-4fhknAaqtrtUJNdnrxWgUGLWM7zyVJB7I2/4AGtXytE=" + }, + "org/apache/lucene#lucene-sandbox/8.11.2": { + "jar": "sha256-/qZMMQLiGhwjOpXr7Y5wIeZfguUX2o2LFEZ3Y1ZwW7c=", + "pom": "sha256-M+S6VEvQv8U33WHboeMXvQ75DzU9yvp9ACePJYlApjs=" + }, + "org/apache/lucene#lucene-solr-grandparent/8.11.2": { + "pom": "sha256-0ShbeRyB734Rqb7fbt8Yh2C8Q/MJPkT0nygSvA8QAHE=" + }, + "org/apache/pdfbox#fontbox/3.0.1": { + "jar": "sha256-nSwtOESSmc0Nghovb2VnFDMlFEjT31efr/0PhzYcfH4=", + "pom": "sha256-dtkbZg8MqSYqfIEqvny+OdvHNNc68yiWpZ7omXG3aQ4=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.1": { + "pom": "sha256-7WhRk3AwJFzoTmKS65oUgKoSltrSwy7fVIZickTXdio=" + }, + "org/apache/velocity#velocity-engine-core/2.3": { + "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", + "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" + }, + "org/apache/velocity#velocity-engine-parent/2.3": { + "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + }, + "org/apache/velocity#velocity-master/4": { + "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" + }, + "org/apache/xmlgraphics#batik-anim/1.17": { + "jar": "sha256-Z9nWkezshXrDYo+9IWfCAZQNPEtlq3OGSErHMMuM+eo=", + "pom": "sha256-SNpMQT2e8VZ6EKLn7UNPpbuOzrfolW9jxLlw42/avxw=" + }, + "org/apache/xmlgraphics#batik-awt-util/1.17": { + "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", + "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" + }, + "org/apache/xmlgraphics#batik-bridge/1.17": { + "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", + "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" + }, + "org/apache/xmlgraphics#batik-codec/1.17": { + "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", + "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" + }, + "org/apache/xmlgraphics#batik-constants/1.17": { + "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", + "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" + }, + "org/apache/xmlgraphics#batik-css/1.17": { + "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", + "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" + }, + "org/apache/xmlgraphics#batik-dom/1.17": { + "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", + "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" + }, + "org/apache/xmlgraphics#batik-ext/1.17": { + "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", + "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" + }, + "org/apache/xmlgraphics#batik-gui-util/1.17": { + "jar": "sha256-2ZNr5tv3rvofNRe4YE7CE/4VTR1lTy7Gcjq1Jn3VXnc=", + "pom": "sha256-1WEFYc2SyU/fnXXAuY3Su0kHldxUaC/qZEQZgdcB/jo=" + }, + "org/apache/xmlgraphics#batik-gvt/1.17": { + "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", + "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" + }, + "org/apache/xmlgraphics#batik-i18n/1.17": { + "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", + "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" + }, + "org/apache/xmlgraphics#batik-parser/1.17": { + "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", + "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" + }, + "org/apache/xmlgraphics#batik-script/1.17": { + "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", + "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" + }, + "org/apache/xmlgraphics#batik-shared-resources/1.17": { + "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", + "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" + }, + "org/apache/xmlgraphics#batik-svg-dom/1.17": { + "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", + "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" + }, + "org/apache/xmlgraphics#batik-svggen/1.17": { + "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", + "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" + }, + "org/apache/xmlgraphics#batik-swing/1.17": { + "jar": "sha256-ejNy6y/pO8CKE2kK7HyiY6Lt1j5n2Qtliy3qLG8L6Tk=", + "pom": "sha256-UJz+WAJ4NGTjWRypIO5OGmsgwHFsoVAj3xbnxpsagv8=" + }, + "org/apache/xmlgraphics#batik-transcoder/1.17": { + "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", + "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" + }, + "org/apache/xmlgraphics#batik-util/1.17": { + "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", + "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" + }, + "org/apache/xmlgraphics#batik-xml/1.17": { + "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", + "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" + }, + "org/apache/xmlgraphics#batik/1.17": { + "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + }, + "org/apache/xmlgraphics#fop-core/2.9": { + "jar": "sha256-G6o/84uWbL+7FXcEXNsMOdou857zN/SCZC+Jwy6E7Qw=", + "pom": "sha256-gYLc9qvzM/JWGIGtG+4ebnaGB5EhIDIrXhbAY1EjPQo=" + }, + "org/apache/xmlgraphics#fop-events/2.9": { + "jar": "sha256-4ddBM2p6q3z9fwYTxwPewOkxyx/gt3OAqXSM9EX1zrY=", + "pom": "sha256-qz74ZmlV0FKvUYeZFfwv85mXymheJaPJIuuKuDU0sH0=" + }, + "org/apache/xmlgraphics#fop-parent/2.9": { + "pom": "sha256-Oq9QCzomfEmzCdoCziBOirxzojRmry4kK7mJRPdL0d0=" + }, + "org/apache/xmlgraphics#fop-util/2.9": { + "jar": "sha256-fJzwPh48KvR5QxIlYHCCnhPyRRu2TJcpk8YFl5k9BD8=", + "pom": "sha256-HfUlsA3xpY3CzLcju3IiMhWhCmbrdl7++PhW+xAZAJw=" + }, + "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { + "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", + "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + }, + "org/apfloat#apfloat-parent/1.10.1": { + "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" + }, + "org/apfloat#apfloat/1.10.1": { + "jar": "sha256-oUgPVg83NV9sBFjFI72kZljaTNPiPMZOMJ/tzXsHgro=", + "pom": "sha256-hhppAMWT7SJoYA3RdxPseJHZM8oBnTlQm0bzGBJ0Xcs=" + }, + "org/assertj#assertj-build/3.24.2": { + "pom": "sha256-1/yMSqgAWDsmxGfrD67eCvXnynkMS+TU0jVDFYPSbq0=" + }, + "org/assertj#assertj-core/3.24.2": { + "jar": "sha256-3z0LNI8f6Aa93csQ+krmPGZ56YiNS8cFXwmEhReXaqM=", + "pom": "sha256-f7mxojdOtQ7SubWYRcaScxEeoYOaQpj5QAqA4rLFyA4=" + }, + "org/assertj#assertj-parent/3.24.2": { + "pom": "sha256-DFAETrW96ehEI7yhOv9dX0PTdSqzxj9zva5p/EqxoKw=" + }, + "org/bouncycastle#bcpg-jdk15on/1.69": { + "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=", + "pom": "sha256-2iKA/jlan+d4adxcwAqpvuiPaUx8R4XqEHOXIrafrU8=" + }, + "org/bouncycastle#bcpg-jdk18on/1.71": { + "jar": "sha256-V/mrdqg1irvqkLoe+OVTuK49B7IzcHikyiCxy9SLTsU=", + "pom": "sha256-HZAWwSXnJp1y/KeGINan6Jha9hCfAI3MQs7H65MTEy0=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk18on/1.71": { + "jar": "sha256-80M6l9eA/p+j3D1WKkHezVmy5hfOiE3pBgNJrBR1AEU=", + "pom": "sha256-u90garzosxsfGnMBORtEO6bN4X5y3udcH9LkEBFsXIc=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/packager#packager-core/0.19.0": { + "jar": "sha256-9XmIqLNtoAU1O6XVo0FHZuGYqlTh+302Ov8ePdhH1Io=", + "pom": "sha256-gMond9r++bVTJcISD3mX79+/37uN8P9QTMqkVmCHmPE=" + }, + "org/eclipse/packager#packager-rpm/0.19.0": { + "jar": "sha256-8lULL06x1mfnZoFdmKPUPJWj3n5oyxkGVRWYC+aJ8T0=", + "pom": "sha256-T3NFFZZmY9uaKDMc1LZT81qkBqY4K5H1IqsbVn8Oahc=" + }, + "org/eclipse/packager#packager/0.19.0": { + "pom": "sha256-K/IL31F8Q7tH/GSAnqKOwOQuMQnUbRPQ/miGquputXE=" + }, + "org/freeplane/archunit#freeplane-archunit-extension/0.0.1": { + "jar": "sha256-XxRdb0LDT8XWt4OfhoSrJb8LAVhPFAO7m2DjEuJ8MuA=", + "pom": "sha256-pwd9Md/wt+QVs7mvzWfg7f3worN8xYPfAegXBGIdtr0=" + }, + "org/freeplane/dpolivaev/mnemonicsetter#mnemonicsetter/0.6": { + "jar": "sha256-tm1Hrc7hdzU8YWFZhOJvG8Fj48VPTvfWo6nwkw5bnKo=", + "module": "sha256-B73+X5w1lH4fExAfRzdYRXAl6EiuTNWn6JfVxx9vOOQ=", + "pom": "sha256-IxRB2JhTMNHoZTTik+S/kLDfO9JsZNpvKDD+dUZJVbo=" + }, + "org/freeplane/emoji#twemoji/12.1.4": { + "jar": "sha256-VPNeiF3UDc/ElmlWosD7QWvNowuSU2D8oRqGLqIhm5I=", + "pom": "sha256-YdIcDlfkD/vek0h07VsDCiJlqoMXphXOVi9iXPOMz8E=" + }, + "org/freeplane/lightdev#simplyhtml/0.19.9": { + "jar": "sha256-M8qZwUjAXtrfOqt/M0bMZedObQYCZIaxIjjizk5/Jq0=", + "pom": "sha256-WsY1HVexEJk4aAPpmMRJhb3f4gzrYMb4K/E+ywF4Jrs=" + }, + "org/glassfish#javax.json/1.1.4": { + "jar": "sha256-F/3rfiI3Wn+0C7BVEwb23PK1dDB4Zorc32xkLJqeyVU=", + "pom": "sha256-UNKlkVUoQQmnCGdbUuu0WYUA5DaTlnz/FAHLJrl/iFM=" + }, + "org/glassfish#json/1.1.4": { + "pom": "sha256-2j9Tvh1F7zr2Z/36JvVMPrwOGWuMTftkZJHb4+Mcsgs=" + }, + "org/hamcrest#hamcrest-all/1.3": { + "jar": "sha256-SHdnBimrlvNPX5CrKDEl/Nmst+aD5mMZpovm6yzKYN4=", + "pom": "sha256-W/9oXY0wk7ttAuBXWvgEVi075wlAm8xxnZ40utZTObA=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jgrapht#jgrapht-core/1.5.2": { + "jar": "sha256-36WW6fDQg48bXoHdDNYOOnbCwpCsJaCgKf/eWM9eTBQ=", + "pom": "sha256-R+MlGXkdDQblxsiNqMUZgA9O/9M2x9bVYE/f10+Sf8o=" + }, + "org/jgrapht#jgrapht/1.5.2": { + "pom": "sha256-V4X+aGHRVM9tin5rwS2X+GcmxgA2g/AOW++4rAPy0sM=" + }, + "org/jheaps#jheaps/0.14": { + "jar": "sha256-SamJjaN1hlk4jxMzxTzK22+9FCp9GKp7GjNXcJBoQnk=", + "pom": "sha256-Fge2IOHytOGg9IkQELNJCx+0qD5xOsTTiwjcLGf6PlE=" + }, + "org/jsoup#jsoup/1.16.1": { + "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=", + "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw=" + }, + "org/jsoup#jsoup/1.16.2": { + "jar": "sha256-pzoetdArUUkFR8RkheMPTxTmivNiSEC1er6MRYCgC4M=", + "pom": "sha256-CDt/BhxojeonbVV3j/Ijw7rcJmmdX9u4n4Gv9VOGsaY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.1": { + "jar": "sha256-YNXDmMMtxwObmSglFK1gZAYdhBfPlZofa9IDjMkHyRM=", + "module": "sha256-+H9zEVSfSf4k5igqEWXpB+AXqR6XnK2r/fm/VMP3EG8=", + "pom": "sha256-PK9ZSxPa5xB1EN2Zj02en6J3MFzcohMh/dWRmdyHzz0=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.1": { + "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", + "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", + "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + }, + "org/junit/platform#junit-platform-commons/1.10.1": { + "jar": "sha256-fZhV7j8/cfAV6xR5VZv5I3gyQ8JPv72LKb7Y6AmbVnI=", + "module": "sha256-VtNwYvzicEHwtaNfOTxoyK0jr+NLLTDvjgewT8EZ1N0=", + "pom": "sha256-Su81pl6VGRWhPZ920fr/CaeMND5SJC+vNSBDtwx/bzA=" + }, + "org/junit/platform#junit-platform-engine/1.10.1": { + "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", + "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", + "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + }, + "org/junit/platform#junit-platform-launcher/1.10.1": { + "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", + "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", + "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.8.0": { + "jar": "sha256-wyD2YqA8KVHtzFGkS2TXmo6ZQ3P/VIRTtf2vad6+RoI=", + "pom": "sha256-dJWKzd4UjzC/ox/8CFi2L3H2PMws602KjGfX9CjUOi0=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.6": { + "jar": "sha256-2Sgy18N+3AfGDiVZrGEYsx1kLjN6ZnHty3up+uaO27s=", + "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-util/9.6": { + "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/owasp#dependency-check-core/9.0.7": { + "jar": "sha256-yhlVOSFWYKUSdUlxFj9kDALwPnnBdL0EvhcbksBnl8U=", + "pom": "sha256-GI2Umv65MFI7SOl7FQDigRdEBOqIVpc01HMub3sH7yM=" + }, + "org/owasp#dependency-check-parent/9.0.7": { + "pom": "sha256-tC3i7MCzf4xVwha5dvk6tkhNu+ZoVcf2EtqlsIFfGE0=" + }, + "org/owasp#dependency-check-utils/9.0.7": { + "jar": "sha256-wATn3kAc3d+o07BeQaTt1V5kNRDnIctyTbDwZw9hrkQ=", + "pom": "sha256-0gNTZJ4/NK7UpjuOnKT+dLa0H28PXnQ2gWTtHIt6nu4=" + }, + "org/redline-rpm#redline/1.2.10": { + "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=", + "pom": "sha256-B6tuIriDJfDPdNQuiaZjQY5Vb+pXmMZnjSY8+YJuxC4=" + }, + "org/scilab/forge#jlatexmath-font-cyrillic/1.0.7": { + "jar": "sha256-GgFQ5L5k24jCUN/0H1kzSfVfDJz9uOOUM/Fbpz7NIbg=", + "pom": "sha256-kburwRXaL3ZznId52afCXWmNjI5/CRCrqgehNwO2oi0=" + }, + "org/scilab/forge#jlatexmath-font-greek/1.0.7": { + "jar": "sha256-zdx+fm8+f/BDTIpIBercPp3IBFfVgtGcNpnmqu6PavI=", + "pom": "sha256-Y4k7Qay6GJQvIt8WO5Cex5yqLzRxjXvmJEeNQ7P6/mo=" + }, + "org/scilab/forge#jlatexmath-parent/1.0.7": { + "pom": "sha256-1dUNpkwZJfPGVwiUI2nakFsYSyIBB5ueJntlLWM5Beg=" + }, + "org/scilab/forge#jlatexmath/1.0.7": { + "jar": "sha256-bQTDhD/JjS7qm6TP8L57gFQMp1xaTgs0Y/0SGcSMxl0=", + "pom": "sha256-w7H6Icz/7VRUA6U8EPte8MoMrT+ZCLIASoIjaItyLcg=" + }, + "org/semver4j#semver4j/5.2.2": { + "jar": "sha256-zShWFivevNE9TiePyhcLWMqpgjk+fGdKTO2rF7Fj7v4=", + "pom": "sha256-1M+xsnGz86pzi88F0lk5d9zLh+UnIQfwy6NhanC5aHc=" + }, + "org/slf4j#jcl-over-slf4j/1.7.28": { + "jar": "sha256-uB9fkQ2pcIx6ane3IKfeIBVMztQGW1bzMwGUXASqrXA=", + "pom": "sha256-CR1F8JpUBvZbO4nYwDcGCN7GS8HP6P/XvyjQThKKOpI=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, + "org/slf4j#slf4j-nop/2.0.9": { + "jar": "sha256-VhI2exK6w+rPTm/04GzluhyDxNjW1eLqX5JGNXF6bYM=", + "pom": "sha256-3qe7VIVu9pOIkiqtCiU4qfNd8nk/iUF5S8smUYp0CK8=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.28": { + "pom": "sha256-kZtfQt3jOs4DaGXR4rKS2YoGJ0F/91bgKH9KVq0+VE4=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, + "org/sonatype/buildsupport#buildsupport/13": { + "pom": "sha256-MuFUs6Y4iedSg+cMOqqNzzS0DQmXHIh7/KOLdDQDBtM=" + }, + "org/sonatype/buildsupport#buildsupport/28": { + "pom": "sha256-cnweK70oqsuQ60sZYX0w2rw/eZ+i8YvNcrrteu6aICY=" + }, + "org/sonatype/buildsupport#public-parent/13": { + "pom": "sha256-apKi9RvzXaZVTJaF1M3klpyETHbUpAZTVR7mXf2zjoY=" + }, + "org/sonatype/buildsupport#public-parent/28": { + "pom": "sha256-xaG91AEo0naus0aPnjlM1aCp9Khliu+XQ8PR6JxIqQM=" + }, + "org/sonatype/goodies#package-url-java/1.1.1": { + "jar": "sha256-FSl4YjQrSUpTV0L7qQ6ooyHNE+HQ3Exht6OxjOOF4ag=", + "pom": "sha256-mGfgLN1Qx6ciQh8quZNY2Z3CUrZHmlQ0AmG2VZkdVXk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/sonatype/ossindex#ossindex-service-api/1.8.2": { + "jar": "sha256-YfsE6TzymRcYBXlW+SU0y/FJTtXnQlC539bAErw3mqg=", + "pom": "sha256-9eL5rbvJHe5Skyg3lVxivwFhljcuFJdPDc/SAkp2VRM=" + }, + "org/sonatype/ossindex#ossindex-service-bom/1.8.2": { + "pom": "sha256-gyZ7UASN3Vhhog/my/u6ZfwHFjCJxk/8wjoWX7ZTCqE=" + }, + "org/sonatype/ossindex#ossindex-service-client/1.8.2": { + "jar": "sha256-72krmeEeVYUkA2RH2u33y5goVAfU23r1eaWRTCZfmBs=", + "pom": "sha256-7Aq9JZUefen7SRl69pMo5rSTf8adNyz07tSqfCrD4E8=" + }, + "org/sonatype/ossindex#ossindex-service/1.8.2": { + "pom": "sha256-3fX6d+tx8GpBDzD8umtqu4O7gUkMzJswQKQej8ukDk0=" + }, + "org/tukaani#xz/1.4": { + "pom": "sha256-/kqLT1R/okQ0L7r0pOgPDEg3HYXMQBtYUViRKENiWJI=" + }, + "org/tukaani#xz/1.8": { + "pom": "sha256-8p51y4jrSsv35apcCe1V6sLLrmAdY6nzdSMfRUUsEBM=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/vafer#jdeb/1.8": { + "jar": "sha256-N0/gKgkxTabsghngBVmOdgMjoavktxXMM84+KpvNqTI=", + "pom": "sha256-MQdFSRqXEzi0XcwhFMRt6GWvNOWLI96d2JJfEGFewBY=" + }, + "org/violetlib#jnr/13": { + "jar": "sha256-Rlyk/6Q2LHssoGLvuY13yo/6ceWCp5VN50hBn72/ERA=", + "pom": "sha256-ylDwFnSA2Q8xOyZ2+aGKpQrIW2cfLwwdqdsSkCTtzPU=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/12": { + "jar": "sha256-rAsehX4k+vkpdpkEZV94Nkl/+24kl+nVGl05qZ7NyOk=", + "pom": "sha256-gcXkZPQxLsbTpEWOCjVX6QFS5bFNcOR6EhMBR0XAbag=" + }, + "org/whitesource#pecoff4j/0.0.2.1": { + "jar": "sha256-hHNzgo4EkLq9+u0rBI7TkI3BqN6C1Mjm66ub/QopTtY=", + "pom": "sha256-ITSyrni76ndbwyNuSR4IJeKoNzZgrvSGW/8cBoDpnUQ=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "us/springett#cpe-parser/2.0.3": { + "jar": "sha256-xmnSer5OmFsIMkXW8zKEsECJ+zKOdmAnYN5bQLcrqAo=", + "pom": "sha256-m1CINhAtmutHKGcerDe2yRWwaMjJO7B1xL0GIkQ2IDU=" + }, + "xml-apis#xml-apis-ext/1.3.04": { + "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", + "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" + } + }, + "https://resources.knopflerfish.org": { + "repo/maven2/release/org/knopflerfish/kf6#framework/8.0.11": { + "jar": "sha256-NC9SRdUhR1Nw/IwVVMseSTswFcAcr3xg6cgYm3A4wGk=", + "pom": "sha256-iWr+X/fdfT4fclUgtJw1xrnYMoS1gsTp9JV0MbdY5hg=" + } + } +} diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 5ce7cebac098..83a59347f933 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, - writeText, jdk17, - perl, gradle_7, which, }: @@ -25,62 +23,6 @@ let hash = "sha256-zEQjB57iiKVQnH8VtynpEGKNAa2e+WpqnGt6fnv5Rjs="; }; - deps = stdenvNoCC.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - - nativeBuildInputs = [ - jdk - perl - gradle - ]; - - buildPhase = '' - runHook preBuild - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon build - runHook postBuild - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - runHook preInstall - find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - # com/squareup/okio/okio-jvm/x.y.z/okio-jvm-x.y.z.jar is expected to exist under com/squareup/okio/okio/x.y.z/okio-x.y.z.jar - while IFS="" read -r -d "" path; do - ln -s "$path" ''${path//okio-jvm/okio} - done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0) - runHook postInstall - ''; - # otherwise the package with a namespace starting with info/... gets moved to share/info/... - forceShare = [ "dummy" ]; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-mWQTe/hOWGwWtsUPCZ7gle2FtskcEmJwsGQZITEc/Uc="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - gradle.projectsLoaded { - rootProject.allprojects { - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; in stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version src; @@ -91,17 +33,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { gradle ]; - buildPhase = '' - runHook preBuild - mkdir -p freeplane/build + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - GRADLE_USER_HOME=$PWD \ - gradle -Dorg.gradle.java.home=${jdk} \ - --no-daemon --offline --init-script ${gradleInit} \ - -x test \ - build - runHook postBuild - ''; + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" "-x" "test" ]; + + preBuild = "mkdir -p freeplane/build"; + + gradleBuildTask = "build"; desktopItems = [ (makeDesktopItem { From 183e1f5fc38c11ce97d0321247836c827299d736 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:42:12 +0700 Subject: [PATCH 185/562] stirling-pdf: convert to gradle setup hook --- pkgs/by-name/st/stirling-pdf/deps.json | 1823 +++++++++++++++++ .../st/stirling-pdf/disable-spotless.patch | 34 - .../st/stirling-pdf/fix-jar-timestamp.patch | 16 - pkgs/by-name/st/stirling-pdf/package.nix | 78 +- .../st/stirling-pdf/use-fod-maven-repo.patch | 25 - 5 files changed, 1838 insertions(+), 138 deletions(-) create mode 100644 pkgs/by-name/st/stirling-pdf/deps.json delete mode 100644 pkgs/by-name/st/stirling-pdf/disable-spotless.patch delete mode 100644 pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch delete mode 100644 pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json new file mode 100644 index 000000000000..fb37c93baae8 --- /dev/null +++ b/pkgs/by-name/st/stirling-pdf/deps.json @@ -0,0 +1,1823 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.2": { + "pom": "sha256-OuJFud+VEnMh8fkF9wO9MndP5VcVip06nlB9grK8TtQ=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.2": { + "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.2": { + "jar": "sha256-LGhp1QXPYNwGZzS31QM5+XW9OtxjXianirtxrLRHPA0=", + "module": "sha256-sBSmTMGESUn4JNNGcSk1Qfq3IyI6yLgyIrV3IRO97Bc=", + "pom": "sha256-hK4DQYN9dpamEEPYCeQyYKXrB3Iy0dyqRkyNpUnNnqA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.2": { + "jar": "sha256-tdN6d8iCd7l+NZPIdAklIWwG345BcrveBYUo3wStPno=", + "module": "sha256-knOeO8vgmyZJ4YfrftJawlK1h3B82SKrlbrc3orqEtw=", + "pom": "sha256-9EzGPWEvA7Hb/IKJLc2zL9t1vxYEn9hZVWHnx6M7xFE=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.2": { + "jar": "sha256-UB06vOTRjcw4EFjsWTxblEd5Brum77rBTa5ApkL3dCQ=", + "module": "sha256-YTDKm5VwfM1PgPYlhWmZCnzkADmqNTxGNckA02vuxwU=", + "pom": "sha256-IoCOu0t12MQDfZzuEgitxlvHgqmIVzIjSjG3tXTF2Qw=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.14.2": { + "jar": "sha256-tOP76lRaFVoU3LimXEa1etjQ+5YnyE94mFgmPwUpkzA=", + "module": "sha256-FS+gHfdRXJqmhk0hmHjx1RDMxU6RSkRuwWhoSQeHNjY=", + "pom": "sha256-ZJQDWanJpVdkpMbeM0eZUJBL0JJtKKHWj2sNQdp1fJc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.14.2": { + "pom": "sha256-Nup9rcsQxxU+9lp14Wmxt/k33tCaGEUODxD+IC3yrc0=" + }, + "com/github/jk1#gradle-license-report/2.6": { + "jar": "sha256-P4Gsjr9QBSzza2Mqbp9/DtCVTYI+FTOZuYolKOz8YbE=", + "module": "sha256-f79/6rarYy/N+dQNR9CJmsoLlRucyAfoz+uE139Zr7M=", + "pom": "sha256-lagUHcf0R4CevR65cNtkDO4iTZwCwMEm8vbDySP93LI=" + }, + "com/github/jk1/dependency-license-report#com.github.jk1.dependency-license-report.gradle.plugin/2.6": { + "pom": "sha256-PHvB2j5eV/g+O4oz2FTAav5LTPGGVy58Y14/VJ+CcJI=" + }, + "com/github/psxpaul#gradle-execfork-plugin/0.2.0": { + "jar": "sha256-609z3xPuJPsZUuCpBUxWGO8H8NYjhr+tGgSZDfDLOmU=", + "module": "sha256-eyOesCmy5MqwDd3x3yBO9Lv4jnikNhnCb7seSbxTxkI=", + "pom": "sha256-2PT/ECfYvjIQBA9xKPisWYCMUJ6+8oTzPZq13IfB8Q0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.20": { + "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc=" + }, + "com/thoughtworks/xstream#xstream/1.4.20": { + "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=", + "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.5": { + "pom": "sha256-Nplw/agsRFMGIjSqxiwBbqw5nY8C2VKdUe28QY0fzPs=" + }, + "edu/sc/seis/launch4j#launch4j/3.0.5": { + "jar": "sha256-4x62k3vvPwCsxAPkraf7ihY4ATiQ0bNSVmiFBocx7WM=", + "module": "sha256-+hiZBJpE2pdEnjoBvCx9rC01t0npPPdsBDSuzjT9ux8=", + "pom": "sha256-UvTlC0T2dzuebNq7jmmveQc4IW+8ZxJ1G77tGKFCknk=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/spring/dependency-management#io.spring.dependency-management.gradle.plugin/1.1.3": { + "pom": "sha256-IjgvRfuFgvBXWMuKSZjk4RsXHH4w8f2r9zBPcm7DV50=" + }, + "io/spring/gradle#dependency-management-plugin/1.1.3": { + "module": "sha256-RgDMe8BIFu+9g/D4OJ9hWSM527UUWo2Uv5f4O8dldsY=", + "pom": "sha256-I9snVxPLFDWY6BBdB6YhbGcJmpHSbV6j5iLoLScbJpM=" + }, + "io/spring/gradle#dependency-management-plugin/1.1.4": { + "jar": "sha256-ilmvd2SN0H5rZ1HScdsvodAr8ubPfpqzf7mwjsybQ6E=", + "module": "sha256-tfZT8jN6BlFiyXmEiGD3kXGbd2qg740mmRSDXFeo/6A=", + "pom": "sha256-7dDEvl+Ooaigy0VhCvoRfn4e8m4wGlBZZI71BdZgj+s=" + }, + "io/swagger#swaggerhub/1.3.2": { + "jar": "sha256-cDph6Wsjr4GyzuukoIG7MhLsACEa4wB0iz58yx8zvTI=", + "module": "sha256-vVzNbkgiTKuIu9eeiA/wEe5PpxFJD0EPeBC3Wiy5w8A=", + "pom": "sha256-Ho4HzW9Tu1RxN9DKdLVetTkAeNmIRd1tZcfcvS8mVv8=" + }, + "io/swagger/swaggerhub#io.swagger.swaggerhub.gradle.plugin/1.3.2": { + "pom": "sha256-aQae7hJEDFIWYgVzNKxKyuoM5lNMpP2LG8Jk3pMK0tA=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "net/sf/launch4j#launch4j/3.50/core": { + "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-lang3/3.13.0": { + "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", + "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/httpcomponents#httpcomponents-parent/13": { + "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.2.3": { + "pom": "sha256-8GQi0fH4n6RqPfdmyHii3RoI4flVOh+mZgmZ47ispow=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.2.3": { + "jar": "sha256-fPTH5gM4qjNOhpnyQjrxyTvcOjEh8t8iN41hIi+lkQw=", + "pom": "sha256-8Dz23MD/7AFWSxfz0I5b5gFORHusRzWwH6cX+S+5XC8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.2.4": { + "jar": "sha256-3BqV5z6wTbk0UVM9OQzgLFOzAaENw0PQjIYvKTSz0w4=", + "pom": "sha256-TRZ2hcCpo5jMJEpzqQhuKs9jUWCAGgpOuM/T4ycc+dM=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.2.4": { + "pom": "sha256-g/3u2xolBJtf5+AK/NNXQ/eon5kED7mjpRNfuSaaWko=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.2.4": { + "jar": "sha256-p/YklhE/ZvnifCa4TET1zkVVxicAg83y1F8lUzbNUq8=", + "pom": "sha256-Abq2p2771NJoSf1FDqrofK75ocHAzF9g/k87kY8HcWQ=" + }, + "org/awaitility#awaitility-kotlin/4.0.3": { + "jar": "sha256-66iiOFFxL0WzGvZ/gwbHYC/0TaAh0UZwl/41LeVlo9s=", + "pom": "sha256-JBnkQ4E6uPP8191HBjPf2KDYDx5R3Z7To87TsmLbr18=" + }, + "org/awaitility#awaitility-parent/4.0.3": { + "pom": "sha256-5KRCX+WKidKbl1x05X5uqIpGg/BNR2KPBTwRgBO7grQ=" + }, + "org/awaitility#awaitility/4.0.3": { + "jar": "sha256-G8JCQg80krW4xo8Ujk5BAfbqglUnznk74iwMb/o7USE=", + "pom": "sha256-P8iCHmLEEy5xfNk1wB0dOTTov7sPklphhPj2oo2jasY=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/hamcrest#hamcrest/2.1": { + "jar": "sha256-upOy46ViMiukMvChtTrdzFXLGIJTMZoCDtd/gk5pIFA=", + "pom": "sha256-eH/dx6wGS1oiQGOA4g1WB2nwoIm77P8ijhntyWz2ySc=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { + "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { + "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": { + "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.20": { + "pom": "sha256-ycHvxLpLRsYy4qIeaTJYo+ztB+vqoAr008NG05kLIB4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springdoc#springdoc-openapi-gradle-plugin/1.8.0": { + "jar": "sha256-lAdaoBdXoMHVc63pFFwJiWPwhP7v0x3JXWVgbFA1hfQ=", + "module": "sha256-by2CiAeWEWkpP09biX98PudtoG3Gu52UrLPV8kGOmYw=", + "pom": "sha256-4CMQC3oczVQmo9cPklZdW8Xdf/51f6TqYGOhkpBlCHM=" + }, + "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.8.0": { + "pom": "sha256-LRFzQyMeKb4i5Im8H0gl4dS771RZBeeTJE6VIhlXFU8=" + }, + "org/springframework#spring-core/6.0.10": { + "jar": "sha256-HApr+czPqLvmq0nBOWPBq7Lt/4HYixr3RiYX3cfAl10=", + "module": "sha256-hbYoaLgyPn4yns3fCcR2oEMC2Ie7de4F+2RSVmrMFSA=", + "pom": "sha256-jKnCE+qV3MCO/lIfH27GsbaSAO+LdPr9Z7Jls/Ndp8k=" + }, + "org/springframework#spring-jcl/6.0.10": { + "jar": "sha256-MjIJyDN06eTAeFMRM0hi/vI3VbJMPA75SvVzEzNtbDA=", + "module": "sha256-3x5LmsRnzVg3yDb9b6D8wYBSxJNx4tpwNxGDVdzkNgM=", + "pom": "sha256-3PtOmzAEr32JWwzRxzVO7dbsO+5ZXFeAn8pG162DtPI=" + }, + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.2.4": { + "pom": "sha256-5DmvFjixGykdvMkP5+YMQnmEOCrOviVmsJQzFYF4Xf8=" + }, + "org/springframework/boot#spring-boot-buildpack-platform/3.2.4": { + "jar": "sha256-wj8dASDMAWMUok49iOK7A8lfLRnpqWG5U84lhoVXzog=", + "module": "sha256-1W3+CczrqrcwXSIHKN6J1Zv4hMgqIy8denoZl2KhNIg=", + "pom": "sha256-k5+6HnB4vmBsg9SaiQB5KbBPKajR9om5faTP8Whiob4=" + }, + "org/springframework/boot#spring-boot-gradle-plugin/3.2.4": { + "jar": "sha256-6V6gGlTW/Q4ocjRlXDCsSSWo9nEqGxZDfTfqTPptlJk=", + "module": "sha256-xbSUt50Fj/B2DvtjphAMAsvBPG/jPv2I0xYBmXocpMc=", + "pom": "sha256-cbraMCUInappn9Uz5yBrPnGBPSGg0xIFsQUrgzNXHlc=" + }, + "org/springframework/boot#spring-boot-loader-tools/3.2.4": { + "jar": "sha256-hwt3UejNc7ev0muh3ihyjnBwVY/2XyGz9gELX5N0Fac=", + "module": "sha256-7sSC123IGCd8bYK4V0BkLHa4XUiJ6ZWyrC+0mxMJzic=", + "pom": "sha256-gzfQx85z1gx3NLmGadxPldXd7uyJXD5UUVD8FFhgH5k=" + }, + "org/tomlj#tomlj/1.0.0": { + "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", + "pom": "sha256-rYGSAH9zRQxRyIAwXxTdIqxVFEm3IbWF/FEjFCLLCRM=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.5.3": { + "jar": "sha256-tf6W/VZV+Usbyogdtc4WQ9CLnb3Ni2/jYeMuRXjVYTs=", + "pom": "sha256-a1TxNgVxhl+cbEvsDkhUiE63o268ZGWlKpYGU6iwZ8Y=" + }, + "ch/qos/logback#logback-core/1.5.3": { + "jar": "sha256-eFRQelmtXFgijcS8Pas9eSJTl/XvJDDts6zlREXgER8=", + "pom": "sha256-sZGeCDrFrpwZZq+FnI/FEgTIW384Nf5pnF7eZtQv2Bg=" + }, + "ch/qos/logback#logback-parent/1.5.3": { + "pom": "sha256-DFvLSOq4iEJD6SEv0+XzOME4PitMsa8xMyCZQfgtCk8=" + }, + "com/datastax/oss#java-driver-bom/4.15.0": { + "pom": "sha256-XJ4x7/lc83XFvf/4XOKCh9Wa/PUTS05qJKdj2xcaXmc=" + }, + "com/datastax/oss#java-driver-bom/4.17.0": { + "pom": "sha256-GMs4z09H2+zY1bKnbEFzqUvrSEMgSS+G1pZGSXQxJn4=" + }, + "com/fasterxml#classmate/1.6.0": { + "jar": "sha256-0vy9lWg3pXocYA3aEY1WNBNsvWc/MIUiUeTw3ij9Tr8=", + "pom": "sha256-LjYTx1Xn2kJeRFiOZraoHmXVKUiVYksR9JfwqHcQO+o=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml/jackson#jackson-base/2.15.4": { + "pom": "sha256-dOOtPAiqNxApnzWCU44H7YxQJsPBKLZqYYl2PXTljIg=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.2": { + "pom": "sha256-Hq1jAlXEiMUbXgq1YMdsI3GtJq422t8JKcUmVy6ls4s=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.4": { + "pom": "sha256-bMLZJfyt9c0iUlTL9OSni7mvkZTQGHF3M9WYRh41/Zg=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.15.4": { + "jar": "sha256-8gTrvVUmFKIrhTH/41DUf4/ULEW7YFF8B5dNwnpaHdM=", + "module": "sha256-IEXd1K3wouVsBUAiBVyUn3xyKqBJhtg0HpbVwQb932I=", + "pom": "sha256-fV1brPhSbkv/LtX+zBk+SgPaKaKbWxssfqYiDdoAZ/U=" + }, + "com/fasterxml/jackson/core#jackson-core/2.15.4": { + "jar": "sha256-jckhDdKF2zZvRfUY3R5qnM/rDxqOGEqJn+ltKe3x/ZQ=", + "module": "sha256-G8EfZVih8qFaFvjR5+Grp6aKLu0aIzemhlniAW0oWM8=", + "pom": "sha256-c+IQW4TXUa6yDR85+StaU7M2IR7Jq+gjRSVTVfBXWhI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.15.4": { + "jar": "sha256-D5n/dxnu8+6FYIs97m7PPGmAA/6dbjTqu/q8zcm1rCw=", + "module": "sha256-RHAqK/3Ro7KScRuTVikdsF35YdGAVVhJ0sv2DrnMsQE=", + "pom": "sha256-DOjRi5CswPz/3dowyl2pPqRFCydtBm2eMCnAOwknBaQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.15.4": { + "jar": "sha256-mkY6yM51+iDEwWNl9qceqICLvE7KNzbjFWZ80x4bVJw=", + "module": "sha256-ST1lmAcoS58VliOHPt06guPK4uuyeV2V6zXhZPI4wiU=", + "pom": "sha256-5ONWD32KBjSF2ZwBEAP96KtBCFf9v4nNAaqUFunv1rM=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.4": { + "pom": "sha256-nc/Zaw46obazYDPnutgd8uodEExbDzsLLMjmHCSRw0c=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.15.4": { + "jar": "sha256-PvudVbYvUOZLEf4AYlgAKF/vh4Fza4C9IGZ3+1YECqw=", + "module": "sha256-r2tfmedOojijTzz7hRFwtDRtKTQQfqJXKs+UHl0Bzw4=", + "pom": "sha256-oYMOic9GPr6Nz9tzoEDwh8LNUO4F3H6bqRkSP+ckGbE=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.4": { + "jar": "sha256-RySYy7onJgEv+C+G/I/u+Vk2Y72hppWhfbgEpj+nM/8=", + "module": "sha256-7fQDOV9KMvjdq3CDS0mTNmkuFJQPK7nXELYufS3Dtn8=", + "pom": "sha256-u28bhQeGliTlTBoh0Bip5Lf06nX/zMcx599Ky2coxbE=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.15.4": { + "jar": "sha256-piDuEfid6ubizmzVpk2fLRSAvwi0XsLwcwvd+Rd/N/w=", + "module": "sha256-4sXPiLCT5prpdqWxJH7JB47YxmySoe/r6sRSPP5r3jE=", + "pom": "sha256-Os249wu/1EeTNai3Dy6EyYGUBlJR+VEYpKvrX47C4Pc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.15.4": { + "pom": "sha256-OxSBaCFhP/9ZoNDHqEboIXxB78xQXYtjlqUMDJEamsw=" + }, + "com/fathzer#javaluator/3.0.3": { + "jar": "sha256-Q/0dt7ItMw5TwNI32BwfTb+gyeE/wUThwxQCDcS2eCs=", + "pom": "sha256-LJV70AFI9vLH9xNp15+7wVojSF5SFdD+2yPV9XOjbDk=" + }, + "com/fathzer#parent-pom/1.0.3": { + "pom": "sha256-bGRS0s8XtqB7GJxI6UdeHQHIEvXnhG3rkkHnRhAcjzo=" + }, + "com/formdev#flatlaf/1.0": { + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" + }, + "com/github/vladimir-bukhtoyarov#bucket4j-core/7.6.0": { + "jar": "sha256-0XMQ4gZuWcBAT2GuXaGkD/lEKvoxNjqCvdwaTmJT/Yg=", + "pom": "sha256-OVtCWprjmQpylVV9ImeBPtDfUm7fQ/iO+xinuBt2Eq8=" + }, + "com/google/zxing#core/3.5.3": { + "jar": "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=", + "pom": "sha256-2KEui/aQVOKt0j15U0FOrv3azskwFAqNFE0frJ5it98=" + }, + "com/google/zxing#zxing-parent/3.5.3": { + "pom": "sha256-W7ilpDmBxNwQl6QUy/tMHUvP5C9yLSOgA8RdixuNTe8=" + }, + "com/h2database#h2/2.1.214": { + "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", + "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" + }, + "com/jayway/jsonpath#json-path/2.9.0": { + "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=", + "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=", + "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8=" + }, + "com/jgoodies#forms/1.2.1": { + "pom": "sha256-Rya6hKIwmKG9F6/xHe6waTOPmywM/X/Xuv4wZYCZsII=" + }, + "com/jgoodies#jgoodies-common/1.7.0": { + "pom": "sha256-MuhZojXD4ip33Q/Xzs9IaIBn2NjLxiGRfC7YBAmMUIY=" + }, + "com/jgoodies#jgoodies-looks/2.5.2": { + "pom": "sha256-ktKprZrAxUXdthqzVSvh1f0w3uG/tMaWEVl2MfPGSMk=" + }, + "com/martiansoftware#jsap/2.1": { + "jar": "sha256-MxdG+mLPvDNoJgxaLmYJNq0RvmEjCMEgoEThIDYdR04=", + "pom": "sha256-ms9WqFecBb7dgZ2ZIyNj4r8yfo9zxnWY29mIWoRaPGk=" + }, + "com/nimbusds#content-type/2.2": { + "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=", + "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs=" + }, + "com/nimbusds#lang-tag/1.7": { + "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", + "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" + }, + "com/nimbusds#nimbus-jose-jwt/9.24.4": { + "jar": "sha256-jViWMHIqTFY0kkhlJHf9qk4w35xzLE1urC8nFDckYwQ=", + "pom": "sha256-rEz2OglJyeyy+E23KZ+R2/8aEdLYbJT6xGdgtmfhXKE=" + }, + "com/nimbusds#oauth2-oidc-sdk/9.43.3": { + "jar": "sha256-YhaW4PEaGTvR8qUcvk977FxYLWRyfYlqSL8RZmLwSAs=", + "pom": "sha256-g3cIDcQCNyiNynUqBynnqNxeNodhdSRg7hcs3FwFnVE=" + }, + "com/opencsv#opencsv/5.9": { + "jar": "sha256-ICOWm4bOlorYrlSWSKxYfRQcGa5oSppcZ8kQXzerDRw=", + "pom": "sha256-l+UC78Xmwt0VZiGynKy8D0dEIowAmPaxafV/eukwMGA=" + }, + "com/oracle/database/jdbc#ojdbc-bom/21.9.0.0": { + "pom": "sha256-YWOUxaVc9n/ygO1pdup/MxarCdRMDin6ILZqyykKyaU=" + }, + "com/querydsl#querydsl-bom/5.0.0": { + "pom": "sha256-M9iKwC/Iwb2sEp3BGP/aOxf+lr9c+DVB3cAUoptiexs=" + }, + "com/squareup/okhttp3#okhttp-bom/4.10.0": { + "module": "sha256-NLNP75zu3d2ihMXxVoc4lg0qU9VuHvz/jK6tPmZSpcM=", + "pom": "sha256-vmLpNvEMNmU+XpGVrwBVq4bMugi4/sKo773exKzu71g=" + }, + "com/squareup/okhttp3#okhttp-bom/4.12.0": { + "module": "sha256-fg4vNHsbY22SsEMZnlFAPhXwn7SsRujBY1UaWCt7Brw=", + "pom": "sha256-eAg47mfyoe5YCIfeinSOWyWfnoFULhxCRNUEJlmSLhQ=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.5": { + "pom": "sha256-vDnKsUxxStmKeyoG96ybM3bgeVVCaa03KhfXEd9Yp6E=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.5": { + "pom": "sha256-xrVu/pzFnzx4NT0oTFXo3PFivoX4IrJs+BAjxvkI9/c=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.5": { + "pom": "sha256-/nf5B+HRRTqtaa92NX6tEKXkkzyKkI9XqZ2ncTBw00A=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { + "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.15": { + "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4=" + }, + "com/thoughtworks/xstream#xstream/1.4.15": { + "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY=" + }, + "com/twelvemonkeys#twelvemonkeys/3.10.1": { + "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + }, + "com/twelvemonkeys/common#common-image/3.10.1": { + "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", + "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + }, + "com/twelvemonkeys/common#common-io/3.10.1": { + "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", + "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + }, + "com/twelvemonkeys/common#common-lang/3.10.1": { + "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", + "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + }, + "com/twelvemonkeys/common#common/3.10.1": { + "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + }, + "com/twelvemonkeys/imageio#imageio-batik/3.10.1": { + "jar": "sha256-38a0g10xkrBfILqFt3b1XnjszN/PoSYLaFcDr5Ugfxc=", + "pom": "sha256-s0PhynnsDrM2ompLPbeGefmxA5Bz1/IkCYTEsNfy9jg=" + }, + "com/twelvemonkeys/imageio#imageio-bmp/3.10.1": { + "jar": "sha256-ICwyjVx+D1vWjyphRGhiT/H7GbteGvrA9xNIEiFGYtM=", + "pom": "sha256-G65QtRvRcMNXUkLf6mGM0F/jNdzhoP9bFij5YfO6oZY=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.10.1": { + "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", + "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + }, + "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { + "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", + "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { + "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", + "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.10.1": { + "jar": "sha256-2UTAU2SRfeSmveUJutzsgGxk0WNoIKjCTaJTjV2lDkA=", + "pom": "sha256-IhuryGIeZx1bb0Koes993F5waA+ctQMg+6NidvC1L44=" + }, + "com/twelvemonkeys/imageio#imageio-webp/3.10.1": { + "jar": "sha256-DTMvXYB2vQ419nG4UvK/txYMPX1gfv2yHTZRV5OP+54=", + "pom": "sha256-W0OaTVQ99Llxhc7agNSw0ewtKT4uRaTUzcy+/KzlArM=" + }, + "com/twelvemonkeys/imageio#imageio/3.10.1": { + "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + }, + "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { + "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", + "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8=" + }, + "com/zaxxer#HikariCP/5.0.1": { + "jar": "sha256-JtSSOX5ndbQpZzeokZvwQEev5YJ/3SwItFV1lUNrOis=", + "pom": "sha256-xHNfXT/2ylsyI0Xofw3diA9XkNiLzle6/hqfn8eeAq4=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.0.4": { + "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", + "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" + }, + "commons-logging#commons-logging/1.2": { + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/dropwizard/metrics#metrics-bom/4.2.19": { + "pom": "sha256-+G9/Vev/HwNOTVHbypTh18FykokM79GdBDDugjrFxDo=" + }, + "io/dropwizard/metrics#metrics-bom/4.2.25": { + "pom": "sha256-glrTe4OA+ZK1FQULvZVFL4VGb+rnuFbVwVDU5fcWqOk=" + }, + "io/dropwizard/metrics#metrics-parent/4.2.19": { + "pom": "sha256-lm7hDMMMk2UClsipjkFs11IpEj1WItPcHqV+UgjVgLY=" + }, + "io/dropwizard/metrics#metrics-parent/4.2.25": { + "pom": "sha256-33tjcfmxVpjhI9mGHyCZyjLJ7JZtnwxgdVoqNMy/q8I=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/pixee#java-security-toolkit/1.1.3": { + "jar": "sha256-eZW1qPrE0aZasCh5AHYWBOa7G+OOsoX0FdCR6PKLAFY=", + "module": "sha256-72CmAQlWmBzCsbpfl1BtbRr5vHdnfOxZfbNgVGypBi8=", + "pom": "sha256-REGk9EmIQBEsrcsUKSL5HqIrKzTgRWPwnemk4K6sdv4=" + }, + "io/micrometer#micrometer-bom/1.11.2": { + "pom": "sha256-2qo2vb6vKmnTVi6A92D+f4bU02uUGsBbqhjPpGtkvhA=" + }, + "io/micrometer#micrometer-bom/1.12.4": { + "pom": "sha256-5db0qM57qkrlKtZ8hWlFcfr2XaUC9LYiKm2guglgJc0=" + }, + "io/micrometer#micrometer-commons/1.12.4": { + "jar": "sha256-YuRvO0biNOOPgzPPPjpf9U0KnzyokOS5dzZ00YDDaRQ=", + "pom": "sha256-TVSeACNoTzcRH5XKktaz2YI69rZasC5XxYy7hCwjgIs=" + }, + "io/micrometer#micrometer-core/1.12.4": { + "jar": "sha256-whV432b5MDFUqiTuuC6o5rLC/RmFCGa0y+UdyWkKJAE=", + "pom": "sha256-vB3kn7iQlw0VQrspDUTFPGJmVYxcyKn135IYcZjtT6c=" + }, + "io/micrometer#micrometer-jakarta9/1.12.4": { + "jar": "sha256-bfoEnUZuA5VwR+/LLAoYFWJorrydU0aQ48xam1RUMi4=", + "pom": "sha256-V02QPoQColDwQf8VUkxV3ATFCVluXFWY7MM//8FXu08=" + }, + "io/micrometer#micrometer-observation/1.12.4": { + "jar": "sha256-UaZwuzPPl5vKSbRjkb10TDpOI2mdCjBcITTvDQGpEPM=", + "pom": "sha256-xkVXuEggDQwjmPCzq65IIMIjI+j0dO06kbAYUAEpXjg=" + }, + "io/micrometer#micrometer-tracing-bom/1.1.3": { + "pom": "sha256-fprbb3oR0grb8tb/f7NMCJ9FGvQdM7uRjr17kcXszJk=" + }, + "io/micrometer#micrometer-tracing-bom/1.2.4": { + "pom": "sha256-57ZJO5fCoBH3POtaRdSCHXk4aLp5dN5kdcdddlj9iMc=" + }, + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" + }, + "io/netty#netty-bom/4.1.94.Final": { + "pom": "sha256-FLsEPt93HvaT1f9ezBRm913JFpjwSn+oIrMJPT0COdE=" + }, + "io/netty#netty-bom/4.1.97.Final": { + "pom": "sha256-eDs+5JRlAO5batDkP81p1/KbiPcknMkTPDn1PQGhUgA=" + }, + "io/opentelemetry#opentelemetry-bom/1.25.0": { + "module": "sha256-RHe55WRW2h7ZM64ig4bOAbusBl2bVLSZ7cKI4rumzLk=", + "pom": "sha256-VsipemuNS6DjaRVWdCMISrVTq++a+XTaGTXcIeXjCR8=" + }, + "io/opentelemetry#opentelemetry-bom/1.31.0": { + "module": "sha256-LeU7hvtjWgl0WtgKGg+yFZSCKjHuN605YQwM/QAiE6E=", + "pom": "sha256-EAmW9IHDQxgozgeqeBIPyyOLdLzW9FibCDVqRXCLf+A=" + }, + "io/projectreactor#reactor-bom/2022.0.9": { + "module": "sha256-BfI8ABvRI1lpnqe+Y6bRi03YWoqRZ/PxehkRrwI9t7k=", + "pom": "sha256-agI/PfE5yap6gWUR1YSSnd0PXrhIeb+i46VRTFsXYJI=" + }, + "io/projectreactor#reactor-bom/2023.0.4": { + "module": "sha256-g7dS+AbTfh8yxIr2ZuFMDIW8D0taUAFkciD1drxSoLI=", + "pom": "sha256-jvedycp5GYn9t/4aIgnOVmg70kzzX1OPSQgQFvuIhEE=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient_bom/0.16.0": { + "pom": "sha256-r0QdMpXeEacONf6+s9kZui7RdVJ1MWMyW5VNU1lNVcM=" + }, + "io/rest-assured#rest-assured-bom/5.3.1": { + "pom": "sha256-Tg5ZUuRY6U+3dZ3nFM6hy9ru/ZFSJ4Z1if6R1EKJBUg=" + }, + "io/rest-assured#rest-assured-bom/5.3.2": { + "pom": "sha256-zMdatMCunjb9B+ZfKP+dGWv1oY3jVldWdk8VpYz5X3g=" + }, + "io/rsocket#rsocket-bom/1.1.3": { + "pom": "sha256-5czY/tNBW7Q4Xk0Hh+PjNiTLLHwALSVQw5eI8rubD64=" + }, + "io/smallrye#jandex-parent/3.1.2": { + "pom": "sha256-fkYFO0xKyz2eo+8LDLLRqWvriSRanlsriuSEzXX4Its=" + }, + "io/smallrye#jandex/3.1.2": { + "jar": "sha256-3uEvoXh9VSPtGgLWxjsZ5672rFYPfG1wWV2wGqN+BB4=", + "pom": "sha256-HFK+SK0hc8V9n7gVhdW/WriGO1jz8sd6/zIL7zINP7o=" + }, + "io/smallrye#smallrye-build-parent/39": { + "pom": "sha256-NtHAKKxxhuPvCc0h603rb8RGdU0Mubl6NVGkwePGzwI=" + }, + "io/swagger/core/v3#swagger-annotations-jakarta/2.2.15": { + "jar": "sha256-2RvQjd92HA2zTvao4Ftf4/7cJrt2h4ti/aEwJLhP7Qw=", + "pom": "sha256-O0+45xZK8IyJMqLESv5jv2Hgc+oF/64iHNxCs3izL68=" + }, + "io/swagger/core/v3#swagger-core-jakarta/2.2.15": { + "jar": "sha256-P+NWP4qRp84f60pqgVlN3PcJHNtPMJ6tjaNPNbezY+Q=", + "pom": "sha256-KqQIInyuhFI7Ey892SGRZA4Hh7gNvMCvshm9qYEV+6A=" + }, + "io/swagger/core/v3#swagger-models-jakarta/2.2.15": { + "jar": "sha256-nsdvb7bqw4X3wJGU9aOGTXb6qDyvtBLcciaZcIvIXeo=", + "pom": "sha256-lYxl0r9XBqnmkVQ7CLl34MMBQfzFzEHuEYlflZ3WJqg=" + }, + "io/swagger/core/v3#swagger-project-jakarta/2.2.15": { + "pom": "sha256-DuEGCUZxQIy4MPJj6NidCVKzXT8oiqY6Mh6CtA9Uugg=" + }, + "io/zipkin/brave#brave-bom/5.15.1": { + "pom": "sha256-HX6AYLG4a9DsxU3Hv99gp9bgAHYaTL0zLCry1W9vvZs=" + }, + "io/zipkin/brave#brave-bom/5.16.0": { + "pom": "sha256-vatLPlSHv9jhec+ipE71zoJLrMQqstaQs4SbIsZ67Gc=" + }, + "io/zipkin/reporter2#zipkin-reporter-bom/2.16.3": { + "pom": "sha256-3hWmaeME4kB8d2agw6vuCKTsAf+JOoBJoJFo5kPFpvw=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/persistence#jakarta.persistence-api/3.1.0": { + "jar": "sha256-R1OJRG01xvRsVlcot1bcUIwoRkTqJpBkTg2OfjOdQv0=", + "pom": "sha256-+Hb8jYhnM1QPWYFat3sbmYvuxwgAMt+xUmyt5GzuzL0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/transaction#jakarta.transaction-api/2.0.1": { + "jar": "sha256-UMCnx2DBOubAQqzxgrKPAEdBPblbRjb7iHm8/6tbqHU=", + "pom": "sha256-X+NJmBwVb7viY4jVmUn9rBa7jXh57mGzTEnHtc4PLyM=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "jakarta/websocket#jakarta.websocket-all/2.1.1": { + "pom": "sha256-J9vJgkpicx4a2/XKfTEkJS+MAjPlVs7aiACjDNGPO7U=" + }, + "jakarta/websocket#jakarta.websocket-api/2.1.1": { + "jar": "sha256-vq25LCbQTaZT9tLbJTK1Sbeg2+WcbiLCPlW9A2F/ASA=", + "pom": "sha256-3xb6ydroxTIAIOJWDJUBbENAFYK5eFyIE8Sv33At610=" + }, + "jakarta/websocket#jakarta.websocket-client-api/2.1.1": { + "jar": "sha256-6P6MHf+Ug4WkYdvIXexUZ8vjUPBl7BoPO/7VO3nnsQI=", + "pom": "sha256-OC2FVbzLdeOu+epfSndOuByFpSs2SlKdkyah59L0jdo=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.12": { + "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", + "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.12": { + "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + }, + "net/bytebuddy#byte-buddy/1.14.12": { + "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", + "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + }, + "net/java/abeille#abeille/3.0": { + "pom": "sha256-tV3TFjYwhIkWkPnb0dHwbJWcRbJaYOBWjqkVSDplZH8=" + }, + "net/minidev#accessors-smart/2.5.0": { + "jar": "sha256-EjFPxogdZqQT/WY3B4etuhblBPv34ThpCw85UuP70yE=", + "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc=" + }, + "net/minidev#json-smart/2.5.0": { + "jar": "sha256-QyueVFhIxBQbgHF7JuNn+DvzPxklCiKM512m6WfaK8c=", + "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY=" + }, + "net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "net/sf/launch4j#launch4j/3.50/workdir-linux64": { + "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/ant#ant-launcher/1.10.9": { + "pom": "sha256-Ek3lb+ph22wNtJwHnR62XUiWwaxNEf8mVXvjaePb6ls=" + }, + "org/apache/ant#ant-parent/1.10.9": { + "pom": "sha256-ytRkDglENOlwQa4RFy0QmA7AQpmERWC/Z+Rje+hFC5Y=" + }, + "org/apache/ant#ant/1.10.9": { + "pom": "sha256-tidgF89vKge3t7YneDMyN8pzQF/MOvHKnZX1L5f7eeE=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-lang3/3.13.0": { + "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", + "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/groovy#groovy-bom/4.0.13": { + "module": "sha256-UMvUHEPhbMJKIJ7i2pNdeV1rN8VnNQlmtJJusxQwM6M=", + "pom": "sha256-M5j/NPIIMkDWY0erSnMzudi3nTqVrN8vz03DAn2B5qs=" + }, + "org/apache/groovy#groovy-bom/4.0.20": { + "module": "sha256-+HZJydeO91O7YLIw6bLPXDf5tlB9pLVmGuf+3NLmu8k=", + "pom": "sha256-VB0owxBiqdn/BwrqS9XRmSIQQijrho7qjabmkfJtPnQ=" + }, + "org/apache/logging#logging-parent/10.1.1": { + "pom": "sha256-NO01x8rCVD9sSDtIvT0B+rFcApjUXUoFkuJ1kZhiH7I=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.21.1": { + "jar": "sha256-HbSOGAiBvvHetQICIAagJaJI2PaiYYZ4mwx85IfGAtY=", + "pom": "sha256-reMKNdCtO0t0ts+8Sfx3+Uy0B+EAKZ377e4nJVPcvpg=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-bom/2.21.1": { + "pom": "sha256-Rv6OpW5KSk5E+fU8/0J/T1UL7y7WGyP6WR2DpeOVBjc=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.21.1": { + "jar": "sha256-3hQ8Vluniw8sC+WPEyx67HXm4aEIRevaWk8XwqNdmZA=", + "pom": "sha256-H+pgZBIKmcgZUvNVxYE1e2wSxxzA/RmmEFY4Y+j5/CE=" + }, + "org/apache/logging/log4j#log4j/2.21.1": { + "pom": "sha256-PFbCFYVfPiXOPPWi2Kgmmk8aPV8JjaAYfM3T8GxskjI=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/apache/pdfbox#xmpbox/3.0.2": { + "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", + "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + }, + "org/apache/tomcat/embed#tomcat-embed-el/10.1.19": { + "jar": "sha256-rNG5rYxgxyyZte0B0+9nR/hb5sUbWwRaNlaG3oib+uQ=", + "pom": "sha256-Za4PdNUBiVQs7BOlb5XEcoFf1jm7SbETbPUIFh0CMiw=" + }, + "org/apache/xmlgraphics#batik-all/1.17": { + "jar": "sha256-F0thbZPqTauabQwjwatfFGEjwO4lNAh5MWB/nuElMZE=", + "pom": "sha256-V3JwMcCaBTM5LTiyi4DfzJvMdZC8ZPd1Lj0hgX7sAHc=" + }, + "org/apache/xmlgraphics#batik/1.17": { + "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + }, + "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { + "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", + "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/aspectj#aspectjweaver/1.9.21": { + "jar": "sha256-zDOX2dOhFIlHVvxnd5lB9fBLBuMuQaqUCFZMZxoVBLo=", + "pom": "sha256-Vhn7SZr9b1S5HpVum9/iIi8STjpgdx80OH1vZ3SUelw=" + }, + "org/assertj#assertj-bom/3.24.2": { + "pom": "sha256-EqxGrmTTYl80S79kKrVvoC4Vuu/lPvX1sGHhJLSEYgA=" + }, + "org/assertj#assertj-build/3.24.2": { + "pom": "sha256-1/yMSqgAWDsmxGfrD67eCvXnynkMS+TU0jVDFYPSbq0=" + }, + "org/assertj#assertj-core/3.24.2": { + "jar": "sha256-3z0LNI8f6Aa93csQ+krmPGZ56YiNS8cFXwmEhReXaqM=", + "pom": "sha256-f7mxojdOtQ7SubWYRcaScxEeoYOaQpj5QAqA4rLFyA4=" + }, + "org/assertj#assertj-parent/3.24.2": { + "pom": "sha256-DFAETrW96ehEI7yhOv9dX0PTdSqzxj9zva5p/EqxoKw=" + }, + "org/attoparser#attoparser/2.0.7.RELEASE": { + "jar": "sha256-dd0cBFSSv/jhljqrsov+kDwgZOEeJ/4vDwr/GtPYRHY=", + "pom": "sha256-sJ04k7/zYJkkXdPBnELIDdzLGAukcvlMGqti8A41vgg=" + }, + "org/awaitility#awaitility-parent/4.2.0": { + "pom": "sha256-LasXIPpF4j2gj3qKOxw8Tbo2oM/xMJALiOZYlxJ1y0U=" + }, + "org/awaitility#awaitility/4.2.0": { + "jar": "sha256-LSO3khH90ZA29pQMx4NUN3kyCq+G841uOFov8m2kEnI=", + "pom": "sha256-O9OMaPy2lPb+4pu1BCyWv209RqN9EyKU+HxivWs4ITo=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.77": { + "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", + "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.77": { + "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", + "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + }, + "org/codehaus/groovy#groovy-bom/3.0.19": { + "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE=" + }, + "org/commonmark#commonmark-ext-gfm-tables/0.22.0": { + "jar": "sha256-yb02kBoKZ/DdTPhOiPizdps1klrE8rypEik29yCRXLI=", + "pom": "sha256-FDGltPkhvIXyNR1/GuvN14Og7zxStFiGifqZ1Pyx7ns=" + }, + "org/commonmark#commonmark-parent/0.22.0": { + "pom": "sha256-YwxW0a89ryKEl8dsNWN0lSk9MDngyffFhJQIzlTuzdc=" + }, + "org/commonmark#commonmark/0.22.0": { + "jar": "sha256-NBeQnymXvIxh2Q1kxq8p9KP1tnKcrOrvlyIc6sk9+BQ=", + "pom": "sha256-jQUuO3manv/Yu+1TTDV98402HbOAxBCVB26Bj5h6sRQ=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-alpn-client/12.0.7": { + "jar": "sha256-YxdWV8ebpXlOZNZrhLePSD07SNZ5PyGFJ3+HFD0khKQ=", + "pom": "sha256-8Af80vHeqJfKKzDGBYaAEaNxlrMzx+xLrPFFBlEuOXc=" + }, + "org/eclipse/jetty#jetty-alpn/12.0.7": { + "pom": "sha256-+taXYU5Y0g/gS/WhYVh/ugFRo4TNHg/wi1uNJynIal4=" + }, + "org/eclipse/jetty#jetty-bom/11.0.15": { + "pom": "sha256-+ksNDeuvyR9Q++wI7+RkInAzTzeOg562o1+jdqoaLPg=" + }, + "org/eclipse/jetty#jetty-bom/12.0.7": { + "pom": "sha256-Tmywx2r+TZYMlnxr+27cy9Or02XwenkDKSMTDcClu9c=" + }, + "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": { + "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU=" + }, + "org/eclipse/jetty#jetty-client/12.0.7": { + "jar": "sha256-kRKisrw635zWQLQ9fSA46BWk3rvG/ZPiZuouK4G/vXM=", + "pom": "sha256-njK8Q0z4JHlF+OOQ21aeK1zRHXsTUeeB2h6DLPCCkGY=" + }, + "org/eclipse/jetty#jetty-core/12.0.7": { + "pom": "sha256-VVn/wpuShKsdqAs4jZw5kYw7lpXJIaTCwNVGWCrtTX0=" + }, + "org/eclipse/jetty#jetty-http/12.0.7": { + "jar": "sha256-uhczUMrRZYFufIrFyzcwqJV2PBCGNwGE90mkbEJkJ8w=", + "pom": "sha256-44BTqnBsi2HvGpZccB2/Uuu2WpeXcBkBlE8Ye3rbqz4=" + }, + "org/eclipse/jetty#jetty-io/12.0.7": { + "jar": "sha256-AvScx82lsGMrsRSb7akttQ/WE6JR4cjvBvQLlOjPio8=", + "pom": "sha256-EBF7Ih+DdMuLdyonoZ2kJ1V7iBf/ghEGrhcb3w+G/qU=" + }, + "org/eclipse/jetty#jetty-jndi/12.0.7": { + "jar": "sha256-/k7+Xt9q58mrRwndO8rpohReCVt1JvVRHrhAuAAjE5E=", + "pom": "sha256-3w7T96MgcxKXq44zlYFFAkS1TGvr2MMuRMXFAuGk04E=" + }, + "org/eclipse/jetty#jetty-plus/12.0.7": { + "jar": "sha256-nWKF154Wj88s7vrKDht8LOa1g5Q0HespP0el4BHMAfM=", + "pom": "sha256-XW+UR7cjLpqkrO5xDZAZ1YRNZUUoyHBx2iiVYB3ukgo=" + }, + "org/eclipse/jetty#jetty-project/12.0.7": { + "pom": "sha256-kY4GfPOIuVqLydGaK2Z5hxsoKa1/NLKyANeBrIpMrO8=" + }, + "org/eclipse/jetty#jetty-security/12.0.7": { + "jar": "sha256-Pa5/oMtzr1HhZ4gaQZdxBsi3RA2tfc79aKTtIdrjI0Y=", + "pom": "sha256-FpML7sOGfmKw2WTClbruIqXROKl6s9q6M9nUsObNZeA=" + }, + "org/eclipse/jetty#jetty-server/12.0.7": { + "jar": "sha256-hL5nXqZc2SEg566w7Uwz1lmZYFgYvYvEp5PKXY0uH3U=", + "pom": "sha256-RPrL4EpUuWksw9O2XSyiS2k18L2sPYCUvf2EljoXHpo=" + }, + "org/eclipse/jetty#jetty-session/12.0.7": { + "jar": "sha256-mcBZ9+WyQjpnQU4ZZEjD0FSoFjEJwJomTYdyhiP1Bf4=", + "pom": "sha256-VtoU55R8i4AucsMfcbiGpCe4sbufC2unszmofs5Hbj0=" + }, + "org/eclipse/jetty#jetty-util/12.0.7": { + "jar": "sha256-kwZqCVyspBBunz+ibDiN4fotLFVLmFmwRdjRqThjgXU=", + "pom": "sha256-ZzfyxZ8l8kOFIV4Z0f7Lzx/BRa2gRDK2CWTwA4Rejq8=" + }, + "org/eclipse/jetty#jetty-xml/12.0.7": { + "jar": "sha256-9vBsQiYbN52/V8CDiv7uLNg8adUHv76PwJbDrqLDIOQ=", + "pom": "sha256-QrxwoV9AG21CQQ+Pd1pI0XHRsYgUNDl/ppOOsK2O3YE=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.7": { + "jar": "sha256-4knkXT8UO9lH5tjnARbxJXt8Sy6wBTmDi1ZqndW8IF8=", + "pom": "sha256-OzT6LlWYLG68GSbDm8I87NELyLVuLE20T/w34TKWS2E=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.7": { + "pom": "sha256-hDBz9n7+k+EFLf7pjsECp9joYoKrUONpzMUEXzjhzd4=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.7": { + "jar": "sha256-E8NvjbRMI4D6XVkJgK1ky0avcO+WBI27YmQGx1QbPsQ=", + "pom": "sha256-gwEntcRmmqbiO7ch/N8XesiwihvFNue23kGvDpND46o=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.7": { + "jar": "sha256-natemJ6UaAq2azI96FpZJj0brLAA0qU8E6ivpWu4hcU=", + "pom": "sha256-JIoarzkdwzsZwFkvUKsnh0vC7NVWMSuhm19xpB9LKdM=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.7": { + "jar": "sha256-bOAryXT0xsKG1xA/avO2XhpRVyydl1un1aL6KHhAx8g=", + "pom": "sha256-vspY2FwraSssjKYyxnS9eaGAu/M+I5M0dQHI0QLEtFs=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.7": { + "jar": "sha256-y1KdrBSR+OfqceW3Sfz1ntlSldjBji9x51Htl6H0kMc=", + "pom": "sha256-ABmnbrthJAQGUphZCJ72a3OZ+fC7jxZQMqKAHxMTxzY=" + }, + "org/eclipse/jetty/ee10#jetty-ee10/12.0.7": { + "pom": "sha256-1FrfFrxnSVbeZxXd/dTNg/yJ8kx2IXGZI0/qsJdqClY=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.7": { + "jar": "sha256-vQoBjfy0yw2UZOpZ6ke5JVi5KKauDAWEqacv9LDaDeQ=", + "pom": "sha256-HE2aGex6gj6kY8r0FMWQdZxRzOoYeDbNtCXGjbAlbvA=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.7": { + "jar": "sha256-yBfr3NxzDFDA5s9BpfDoj0GCTewjBRBi3E01HnxMTNQ=", + "pom": "sha256-mqBhmkUImpBIkT148Fvt/pjbd27Z6TqdY1+rNEv99sU=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.7": { + "jar": "sha256-A19hqfAVgm1o87Zweka/SYoFx4y5Q/8Iaz0QUoy3z1o=", + "pom": "sha256-o6pdb2eL+pnC6L1Q5lgNLi4oamIfFTsZvc0q2+OKfDM=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.7": { + "jar": "sha256-Ts74xCOob76QsDmFBcHZD8TKwM9g3VIuMQ7JJ1fsG18=", + "pom": "sha256-zE5zAM1radv2kWPRXEENPfKFxNGjKXDPS0HCl0/oaCk=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.7": { + "jar": "sha256-7WAYEdZrzIKYO0Sv4zAjMU8koCLPrGtVdt5Tlgwy3y4=", + "pom": "sha256-2nbRYHjEV5q8c8+dDABV/1VZ0JW3kq2dmhhfAKoq00E=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.7": { + "pom": "sha256-wtne5akTiixFGtAv+N5Yf+deZG+eqSfJJOmbHCJ7va0=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.7": { + "jar": "sha256-PISYNhMgHsu01x6Ndo6/EbvAIHhJG+HsX4XvzNkuTPY=", + "pom": "sha256-iEUsuxBfM0/j+yVIkOm7JjEYPINBhynK8AhepMY0l0M=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.7": { + "jar": "sha256-HeOZnr5cS0JRMiKFNDz0QlSGwap5GrA5lbKVioIsv4k=", + "pom": "sha256-0Uvg308AGBopUyXYQQLnUSqTR+SznWc2h2VZ8jBRqVM=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.7": { + "jar": "sha256-9+SmIFMyhCOztVPwR0ODrTBF7mpsYFOCfslWuX0YUs4=", + "pom": "sha256-F5mF9191dWvfcTbip499FxUiB5Req3DwC+jsid8AANg=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.7": { + "jar": "sha256-TW0eky1ao6ANk79hheVDrPs8cHRBtCaxRgYzDdd8Ync=", + "pom": "sha256-SJJEq2meLe5aymiuecB3UPaPJEX8kakVRwrl0IcOGP8=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.7": { + "jar": "sha256-lY3a0UIQBCTldkZxqRnPIdkYCg9E/yAI3hPqWfiNQs4=", + "pom": "sha256-ZXh1WuFEm4wghu1kVJ6OCP//SVRt/NyHtMUyTspySqg=" + }, + "org/eclipse/jetty/websocket#jetty-websocket/12.0.7": { + "pom": "sha256-wxv6MC9SZtQx2ifh1+vOP7tZ+SKtcquE6m0zCfIti7Y=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.3": { + "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.5": { + "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.5": { + "jar": "sha256-rT/ZvwDePtqYWfcLbPsBHi/pkEgE4WomZQkoiOzg/co=", + "pom": "sha256-S1OSE3b7/exg46j+8FjMPcmdn8o+nJUOhZKYeYRghXI=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.5": { + "jar": "sha256-SF2JQOdjc6fzAIFepVBL9bcmwjRCWtMJcQGdEzEkzKQ=", + "pom": "sha256-d8T6BuLZyVN2LC5jUXN3oa4oWbGBssEzdZy1poKojKA=" + }, + "org/glassfish/jaxb#txw2/4.0.5": { + "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=", + "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s=" + }, + "org/glassfish/jersey#jersey-bom/3.1.2": { + "pom": "sha256-WmsvkyguMAlcrhRpCiqrWpxTa1f/MuiQ6giu/4qEwT4=" + }, + "org/glassfish/jersey#jersey-bom/3.1.5": { + "pom": "sha256-WoMNet3GCaIEQueBfK+fbHts6yV/x/oO0Y8WHe+0SVc=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/hdrhistogram#HdrHistogram/2.1.12": { + "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", + "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + }, + "org/hibernate/common#hibernate-commons-annotations/6.0.6.Final": { + "jar": "sha256-zZdOCoSB+v26+bSg8Iu1pslpsDZUgnY+7fd+b9f0k7c=", + "module": "sha256-WvzxkaqDNZY3NlnlROW1BnQmwbF0Hg3jcc6+K6wYOLs=", + "pom": "sha256-hzhyRO2hjBgdDvEwH4zyeQ8HTO2LXrFl1qW9TtIH5MQ=" + }, + "org/hibernate/orm#hibernate-core/6.4.4.Final": { + "jar": "sha256-oTJLfIDIAIJsml10thsN52gUH5Z8KwgmUMt79GdVcKc=", + "pom": "sha256-nKbm1A5oAPDV5aofZGeX3Ex9AvoGZvzvX4JXj/7KpE0=" + }, + "org/infinispan#infinispan-bom/11.0.18.Final": { + "pom": "sha256-msM5qJN8P0WwSXPDuUiJJdnKGe/AZJVGJ0ml4LnPKSA=" + }, + "org/infinispan#infinispan-bom/14.0.12.Final": { + "pom": "sha256-morEX54P+bvW3iEsHdCHIrxPrmuhC/vN7zaL8jroDh4=" + }, + "org/infinispan#infinispan-bom/14.0.27.Final": { + "pom": "sha256-4xy7kAucGCozFn8D8vglBkmE7PFZgMMztPzun9r6oNM=" + }, + "org/infinispan#infinispan-build-configuration-parent/11.0.18.Final": { + "pom": "sha256-8cAOWfuORG8HEL3BcZ5hlS8nwWFK5HhFLC8AEQNTIq4=" + }, + "org/infinispan#infinispan-build-configuration-parent/14.0.12.Final": { + "pom": "sha256-WTir5k+BZwjr5C5mlla+UltuhfxMyAh3OkVqnp6ne6I=" + }, + "org/infinispan#infinispan-build-configuration-parent/14.0.27.Final": { + "pom": "sha256-5eKwoVo9nMBdz+Ju7CroBCpbey9GMwFXDQPFjMqZcFQ=" + }, + "org/jboss#jboss-parent/36": { + "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jboss/logging#jboss-logging/3.5.3.Final": { + "jar": "sha256-exGUYN4XQZWspBLf7VLKC77w7OJsLXQwG2Fyz630/1k=", + "pom": "sha256-GGFMhJXpXxL+1s8lR5syQwhTnRSUjmAoGLhH1Bld1Oo=" + }, + "org/jboss/logging#logging-parent/1.0.1.Final": { + "pom": "sha256-e2CEZRKTW9dYnba5e57G3W7zlUmesUEYULL00hDcDZM=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.8.22": { + "pom": "sha256-yNeU63YYiNNDaeZ33o6roLAfnop1bPv/UyFcz6XFjD8=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.23": { + "pom": "sha256-Gb8FhoXOaQ3AslVsVqux08SF+j4VXTXy08foBV+NeP8=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": { + "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.2": { + "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", + "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", + "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + }, + "org/junit/jupiter#junit-jupiter/5.10.2": { + "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", + "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", + "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/latencyutils#LatencyUtils/2.0.3": { + "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", + "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-bom/5.3.1": { + "pom": "sha256-F8lglCSkwzBWhOTlZS9VQRAyV1wafKPXhZZiEEafJTU=" + }, + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/mockito#mockito-core/5.7.0": { + "jar": "sha256-261edGZUkQoRpZ7LTQHjhGHz5dFhYWidwliNVVRDJSE=", + "pom": "sha256-eeZzpTX0jKN+6/dst6xMaZ1JRs7tbwgrBAxZNtRDAO8=" + }, + "org/mockito#mockito-junit-jupiter/5.7.0": { + "jar": "sha256-4kFqJgw6Rbp31nTP4n1JQo5X7+Iaey3ernM+u1xdhb8=", + "pom": "sha256-imEoqpHW4uT0Glxw6kEkfhgUnORgiDUbIFl6Y82qWZE=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.5": { + "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + }, + "org/ow2/asm#asm-bom/9.6": { + "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + }, + "org/ow2/asm#asm-commons/9.6": { + "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm/9.3": { + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/projectlombok#lombok/1.18.32": { + "jar": "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0=", + "pom": "sha256-kJG8bAW2lzNJ2beLe33Y3abrt0zJ6nTieSlg+1A0ipI=" + }, + "org/seleniumhq/selenium#selenium-bom/4.14.1": { + "pom": "sha256-lsHFVPuI0tI0gU1PEQAVtuSGzw5Ai96qnqWRnJYw71A=" + }, + "org/seleniumhq/selenium#selenium-bom/4.8.3": { + "pom": "sha256-VjKTeC4Y0PLA1r3M6+vjQUjw7LuSuBjbCLhAXtOuCB4=" + }, + "org/skyscreamer#jsonassert/1.5.1": { + "jar": "sha256-Hpp8RD0N1XmQZkbXZ/NwGRinjLiKkxEvUoMF/JCV0mE=", + "pom": "sha256-x07S0PFNq9SGOLgph7qMwFCZmEsFluBwbEzUXs/XgWc=" + }, + "org/slf4j#jul-to-slf4j/2.0.12": { + "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", + "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + }, + "org/slf4j#slf4j-api/2.0.12": { + "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", + "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + }, + "org/slf4j#slf4j-bom/2.0.12": { + "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springdoc#springdoc-openapi-starter-common/2.2.0": { + "jar": "sha256-zEr8QIcXzwP6tvVFrZZ1eDy6+D18h04LrnLLWPh2OG8=", + "pom": "sha256-ispBYN10vlujiirctgHGPFZ/ezLy1oY9/d2hkAX1yu0=" + }, + "org/springdoc#springdoc-openapi-starter-webmvc-api/2.2.0": { + "jar": "sha256-0LKlyYo07K2f0Mwo2mz5sH37yHeOJlMZAF0sSvI2+jI=", + "pom": "sha256-ZPUNQT5EKWrYbXRpe2WRlpLRoZ8kuR5yqDA25VQXKqo=" + }, + "org/springdoc#springdoc-openapi-starter-webmvc-ui/2.2.0": { + "jar": "sha256-2+lkQpxHn/vJKynrfLO8cRNuGzShifnOk0pxX2Uje9g=", + "pom": "sha256-Cv9w4vNuOl5Zgq2nnSbUxIiN4Umoiqya9fVdJ9ukizo=" + }, + "org/springdoc#springdoc-openapi/2.2.0": { + "pom": "sha256-Los3sS+E+doEZrqeLfbA2nneG1cyCSPFNW/oXbE0d2w=" + }, + "org/springframework#spring-aop/6.1.5": { + "jar": "sha256-HgPayw2pkpOO9ZfaqWJxBJku/LWiJPywuhB2H1YD23A=", + "module": "sha256-Gs+T81Rc9Igs7E2kdpv/gDvHItPOmE4V/EA/0SpoYKs=", + "pom": "sha256-BOtzUrc6yG0txf0phEh9zJhtK7Dkr2iTL8+5pv/3O5E=" + }, + "org/springframework#spring-aspects/6.1.5": { + "jar": "sha256-f+u/HH9IX9naYVtN/YPBJWQR3nXO5j86olIYQeLwIO0=", + "module": "sha256-CV0KNwdOWgR53RCLw8BXxU5fpgBjhsz7wE7d58GzjKA=", + "pom": "sha256-6pqt6vIWz9OTzoRU96wGbadbXo1n3BO752bCNnNkQt8=" + }, + "org/springframework#spring-beans/6.1.5": { + "jar": "sha256-vc9hA2KT/DR1Jy50O2JdZ54G0VK3gRNJUckHsYXw9fE=", + "module": "sha256-Xl8vA+zEAsSsmrvB/ai17XvXrqeQq+zPo/oIt0tYsZU=", + "pom": "sha256-Xabx7e45f/XlcfEevU74LTGwV8gz5eGDDCX+z2AtON8=" + }, + "org/springframework#spring-context/6.1.5": { + "jar": "sha256-j4XrCr4egPYqgx90vhNePLvgWHpRBBevdP3S476k7sc=", + "module": "sha256-Q/+/GUNAYNYvULfuQ9+Nm4z93wPTEqreWJJNwCUCr3Q=", + "pom": "sha256-ZUYqy97G8s3HsWRrV9Yqho+g9R16vfcfph1TO5piBzg=" + }, + "org/springframework#spring-core/6.1.5": { + "jar": "sha256-R22sKFCbP0fQteiVpjn6dawiGPB0ziFORIMqg2xGn34=", + "module": "sha256-9y0utFaZs5m96BcHjDofP9w1h88rIPVj+YRlFOcFd4k=", + "pom": "sha256-lAoGKQS46H9ZNzhcr59XLhFhI1MpGDX74aiTTkfgIvI=" + }, + "org/springframework#spring-expression/6.1.5": { + "jar": "sha256-Hze1DcrwkaQ7sQ2UYXj/9AgmdEl/2CFDgyeBXaFPf9A=", + "module": "sha256-BjxGmLzfA7yBy7p2C6QlORxmqCbr8oMV26qzaiDKXCU=", + "pom": "sha256-bGhL5Up+3D355xKaSvovDXHhPd15TGbDy8VFKRY7t4A=" + }, + "org/springframework#spring-framework-bom/5.3.29": { + "module": "sha256-pslWW9lncgrg50PCMmUst9yai4GAjvFDWv1/aJICE78=", + "pom": "sha256-Bald+izdhQdNkd3pYqk/KW2v3tf6l9Eu2+jQ/21hMys=" + }, + "org/springframework#spring-framework-bom/6.0.11": { + "module": "sha256-CV5xI53YkWkSRMjWvm19o05nC2UYaUeexdJBXZmrYZI=", + "pom": "sha256-SK3yYlH1WiPKJZbVBuBZEdmnZ3fm0CxSgMGhd4wUMGc=" + }, + "org/springframework#spring-framework-bom/6.1.5": { + "module": "sha256-7U7C7/BZdKQd6tLcvrGWx3zguWo0ASx1moJgekDyPkM=", + "pom": "sha256-yQDgm0NW62vBKuKjqnWvYyfM9k4xGSEtH6wUEs3j7RQ=" + }, + "org/springframework#spring-jcl/6.1.5": { + "jar": "sha256-xTVAQZ5IIkLIFdttaozYCvhaaoleODKbnZvWtGFlA+s=", + "module": "sha256-2cFwLKmfXbBVH0OfHVTdFTVFXp/mmorW8ITIcCuDufk=", + "pom": "sha256-zFNMIQNwPoP72KUfEIjB+IwxPFf8rBqVmbqUnYQrkuk=" + }, + "org/springframework#spring-jdbc/6.1.5": { + "jar": "sha256-EhoCQxcPwuz++fKlKfn9CbtGXZBeqg4pgjCOZFGTctU=", + "module": "sha256-EAKtC26LefaL7gxTpnG2f6mewMDp3ljqiBBUo0fR5x4=", + "pom": "sha256-bQmiCchhzxfOy+DlWfmFmSPPbmD0ifz4ozyMBwI9pJk=" + }, + "org/springframework#spring-orm/6.1.5": { + "jar": "sha256-1N5k8OxGyhSAsSDbVeuVOQSn5caNq7nf2WRrmh0qgso=", + "module": "sha256-NoB5v3YCe26jNlErhr+KuIuD7rWzG89K5Np2oAOnOTE=", + "pom": "sha256-bn/rmLIKcE49DTI04Jx4JnB69ptbX4tzvaArNtk5JDE=" + }, + "org/springframework#spring-test/6.1.5": { + "jar": "sha256-e1tYUlfSb4wr1dzN3MvFgAKK6sWS05CVBVEcbF7L9lc=", + "module": "sha256-3ZAJHhRe23LjjFnlg8qmqtJlPH/639b0iZ87T1aDOoc=", + "pom": "sha256-sU3+3yKLCJV+8ssDZaEMQQb3EdCvsSqJFrIL9vBRFD4=" + }, + "org/springframework#spring-tx/6.1.5": { + "jar": "sha256-u9Q3Y5H0yVCWD2vfTX3Px84cQDOWEEaKz6/dA2hdrUQ=", + "module": "sha256-MEDEuSz02m9hCZiuPn2iEIeE9BSIL0FqETnprzIYMJ8=", + "pom": "sha256-npsjXfHJoAKQF9jYdlrqT8SkAbKFlf9fWUedRBkUwiE=" + }, + "org/springframework#spring-web/6.1.5": { + "jar": "sha256-ufqr5wdENG3tLvi7eqj3LmN2IpSHiNAPxdHg8mR877I=", + "module": "sha256-zIS+644Hkn816yfX+yH5T6/vt7H3qFekxyBihh+mBpI=", + "pom": "sha256-+UyFgG1XKe4in7Y9xLIg4YAFpX6cJx2H+zuBE7DsZps=" + }, + "org/springframework#spring-webmvc/6.1.5": { + "jar": "sha256-9PvgwzbUxrM52EwmQYQoo0xeVAgyHaTlqwpXg7F5MiU=", + "module": "sha256-0w+TeO861HHMiUU9EpE0cjx0XAde+EHOoZx/JIxCN5s=", + "pom": "sha256-WGBut3Pi52sXgk130Nv/ow+JjtEM6WUaanNEdkVIT4E=" + }, + "org/springframework/amqp#spring-amqp-bom/3.0.6": { + "pom": "sha256-sch8n8omH3LZPz+tDWBfn6FQECv1fU6eT9Ga0ltYvB4=" + }, + "org/springframework/amqp#spring-amqp-bom/3.1.3": { + "module": "sha256-Q4DGAGtYET+GTeGA/GVbn/qlQi4hLOD+EqLgX7W6VUM=", + "pom": "sha256-RFfi3NUlrKZCKAmqZtNLnsj0RDc56LUj8I3ZgwiD3Gk=" + }, + "org/springframework/batch#spring-batch-bom/5.0.2": { + "pom": "sha256-aDpeNRsQ0aR8gkN/CtTnhmTUICWhpXBtaPpDhCHt1uw=" + }, + "org/springframework/batch#spring-batch-bom/5.1.1": { + "pom": "sha256-1R88KqBI9EqHD7C+H4i5MhfWHfQwW+NsfeXB23ENa80=" + }, + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.2.4": { + "jar": "sha256-Qm8Cl8uwX7gZ1SSCp4FoKivKCVUSPOgf4meTih5E0Z8=", + "module": "sha256-M7Yu8nhLidE4hVHgnQWLHwczE8XyuKbiJxthsFokWSc=", + "pom": "sha256-6sGp05pSESzuofYNPWh3B3BWy0ZIMVPbcCcUYDex6mY=" + }, + "org/springframework/boot#spring-boot-actuator/3.2.4": { + "jar": "sha256-3TmG65GkOvANXasDzRWA2y49Z3Lu7EMC/fqyu1AQcb8=", + "module": "sha256-qZsBKuzw2tJcKh6S2JGTD1EpzeGIHTWX2yFIzSt+WTg=", + "pom": "sha256-X74vIc9RpPbvHXfDiXl6QxQDsSxIdv65g8tHz6/jTUw=" + }, + "org/springframework/boot#spring-boot-autoconfigure/3.2.4": { + "jar": "sha256-FLRpThp4LqlGJkp2dtopNtJHSr8Ph1c5sa9do7t62Fs=", + "module": "sha256-9LuyO5Wgmt2QkeNe2jQ0yacJutGo8I7/cyN0jDKcaEg=", + "pom": "sha256-yb4pyPXeG7NfGk3ixkuiaK5zZGQEBAk13fNM1gWNycY=" + }, + "org/springframework/boot#spring-boot-dependencies/3.1.2": { + "pom": "sha256-DIaB6QfO2iWOWU6lt8/aByuKxHDamKrAGEqO62lQV9o=" + }, + "org/springframework/boot#spring-boot-dependencies/3.2.4": { + "pom": "sha256-70YbfRmWkP/4qTa436J16BOHzXPaXRfnpuDhlX87ZHY=" + }, + "org/springframework/boot#spring-boot-devtools/3.2.4": { + "jar": "sha256-+ipJT83cd0DiM/MC7v1rhO2K2LPhIvPLA8ncn1U4jR8=", + "module": "sha256-TFz9e2WvdjtnUYPu5RsX3QDmsb6U4PXy+3k27HBOgEA=", + "pom": "sha256-AKmUsRZ4Syaop9bZtvG9m5POOhU4KtU1PHvcaPmyoj8=" + }, + "org/springframework/boot#spring-boot-starter-actuator/3.2.4": { + "jar": "sha256-PplRboWGYJGG2yTB3/10KTx0Pxy2iIPzUm4ewgGIA70=", + "module": "sha256-f/+Mys1QFcuaATkwqeLchgqUWRa1N1Vq8jGdg50dNzU=", + "pom": "sha256-n/JDazVblAkx+XO4ayvynkEigJ4FpHGNbzloSsJ6ETw=" + }, + "org/springframework/boot#spring-boot-starter-aop/3.2.4": { + "jar": "sha256-CXsCUrgjpzANh9TBGBunS0aNolOyayUMoivRg9hKlYM=", + "module": "sha256-TIejCWG4uVNixxbvkBeq5790bWo9r87+aSHub595pE8=", + "pom": "sha256-QSGWU4+tZOWjsqEzm3hbyBOq5r+CvOtXPU1OCIQ1j3g=" + }, + "org/springframework/boot#spring-boot-starter-data-jpa/3.2.4": { + "jar": "sha256-spfq4M7fVJBaKMSeVw9ka2o76mod9jYVOwPu+GSvi1g=", + "module": "sha256-tSzjyfv4FJnMJQt3Dj3CCFb4XsuDIIIlyA5FCtdboJc=", + "pom": "sha256-VLhpTsL5oAD3UQNxTrZiwHvyKyPwdNjGmZJes1LQJMo=" + }, + "org/springframework/boot#spring-boot-starter-jdbc/3.2.4": { + "jar": "sha256-1dLxE4kJ135ztyhmv6qgBSxnjvCyOH2XqP0Pb9tvbCY=", + "module": "sha256-FKXvpRN+Eo8h/KxYH/NRQnrYqOkM9R6H16pwP2Y/za0=", + "pom": "sha256-pUn2sXF1H71qk8L9+NuhAEXVKlyDTeQ053/W+JsRbOI=" + }, + "org/springframework/boot#spring-boot-starter-jetty/3.2.4": { + "jar": "sha256-jWRTsvLnHsEBsHw8gEn9ziHIlX5UjLVUnHR0YRLySL8=", + "module": "sha256-i9h7yYGoVNmPrcewZKn3peOXguU+f07bdIG67/hup6I=", + "pom": "sha256-KJYplMADbOGAmBRAc+goZYSQRc07IS8KTNJq+CBrqwk=" + }, + "org/springframework/boot#spring-boot-starter-json/3.2.4": { + "jar": "sha256-9I1Q6hnzGY0y7zVXvVcrX+JwSprWI52lbRzOQd+tQy4=", + "module": "sha256-VDviUkvA422Sm7VNmfzOOZ46bTKWRjw0yfgXxC1K+Gc=", + "pom": "sha256-2q8V85plreytydxTp5a7f3bdfmtMkk/5VqXxIKq85qM=" + }, + "org/springframework/boot#spring-boot-starter-logging/3.2.4": { + "jar": "sha256-NJCOp/RztUMcKTcUg4KU4fYwy5PWxBnLE3C3qzXPJCQ=", + "module": "sha256-CfVHe9vFckpo6tshH/1KSoCRG1Kn91To96xbQ+MQhcg=", + "pom": "sha256-jK8Fj0FUSTqX6PsvTOqzdlRMQW2Y02njpZVEcC02Nlw=" + }, + "org/springframework/boot#spring-boot-starter-oauth2-client/3.2.4": { + "jar": "sha256-kQGeJk9c475xKyE0vFgUnyt2gbFVWD1BcgLdSJUgrwo=", + "module": "sha256-obqnMV97fdb2AbnbxkXfidX8hHNMy4mxbmuLMG/KCJI=", + "pom": "sha256-nVhE8Nra1qNX8o5liNY7mX2BDkNxsLrbvOMUkVp1qF8=" + }, + "org/springframework/boot#spring-boot-starter-parent/3.1.2": { + "pom": "sha256-TB9NCfr9cgJEhZCDvfx7VytHF22Bil965q1m0ZOODO4=" + }, + "org/springframework/boot#spring-boot-starter-security/3.2.4": { + "jar": "sha256-z7u6be1UrrxNPuR0jlpjcMIHmyaS8sUPExXcuzJt500=", + "module": "sha256-pWm2RyqDlRJpa5HOHJSVxZytw7BkIrGCeMIJ3z2IDhA=", + "pom": "sha256-t6P8Kf0TVarO5elLBBTqdSKYAjVDHwdqsxpGYZNo9KE=" + }, + "org/springframework/boot#spring-boot-starter-test/3.2.4": { + "jar": "sha256-roiIYrffE8AbIjIBBaQZLM5o2FdBI2WfCMe3rrK51NA=", + "module": "sha256-Rn4w+w+o3k6LQoCUEtkbDUdab7/0BT1oDIfCZRUVTVQ=", + "pom": "sha256-g5hcN9j1HOND/K1RJv3egrarTEcBIhcqxkKoUc1T9pA=" + }, + "org/springframework/boot#spring-boot-starter-thymeleaf/3.2.4": { + "jar": "sha256-K6M/xhRjEXomVKNqTN2GpbMwAQWKM1OosPW96GRdu0I=", + "module": "sha256-c3xgISaYbfye+GcGN+INItEGsYZntSXEmED2dFsmo10=", + "pom": "sha256-2LsV8iADLSVxKM+VuDpER2PO4KTiaJpUS9urkabbNRk=" + }, + "org/springframework/boot#spring-boot-starter-web/3.2.4": { + "jar": "sha256-YD7sNOOuA+G/VZ8VM+g0tAxZ0gxysHXEa4ZlVehpcUA=", + "module": "sha256-5mNnkF/YqgUwA5nUYHKbh0yeVGHUQ5XF8RKMSScReDw=", + "pom": "sha256-Ls5mMK0u7d7UxrBnZ9SzTfx3+jm4549FRY+S9u0fjes=" + }, + "org/springframework/boot#spring-boot-starter/3.2.4": { + "jar": "sha256-L9hZRjMhRTEXoPndsX1GDU7MQz0Q7BDBLnkz4Dpc1tw=", + "module": "sha256-ZadNITSiaVlQI/pbKEqd8v6PFwa6NU6gJ4ts0K6GLGU=", + "pom": "sha256-8lZomjiyuFTAQoXap1041mwqacK/QK2Nz4dBDKmahPA=" + }, + "org/springframework/boot#spring-boot-test-autoconfigure/3.2.4": { + "jar": "sha256-xRGtoYwbzGwxuM6+Yk+78bN6mfsIT/1lHrN+6pHgYdY=", + "module": "sha256-B2KbO0M7AJgbZdDBW++/oBySubjqIxsTsy/a1Fv84Ag=", + "pom": "sha256-cJiOKwXyrLN9wyDKavIh4dtNA4QB0fgyYO1TvJzuZd4=" + }, + "org/springframework/boot#spring-boot-test/3.2.4": { + "jar": "sha256-4o9VYcRXVaI5JX32z62FZWKrpo57dGXLZFsfxIl/66c=", + "module": "sha256-A5GtDR82iY4hMpE/VdxO4UZ8luU604c7/etw8QqgteA=", + "pom": "sha256-ObCg+EFSTshH2N0orqQo0S6rKyAWhdiHdKG1l5tool0=" + }, + "org/springframework/boot#spring-boot/3.2.4": { + "jar": "sha256-+bu6EGY7vkZ1JkrrBxl2KfG7ysYRGJ+Jh6Rsgvf/uVo=", + "module": "sha256-sUyCr1mB59SKH92P6L2vzlc9kxx99ltnJMztRtXbRdc=", + "pom": "sha256-2+K06VhH4WLufDefQ6m8xes4kKhS7uxQDiJJWSsvPrs=" + }, + "org/springframework/data#spring-data-bom/2023.0.2": { + "pom": "sha256-r5JYFO1beGWJH9CGEGBVcLS7hFCi9Rv55bhjXNNoHgQ=" + }, + "org/springframework/data#spring-data-bom/2023.1.4": { + "pom": "sha256-/o7BqXiJbhaY1SHehZAgxzcMuwwJcvg+ivelhjh2YLQ=" + }, + "org/springframework/data#spring-data-commons/3.2.4": { + "jar": "sha256-NdlUQqtHbkbZrE1gB0+bnDCxjBBv0exx0daMANgID20=", + "pom": "sha256-mWK4Z7iOOkC3J3P2HeHPJXN2LHA5GKAnREg4Is2UW28=" + }, + "org/springframework/data#spring-data-jpa-parent/3.2.4": { + "pom": "sha256-nQUPSozvyh+SX0xF3rZaM2DBwYU7ugd9MGUheSxB4zk=" + }, + "org/springframework/data#spring-data-jpa/3.2.4": { + "jar": "sha256-mCeFLgIRhSnHTNviPdQyacxVUMqksAz+baiUkgD8zJo=", + "pom": "sha256-m5x8wh8EuArrW5HaofqhCN3mRJrJqZnH9DmcnuX72tg=" + }, + "org/springframework/data/build#spring-data-build/3.2.4": { + "pom": "sha256-4yRJ0xvTcBm+/zrQr7Wylmme7BrALVpgYWlOjjmR+DY=" + }, + "org/springframework/data/build#spring-data-parent/3.2.4": { + "pom": "sha256-ERQ+XCTTLtCF1jfagA/0ITmf2RUO/8UV380l8Y+pQa4=" + }, + "org/springframework/integration#spring-integration-bom/6.1.2": { + "pom": "sha256-0mxOaZYUSD15O82BeZxUTtpYlXYrSzGXFX7tAo7GL+c=" + }, + "org/springframework/integration#spring-integration-bom/6.2.3": { + "module": "sha256-NalcbsQOkaB/xJQh8OHI82Ae/Yg0P5GffYL62PpC318=", + "pom": "sha256-imipyWBFoXiOfs3aBwqvNwYT/jpyYfYrtbBBOXs3aI0=" + }, + "org/springframework/pulsar#spring-pulsar-bom/1.0.4": { + "module": "sha256-zi4j7BIPd3hz/BoiscQVZW9aek2OZHFE1Y7nUYFhBwU=", + "pom": "sha256-GFpoIFAhC4R2imyGxL5DvjKfuqeCnIgDzUwZBTXHG74=" + }, + "org/springframework/restdocs#spring-restdocs-bom/3.0.0": { + "pom": "sha256-/8nEe+Wo60iO3pJozgiaeZyT6JT7G9P5QPYsRnpmEyM=" + }, + "org/springframework/restdocs#spring-restdocs-bom/3.0.1": { + "pom": "sha256-USAiW8r+ZB3MJmfpDTSFMXGaUOvdX4rwf7o0UZmtWM4=" + }, + "org/springframework/security#spring-security-bom/5.8.5": { + "module": "sha256-ThRXe7Hs0qntCNqoNEe5HBK2pGX+1YqlqWoztXBZEVo=", + "pom": "sha256-NtcpSd0VViwUD/4Xbnf8sfc+GaTSwDNhE6oJbCNbW8s=" + }, + "org/springframework/security#spring-security-bom/6.1.2": { + "module": "sha256-HMJ40imEfP7hLpBd9w5W5W4eo2m+LKd3S/u60EtbMos=", + "pom": "sha256-P0nGqe8bTNCnKRAzAyshnLkmzIPX3KlutclyzSQnI44=" + }, + "org/springframework/security#spring-security-bom/6.2.3": { + "module": "sha256-f84oRRxjgixv0HNVa/nTgKjHjB/SdlMxC2s5J22iNsE=", + "pom": "sha256-gMuEACI3nqzsIjYnas19+8DFenkhBnuAlrMspnein9w=" + }, + "org/springframework/security#spring-security-config/6.2.3": { + "jar": "sha256-DgdWeH0RK+ufxrA45sqKwJ8fF5Hn1BZ7p+d7C9jMtZU=", + "module": "sha256-xZyqjp8OT+xpiGpJnm+cmfIN64keizk/kkT+nSxAkkI=", + "pom": "sha256-NjSHendEXyFnJRwFFlwHSePBFeAvdeIADyI21eI9mOs=" + }, + "org/springframework/security#spring-security-core/6.2.3": { + "jar": "sha256-K/5zefSpk6lnCrn1ldzhDNDx2KpE02k1AG+uL8b7ro4=", + "module": "sha256-FSCaQ+9sWr+zqJ3zlrRHMOZirDsm5zMnGUA6y/COw6k=", + "pom": "sha256-kijsMZ42lwTLW3be6PjuE2YCNEJhcEY0TgWfeiDqjYQ=" + }, + "org/springframework/security#spring-security-crypto/6.2.3": { + "jar": "sha256-S4/0AkG0addIiMxuQSz7qDk7diCuMFImubLy0zhOojY=", + "module": "sha256-1Z819TgD+L3X6u5pfriOQmNk1fki0e+A9lXZSD8w5VQ=", + "pom": "sha256-tYVxm1x8aS1mIEgp74HqSRNzvkd+7Hz3Hz2kuyvIStg=" + }, + "org/springframework/security#spring-security-oauth2-client/6.2.3": { + "jar": "sha256-dQU2HZlKEc65EruqbBg4S91cKfNo08LLtlOhJUPWCh8=", + "module": "sha256-WFFQJVcahVA3bjvDbwiB51YZPYIs4nRS/g6VZAKdjoQ=", + "pom": "sha256-OZPCiABfsTWoh97Q2xiU1nJCcFna/Hr1K9lv3uPgkRs=" + }, + "org/springframework/security#spring-security-oauth2-core/6.2.3": { + "jar": "sha256-7GfsWYypjmSZu9+B3/iOOVg3PaYNme7Jv79q1AcATvg=", + "module": "sha256-tPQigzzqjx3uF2Ln9wSNVlwFU5WBFXgm/AmdzPHipZ4=", + "pom": "sha256-VhY1V59db2HsEzjLuMhcW0VxUQoxiUbkEYq9o5mHdqM=" + }, + "org/springframework/security#spring-security-oauth2-jose/6.2.3": { + "jar": "sha256-xeExSPNakMj0SD3YKXaxRwVJwii4iFsDB8MTIVdyX60=", + "module": "sha256-JoA2U5+6FHT1wfQCgSf3UH5YLboMdkssM2OCFvFXWlM=", + "pom": "sha256-z/1HGThaaSlzCcQH0a6Q3UUI6qJ/RVSYomVJIj98HKo=" + }, + "org/springframework/security#spring-security-web/6.2.3": { + "jar": "sha256-jn4vSk7LjAwHjMr2QKKqxyc4YJVKCpiLH60WfWN6J4g=", + "module": "sha256-SF+TouUqLcNDpsX/UtxcFgvBUwAA7JBfUfBpihtpXLQ=", + "pom": "sha256-ZZP6CHlOVrNi0/3cpN8ekWOFpE9bON5uwsoPzSMEAKk=" + }, + "org/springframework/session#spring-session-bom/3.1.1": { + "module": "sha256-1pUWyPsAHxEYTRTC/WPXiiXTt3H27w40+UMFo+/cYyc=", + "pom": "sha256-yKH2TVmHtfeggnybjVe/dSegTYM/7o7EXlKD7kKTwV0=" + }, + "org/springframework/session#spring-session-bom/3.2.2": { + "module": "sha256-HETW6djPKtvw3VzVzAgnvlyDfHKGLGvoYQdOdzMXhPo=", + "pom": "sha256-xUZFF0k+pgCmhLEeGlZNGrW4ebU48i+CjbXC7/623HM=" + }, + "org/springframework/ws#spring-ws-bom/4.0.10": { + "pom": "sha256-1BQ8nGc3RNef88ZLWSPKP7oDaeLC+W4uPnx2LAyLY/o=" + }, + "org/springframework/ws#spring-ws-bom/4.0.5": { + "pom": "sha256-8OjPCyFD18APnTYVoZy7cPI+Qy+B8OcCi91a0/KBo/w=" + }, + "org/testcontainers#testcontainers-bom/1.18.3": { + "pom": "sha256-l0dtYsuLXM/NHLrmkmHEk3v36BtWUw2oKmZJ4w3DHMw=" + }, + "org/testcontainers#testcontainers-bom/1.19.3": { + "pom": "sha256-0L6xP4gXPdXI4XgioXWun7r17homxyAfafZYpW5SqeU=" + }, + "org/testcontainers#testcontainers-bom/1.19.7": { + "pom": "sha256-bDMp72KWE8iKyQI7fa4oHOHdh6AO+hg5ah2pErDJRPQ=" + }, + "org/thymeleaf#thymeleaf-lib/3.1.2.RELEASE": { + "pom": "sha256-+BG2hU0QZoLGjwYOUMk3ONhXOaq8UKOYiP3FnWZlu+Q=" + }, + "org/thymeleaf#thymeleaf-parent/3.1.2.RELEASE": { + "pom": "sha256-yISd92GB/uypYinPsWHcJA7eQNtQUsnWjSyqd8r4Ujk=" + }, + "org/thymeleaf#thymeleaf-spring5/3.1.2.RELEASE": { + "jar": "sha256-DELJReKUFEYCy0R9NkExEjkktg/Y1PS28TN+R4qr3L8=", + "pom": "sha256-LYUlq7euSQPQGwB5TQhhoVfgXKwaJB6EY7DBeTZl82I=" + }, + "org/thymeleaf#thymeleaf-spring6/3.1.2.RELEASE": { + "jar": "sha256-LS3THRJS03d7Uh22s3HemG76vS1bFdUcXK14t5zXeZw=", + "pom": "sha256-KoPIXHLDCamBMDIvJ6ycgqN2gkXmVxgrrnWDSM8g93Y=" + }, + "org/thymeleaf#thymeleaf/3.1.2.RELEASE": { + "jar": "sha256-KzpxS+LeNJzLYMZWA65ei9cGDHpPiDNIVwdnHpqGKiQ=", + "pom": "sha256-yNg11KkpXvSZfjyK6eiUz4B1nNVpPoNukaSkY4cn3/w=" + }, + "org/thymeleaf/extras#thymeleaf-extras-springsecurity5/3.1.2.RELEASE": { + "jar": "sha256-NANxlgdib0YRutYET9yB7WpDTxMOmtZG03JlaCWT5Ow=", + "pom": "sha256-gahhwPVVfRDoivS0opdkOwUlWgws+yLaORBtpTTAVWI=" + }, + "org/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + }, + "org/webjars#swagger-ui/5.2.0": { + "jar": "sha256-x7hZO4W+yIujqoGQudsk2a7a8CyVmqOMMu3WpkO8k9Q=", + "pom": "sha256-n0iJORwtkGWjTpc9CURMnMycPMASGDNgQ8Umuqe5BgA=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "xml-apis#xml-apis-ext/1.3.04": { + "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", + "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" + }, + "xml-apis#xml-apis/1.4.01": { + "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", + "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + }, + "xpp3#xpp3_min/1.1.4c": { + "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" + } + } +} diff --git a/pkgs/by-name/st/stirling-pdf/disable-spotless.patch b/pkgs/by-name/st/stirling-pdf/disable-spotless.patch deleted file mode 100644 index 8b58207b963f..000000000000 --- a/pkgs/by-name/st/stirling-pdf/disable-spotless.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index c206e2f..b1fda33 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -69,19 +69,7 @@ launch4j { - messagesInstanceAlreadyExists="Stirling-PDF is already running." - } - --spotless { -- java { -- target project.fileTree('src/main/java') - -- googleJavaFormat('1.19.1').aosp().reorderImports(false) -- -- importOrder('java', 'javax', 'org', 'com', 'net', 'io') -- toggleOffOn() -- trimTrailingWhitespace() -- indentWithSpaces() -- endWithNewline() -- } --} - - dependencies { - //security updates -@@ -163,9 +151,6 @@ dependencies { - annotationProcessor 'org.projectlombok:lombok:1.18.28' - } - --tasks.withType(JavaCompile) { -- dependsOn 'spotlessApply' --} - compileJava { - options.compilerArgs << '-parameters' - } diff --git a/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch b/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch deleted file mode 100644 index dd94b8514f76..000000000000 --- a/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 7025b2b..d063da3 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -20,6 +20,11 @@ repositories { - } - - -+tasks.withType(AbstractArchiveTask) { -+ preserveFileTimestamps = false -+ reproducibleFileOrder = true -+} -+ - - licenseReport { - renderers = [new JsonReportRenderer()] diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 9ec363cf5b58..2695e3d58010 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -2,13 +2,14 @@ lib, stdenv, fetchFromGitHub, - substituteAll, gradle_7, - perl, makeWrapper, jre, }: +let + gradle = gradle_7; +in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; version = "0.25.1"; @@ -21,77 +22,28 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # disable spotless because it tries to fetch files not in the FOD - # and also because it slows down the build process - ./disable-spotless.patch # remove timestamp from the header of a generated .properties file ./remove-props-file-timestamp.patch - # use gradle's built-in method of zeroing out timestamps, - # because stripJavaArchivesHook can't patch signed JAR files - ./fix-jar-timestamp.patch - # set the FOD as the only repository gradle can resolve from - (substituteAll { - src = ./use-fod-maven-repo.patch; - inherit (finalAttrs) deps; - }) ]; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-deps"; - inherit (finalAttrs) src; - - patches = [ ./disable-spotless.patch ]; - - nativeBuildInputs = [ - gradle_7 - perl - ]; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon --console=plain build - - runHook postBuild - ''; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - runHook preInstall - - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - - # Mimic existence of okio-3.6.0.jar, originally known as okio-jvm-3.6.0 (and renamed). - # Gradle doesn't detect such renames and only fetches the latter. - # Whenever this package gets updated, please check if this hack is obsolete. - ln -s $out/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar $out/com/squareup/okio/okio/3.6.0/okio-3.6.0.jar - - runHook postInstall - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-JaTL6/DyBAqXkIQOkbi8MYoIZrhWqc3MpJ7DDB4h+ok="; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; }; + __darwinAllowLocalNetworking = true; + + # disable spotless because it tries to fetch files not in deps.json + # and also because it slows down the build process + gradleFlags = [ "-x" "spotlessApply" ]; + + doCheck = true; + nativeBuildInputs = [ - gradle_7 + gradle makeWrapper ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --console=plain build - - runHook postBuild - ''; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch b/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch deleted file mode 100644 index f26074a0598f..000000000000 --- a/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index c206e2f..cdaddf7 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -16,7 +16,7 @@ version = '0.22.3' - sourceCompatibility = '17' - - repositories { -- mavenCentral() -+ maven { url '@deps@' } - } - - -diff --git a/settings.gradle b/settings.gradle -index f813993..2c87f3c 100644 ---- a/settings.gradle -+++ b/settings.gradle -@@ -1 +1,7 @@ -+pluginManagement { -+ repositories { -+ maven { url '@deps@' } -+ } -+} -+ - rootProject.name = 'Stirling-PDF' From 2aff719a093e2efb8dd889f8014b82847121458b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 12 Jul 2024 18:07:36 +0200 Subject: [PATCH 186/562] unison-ucm: 0.5.22 -> 0.5.24 --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 587ca9d7f35e..67dbb9e57677 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.22"; + version = "0.5.24"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-Exgi0eKk+ZngpnbfY/btHf+uiXcmummnWKfmCUESWgc="; + hash = "sha256-5LVcN7ly0n68DFqIjA8EJabZa3WwJf1ueqgJ+gPHNbA="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-EWfyqaFtGJJ5GE0mRTtNC9hHOzbqG9MsvRh5sFq5pRY="; + hash = "sha256-nCNmUYkBWhXL2eN+uQblf7oPkiVwfAKi6v+Cb9Co19g="; }; # The tarball is just the prebuilt binary, in the archive root. From 60e0149a1668d441ead86b88e79be9074eb5ae30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Jul 2024 09:56:52 -0700 Subject: [PATCH 187/562] qutebrowser: don't use distutils --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 358da2082c0a..9d5114f66801 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -83,7 +83,7 @@ python3.pkgs.buildPythonApplication { runHook preInstall make -f misc/Makefile \ - PYTHON=${python3.pythonOnBuildForHost.interpreter} \ + PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \ PREFIX=. \ DESTDIR="$out" \ DATAROOTDIR=/share \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dadb301c0e..96f1f4811b76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33635,12 +33635,10 @@ with pkgs; qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; - python3 = python311; }; qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser { inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; - python3 = python311; }; qxw = callPackage ../applications/editors/qxw { }; From da062e0e15d2805d5e0c0f3a33280c3571ffbf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Jul 2024 10:01:51 -0700 Subject: [PATCH 188/562] qutebrowser: update dependencies --- .../networking/browsers/qutebrowser/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9d5114f66801..3f676ecd6cc0 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -43,15 +43,17 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; nativeBuildInputs = [ wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - python3.pkgs.pygments ]; - propagatedBuildInputs = with python3.pkgs; ([ + dependencies = with python3.pkgs; [ + colorama pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 @@ -62,8 +64,8 @@ python3.pkgs.buildPythonApplication { adblock # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard pyperclip - ] ++ lib.optional stdenv.isLinux qtwayland - ); + ]; + patches = [ ./fix-restart.patch From 2bf90681b642dd3754592274768c9b0cc233ea94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 17:05:56 +0000 Subject: [PATCH 189/562] emuflight-configurator: 0.4.1 -> 0.4.3 --- .../science/robotics/emuflight-configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 9669d48e744e..66b9cf0efa8e 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "sha256-e4HNg5yr9V5LyT0hYP6gzw0tZm4dLidJg5MQtH3L3JI="; + sha256 = "sha256-7NcN1wF3BUClJBVm13VnV80N/+a2jAEIRqB/x9+GDEg="; }; nativeBuildInputs = [ wrapGAppsHook3 unzip copyDesktopItems ]; From 9756142adc8c0aa9a234b696059a31aa78134d35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 17:35:37 +0000 Subject: [PATCH 190/562] nomad-driver-podman: 0.5.2 -> 0.6.0 --- .../networking/cluster/nomad-driver-podman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 8eb6a4656318..11f6d7461d4a 100644 --- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L2OnnSTrr49THE2ZQpuHagTjcg3/pt/ydivGmWZSvas="; + sha256 = "sha256-cM/bu8d39mY85XtHJNIp9h0U3kzviSe87c2CQs9vVTA="; }; - vendorHash = "sha256-0a8wnwyquDrEnPlR337uCxMzuc/9MjgGUsDd+xIfPhw="; + vendorHash = "sha256-BdCcFR5vWXbZ+yumRdpozfuB3fqzVifErRQ7RAfdco8="; subPackages = [ "." ]; From 82b70a2d7641d922e03376d190763ad02fbbc81a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 12 Jul 2024 19:24:22 +0200 Subject: [PATCH 191/562] koka: build with lsp 2.4.0.0 (latest is not supported) --- pkgs/development/compilers/koka/default.nix | 4 +- .../haskell-modules/configuration-common.nix | 5 ++ .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 67 +++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index c280d2fb7e70..a1c086a338d8 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -20,7 +20,7 @@ , FloatingHex , isocline , lens -, lsp +, lsp_2_4_0_0 , mtl , network , network-simple @@ -78,7 +78,7 @@ mkDerivation rec { FloatingHex isocline lens - lsp + lsp_2_4_0_0 mtl network network-simple diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 56fbc133fbf5..959b221b9ffc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1557,6 +1557,11 @@ self: super: { # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; + # Needs matching lsp-types + lsp_2_4_0_0 = super.lsp_2_4_0_0.override { + lsp-types = self.lsp-types_2_1_1_0; + }; + # 2024-02-28: The Hackage version dhall-lsp-server-1.1.3 requires # lsp-1.4.0.0 which is hard to build with this LTS. However, the latest # git version of dhall-lsp-server works with lsp-2.1.0.0, and only diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 72372897737e..4bb9bd7fadc1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -92,6 +92,8 @@ extra-packages: - lens-aeson < 1.2 # 2022-12-17: For aeson < 2.0 compat - lsp == 2.1.0.0 # 2024-02-28: need for dhall-lsp-server unstable - lsp-types == 2.0.2.0 # 2024-02-28: need for dhall-lsp-server unstable + - lsp < 2.5 # 2024-07-08: need for koka + - lsp-types < 2.2 # 2024-07-08: need for koka - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9206d586f81..7f9245818228 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -197105,6 +197105,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lsp_2_4_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , co-log-core, containers, data-default, directory, exceptions + , filepath, hashable, hspec, hspec-discover, lens, lens-aeson + , lsp-types, mtl, prettyprinter, random, row-types, sorted-list + , stm, text, text-rope, transformers, unliftio-core + , unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "2.4.0.0"; + sha256 = "1ggfw2wp9g9fpg9x3kj9zh6l6p2yiw4q0v1gzxjg0mcmvp4aad8w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring co-log-core containers + data-default directory exceptions filepath hashable lens lens-aeson + lsp-types mtl prettyprinter random row-types sorted-list stm text + text-rope transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + base containers hspec row-types sorted-list text text-rope + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions @@ -197224,6 +197254,43 @@ self: { mainProgram = "generator"; }) {}; + "lsp-types_2_1_1_0" = callPackage + ({ mkDerivation, aeson, base, binary, containers, data-default + , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath + , generic-arbitrary, hashable, hspec, hspec-discover + , indexed-traversable, indexed-traversable-instances, lens + , lens-aeson, mod, mtl, network-uri, prettyprinter, QuickCheck + , quickcheck-instances, regex, row-types, safe, some + , template-haskell, text + }: + mkDerivation { + pname = "lsp-types"; + version = "2.1.1.0"; + sha256 = "0gsr0v11xfav7dnq4d433y9ca0snmqaax4pp5sgmf33zl8qhi6s0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary containers data-default deepseq Diff dlist + exceptions file-embed filepath generic-arbitrary hashable + indexed-traversable indexed-traversable-instances lens lens-aeson + mod mtl network-uri prettyprinter QuickCheck quickcheck-instances + row-types safe some template-haskell text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl prettyprinter regex text + ]; + testHaskellDepends = [ + aeson base filepath hspec lens network-uri QuickCheck + quickcheck-instances row-types text + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "generator"; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath From 3094491faefc6bc0549e6e416e5d19446b6018be Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 12 Jul 2024 20:18:08 +0200 Subject: [PATCH 192/562] top-level/release-haskell.nix: test packages on GHC 9.6.6 --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d2e9e58e4ba9..62fedeead0f6 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -72,6 +72,7 @@ let ghc963 ghc964 ghc965 + ghc966 ghc981 ghc982 ghc9101 From d42ba49cbf1764169de0f27212cfc9955f12b96b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 12 Jul 2024 14:25:44 -0400 Subject: [PATCH 193/562] incus: 6.2.0 -> 6.3.0 --- pkgs/by-name/in/incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index e5249ac1d48f..3cc8f463b7a3 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY="; - version = "6.2.0"; - vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; + hash = "sha256-qRx2l677OAo8or/form1fTgL3vjM/kz3RA/8umkAP80="; + version = "6.3.0"; + vendorHash = "sha256-VlJyq+PzToBicKCF3EMqzDsnIWuPhbk4JS4ASyhfiss="; patches = [ ]; } From eefeee7fdebd8b70f6a8b0d08d0b79d2f3fcb0a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 18:54:13 +0000 Subject: [PATCH 194/562] python312Packages.pylink-square: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pylink-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 2e8121e0932f..59f2e0bf926d 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M="; + hash = "sha256-WMpb/b9kF1rFlegDYxNGJbZ2Nz8nuG21tyjgUFLs5mg="; }; propagatedBuildInputs = [ From 91d38a07073f97e9fcb65e8add7ee0c16d50396e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 19:33:43 +0000 Subject: [PATCH 195/562] tcpreplay: 4.4.4 -> 4.5.1 --- pkgs/tools/networking/tcpreplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 625de8111dcb..f993ae0138bc 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.4.4"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-RPGPttNHDsr3elG5AaEZ2uFtpb5NQUD/uyeF43rW1L8="; + sha256 = "sha256-Leeb/Wfsksqa4v+1BFbdHVP/QPP6cbQixl6AYgE8noU="; }; buildInputs = [ libpcap ] From e41561f68b4df0a25b07addfb304d0a93034b884 Mon Sep 17 00:00:00 2001 From: RockWolf Date: Fri, 12 Jul 2024 22:04:04 +0200 Subject: [PATCH 196/562] stackit-cli: 0.8.1 -> 0.9.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 790978872c9e..a239db3c7b68 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-egAN97ANeuadxHpEpqI6eTjZRuPR2O2khjh0wgGLqIM="; + hash = "sha256-md21Cq+Az7Wwq9Q+4AHDKvFMD5skUCxtwfJzN6ekJes="; }; - vendorHash = "sha256-vHzPNNU2im22bypkxaweBLcC9KAuuCobNrZ6l7jvv9s="; + vendorHash = "sha256-fDGqtvDtIAbTGWief4liTJjRSF2mtP0IchT9sy9qXcQ="; subPackages = [ "." ]; From c2a12db1a456a4b2a7b85a92143d26fda794f4e2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 12 Jul 2024 16:33:52 -0400 Subject: [PATCH 197/562] nixos/incus: add skopeo and umoci --- nixos/modules/virtualisation/incus.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 2b69a7a07658..8e26e6c77dd1 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -44,12 +44,14 @@ let qemu-utils qemu_kvm rsync + skopeo squashfs-tools-ng squashfsTools sshfs swtpm systemd thin-provisioning-tools + umoci util-linux virtiofsd xdelta From acc1b3260e9291eadd678096895f0f852b81e585 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 17:53:28 -0400 Subject: [PATCH 198/562] spotifyd: set default arguments internally --- pkgs/applications/audio/spotifyd/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 13c85e7d3584..c8745947d6a8 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl -, withALSA ? true, alsa-lib -, withPulseAudio ? false, libpulseaudio -, withPortAudio ? false, portaudio -, withMpris ? false +{ lib, stdenv, config, fetchFromGitHub, rustPackages, pkg-config, openssl +, withALSA ? stdenv.isLinux, alsa-lib +, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, withPortAudio ? stdenv.isDarwin, portaudio +, withMpris ? stdenv.isLinux , withKeyring ? false , dbus }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e010edf26b9..7b5dbfd53952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31378,12 +31378,7 @@ with pkgs; spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; - spotifyd = callPackage ../applications/audio/spotifyd { - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; - withMpris = stdenv.isLinux; - }; + spotifyd = callPackage ../applications/audio/spotifyd { }; srain = callPackage ../applications/networking/irc/srain { }; From e932f90954fb9f0a3e2658d2a748c6b208a0a827 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 17:54:28 -0400 Subject: [PATCH 199/562] spotifyd: migrate to by-name --- .../spotifyd/default.nix => by-name/sp/spotifyd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/spotifyd/default.nix => by-name/sp/spotifyd/package.nix} (100%) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/by-name/sp/spotifyd/package.nix similarity index 100% rename from pkgs/applications/audio/spotifyd/default.nix rename to pkgs/by-name/sp/spotifyd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b5dbfd53952..d933cf79d38a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31378,8 +31378,6 @@ with pkgs; spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; - spotifyd = callPackage ../applications/audio/spotifyd { }; - srain = callPackage ../applications/networking/irc/srain { }; super-productivity = callPackage ../applications/office/super-productivity { }; From c2ebccb950423d7d3b57de1457e3ec66a90f559e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 17:55:35 -0400 Subject: [PATCH 200/562] spotifyd: format with nixfmt --- pkgs/by-name/sp/spotifyd/package.nix | 35 ++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index c8745947d6a8..37e1bfb339fb 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -1,10 +1,20 @@ -{ lib, stdenv, config, fetchFromGitHub, rustPackages, pkg-config, openssl -, withALSA ? stdenv.isLinux, alsa-lib -, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio -, withPortAudio ? stdenv.isDarwin, portaudio -, withMpris ? stdenv.isLinux -, withKeyring ? false -, dbus +{ + lib, + stdenv, + config, + fetchFromGitHub, + rustPackages, + pkg-config, + openssl, + withALSA ? stdenv.isLinux, + alsa-lib, + withPulseAudio ? config.pulseaudio or stdenv.isLinux, + libpulseaudio, + withPortAudio ? stdenv.isDarwin, + portaudio, + withMpris ? stdenv.isLinux, + withKeyring ? false, + dbus, }: rustPackages.rustPlatform.buildRustPackage rec { @@ -22,14 +32,16 @@ rustPackages.rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] + buildInputs = + lib.optionals stdenv.isLinux [ openssl ] ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; buildNoDefaultFeatures = true; - buildFeatures = lib.optional withALSA "alsa_backend" + buildFeatures = + lib.optional withALSA "alsa_backend" ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMpris "dbus_mpris" @@ -42,7 +54,10 @@ rustPackages.rustPlatform.buildRustPackage rec { homepage = "https://spotifyd.rs/"; changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ anderslundstedt Br1ght0ne ]; + maintainers = with maintainers; [ + anderslundstedt + Br1ght0ne + ]; platforms = platforms.unix; mainProgram = "spotifyd"; }; From b3cd2a1df25a1ffdcde6fe4c143e9a2ac0d7e95e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 17:56:02 -0400 Subject: [PATCH 201/562] spotifyd: modernize Adds updateScript to help in maintenance https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/sp/spotifyd/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 37e1bfb339fb..29a739f177cb 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -15,6 +15,7 @@ withMpris ? stdenv.isLinux, withKeyring ? false, dbus, + nix-update-script, }: rustPackages.rustPlatform.buildRustPackage rec { @@ -49,16 +50,20 @@ rustPackages.rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + + meta = { description = "Open source Spotify client running as a UNIX daemon"; homepage = "https://spotifyd.rs/"; changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ anderslundstedt Br1ght0ne ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "spotifyd"; }; } From 13c5512f1e1462b80eb66dcd209c587c2228da7c Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 17:57:05 -0400 Subject: [PATCH 202/562] spotifyd: add getchoo as maintainer --- pkgs/by-name/sp/spotifyd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 29a739f177cb..ff4c03e28e33 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -62,6 +62,7 @@ rustPackages.rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ anderslundstedt Br1ght0ne + getchoo ]; platforms = lib.platforms.unix; mainProgram = "spotifyd"; From 94a6fbf3213f8e0599a92b2b451191df6865e11b Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:02:59 -0400 Subject: [PATCH 203/562] spotifyd: add version test --- pkgs/by-name/sp/spotifyd/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index ff4c03e28e33..679a15ecb37f 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -16,6 +16,8 @@ withKeyring ? false, dbus, nix-update-script, + testers, + spotifyd, }: rustPackages.rustPlatform.buildRustPackage rec { @@ -51,6 +53,10 @@ rustPackages.rustPlatform.buildRustPackage rec { doCheck = false; passthru = { + tests.version = testers.testVersion { + package = spotifyd; + version = builtins.head (lib.splitString "-" version); + }; updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; }; From fb033f0be1953936f42767db575813d6ee4938c7 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:07:51 -0400 Subject: [PATCH 204/562] spotifyd: 0.3.5-unstable-2024-02-18 -> 0.3.5-unstable-2024-07-10 --- pkgs/by-name/sp/spotifyd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 679a15ecb37f..bb819651bda4 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -22,16 +22,16 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.5-unstable-2024-02-18"; + version = "0.3.5-unstable-2024-07-10"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = "ff2f7a06e54bf05afd57a0243dc9f67abc15f040"; - hash = "sha256-nebAd4a+ht+blRP52OF830/Dm15ZPwRL4IPWmmT9ViM="; + rev = "8fb0b9a5cce46d2e99e127881a04fb1986e58008"; + hash = "sha256-wEPdf5ylnmu/SqoaWHxAzIEUpdRhhZfdQ623zYzcU+s="; }; - cargoHash = "sha256-6BRIMTrWTwvX3yIGEYEvigMT+n4EtaruMdrej2Dd49w="; + cargoHash = "sha256-+xTmkp+hGzmz4XrfKqPCtlpsX8zLA8XgJWM1SPunjq4="; nativeBuildInputs = [ pkg-config ]; From 41e79c9e11005208bbd929588ed880cdd7727da7 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:24:40 -0400 Subject: [PATCH 205/562] spotifyd: add `withJack` option this allows using the rodiojack backend added in https://github.com/Spotifyd/spotifyd/pull/1281 --- pkgs/by-name/sp/spotifyd/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index bb819651bda4..e1393e447d2a 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -8,6 +8,8 @@ openssl, withALSA ? stdenv.isLinux, alsa-lib, + withJack ? stdenv.isLinux, + libjack2, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, withPortAudio ? stdenv.isDarwin, @@ -37,7 +39,8 @@ rustPackages.rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optional withALSA alsa-lib + ++ lib.optional (withALSA || withJack) alsa-lib + ++ lib.optional withJack libjack2 ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; @@ -45,6 +48,7 @@ rustPackages.rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = lib.optional withALSA "alsa_backend" + ++ lib.optional withJack "rodiojack_backend" ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMpris "dbus_mpris" From b0df3a330f781f791d33318bc9773b4f29fd6152 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:26:47 -0400 Subject: [PATCH 206/562] spotifyd: enable `withKeyring` by default This is a standard feature described in documentation and very useful in configuring spotify declaratively without leaking secrets --- pkgs/by-name/sp/spotifyd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index e1393e447d2a..83240137a064 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -15,7 +15,7 @@ withPortAudio ? stdenv.isDarwin, portaudio, withMpris ? stdenv.isLinux, - withKeyring ? false, + withKeyring ? true, dbus, nix-update-script, testers, From cb12f50511d7d96aced6eeb5cf4b74e09df75a69 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 12 Jul 2024 17:02:17 -0700 Subject: [PATCH 207/562] conan: 2.0.17 -> 2.5.0 --- .../tools/build-managers/conan/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 39d974e0f3b8..5e7a0e866cff 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "conan"; - version = "2.0.17"; + version = "2.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = "refs/tags/${version}"; - hash = "sha256-liCeGe0WBW+tOjW81cqrFUiOEWYhlqsBVgns6SxjPNM="; + hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag="; }; nativeBuildInputs = with python3.pkgs; [ @@ -88,20 +88,25 @@ python3.pkgs.buildPythonApplication rec { disabledTestPaths = [ # Requires cmake, meson, autotools, apt-get, etc. - "conans/test/functional/command/new_test.py" - "conans/test/functional/command/test_install_deploy.py" - "conans/test/functional/graph/test_transitive_build_scripts.py" - "conans/test/functional/layout/test_editable_cmake_components.py" - "conans/test/functional/layout/test_editable_cmake.py" - "conans/test/functional/layout/test_in_subfolder.py" - "conans/test/functional/layout/test_source_folder.py" - "conans/test/functional/toolchains/" - "conans/test/functional/tools_versions_test.py" - "conans/test/functional/tools/scm/test_git.py" - "conans/test/functional/tools/system/package_manager_test.py" - "conans/test/functional/util/test_cmd_args_to_string.py" - "conans/test/integration/command_v2/list_test.py" - "conans/test/unittests/tools/env/test_env_files.py" + "test/functional/command/new_test.py" + "test/functional/command/test_install_deploy.py" + "test/functional/graph/test_transitive_build_scripts.py" + "test/functional/layout/test_editable_cmake.py" + "test/functional/layout/test_editable_cmake_components.py" + "test/functional/layout/test_in_subfolder.py" + "test/functional/layout/test_source_folder.py" + "test/functional/test_local_recipes_index.py" + "test/functional/test_profile_detect_api.py" + "test/functional/toolchains/" + "test/functional/tools/scm/test_git.py" + "test/functional/tools/system/package_manager_test.py" + "test/functional/tools_versions_test.py" + "test/functional/util/test_cmd_args_to_string.py" + "test/integration/command/runner_test.py" + "test/integration/command/user_test.py" + "test/integration/command_v2/list_test.py" + "test/performance/test_large_graph.py" + "test/unittests/tools/env/test_env_files.py" ]; meta = with lib; { From e7c9cf24a80a83c9bcf28f3470b8e5901e6e9e12 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 13 Jul 2024 01:21:28 +0100 Subject: [PATCH 208/562] haskell.compiler.ghc8107: don't use libffi 3.3 on aarch64-darwin --- pkgs/development/compilers/ghc/8.10.7.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 7b873d903eee..a0ba35619a47 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -11,7 +11,9 @@ , # GHC can be built with system libffi or a bundled one. # we explicitly use libffi-3.3 here because 3.4 removes a flag that causes # problems for ghc-8.10.7's RTS. See #324384. - libffi_3_3 ? null + # Save for aarch_darwin since libffi-3.3 is broken there but the issue isn't present anyway + libffi ? null +, libffi_3_3 ? null , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower @@ -58,7 +60,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: +}@args: assert !enableIntegerSimple -> gmp != null; @@ -67,6 +69,7 @@ assert !enableIntegerSimple -> gmp != null; assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; let + libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; inherit (bootPkgs) ghc; @@ -121,7 +124,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi_3_3] + ++ [args.${libffi_name}] ++ lib.optional (!enableIntegerSimple) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -336,10 +339,10 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi_3_3 != null) [ + ] ++ lib.optionals (args.${libffi_name} != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi_3_3.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi_3_3.out}/lib" + "--with-ffi-includes=${targetPackages.${libffi_name}.dev}/include" + "--with-ffi-libraries=${targetPackages.${libffi_name}.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" From 09374ff354c5d089eb36de85a56001073f30dfa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:37:44 +0000 Subject: [PATCH 209/562] pscale: 0.197.0 -> 0.204.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index e719fb7691b9..9b5c852939bb 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.197.0"; + version = "0.204.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Yjnq6ALbuvkYIOZ4CdBq1naTPGgT3aX0wRmREZpHo7I="; + sha256 = "sha256-qUUVEnxZbWAygIFCSM1HvSmnDBZvYCO/1oJu6P46Y3g="; }; - vendorHash = "sha256-TdRfff342QvwjBC6B6/npbkvaH3o9CBKe2exu6TnT2o="; + vendorHash = "sha256-uy/TyAnkb8D3qqOK+zf49082o2974G/YiJO0nb7MioM="; ldflags = [ "-s" "-w" From 5daa6f210287cbd829593afab0e31486f20ed60b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:51:04 +0000 Subject: [PATCH 210/562] regclient: 0.6.1 -> 0.7.0 --- pkgs/development/tools/regclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 207060f1ffa8..0860c28c5040 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -12,16 +12,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.6.1"; + version = "0.7.0"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-0TeqZeW2HTjHyHyO8EhmOUCaLTq/XpWTPQMKh58VH8M="; + sha256 = "sha256-MumOum8mG2KOSKz2wRZlbTFvgSOEpJ/qMz7+hYooPgk="; }; - vendorHash = "sha256-cKpsgT/YOyNEV8OQdclZnDmGKCrUjNeZCOd0zQ/bvL8="; + vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4="; outputs = [ "out" ] ++ bins; From e390a2413116022e492bbc15ddc6899dd95be693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 06:29:02 +0000 Subject: [PATCH 211/562] earthly: 0.8.14 -> 0.8.15 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 8dabbd7dfade..576c3edd405c 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.14"; + version = "0.8.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-G9AvJMrgb71KxOaYScYOVuYSwubLlSd6a9KhzA8DKlA="; + hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78="; }; - vendorHash = "sha256-Uy/h6TBmDYHSewq3TbchLe+AtdvO2xNSp9pVDglRKVc="; + vendorHash = "sha256-bwNuQPGjAQ9Afa2GuPWrW8ytfIvhsOYFKPt0zyfdZhU="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From dbefca319188dbcdd0ea9bd981a9a9c7dfef322f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 06:50:38 +0000 Subject: [PATCH 212/562] frankenphp: 1.2.1 -> 1.2.2 --- pkgs/by-name/fr/frankenphp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index a373c870c546..da611ee21917 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -27,13 +27,13 @@ let pieBuild = stdenv.hostPlatform.isMusl; in buildGoModule rec { pname = "frankenphp"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; rev = "v${version}"; - hash = "sha256-VHN5ezPwWZ9cKcaGyIkNh2RnD9ETt/3I+/QmAV6DY3o="; + hash = "sha256-N8cnbyoacftQNQWQBh+KxLp9L+uFVR6qYcid8a4Blso="; }; sourceRoot = "${src.name}/caddy"; @@ -41,7 +41,7 @@ in buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-37nt6UuHgZZ7ZZlqgE3ggGwtiJwT2lgnwV1Pt3RsU7o="; + vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; From 03d18400251f981ec34f69e80f3206626cbec5b2 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Fri, 12 Jul 2024 23:43:12 +0530 Subject: [PATCH 213/562] xcbeautify: 1.4.0 -> 2.4.1 --- pkgs/by-name/xc/xcbeautify/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xc/xcbeautify/package.nix b/pkgs/by-name/xc/xcbeautify/package.nix index 5ad33771d358..fb0cea984670 100644 --- a/pkgs/by-name/xc/xcbeautify/package.nix +++ b/pkgs/by-name/xc/xcbeautify/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "xcbeautify"; - version = "1.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${stdenv.hostPlatform.darwinArch}-apple-macosx.zip"; hash = lib.getAttr stdenv.hostPlatform.darwinArch { - arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk="; - x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg="; + arm64 = "sha256-EjBhpw9qsOEweXOepQVPNL/hCxj12Z5gyvv7neNEeMU="; + x86_64 = "sha256-Zb54g0cMWB6ouzLPUd+VTCicp+bVb5aDKxNSB3eGaZU="; }; }; @@ -30,12 +30,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Little beautifier tool for xcodebuild"; homepage = "https://github.com/cpisciotta/xcbeautify"; - license = licenses.mit; - platforms = platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; mainProgram = "xcbeautify"; - maintainers = with maintainers; [ siddarthkay ]; + maintainers = with lib.maintainers; [ siddarthkay ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } From 4b7d2575d7c71af6d10a59a33fc1cd41366e0619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 07:46:39 +0000 Subject: [PATCH 214/562] osv-scanner: 1.8.1 -> 1.8.2 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 30f759924076..4e55b39dfa69 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-Hk5W55xBIAwbpHgkI5bvQYkebwPfEkyKhXuysKsbNgQ="; + hash = "sha256-kgrKJJxTaKfZyln0t9gKJgpTbrh5d1j1Ax25Y9JK05w="; }; - vendorHash = "sha256-uc1+TDqrwiRnvS59GpypO3US54Ip5LrOQYEsyHhDDwk="; + vendorHash = "sha256-FeLxMmq1BwbDYc+FGXjn8n8YaechTpn9XwODLDOnuTo="; subPackages = [ "cmd/osv-scanner" From a6f3b517590e99e0cab5320c32e9827704ff3fd3 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Thu, 11 Jul 2024 18:23:08 +0200 Subject: [PATCH 215/562] maintainers: add oynqr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 49261f9eed3c..e40452209498 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15207,6 +15207,12 @@ name = "Alvar Penning"; keys = [ { fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; } ]; }; + oynqr = { + email = "pd-nixpkgs@3b.pm"; + github = "oynqr"; + githubId = 71629732; + name = "Philipp David"; + }; oyren = { email = "m.scheuren@oyra.eu"; github = "oyren"; From 1e049fb14fa83adf6bed8c04697327ad13b7bc47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 09:06:05 +0000 Subject: [PATCH 216/562] fflogs: 8.5.25 -> 8.6.0 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index d8bacf16658d..7b5f8849c800 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.25"; + version = "8.6.0"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-GrN19ONZ4a400d3BM7bdpR/+v0F4Q13+zcGqvDBcEPU="; + hash = "sha256-fJOZHvnGOB+b67w2F8kJ+1hogc0DTmtujvNw3W8WWSU="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From 3751d66c836fa24f2828f0a4d818c7d9cd18aa39 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jul 2024 11:49:04 +0200 Subject: [PATCH 217/562] python311Packages.jaxtyping: 0.2.31 -> 0.2.33 Diff: https://github.com/google/jaxtyping/compare/refs/tags/v0.2.31...v0.2.33 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.2.33 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index c8fba04ec260..e28c6aecef3d 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -18,7 +18,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.31"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-kuGFzp8sDLq6J/qq8ap3lD3n1pABHurXcbRUtDQyWwE="; + hash = "sha256-CL1EONbjjT3SCAn2o1x+1cgfuYWMEgQwbX9j34t+HGs="; }; build-system = [ From 6c549edd900a82dbce58524457ddc06d3fac6d4f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Jul 2024 11:35:42 +0200 Subject: [PATCH 218/562] python311Packages.equinox: disable flaky test --- pkgs/development/python-modules/equinox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 0e9cabdcf656..47a1be300568 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -72,6 +72,10 @@ buildPythonPackage rec { # AssertionError: assert 'foo:\n pri...pe=float32)\n' == 'foo:\n pri...pe=float32)\n' # Also reported in patrick-kidger/equinox#716 "test_backward_nan" + + # Flaky test + # See https://github.com/patrick-kidger/equinox/issues/781 + "test_traceback_runtime_eqx" ]; meta = { From 61be8d2f64919f8f7c05122d5ecf1c59b0c305f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jul 2024 10:24:14 -0700 Subject: [PATCH 219/562] nextcloud-client: only update after official release --- pkgs/applications/networking/nextcloud-client/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 88e53389598a..5c0cdf4455a8 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; + # make sure an official release has been published on + # https://github.com/nextcloud-releases/desktop/releases and re-check the + # hash afterwards version = "3.13.2"; outputs = [ "out" "dev" ]; From 7459b7ce657eba6809eb0c98ddae4b01205a8ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Tue, 9 Jul 2024 07:52:14 -0400 Subject: [PATCH 220/562] ossia-score: 3.2.3-3 -> 3.2.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update pkgs/by-name/os/ossia-score/package.nix - Remove unused stdenv - Support AArch64 Co-authored-by: Rémi NICOLE --- pkgs/by-name/os/ossia-score/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 9dca52e18195..8eb6df45db9a 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , cmake , ninja @@ -42,15 +41,15 @@ # TODO: figure out LLVM jit # assert lib.versionAtLeast llvm.version "15"; -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.2.3-3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; - rev = "v3.2.3-3"; - hash = "sha256-xRqsMKwuejbl+5ljYMFhQv/j1MfnFH5MGIn9rCQG/ro="; + rev = "v${finalAttrs.version}"; + hash = "sha256-O9v7hhBHVi4OuuCebG3bvjp/MOYu1iPv+lji/wS4O7o="; fetchSubmodules = true; }; @@ -152,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { the creation of interactive shows, museum installations, intermedia digital artworks, interactive music and more in an intuitive user interface. ''; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.gpl3Only; maintainers = with maintainers; [ jcelerier minijackson ]; }; From f55d58cfa1c8cb42c7e78c2f1efa09e1579b284e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 13 Jul 2024 13:27:02 +0200 Subject: [PATCH 221/562] haskellPackages.llvm-tf: Remove broken flag --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 8 -------- pkgs/development/haskell-modules/hackage-packages.nix | 9 --------- 3 files changed, 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 00407c5fc378..82254967cda3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3550,7 +3550,6 @@ broken-packages: - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02 - llvm-party # failure in job https://hydra.nixos.org/build/233221113 at 2023-09-02 - llvm-pretty # failure in job https://hydra.nixos.org/build/233206445 at 2023-09-02 - - llvm-tf # failure in job https://hydra.nixos.org/build/233211770 at 2023-09-02 - lmdb-high-level # failure in job https://hydra.nixos.org/build/233238988 at 2023-09-02 - lmdb-simple # failure in job https://hydra.nixos.org/build/233206781 at 2023-09-02 - lmonad # failure in job https://hydra.nixos.org/build/233246737 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 e6f8a8681410..7c7e004f6cf9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -844,7 +844,6 @@ dont-distribute-packages: - clash-verilog - clash-vhdl - clashilator - - classify-frog - classy-effects - classy-effects-th - classy-miso @@ -2457,8 +2456,6 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector - - knead - - knead-arithmetic - knit-haskell - koji-install - koji-tool @@ -2592,9 +2589,6 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop - - llvm-dsl - - llvm-extension - - llvm-extra - llvm-general - llvm-general-quote - llvm-hs-pretty @@ -3020,7 +3014,6 @@ dont-distribute-packages: - partage - partial-semigroup-test - passman-cli - - patch-image - pathfindingcore - patterns - paypal-rest-client @@ -3841,7 +3834,6 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell - - synthesizer-llvm - sys-process - syslog - systemd-api diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f9245818228..bc67f135a866 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -66413,7 +66413,6 @@ self: { ]; description = "Classify sounds produced by Xenopus laevis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "classify-frog"; }) {}; @@ -184084,7 +184083,6 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "knead-arithmetic" = callPackage @@ -184098,7 +184096,6 @@ self: { ]; description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "knit" = callPackage @@ -194564,7 +194561,6 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-extension" = callPackage @@ -194583,7 +194579,6 @@ self: { ]; description = "Processor specific intrinsics for the llvm interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-extra" = callPackage @@ -194610,7 +194605,6 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-ffi" = callPackage @@ -194934,8 +194928,6 @@ self: { doHaddock = false; description = "Bindings to the LLVM compiler toolkit using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-tools" = callPackage @@ -297194,7 +297186,6 @@ self: { doHaddock = false; description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-midi" = callPackage From a6ede4e0d0b8208722ce9f27129a679d56ebbdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 13 Jul 2024 14:27:32 +0200 Subject: [PATCH 222/562] neovide: 0.13.1 -> 0.13.2 --- pkgs/by-name/ne/neovide/package.nix | 10 +++++----- pkgs/by-name/ne/neovide/skia-externals.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 4c4dfab2fe1d..0d73f15d37dd 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - hash = "sha256-vN4LwJdVU0OWBuG7omDYY3Q6QZ2pTyCxWxFzv9Z1/6I="; + hash = "sha256-4pTMG/CUHFNMJxGGEm0Pz3gGhAzOpy69lAZyg2lwor8="; }; - cargoHash = "sha256-TiGEAwNXBNTXVU/CyKrUkjy8eIypYiLtoTyjskMpWvs="; + cargoHash = "sha256-gN7W/EO4D0NbjUVTnoYZr2334hWG5jn6SJFdDnHpImo="; SKIA_SOURCE_DIR = let @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m124-0.72.3"; - hash = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; + rev = "m126-0.74.2"; + hash = "sha256-4l6ekAJy+pG27hBGT6A6LLRwbsyKinJf6PP6mMHwaAs="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json index 9a71fd62899f..d1ca67f74235 100644 --- a/pkgs/by-name/ne/neovide/skia-externals.json +++ b/pkgs/by-name/ne/neovide/skia-externals.json @@ -11,8 +11,8 @@ }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "a0718d4f121727e30b8d52c7a189ebf5ab52421f", - "sha256": "sha256-BI3f/gf9GNDvSfXWeRHKBvznSz4mjXY8rM24kK7QvOM=" + "rev": "364118a1d9da24bb5b770ac3d762ac144d6da5a4", + "sha256": "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg=" }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", @@ -21,8 +21,8 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "c053e8f29257814e11ad61493dbbe29f27656de4", - "sha256": "sha256-D8DNcZH/oiJqWvfWFHvQ8AwQ3OrMwyZdfGmZ5y30Hvg=" + "rev": "b74a7ecc93e283d059df51ee4f46961a782bcdb8", + "sha256": "sha256-/ZYsusWvLzBk5fym3ndVVEplyAdWFf7d4twBvwQVioY=" }, "wuffs": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -31,7 +31,7 @@ }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", - "rev": "144b348e072a78e8130ed0acc452c9f039a67bf2", - "sha256": "sha256-eTF7q7hR4S1OqV2oPQKmcHujA5Od4rGMc5879kT0SkE=" + "rev": "ed217e3e601d8e462f7fd1e04bed43ac42212429", + "sha256": "sha256-Mo1M8TuVaoSIb7Hy2u6zgjZ1DKgpmgNmGRP6dGg/aTs=" } } From 7e9e215bbc673d31a5141cc66618608d0abd155a Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 24 Jun 2024 10:23:01 +0200 Subject: [PATCH 223/562] ocis-bin: support more architectures and add update script * Adds an update script that can be used by the passthru updateScript [0] * this script tracks the Production (aka stable) channel for oCIS https://owncloud.dev/ocis/release_roadmap/#release-types as decided by the package maintainers * Adds the full range of architectures released by owncloud * darwin: amd64, aarch64 * linux: i686, x86_64, arm, aarch64 [0]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#automatic-package-updates --- pkgs/by-name/oc/ocis-bin/package.nix | 59 ++++++-- pkgs/by-name/oc/ocis-bin/update.py | 215 +++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 16 deletions(-) create mode 100755 pkgs/by-name/oc/ocis-bin/update.py diff --git a/pkgs/by-name/oc/ocis-bin/package.nix b/pkgs/by-name/oc/ocis-bin/package.nix index f64625b7a5ee..572c78ba10f1 100644 --- a/pkgs/by-name/oc/ocis-bin/package.nix +++ b/pkgs/by-name/oc/ocis-bin/package.nix @@ -5,28 +5,46 @@ autoPatchelfHook, }: +let + arch = + { + i686-linux = "386"; + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + armv7l-linux = "arm"; + x86_64-darwin = "amd64"; + aarch64-darwin = "arm64"; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + os = + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "darwin" + else + throw "Unsupported OS"; + + hash = + { + hash_386-linux = "sha256-4yEgg0Ve8tjNn2weH9d91tfRaU1TE569VvZLxzuzXsw="; + hash_amd64-linux = "sha256-YAIhtHv/cO4yFpkWoRNMf6t4+ifMtGPTcYu84ZMvfD4="; + hash_arm64-linux = "sha256-OdtT9NOhh0Fkk+8CDic0NWWbGflk3FcuKB60OycJU5E="; + hash_arm-linux = "sha256-foMsZ8Nq+Q5lqt2XZCDvQ+/sFM8/1/rPfogzsyrQHqs="; + hash_amd64-darwin = "sha256-6jaX9iqyqztykeXZX3YqwRV/silFiyfeB9gJyreAfF8="; + hash_arm64-darwin = "sha256-KJqMJct7YWocE4eVjMF36adqTIf7WcutZlG3QEoMhCI="; + } + ."hash_${arch}-${os}"; +in stdenv.mkDerivation (finalAttrs: { pname = "ocis-bin"; version = "5.0.5"; - system = - if stdenv.isLinux && stdenv.isx86_64 then - "linux-amd64" - else if stdenv.isLinux && stdenv.isAarch64 then - "linux-arm64" - else - ""; src = fetchurl { - url = "https://github.com/owncloud/ocis/releases/download/v${finalAttrs.version}/ocis-${finalAttrs.version}-${finalAttrs.system}"; - - hash = - if stdenv.isLinux && stdenv.isAarch64 then - "sha256-OdtT9NOhh0Fkk+8CDic0NWWbGflk3FcuKB60OycJU5E=" - else if stdenv.isLinux && stdenv.isx86_64 then - "sha256-YAIhtHv/cO4yFpkWoRNMf6t4+ifMtGPTcYu84ZMvfD4=" - else - builtins.throw "Unsupported platform, please contact Nixpkgs maintainers for ocis package"; + url = "https://github.com/owncloud/ocis/releases/download/v${finalAttrs.version}/ocis-${finalAttrs.version}-${os}-${arch}"; + inherit hash; }; + dontUnpack = true; nativeBuildInputs = [ autoPatchelfHook ]; @@ -37,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.py; + meta = with lib; { description = "ownCloud Infinite Scale Stack "; homepage = "https://owncloud.dev/ocis/"; @@ -50,6 +70,13 @@ stdenv.mkDerivation (finalAttrs: { danth ramblurr ]; + + platforms = + (lib.intersectLists platforms.linux ( + lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.x86 + )) + ++ (lib.intersectLists platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64)); + sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "ocis"; }; diff --git a/pkgs/by-name/oc/ocis-bin/update.py b/pkgs/by-name/oc/ocis-bin/update.py new file mode 100755 index 000000000000..e66b39f96f38 --- /dev/null +++ b/pkgs/by-name/oc/ocis-bin/update.py @@ -0,0 +1,215 @@ +#!/usr/bin/env nix-shell +##!nix-shell -I nixpkgs=./. -i python3 -p common-updater-scripts gnused nix coreutils python312 +""" +Updater script for the ocis-bin package. + +This script fetches an HTML table from a specified URL and parses it to determine the release type +(either "Rolling" or "Production") of a given software version. It uses the built-in urllib.request +for fetching the HTML content and the built-in html.parser for parsing the HTML. By relying only on +standard library modules, we avoid dependencies on third-party libraries, which simplifies deployment +and improves portability. +""" +import urllib.request +import os +import subprocess +import json +import sys +from datetime import datetime +from html.parser import HTMLParser + +TRACKING_CHANNEL = "Production" # Either Rolling or Production + +GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None) + + +class TableParser(HTMLParser): + def __init__(self, version): + super().__init__() + self.version = version + self.in_td = False + self.current_row = [] + self.release_type = None + self.in_target_row = False + + def handle_starttag(self, tag, attrs): + if tag == "td": + self.in_td = True + + if tag == "a": + href = dict(attrs).get("href", "") + if self.version in href: + self.in_target_row = True + + def handle_endtag(self, tag): + if tag == "td": + self.in_td = False + + if tag == "tr" and self.in_target_row: + self.release_type = self.current_row[1] + self.in_target_row = False + + if tag == "tr": + self.current_row = [] + + def handle_data(self, data): + if self.in_td: + self.current_row.append(data.strip()) + + +def get_release_type(content, version): + parser = TableParser(version) + parser.feed(content) + return parser.release_type + + +def get_latest_version(): + url = "https://api.github.com/repos/owncloud/ocis/releases?per_page=1" + req = urllib.request.Request(url) + + if GITHUB_TOKEN: + req.add_header("Authorization", f"Bearer {GITHUB_TOKEN}") + + with urllib.request.urlopen(req) as response: + if response.status != 200: + raise Exception(f"HTTP request failed with status {response.status}") + + data = response.read() + releases = json.loads(data) + latest_version = releases[0]["tag_name"].lstrip("v") + + return latest_version + + +def get_all_versions(): + url = "https://api.github.com/repos/owncloud/ocis/releases" + req = urllib.request.Request(url) + + if GITHUB_TOKEN: + req.add_header("Authorization", f"Bearer {GITHUB_TOKEN}") + + with urllib.request.urlopen(req) as response: + if response.status != 200: + raise Exception(f"HTTP request failed with status {response.status}") + + data = response.read() + releases = json.loads(data) + + versions = [] + for release in releases: + version = release["tag_name"].lstrip("v") + published_date = datetime.strptime( + release["published_at"], "%Y-%m-%dT%H:%M:%SZ" + ) + versions.append({"version": version, "published_date": published_date}) + + return versions + + +def get_current_version(): + result = subprocess.run( + [ + "nix-instantiate", + "--eval", + "-E", + "with import ./. {}; ocis-bin.version or (lib.getVersion ocis-bin)", + ], + capture_output=True, + text=True, + ) + result.check_returncode() + return result.stdout.strip().strip('"') + + +def get_hash(os_name, arch, version): + url = f"https://github.com/owncloud/ocis/releases/download/v{version}/ocis-{version}-{os_name}-{arch}" + result = subprocess.run( + ["nix-prefetch-url", "--type", "sha256", url], capture_output=True, text=True + ) + result.check_returncode() + pkg_hash = result.stdout.strip() + result = subprocess.run( + ["nix", "hash", "to-sri", f"sha256:{pkg_hash}"], capture_output=True, text=True + ) + result.check_returncode() + return result.stdout.strip() + + +def update_source_version(pkg_name, version, hash_value, system): + subprocess.run( + [ + "update-source-version", + pkg_name, + version, + hash_value, + f"--system={system}", + "--ignore-same-version", + ], + check=True, + ) + + +def main(): + all_versions = get_all_versions() + latest_version = all_versions[0] + nix_current_version = get_current_version() + + current_version = None + for version in all_versions: + if nix_current_version == version["version"]: + current_version = version + break + + if not current_version: + print( + f"error: cannot find github release for current nix version of ocis-bin {nix_current_version}" + ) + sys.exit(1) + + if current_version == latest_version: + print(f"ocis-bin is up-to-date: {current_version}") + return + + roadmap_url = "https://owncloud.dev/ocis/release_roadmap/" + response = urllib.request.urlopen(roadmap_url) + content = response.read().decode("utf-8") + latest_version_channel = get_release_type(content, latest_version["version"]) + current_version_channel = get_release_type(content, current_version["version"]) + + target_version = None + if latest_version_channel == TRACKING_CHANNEL: + target_version = latest_version + elif latest_version_channel != TRACKING_CHANNEL: + for version in all_versions: + channel = get_release_type(content, version["version"]) + if ( + channel == TRACKING_CHANNEL + and version["published_date"] > current_version["published_date"] + ): + target_version = version + print( + f"ocis-bin found newer version {version['version']} in channel {TRACKING_CHANNEL}" + ) + break + + if not target_version: + print( + f"ocis-bin could not find newer version in {TRACKING_CHANNEL} than the current {current_version['version']}" + ) + return + + systems = [ + ("darwin", "arm64", "aarch64-darwin"), + ("darwin", "amd64", "x86_64-darwin"), + ("linux", "arm64", "aarch64-linux"), + ("linux", "arm", "armv7l-linux"), + ("linux", "amd64", "x86_64-linux"), + ("linux", "386", "i686-linux"), + ] + + for os_name, arch, system in systems: + hash_value = get_hash(os_name, arch, target_version["version"]) + update_source_version("ocis-bin", target_version["version"], hash_value, system) + + +if __name__ == "__main__": + main() From 8bad99561b239ac9d36442775353192334ef9807 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jul 2024 15:29:17 +0200 Subject: [PATCH 224/562] fmt: reformat --- pkgs/development/libraries/fmt/default.nix | 44 ++++++++++++++-------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 9ce329df7957..b13a0e12d0e9 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,23 +1,32 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, enableShared ? !stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + enableShared ? !stdenv.hostPlatform.isStatic, -# tests -, mpd -, openimageio -, fcitx5 -, spdlog + # tests + mpd, + openimageio, + fcitx5, + spdlog, }: let - generic = { version, sha256, patches ? [ ] }: + generic = + { + version, + sha256, + patches ? [ ], + }: stdenv.mkDerivation { pname = "fmt"; inherit version; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchFromGitHub { owner = "fmtlib"; @@ -30,14 +39,17 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; doCheck = true; passthru.tests = { - inherit mpd openimageio fcitx5 spdlog; + inherit + mpd + openimageio + fcitx5 + spdlog + ; }; meta = with lib; { From b5dade8ca0fef21d44f49d1ff3ffb12031ebe3c1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jul 2024 15:29:29 +0200 Subject: [PATCH 225/562] fmt_11: init at 11.0.1 --- pkgs/development/libraries/fmt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index b13a0e12d0e9..f42e12f03bec 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -82,4 +82,9 @@ in version = "10.2.1"; sha256 = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co="; }; + + fmt_11 = generic { + version = "11.0.1"; + sha256 = "sha256-EPidbZxCvysrL64AzbpJDowiNxqy4ii+qwSWAFwf/Ps="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0ad89cb57d..773f82a1931f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20482,7 +20482,7 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11; fmt = fmt_10; From 942ae171abfeb3ca2db303a93069597e42786239 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jul 2024 15:00:32 +0200 Subject: [PATCH 226/562] rspamd: reformat --- pkgs/servers/mail/rspamd/default.nix | 124 +++++++++++++++++---------- 1 file changed, 77 insertions(+), 47 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index dd34e5cc2a62..ecd037fd4967 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,30 +1,31 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, doctest -, fmt -, perl -, glib -, luajit -, openssl -, pcre -, pkg-config -, sqlite -, ragel -, icu -, hyperscan -, jemalloc -, blas -, lapack -, lua -, libsodium -, xxHash -, zstd -, withBlas ? true -, withHyperscan ? stdenv.isx86_64 -, withLuaJIT ? stdenv.isx86_64 -, nixosTests +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + doctest, + fmt, + perl, + glib, + luajit, + openssl, + pcre, + pkg-config, + sqlite, + ragel, + icu, + hyperscan, + jemalloc, + blas, + lapack, + lua, + libsodium, + xxHash, + zstd, + withBlas ? true, + withHyperscan ? stdenv.isx86_64, + withLuaJIT ? stdenv.isx86_64, + nixosTests, }: assert withHyperscan -> stdenv.isx86_64; @@ -42,27 +43,51 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - nativeBuildInputs = [ cmake pkg-config perl ]; - buildInputs = [ doctest fmt glib openssl pcre sqlite ragel icu jemalloc libsodium xxHash zstd ] + nativeBuildInputs = [ + cmake + pkg-config + perl + ]; + buildInputs = + [ + doctest + fmt + glib + openssl + pcre + sqlite + ragel + icu + jemalloc + libsodium + xxHash + zstd + ] ++ lib.optional withHyperscan hyperscan - ++ lib.optionals withBlas [ blas lapack ] - ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; + ++ lib.optionals withBlas [ + blas + lapack + ] + ++ lib.optional withLuaJIT luajit + ++ lib.optional (!withLuaJIT) lua; - cmakeFlags = [ - # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908 - "-DENABLE_PCRE2=OFF" - "-DDEBIAN_BUILD=ON" - "-DRUNDIR=/run/rspamd" - "-DDBDIR=/var/lib/rspamd" - "-DLOGDIR=/var/log/rspamd" - "-DLOCAL_CONFDIR=/etc/rspamd" - "-DENABLE_JEMALLOC=ON" - "-DSYSTEM_DOCTEST=ON" - "-DSYSTEM_FMT=ON" - "-DSYSTEM_XXHASH=ON" - "-DSYSTEM_ZSTD=ON" - ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON" - ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF"; + cmakeFlags = + [ + # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908 + "-DENABLE_PCRE2=OFF" + "-DDEBIAN_BUILD=ON" + "-DRUNDIR=/run/rspamd" + "-DDBDIR=/var/lib/rspamd" + "-DLOGDIR=/var/log/rspamd" + "-DLOCAL_CONFDIR=/etc/rspamd" + "-DENABLE_JEMALLOC=ON" + "-DSYSTEM_DOCTEST=ON" + "-DSYSTEM_FMT=ON" + "-DSYSTEM_XXHASH=ON" + "-DSYSTEM_ZSTD=ON" + ] + ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON" + ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF"; passthru.tests.rspamd = nixosTests.rspamd; @@ -70,7 +95,12 @@ stdenv.mkDerivation rec { homepage = "https://rspamd.com"; license = licenses.asl20; description = "Advanced spam filtering system"; - maintainers = with maintainers; [ avnik fpletz globin lewo ]; + maintainers = with maintainers; [ + avnik + fpletz + globin + lewo + ]; platforms = with platforms; linux; }; } From eda516d4ed24c7800fadc72b8f125962a650027a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jul 2024 15:46:46 +0200 Subject: [PATCH 227/562] rspamd: 3.8.4 -> 3.9.0 --- pkgs/servers/mail/rspamd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index ecd037fd4967..41074da03471 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, doctest, - fmt, + fmt_11, perl, glib, luajit, @@ -22,6 +22,7 @@ libsodium, xxHash, zstd, + libarchive, withBlas ? true, withHyperscan ? stdenv.isx86_64, withLuaJIT ? stdenv.isx86_64, @@ -32,13 +33,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.8.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-3skF+aQv8Y3ATujV+WH4DxwyQ2hXR6CDZz77CkaRso0="; + hash = "sha256-PCogHnes3/8qqdcqsiUzuVVEUf8+ze3xiYUmfe6L3IU="; }; hardeningEnable = [ "pie" ]; @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ doctest - fmt + fmt_11 glib openssl pcre @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { libsodium xxHash zstd + libarchive ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ From adf3e496489c169cd512665c0d3a3e50ff38d382 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 14:52:55 +0000 Subject: [PATCH 228/562] tutanota-desktop: 232.240626.0 -> 235.240712.0 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index bf0b709abdcf..f052e6930591 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "232.240626.0"; + version = "235.240712.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE="; + hash = "sha256-IhGfpHzK853b21oqhlfvXVrS1gl/4xgrZeWvBCIL1qg="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From dd0e1ee3fd55f482ff6be034101723b8ed3bdd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jul 2024 19:33:59 +0200 Subject: [PATCH 229/562] thunderbird: refactor (prepare for version 128) --- .../mailreaders/thunderbird/packages.nix | 27 ++++++++++++------- .../mailreaders/thunderbird/update.nix | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 817860120b55..0aa62d088a7f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,17 +1,15 @@ { stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: -rec { - thunderbird = thunderbird-115; - - thunderbird-115 = (buildMozillaMach rec { +let + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; - version = "115.12.2"; + inherit version updateScript; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + inherit sha512; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -30,10 +28,6 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-unwrapped"; - versionPrefix = "115"; - }; }).override { geolocationSupport = false; webrtcSupport = false; @@ -51,6 +45,19 @@ rec { })]; }); }; + +in rec { + thunderbird = thunderbird-115; + + thunderbird-115 = common { + version = "115.12.2"; + sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-115"; + versionPrefix = "115"; + }; + }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix index d6f1a007faa4..c7f2e0511d24 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/update.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/update.nix @@ -3,5 +3,5 @@ }@args: callPackage ../../browsers/firefox/update.nix ({ - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + baseUrl = "https://archive.mozilla.org/pub/thunderbird/releases/"; } // (builtins.removeAttrs args ["callPackage"])) From 22601be95cba9652b9f8fce48580a1924e53cd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jul 2024 19:34:52 +0200 Subject: [PATCH 230/562] thunderbird-128: init at 128.0esr https://blog.thunderbird.net/2024/07/welcome-to-thunderbird-128-nebula/ --- .../networking/mailreaders/thunderbird/packages.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 0aa62d088a7f..01ba91f43e1d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -58,6 +58,17 @@ in rec { versionPrefix = "115"; }; }; + + thunderbird-128 = common { + version = "128.0esr"; + sha512 = "8524fbdcc51eddf83fec439273319315c44e6d3be9e4dcf51e453ced7fd1676abdca44442dcb302c637a98b7873828168f2d2d2b635551e406645a134d09aee0"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-128"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0ad89cb57d..636d6050d594 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34390,6 +34390,8 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; + thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; pname = "thunderbird-bin"; From 0bc995ab0bc0e11e797b7f18814035c1f02c9d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 18:17:07 +0000 Subject: [PATCH 231/562] python312Packages.augmax: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/augmax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index ac4d6834f8ba..3982a00674ea 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "augmax"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disbaled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "khdlr"; repo = "augmax"; rev = "refs/tags/v${version}"; - hash = "sha256-xz6yJiVZUkRcRa2rKZdytfpP+XCk/QI4xtKlNaS9FYo="; + hash = "sha256-FXgkhZEAR1Y2LvVvV+IWMSQDWrLulLDsSKKuw4ER5wg="; }; build-system = [ setuptools ]; From 72a3c73d8539f3be03e960a6ef4d5d6be958b16b Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 23:04:12 +0300 Subject: [PATCH 232/562] ios-webkit-debug-proxy: move to `pkgs/by-name` --- .../ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch | 0 .../io/ios-webkit-debug-proxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/mobile => by-name/io}/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch (100%) rename pkgs/{development/mobile/ios-webkit-debug-proxy/default.nix => by-name/io/ios-webkit-debug-proxy/package.nix} (100%) diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch b/pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch similarity index 100% rename from pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch rename to pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix similarity index 100% rename from pkgs/development/mobile/ios-webkit-debug-proxy/default.nix rename to pkgs/by-name/io/ios-webkit-debug-proxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f90e707a504..7e98bf1d1b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3995,8 +3995,6 @@ with pkgs; xc = callPackage ../development/tools/xc { }; - ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; xcodes = swiftPackages.callPackage ../development/tools/xcodes { From 1dd31a7861b25fdfa63f6ee0590a612fa2447a92 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 22:57:39 +0300 Subject: [PATCH 233/562] ios-webkit-debug-proxy: reformat --- .../io/ios-webkit-debug-proxy/package.nix | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 3b32a1bb9a31..0f40c24c9171 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -1,25 +1,33 @@ -{ stdenv -, autoconf -, automake -, fetchFromGitHub -, fetchpatch -, lib -, libimobiledevice -, libusb1 -, libplist -, libtool -, openssl -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + + autoconf, + automake, + libtool, + pkg-config, + + libimobiledevice, + libplist, + libusb1, + openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ios-webkit-debug-proxy"; version = "1.9.0"; + outputs = [ + "out" + "dev" + ]; + src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; + repo = "ios-webkit-debug-proxy"; + rev = "v${finalAttrs.version}"; hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; }; @@ -38,10 +46,19 @@ stdenv.mkDerivation rec { ./0001-Don-t-compile-examples.patch ]; - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - buildInputs = [ libimobiledevice libusb1 libplist openssl ]; + buildInputs = [ + libimobiledevice + libplist + libusb1 + openssl + ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh @@ -51,7 +68,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; - mainProgram = "ios_webkit_debug_proxy"; longDescription = '' The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd daemon over a websocket connection, allowing developers to send commands @@ -59,6 +75,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/google/ios-webkit-debug-proxy"; license = licenses.bsd3; - maintainers = [ maintainers.abustany ]; + mainProgram = "ios_webkit_debug_proxy"; + maintainers = with maintainers; [ + abustany + paveloom + ]; }; -} +}) From 8de2a2656feeb67b47e6174031b75416487434f5 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 22:59:48 +0300 Subject: [PATCH 234/562] ios-webkit-debug-proxy: add the `updateScript` and the version test --- pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 0f40c24c9171..626da3700246 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -13,6 +13,10 @@ libplist, libusb1, openssl, + + ios-webkit-debug-proxy, + nix-update-script, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -66,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = ios-webkit-debug-proxy; }; + }; + meta = with lib; { description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; longDescription = '' From 671396fe510ebf03110c6fb81bc0359402bf7b70 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 23:11:17 +0300 Subject: [PATCH 235/562] ios-webkit-debug-proxy: 1.9.0 -> 1.9.1 --- pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 626da3700246..13ecbb058c06 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ios-webkit-debug-proxy"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "out" @@ -32,20 +32,10 @@ stdenv.mkDerivation (finalAttrs: { owner = "google"; repo = "ios-webkit-debug-proxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; + hash = "sha256-94gYTv5v4YNwbiUJ/9PIHU+Bnvf5uN12+oMFWKj+J1Y="; }; patches = [ - # OpenSSL 3.0 compatibility - (fetchpatch { - url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch"; - hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s="; - }) - (fetchpatch { - name = "libplist-2.3.0-compatibility.patch"; - url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch"; - hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg="; - }) # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399 ./0001-Don-t-compile-examples.patch ]; From f88960c7b6a18483791535dac0b133566759ba70 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 13 Jul 2024 11:56:37 -0400 Subject: [PATCH 236/562] ukmm: fix running on x11 Also switches from using LD_LIBRARY_PATH to RUSTFLAGS to include required runtime libraries. --- pkgs/tools/games/ukmm/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index dcfe3082c911..a13f65553e6e 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -5,6 +5,7 @@ , pkg-config , wrapGAppsHook3 , libglvnd +, libxkbcommon , nix-update-script }: @@ -35,9 +36,21 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}) - ''; + buildInputs = [ + libglvnd + libxkbcommon + ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client & libxkbcommon, which is dlopen()ed based on the + # winit backend. + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-lxkbcommon" + "-Wl,--pop-state" + ]; cargoTestFlags = [ "--all" From c7b7295447b4e4a8948ed0e2e8ffc214adbbad94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:36:52 +0000 Subject: [PATCH 237/562] goreleaser: 2.0.1 -> 2.1.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index d73ade81d024..248c588f7f56 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-GC9jT0vEokezBeCUSvSal7mcExiPgGcTHmP94A1cEPE="; + hash = "sha256-A/k7oubfpOPDq6hHM/gmm6CrDPrdEpYv9jW5dzRJyaQ="; }; - vendorHash = "sha256-0EO99dUNdIEQt8iswPOvHFt/+XeihhJRhJIt2bC9Zp0="; + vendorHash = "sha256-igl/h8T7ZBntDanIWpsyJmR5X6h6VaKmSj0NScQJ9Wo="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; From 1b656e513c2cd84b0c82fbcf74154602139e6f8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:36:30 +0000 Subject: [PATCH 238/562] python312Packages.webdav4: 0.9.8 -> 0.10.0 --- pkgs/development/python-modules/webdav4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 6e4d6657763c..8083b080e44d 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "webdav4"; - version = "0.9.8"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "skshetry"; repo = "webdav4"; rev = "refs/tags/v${version}"; - hash = "sha256-Le/gABaUxMmSW2SjgucsBKqjxOq1h9UCAWl5YyUsCPk="; + hash = "sha256-LgWYgERRuUODFzUnC08kDJTVRx9vanJ+OU8sREEMVwM="; }; postPatch = '' From 23604ca2a71971e0cfc7592f021a8b61ed909458 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:44:43 +0000 Subject: [PATCH 239/562] python312Packages.zigpy-zigate: 0.12.1 -> 0.13.0 --- 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 0fb84ddcad9c..ac6906b3dfda 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.12.1"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-17XiGeEnQ3zQ4BaQ/RzwBUU9Xpg4yjUX1pV3mcIiI+M="; + hash = "sha256-fLNUTrPR1bc6H2mpdHj6O4pbrfLTb3filBE4mSDhZn0="; }; postPatch = '' From 927918a291db8a7f5477119904ea9ac3cd53d65a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 14 Jul 2024 06:18:13 +0200 Subject: [PATCH 240/562] libjpeg: add sigmanificient to maintainers --- pkgs/development/libraries/libjpeg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 6b1c80c6db2a..11378337c78b 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.ijg.org/"; description = "Library that implements the JPEG image file format"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; license = licenses.free; pkgConfigModules = [ "libjpeg" ]; platforms = platforms.unix; From 23349d3e280eb7bcd7e90c098852d0068695d7f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 04:19:29 +0000 Subject: [PATCH 241/562] drawterm: 0-unstable-2024-06-10 -> 0-unstable-2024-07-03 --- pkgs/tools/admin/drawterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index c0bead586d50..e7e9c7f7360b 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-06-10"; + version = "0-unstable-2024-07-03"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "19f4185f3967a5c00053236015da22c0da2af41d"; - hash = "sha256-aIoWhjzVmfXv5fcwIBwjUFVjdx316JivKMS+odnEB/I="; + rev = "f11139d4c918802a87730bc14d094670ee4ce572"; + hash = "sha256-vkBXzIezC9DWlGpk6klUvtmq4F4D5LJWwjEllMIr8D0="; }; enableParallelBuilding = true; From f606fe4fef3b2c66fef761c8dc7fe7fa95e17b39 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 14 Jul 2024 06:22:54 +0200 Subject: [PATCH 242/562] libjpeg: format with nixfmt, change sha56 -> hash --- pkgs/development/libraries/libjpeg/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 11378337c78b..63a4e9f27be2 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchurl -, testers -, static ? false +{ + lib, + stdenv, + fetchurl, + testers, + static ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -9,12 +12,17 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; + hash = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ + "bin" + "dev" + "out" + "man" + ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; From 9178b8e4eef4da8b71273d29fde96100e8e28f7b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 13 Jul 2024 21:21:38 +0800 Subject: [PATCH 243/562] librime-lua: init at 0-unstable-2024-05-19 --- pkgs/by-name/li/librime-lua/package.nix | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/li/librime-lua/package.nix diff --git a/pkgs/by-name/li/librime-lua/package.nix b/pkgs/by-name/li/librime-lua/package.nix new file mode 100644 index 000000000000..887ec14ff0f4 --- /dev/null +++ b/pkgs/by-name/li/librime-lua/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + unstableGitUpdater, + lua, +}: + +stdenvNoCC.mkDerivation { + pname = "librime-lua"; + version = "0-unstable-2024-05-19"; + + src = fetchFromGitHub { + owner = "hchunhui"; + repo = "librime-lua"; + rev = "7be6974b6d81c116bba39f6707dc640f6636fa4e"; + hash = "sha256-jsrnAFE99d0U0LdddTL7G1p416qJfSNR935TZFH3Swk="; + }; + + propagatedBuildInputs = [ lua ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp --archive --verbose src/ $out + install --mode=644 --verbose --target-directory=$out CMakeLists.txt LICENSE README.md + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + description = "Extending RIME with Lua scripts"; + homepage = "https://github.com/hchunhui/librime-lua"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ linj xddxdd ]; + }; +} From 2bbfe90eee015cc44f6fa5636df952d58b159389 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 13 Jul 2024 21:37:53 +0800 Subject: [PATCH 244/562] librime: add librime-lua plugin by default following Arch Linux https://gitlab.archlinux.org/archlinux/packaging/packages/librime/-/blob/0da73fbd402865409d0f4ef186fb763e9b4523e2/PKGBUILD#L22 --- pkgs/development/libraries/librime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4a95915d4205..73c335d00e15 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }: + yaml-cpp, gtest, capnproto, pkg-config, librime-lua, plugins ? [ librime-lua ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; From 4155672b5dd19cf289bcc3d33167181435cc8a73 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:40:54 +0900 Subject: [PATCH 245/562] python3Packages.twitter-common-collections: remove twitter-common-collections has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-collections/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-collections/default.nix diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix deleted file mode 100644 index 89137a326391..000000000000 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.collections"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Twitter's common collections"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4b887b0e4249..185110624bdd 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 + twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..694e1a528246 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; From 7980a8230f4c570d190a1188c597f637f429f7fd Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:41:37 +0900 Subject: [PATCH 246/562] python3Packages.twitter-common-confluence: remove twitter-common-confluence has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-confluence/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-confluence/default.nix diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix deleted file mode 100644 index f7b900f2ca11..000000000000 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-log, -}: - -buildPythonPackage rec { - pname = "twitter.common.confluence"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; - }; - - propagatedBuildInputs = [ twitter-common-log ]; - - meta = with lib; { - description = "Twitter's API to the confluence wiki"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 185110624bdd..44acb379dcc0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 694e1a528246..15e299820cb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; From 9fb5d8ca4a2431fddff04971780f55152e841bb6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:42:46 +0900 Subject: [PATCH 247/562] python3Packages.twitter-common-dirutil: remove twitter-common-dirutil has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-dirutil/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-dirutil/default.nix diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix deleted file mode 100644 index 10043c7ead8f..000000000000 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.dirutil"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Utilities for manipulating and finding files and directories"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44acb379dcc0..b3732a3d0ea7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -565,6 +565,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15e299820cb2..c74a508b23db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; From 75e249cecbe250d1ef3e922ef8342e6c3d7c4c89 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:43:33 +0900 Subject: [PATCH 248/562] python3Packages.twitter-common-lang: remove twitter-common-lang has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-lang/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-lang/default.nix diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix deleted file mode 100644 index 975b6d128d0b..000000000000 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.lang"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; - }; - - meta = with lib; { - description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b3732a3d0ea7..1c50987c7456 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -566,6 +566,7 @@ mapAliases ({ twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c74a508b23db..f327bdd98db6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; From 811f3347fe215489fd2423ed75c6935426e72a11 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:44:05 +0900 Subject: [PATCH 249/562] python3Packages.twitter-common-log: remove twitter-common-log has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-log/default.nix | 29 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-log/default.nix diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix deleted file mode 100644 index bd7a2fec8198..000000000000 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-options, - twitter-common-dirutil, -}: - -buildPythonPackage rec { - pname = "twitter.common.log"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; - }; - - propagatedBuildInputs = [ - twitter-common-options - twitter-common-dirutil - ]; - - meta = with lib; { - description = "Twitter's common logging library"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1c50987c7456..b102f5f74367 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f327bdd98db6..798d20ac3298 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; twitterapi = callPackage ../development/python-modules/twitterapi { }; From d2adf58973a45f9afe8b3e21daf1f56e9cfb40d4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:44:27 +0900 Subject: [PATCH 250/562] python3Packages.twitter-common-options: remove twitter-common-options has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-options/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-options/default.nix diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix deleted file mode 100644 index 47aa9e70824e..000000000000 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.options"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; - }; - - meta = with lib; { - description = "Twitter's optparse wrapper"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b102f5f74367..34fa065b9945 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -568,6 +568,7 @@ mapAliases ({ twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 798d20ac3298..0c901f150027 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - twitterapi = callPackage ../development/python-modules/twitterapi { }; twofish = callPackage ../development/python-modules/twofish { }; From 564dd254b6ebdc9c2eca032bf64a5ab6dec81913 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:57:48 +0000 Subject: [PATCH 251/562] proton-pass: 1.19.2 -> 1.20.1 --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 572bff100579..9e2b4d5f490d 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.19.2"; + version = "1.20.1"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-p16QleX6ZUu6ZfEPWCaTaWcMzoF2ruNgtvnDDH95iLQ="; + hash = "sha256-G14/gVevvccV8ILPr701IP8krR2/mOnRn0icCP1Hi4s="; }; dontConfigure = true; From e20001dbf61071adcd32a4079fb5c523e0e0ce1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 08:00:48 +0000 Subject: [PATCH 252/562] python312Packages.awscrt: 0.20.12 -> 0.21.1 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 209627d858bf..1ef9d1eeda9a 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.12"; + version = "0.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z271rdHsBh8/+nIrMm3wGhxEJJNIl2hYuBQdkHSlRok="; + hash = "sha256-q7nF79TzOItcXQsWQADF9SgLLKz72I5FhSVSjkEoJbw="; }; buildInputs = lib.optionals stdenv.isDarwin [ From 26595b1e41539ba5f141c7d885171858a88b80e6 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 14 Jul 2024 09:53:49 +0000 Subject: [PATCH 253/562] python312Packages.eliot: 1.14.0 -> 1.15.0 https://github.com/itamarst/eliot/releases/tag/1.15.0 https://github.com/itamarst/eliot/compare/1.14.0...1.15.0 switch to GitHub as source distribution is not available from PyPI --- .../python-modules/eliot/default.nix | 68 +++++++++++-------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 6c522d941387..e5f447b233c6 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -1,45 +1,62 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, - aiocontextvars, - boltons, - hypothesis, - pyrsistent, - pytestCheckHook, + pythonAtLeast, + setuptools, - six, - testtools, + + boltons, + orjson, + pyrsistent, zope-interface, + + daemontools, + dask, + distributed, + hypothesis, + pandas, + pytestCheckHook, + testtools, + twisted, }: buildPythonPackage rec { pname = "eliot"; - version = "1.14.0"; - format = "setuptools"; + version = "1.15.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk="; + src = fetchFromGitHub { + owner = "itamarst"; + repo = "eliot"; + rev = "refs/tags/${version}"; + hash = "sha256-Ur7q7PZ5HH4ttD3b0HyBTe1B7eQ2nEWcTBR/Hjeg9yw="; }; - propagatedBuildInputs = [ - aiocontextvars + build-system = [ setuptools ]; + + dependencies = [ boltons + orjson pyrsistent - setuptools - six zope-interface ]; nativeCheckInputs = [ + dask + distributed hypothesis + pandas pytestCheckHook testtools - ]; + twisted + ] ++ lib.optionals stdenv.isLinux [ daemontools ]; + + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "eliot" ]; @@ -48,17 +65,12 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_parse_stream" - # AttributeError: module 'inspect' has no attribute 'getargspec' - "test_default" - ]; - - meta = with lib; { + meta = { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened"; + changelog = "https://github.com/itamarst/eliot/blob/${version}/docs/source/news.rst"; mainProgram = "eliot-prettyprint"; - license = licenses.asl20; - maintainers = with maintainers; [ dpausp ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dpausp ]; }; } From d7047e2fbfa573db11521da895e0b2b957123aa6 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 14 Jul 2024 09:53:49 +0000 Subject: [PATCH 254/562] eliot-tree: make usable with Python 3.12 --- pkgs/development/tools/eliot-tree/default.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 04eac7726f71..3a8c809f933c 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -1,39 +1,54 @@ -{ lib, python3Packages, fetchPypi }: +{ + lib, + python3Packages, + fetchPypi, +}: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; version = "21.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; }; - nativeCheckInputs = with python3Packages; [ - testtools - pytest - ]; + # Patch Python 3.12 incompatibilities in versioneer.py. + postPatch = '' + substituteInPlace versioneer.py \ + --replace-fail SafeConfigParser ConfigParser \ + --replace-fail readfp read_file + ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colored eliot iso8601 jmespath - setuptools toolz ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + testtools + ]; + # Tests run eliot-tree in out/bin. - checkPhase = '' + preCheck = '' export PATH=$out/bin:$PATH - pytest ''; - meta = with lib; { + pythonImportsCheck = [ "eliottree" ]; + + meta = { homepage = "https://github.com/jonathanj/eliottree"; + changelog = "https://github.com/jonathanj/eliottree/blob/${version}/NEWS.rst"; description = "Render Eliot logs as an ASCII tree"; mainProgram = "eliot-tree"; - license = licenses.mit; - maintainers = [ maintainers.dpausp ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dpausp ]; }; } From 7abe9d11615af5ce0266e56aa13a162272c6cb16 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 14 Jul 2024 09:54:25 +0000 Subject: [PATCH 255/562] tahoe-lafs: use Python 3.11 Tahoe-LAFS unstable-2021-07-09 is incompatible with Python 3.12, and uses eliot in a way incompatible after version 1.14.0. These versions should be unpinned, when updating Tahoe-LAFS to a more recent version.lafs --- .../networking/p2p/tahoe-lafs/default.nix | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index abeabc337a15..e9de0da071c6 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,10 +1,36 @@ -{ lib, nettools, python3Packages, texinfo, fetchFromGitHub }: +{ lib, nettools, python311, texinfo, fetchFromGitHub }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. +let + # Tahoe-LAFS unstable-2021-07-09 is incompatible with Python 3.12, and + # uses eliot in a way incompatible after version 1.14.0. + # These versions should be unpinned, when updating Tahoe-LAFS to a more recent version. + python = python311.override { + packageOverrides = self: super: { + eliot = super.eliot.overridePythonAttrs (oldAttrs: rec { + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "itamarst"; + repo = "eliot"; + rev = "refs/tags/${version}"; + hash = "sha256-1QE/s8P2g7DGIcuT+/AikAaWMTafNWn4BRZqpBn5ghk="; + }; + + disabledTests = [ + "test_default" + "test_large_numpy_array" + "test_numpy" + ]; + }); + }; + }; + python3Packages = python.pkgs; +in python3Packages.buildPythonApplication rec { pname = "tahoe-lafs"; version = "unstable-2021-07-09"; From 86307866c2563dd6ac5a37070d1df9dd32c8262d Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sun, 14 Jul 2024 19:08:17 +0800 Subject: [PATCH 256/562] pacman: 6.1.0 -> 7.0.0 --- pkgs/tools/package-management/pacman/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 7a5fc098bb2c..d1ef5a778063 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -40,14 +40,14 @@ stdenv.mkDerivation (final: { pname = "pacman"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitLab { domain = "gitlab.archlinux.org"; owner = "pacman"; repo = "pacman"; rev = "v${final.version}"; - hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; + hash = "sha256-ejOBxN2HjV4dZwFA7zvPz3JUJa0xiJ/jZ+evEQYG1Mc="; }; strictDeps = true; @@ -107,8 +107,6 @@ stdenv.mkDerivation (final: { "--localstatedir=/var" ]; - hardeningDisable = [ "fortify3" ]; - postInstall = '' installShellCompletion --bash scripts/pacman --zsh scripts/_pacman wrapProgram $out/bin/makepkg \ From 2a0f95dbaf85fa913fd8c2b222c6b5a6b694afb0 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 14 Jul 2024 14:10:39 +0300 Subject: [PATCH 257/562] arc-browser: 1.49.1-51495 -> 1.51.0-51691 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index dfa2ff46745f..a3b7f014473d 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.49.1-51495"; + version = "1.51.0-51691"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-9wuZQgf8uta0ynMRe3GKqORZsCuwhvxjSpGLajCp7N8="; + hash = "sha256-d1dCx9knh7LqtRWzDsuPW1OD65CuZ9SPkOvyoDT4Q6c="; }; nativeBuildInputs = [ undmg ]; From 0e0ffd4b728540c5d0ddd0cb949b49ffac2f07a8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 13:53:53 +0200 Subject: [PATCH 258/562] obconf: use finalAttrs, hash instead of sha256 --- pkgs/tools/X11/obconf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 02fe2663b002..aade67270152 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -12,14 +12,14 @@ , openbox }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obconf"; version = "unstable-2015-02-13"; src = fetchgit { url = "git://git.openbox.org/dana/obconf"; rev = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39"; - sha256 = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; + hash = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace configure.ac --replace 2.0.4 ${version} + substituteInPlace configure.ac --replace 2.0.4 ${finalAttrs.version} ''; meta = { @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "obconf"; }; -} +}) From 20d8ea02b3b286125ff1cb9986061f90f0e3f733 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 13:54:16 +0200 Subject: [PATCH 259/562] obconf: reformat for RFC166 --- pkgs/tools/X11/obconf/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index aade67270152..9b233017b4ea 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchgit -, autoreconfHook -, pkg-config -, wrapGAppsHook3 -, gtk3 -, imlib2 -, libSM -, libstartup_notification -, libxml2 -, openbox +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + wrapGAppsHook3, + gtk3, + imlib2, + libSM, + libstartup_notification, + libxml2, + openbox, }: stdenv.mkDerivation (finalAttrs: { From aa9ffbf2b0d96c86b9e0fa6faf42cbc4a60e3db4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 13:54:59 +0200 Subject: [PATCH 260/562] obconf: move to by-name --- .../X11/obconf/default.nix => by-name/ob/obconf/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/X11/obconf/default.nix => by-name/ob/obconf/package.nix} (100%) diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/by-name/ob/obconf/package.nix similarity index 100% rename from pkgs/tools/X11/obconf/default.nix rename to pkgs/by-name/ob/obconf/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74e5060f2e7..e0af508c9820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33015,8 +33015,6 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { inherit (darwin.apple_sdk.frameworks) Foundation; }; From 7264bbf85b2f4e63f74b3cb3e7ce50ed661252bb Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 14:01:52 +0200 Subject: [PATCH 261/562] h5dump: use finalAttrs, hash instead of sha256, remove with lib --- pkgs/tools/misc/h5utils/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index 90f9b48dd118..917313a0cb4f 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -4,15 +4,15 @@ , libmatheval ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.13.2"; pname = "h5utils"; # fetchurl is used instead of fetchFromGitHub because the git repo version requires # additional tools to build compared to the tarball release; see the README for details. src = fetchurl { - url = "https://github.com/stevengj/h5utils/releases/download/${version}/h5utils-${version}.tar.gz"; - sha256 = "sha256-7qeFWoI1+st8RU5hEDCY5VZY2g3fS23luCqZLl8CQ1E="; + url = "https://github.com/stevengj/h5utils/releases/download/${finalAttrs.version}/h5utils-${finalAttrs.version}.tar.gz"; + hash = "sha256-7qeFWoI1+st8RU5hEDCY5VZY2g3fS23luCqZLl8CQ1E="; }; # libdf is an alternative name for libhdf (hdf4) @@ -22,18 +22,17 @@ stdenv.mkDerivation rec { --replace "-ldf" "-lhdf" \ ''; - preBuild = lib.optionalString hdf5.mpiSupport "export CC=${hdf5.mpi}/bin/mpicc"; + preBuild = lib.optionalString hdf5.mpiSupport "export CC=${lib.getBin hdf5.mpi}/mpicc"; - buildInputs = with lib; [ hdf5 libjpeg libpng ] ++ optional hdf5.mpiSupport hdf5.mpi - ++ optional (hdf4 != null) hdf4 - ++ optional (libmatheval != null) libmatheval; + buildInputs = [ hdf5 libjpeg libpng ] ++ lib.optional hdf5.mpiSupport hdf5.mpi + ++ lib.optional (hdf4 != null) hdf4 + ++ lib.optional (libmatheval != null) libmatheval; meta = with lib; { description = "Set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; homepage = "https://github.com/stevengj/h5utils"; - changelog = "https://github.com/NanoComp/h5utils/releases/tag/${version}"; + changelog = "https://github.com/NanoComp/h5utils/releases/tag/${finalAttrs.version}"; license = with licenses; [ mit gpl2Plus ]; maintainers = with maintainers; [ sfrijters ]; }; - -} +}) From ba942e865e538394bee682e694e35aa3eb246af7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 14:02:41 +0200 Subject: [PATCH 262/562] h5utils: reformat for RFC166 --- pkgs/tools/misc/h5utils/default.nix | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index 917313a0cb4f..41f23dda2a42 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -1,7 +1,12 @@ -{ stdenv, fetchurl, lib -, hdf5, libpng, libjpeg -, hdf4 ? null -, libmatheval ? null +{ + stdenv, + fetchurl, + lib, + hdf5, + libpng, + libjpeg, + hdf4 ? null, + libmatheval ? null, }: stdenv.mkDerivation (finalAttrs: { @@ -16,15 +21,20 @@ stdenv.mkDerivation (finalAttrs: { }; # libdf is an alternative name for libhdf (hdf4) - preConfigure = lib.optionalString (hdf4 != null) - '' + preConfigure = lib.optionalString (hdf4 != null) '' substituteInPlace configure \ --replace "-ldf" "-lhdf" \ ''; preBuild = lib.optionalString hdf5.mpiSupport "export CC=${lib.getBin hdf5.mpi}/mpicc"; - buildInputs = [ hdf5 libjpeg libpng ] ++ lib.optional hdf5.mpiSupport hdf5.mpi + buildInputs = + [ + hdf5 + libjpeg + libpng + ] + ++ lib.optional hdf5.mpiSupport hdf5.mpi ++ lib.optional (hdf4 != null) hdf4 ++ lib.optional (libmatheval != null) libmatheval; @@ -32,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; homepage = "https://github.com/stevengj/h5utils"; changelog = "https://github.com/NanoComp/h5utils/releases/tag/${finalAttrs.version}"; - license = with licenses; [ mit gpl2Plus ]; + license = with licenses; [ + mit + gpl2Plus + ]; maintainers = with maintainers; [ sfrijters ]; }; }) From c002109fb2f700924eb94c037a355bd6b313d2e9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 21:00:16 +0900 Subject: [PATCH 263/562] python312Packages.pylink-square: switch to pypa build --- pkgs/development/python-modules/pylink-square/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 59f2e0bf926d..4e95fc447530 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, mock, psutil, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pylink-square"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,9 @@ buildPythonPackage rec { hash = "sha256-WMpb/b9kF1rFlegDYxNGJbZ2Nz8nuG21tyjgUFLs5mg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ psutil six ]; From 9aaab7493ca32c55fc61028df137c8cd68985855 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 14:04:12 +0200 Subject: [PATCH 264/562] h5utils: move to by-name --- .../h5utils/default.nix => by-name/h5/h5utils/package.nix} | 0 pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 5 deletions(-) rename pkgs/{tools/misc/h5utils/default.nix => by-name/h5/h5utils/package.nix} (100%) diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/by-name/h5/h5utils/package.nix similarity index 100% rename from pkgs/tools/misc/h5utils/default.nix rename to pkgs/by-name/h5/h5utils/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74e5060f2e7..696dc1d6cada 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8709,11 +8709,6 @@ with pkgs; h2 = callPackage ../servers/h2 { }; - h5utils = callPackage ../tools/misc/h5utils { - libmatheval = null; - hdf4 = null; - }; - haproxy = callPackage ../tools/networking/haproxy { }; hackertyper = callPackage ../tools/misc/hackertyper { }; From 4a965c5df18e481dca59d0b4ce38c3dd217c6140 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 14:09:56 +0200 Subject: [PATCH 265/562] h5utils: remove more 'with lib' --- pkgs/by-name/h5/h5utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h5/h5utils/package.nix b/pkgs/by-name/h5/h5utils/package.nix index 41f23dda2a42..3c93a3f2a407 100644 --- a/pkgs/by-name/h5/h5utils/package.nix +++ b/pkgs/by-name/h5/h5utils/package.nix @@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (hdf4 != null) hdf4 ++ lib.optional (libmatheval != null) libmatheval; - meta = with lib; { + meta = { description = "Set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; homepage = "https://github.com/stevengj/h5utils"; changelog = "https://github.com/NanoComp/h5utils/releases/tag/${finalAttrs.version}"; - license = with licenses; [ + license = with lib.licenses; [ mit gpl2Plus ]; - maintainers = with maintainers; [ sfrijters ]; + maintainers = [ lib.maintainers.sfrijters ]; }; }) From fe4e0899325ba9835717a0f46cb8233f134cfede Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 14 Jul 2024 14:14:43 +0200 Subject: [PATCH 266/562] kodiPackages.jellyfin: 1.0.3 -> 1.0.4 fixes missing distutils module --- .../video/kodi/addons/jellyfin/default.nix | 29 ++++++++++++------- .../jellyfin/no-strict-zip-timestamp.patch | 15 ++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 93217122d53b..024f0f7d9fdc 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -1,28 +1,35 @@ -{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: +{ + lib, + addonDir, + buildKodiAddon, + fetchFromGitHub, + kodi, + requests, + dateutil, + six, + kodi-six, + signals, + websocket, +}: let python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-Uyo8GClJU2/gdk4PeFNnoyvxOhooaxeXN3Wc5YGuCiM="; + sha256 = "sha256-N5ZNGeLf3P4p3RQimSaZteddKjqXE274mWpo7W9xqPs="; }; - nativeBuildInputs = [ - python - ]; + nativeBuildInputs = [ python ]; - prePatch = '' - # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 - substituteInPlace build.py \ - --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:" - ''; + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + patches = [ ./no-strict-zip-timestamp.patch ]; buildPhase = '' ${python}/bin/python3 build.py --version=py3 diff --git a/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch b/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch new file mode 100644 index 000000000000..07d54c1e1384 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch @@ -0,0 +1,15 @@ +diff --git a/build.py b/build.py +index 148441f3..2aa0f1ea 100755 +--- a/build.py ++++ b/build.py +@@ -69,7 +69,9 @@ def zip_files(py_version: str, source: str, target: str, dev: bool) -> None: + """ + archive_name = "plugin.video.jellyfin+{}.zip".format(py_version) + +- with zipfile.ZipFile("{}/{}".format(target, archive_name), "w") as z: ++ with zipfile.ZipFile( ++ "{}/{}".format(target, archive_name), "w", strict_timestamps=False ++ ) as z: + for root, dirs, files in os.walk(args.source): + for filename in filter(file_filter, files): + file_path = os.path.join(root, filename) From 3c9f658e847e97607a27c164d74665727eeb44dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:22:53 +0000 Subject: [PATCH 267/562] mainsail: 2.11.2 -> 2.12.0 --- pkgs/applications/misc/mainsail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 9ffdc79f04cb..e57d286318a6 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mainsail"; - version = "2.11.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; rev = "v${version}"; - hash = "sha256-N0tm36YMRRrkyuIwzcYbDo1DHesAnJ2s2g0KCms3h5I="; + hash = "sha256-ZRs+KhHNQIGXy/3MUNM5OUuWSntfjYsW3d0OOvuvdAQ="; }; - npmDepsHash = "sha256-z6Fo0XAds/F0Ig+nUE3O16gmH0EVcpML3K8cdKhkJzg="; + npmDepsHash = "sha256-du1X58wUTelgJO/0JYwxfHjjNpu1e4M1GDvx6tgz8Zw="; # Prevent Cypress binary download. CYPRESS_INSTALL_BINARY = 0; From 267f23a0b67a50853190ab3cb9baf19ad180da11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:26:45 +0000 Subject: [PATCH 268/562] nerdfix: 0.4.0 -> 0.4.1 --- pkgs/tools/text/nerdfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/nerdfix/default.nix b/pkgs/tools/text/nerdfix/default.nix index fdad3094bbec..f280c891643f 100644 --- a/pkgs/tools/text/nerdfix/default.nix +++ b/pkgs/tools/text/nerdfix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nerdfix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "loichyan"; repo = "nerdfix"; rev = "v${version}"; - hash = "sha256-V9f39/9k9kYjngYOSXJYblaKDABPCZbVWxD0p3ZWzlY="; + hash = "sha256-5pUFj3K4yH/M8F+ZpCHFO3gEfxQ4pwxRa6uJbejrQxQ="; }; - cargoHash = "sha256-PkUQZPLzvVJ7s1D9TkMmgIVQiR/E79BRCYmjZVcHIv8="; + cargoHash = "sha256-6S6NyX2hmkekgpuLaBjBxoybnqJpJXtqelJ+6YzxA0I="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; From b4c767fb83ae7aa42e987dcdf3ee7d88fd981c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:29:57 +0000 Subject: [PATCH 269/562] nix-eval-jobs: 2.22.1 -> 2.23.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 0417b5c294de..ee8117f85503 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54="; + hash = "sha256-7XG3nH5eHdrPhbtVFWrUjJPyqt8VNkX86HzLm9MvcVo="; }; buildInputs = [ boost From e5feb4198a3c012594b414ec1f25e339b5485686 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jul 2024 16:10:15 +0200 Subject: [PATCH 270/562] python312Packages.fastcore: 1.5.51 -> 1.5.53 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.5.51...1.5.53 Changelog: https://github.com/fastai/fastcore/blob/1.5.53/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 819a79bdfa5c..a0434b6dcd57 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.51"; + version = "1.5.53"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-Dx+HnrVsceiwOORRW1PmmjvHJNcKzWjdIYIOW19FT7U="; + hash = "sha256-/G2v1jFoAiDHM4T/XQx/tHZRBWb+7XY3Jsw5lFFSp1E="; }; build-system = [ setuptools ]; From 77d4e832d142a311954ca2ea21dd6b356d3347cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 15:19:06 +0000 Subject: [PATCH 271/562] php81Extensions.blackfire: 1.92.18 -> 1.92.19 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index fb2bf3964bdb..0d2a2968afe5 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.18"; + version = "1.92.19"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-5PVYDcyjarTG8RZaqEMvS8FK4DOw9goSaz9WZQtjvFo="; - "8.2" = "sha256-2E+LmM0ZAkE4iIyo6Mxu8jJjX1aLHelsJRzM9Yo9D4g="; - "8.3" = "sha256-Rm1E+ouUz50Wq4bjGnBwDpVN9C3JXu9zF6jmcrn6Xzg="; + "8.1" = "sha256-P9KXGnVwhoYWJfp4HShfZ/jEq2U0fZP5tgTmQLRrkrg="; + "8.2" = "sha256-PBEVpnlLeXDaQkjzUqA4Wlt629Vss9hxPaosDhB7GZQ="; + "8.3" = "sha256-pJkY31YvDXJo/Ag2BMlEv4HMCsDNjdBFygjAWS9o9cQ="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-iJucmU/ytes45VJAhsJHsvovbZ/mHtj+ChVv1vsL/XU="; - "8.2" = "sha256-0Xc6d6ibfnkHEwwkseNWj52DesxVmBRD9oRZRS36XOI="; - "8.3" = "sha256-x89Ub3LDstdzqdMDcF0mMpwDGufNDNRAp2yeZLNXnoQ="; + "8.1" = "sha256-bRGW/Iw3Ok9QexWJ0JG9toXr7ml8GHDFGioz5XIfulQ="; + "8.2" = "sha256-0D2mf8q0dR3fLt2dnSiouVwwTT5wQVtu404CYTHZgQw="; + "8.3" = "sha256-W2VimZ6pTFUJsA/VWUoeJwdwJS7Mj55HcewG32OacPk="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-wESvg1iqPMvT9EjTNLJk5GtzgW80UigmR0m4Rr8VVaQ="; - "8.2" = "sha256-/1hlgAVITlLM2i7aa3cIF/eci/q68rDT+wsB+zBxIzg="; - "8.3" = "sha256-oABuQk6uZxC/Ry1DcpKbULso5CzEZEIod0GECxbLROk="; + "8.1" = "sha256-c7etUw+FsdIEu2w2nmqmSO6c2f1bGEovhxdvMW/pIh8="; + "8.2" = "sha256-dfBOE5LiQ/rmK4vCmclTF4LRmS2B2L7aiiim5p4bsoU="; + "8.3" = "sha256-zeNi17X6QNh9F6WvNmaYWzqD9QJJWRsvmuZuh59d2zA="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-hLPM07WVu1jPaaxR8YPeGcL05nrDG8LTVUJ9IoMKLWE="; - "8.2" = "sha256-2gUmMr55r2FBMlmd/dyXQaXMEfod9tG8/QY0fo0NJxc="; - "8.3" = "sha256-H+y1+671+V60GHHKP/0ss+A8t/h2HdGkRgARsqyJJ3M="; + "8.1" = "sha256-Dntp4EKEU8fTQkl2x0cYlHA1BvqrY2hT29nG9z+AftA="; + "8.2" = "sha256-V1Dhw5kiU85OTZ50tPeK4clg/ecueJkyaEgBTPy/k0w="; + "8.3" = "sha256-F3HGLq6+kuuQlXGVkwA/igw3I9IbuvJ1AisMrOuz2Ds="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-Mm+CiC6dBb1JOs+Z/3dPSJNdKqvRLruYEFihsY52bpI="; - "8.2" = "sha256-OXemTJV4exlTQj6MGBxMOA8TuXw3e6iXTD2i/gott2A="; - "8.3" = "sha256-VtGUwhKAXr+P6+sn65Hyo8Dxh+Iyd/K3dwlqQmH0ElI="; + "8.1" = "sha256-7q9b9EAcUIJdyl7ggjDqQ1MF9k+mcdCrsIprL51ep1k="; + "8.2" = "sha256-9MOR4mHJ9q/L/jQZGrlojJzMlYXeU6VvNsHqnlF6hl0="; + "8.3" = "sha256-BK1dx9R2VpQM+LxxmkOujdceD3OM7g1LmqoHv3gkd0U="; }; }; }; From fe27814e39622f911d34d15fd8c89f9406d53a8f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 22 Apr 2024 22:28:14 +0200 Subject: [PATCH 272/562] blendfarm: init at 1.1.6 Signed-off-by: Florian Brandes --- pkgs/by-name/bl/blendfarm/deps.nix | 185 ++++++++++++++++++++++++++ pkgs/by-name/bl/blendfarm/package.nix | 135 +++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 pkgs/by-name/bl/blendfarm/deps.nix create mode 100644 pkgs/by-name/bl/blendfarm/package.nix diff --git a/pkgs/by-name/bl/blendfarm/deps.nix b/pkgs/by-name/bl/blendfarm/deps.nix new file mode 100644 index 000000000000..12bb03d85bdb --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/deps.nix @@ -0,0 +1,185 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; sha256 = "02rf96gxpafbk0ilg3nxf0fas9gkpb25kzqc2lnbxp8h366qg431"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.15"; sha256 = "0wgc46vg227bv7nsybc9mxkqv9xlz2bj08bdipkigjlf23g0x4p6"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.15"; sha256 = "1bq2ha1mmgsb9gxmsibr3i6alcg6y3kizxi07qh4wgw38c3fkwzs"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.15"; sha256 = "0p0ih6ql5kyvpfhc6ll2mgy23kx0vwn88qji74713id493w2ab02"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.15"; sha256 = "1va9zwznfr161w2xjjg4swm5505685mdkxxs747l2s35mahl5072"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; sha256 = "0xlnanssz24rcnybz1x0d3lclzmbzdjb9k0i37rd76dif3rgng0h"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; sha256 = "1lxaj8la8bwc7j4d3cc3q5jklycc647lzpm8610ya241y64gryww"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; sha256 = "120d19i8ad3b2m1516v5r1bj4h7fddmad6szrbkbpd711x3sh6ka"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "1.2.0"; sha256 = "0gbhdk9i3xqhay4jbfi0mxdpgk2w5x5m89rfzviv7zp1i7cksbka"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.29"; sha256 = "031kalc7mp8w35rwvnb13jbwwi8cgmny7nywsk3717iy6blxldih"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.29"; sha256 = "0byixcrwj7ixz60lvg7c6r3f132br4pfrjv0w0fh99b3iwzrf114"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.5.0"; sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.5.0"; sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.29"; sha256 = "03rzclkvl2gc7wakh0xqhnj6zl32b91igrnyhd69pzr3mql5kdll"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.29"; sha256 = "0kh3lrzpz7y42iqa4vdhw4mg51vf4y2x8l4lg767mzbx0sd4xllv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.29"; sha256 = "1bk2n7csgnvqma5yv550037xg4ph4j11gp4m5hn7s4sy23cfc5xp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.29"; sha256 = "0hhypwr4202n8nvpz10ac1q48ryjr7d4xj34r4c79mw49fvh1n61"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.1"; sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.5.0"; sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.0"; sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.0"; sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.linux-x64.CoreCompat.System.Drawing"; version = "1.0.0-beta009"; sha256 = "1fb0fjxxa8g4f0p9mqnd221iw7qkc7jmm05nwmymjfl5g8b1nin7"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.CoreCompat.System.Drawing"; version = "5.8.64"; sha256 = "1m5b58ifqkdci5281hjfx2ci1fzrnff1isddxinyg566w40arfhp"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.26.0"; sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; sha256 = "0wqfgzyp2m4myqrni9rgchiqi95axbf279hlqjflrj4c9z2412ni"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux.NoDependencies"; version = "2.88.0"; sha256 = "1hxn1gqq8qmds65zb5jhq7r1l94lyg52qks61zmh5fqfvcmkfc17"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0"; sha256 = "0d0pdcm61jfy3fvgkxmm3hj9cijrwbmp6ky2af776m1l63ryii3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.1"; sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) +] diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix new file mode 100644 index 000000000000..badbda23c38a --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + xz, + pcre, + libX11, + libICE, + libSM, + autoPatchelfHook, + bintools, + fixDarwinDylibNames, + darwin, + fontconfig, + libgdiplus, + libXrandr, + glib, + writeShellScriptBin, + blender, + openssl, + libkrb5, + icu, +}: +let + + # blendfarm (client) will run from the current workdir. + # It needs to create files there, so it cannot be in the nix store. + # We also need to create some files there so it can work with its + # server part. + USERHOMEDIR = "~/.local/share/blendfarm"; + blendfarm-nix = writeShellScriptBin "blendfarm-nix" '' + if [[ -z $BLENDFARM_HOME && ! -d ${USERHOMEDIR} ]]; then + echo "Creating home for blendfarm at ${USERHOMEDIR}" + echo "You can change that by setting BLENDFARM_HOME to another directory" + fi + if [[ -z $BLENDFARM_HOME ]]; then + BLENDFARM_HOME=${USERHOMEDIR} + fi + mkdir -p $BLENDFARM_HOME/BlenderData/nix-blender-linux64 > /dev/null 2>&1 + ln -s ${lib.getExe blender} $BLENDFARM_HOME/BlenderData/nix-blender-linux64/blender > /dev/null 2>&1 + echo "nix-blender" > $BLENDFARM_HOME/VersionCustom + cd $BLENDFARM_HOME + exec -a "$0" @out@/bin/LogicReinc.BlendFarm "$@" + ''; +in + +buildDotnetModule rec { + pname = "blendfarm"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "LogicReinc"; + repo = "LogicReinc.BlendFarm"; + rev = "v${version}"; + hash = "sha256-2w2tdl5n0IFTuthY97NYMeyRe2r72jaKFfoNSjWQMM4="; + }; + + nativeBuildInputs = + [ ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + bintools + fixDarwinDylibNames + darwin.autoSignDarwinBinariesHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + fontconfig + openssl + libkrb5 + icu + ]; + + runtimeDeps = [ + xz + pcre + libX11 + libICE + libSM + libgdiplus + glib + libXrandr + fontconfig + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ]; + + # there is no "*.so.3" or "*.so.5" in nixpkgs. So ignore the warning + # and add it later + autoPatchelfIgnoreMissingDeps = [ + "libpcre.so.3" + "liblzma.so.5" + ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + projectFile = [ + "LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj" + "LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj" + "LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj" + ]; + nugetDeps = ./deps.nix; + executables = [ + "LogicReinc.BlendFarm" + "LogicReinc.BlendFarm.Server" + ]; + + # add libraries not found by autopatchelf + libPath = lib.makeLibraryPath [ + pcre + xz + ]; + makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${libPath}" ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/bin + cp -v ${blendfarm-nix}/bin/blendfarm-nix $out/bin + substituteInPlace $out/bin/blendfarm-nix --subst-var out + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s ${libgdiplus}/lib/libgdiplus.dylib $out/lib/blendfarm/ + ''; + + meta = with lib; { + description = "A open-source, cross-platform, stand-alone, Network Renderer for Blender"; + homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ gador ]; + mainProgram = "blendfarm-nix"; + platforms = platforms.unix; + }; +} From f312bdb5d72abc526487e5907cf3585b3e7c41ad Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 23 Apr 2024 15:06:43 +0200 Subject: [PATCH 273/562] nixos/blendfarm: init Signed-off-by: Florian Brandes --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/blenderfarm.nix | 141 ++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 nixos/modules/services/misc/blenderfarm.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a2cf9b51f5bd..1e5787e44b55 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -705,6 +705,7 @@ ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix + ./services/misc/blenderfarm.nix ./services/misc/calibre-server.nix ./services/misc/canto-daemon.nix ./services/misc/cfdyndns.nix diff --git a/nixos/modules/services/misc/blenderfarm.nix b/nixos/modules/services/misc/blenderfarm.nix new file mode 100644 index 000000000000..c13e43c7ecda --- /dev/null +++ b/nixos/modules/services/misc/blenderfarm.nix @@ -0,0 +1,141 @@ +{ config +, lib +, pkgs +, ... +}: +let + cfg = config.services.blendfarm; + json = pkgs.formats.json { }; + configFile = json.generate "ServerSettings" (defaultConfig // cfg.serverConfig); + defaultConfig = { + Port = 15000; + BroadcastPort = 16342; + BypassScriptUpdate = false; + BasicSecurityPassword = null; + }; +in +{ + meta.maintainers = with lib.maintainers; [ gador ]; + + options.services.blendfarm = with lib.types; { + enable = lib.mkEnableOption "Blendfarm, a render farm management software for Blender."; + package = lib.mkPackageOption pkgs "blendfarm" { }; + openFirewall = lib.mkEnableOption "Allow blendfarm network access through the firewall."; + + user = lib.mkOption { + description = "User under which blendfarm runs."; + default = "blendfarm"; + type = str; + }; + + group = lib.mkOption { + description = "Group under which blendfarm runs."; + default = "blendfarm"; + type = str; + }; + + basicSecurityPasswordFile = lib.mkOption { + description = ''Path to the password file the client needs to connect to the server. + The password must not contain a forward slash.''; + default = null; + type = nullOr str; + }; + + blenderPackage = lib.mkPackageOption pkgs "blender" { }; + + serverConfig = lib.mkOption { + description = "Server configuration"; + default = defaultConfig; + type = submodule { + freeformType = attrsOf anything; + options = { + Port = lib.mkOption { + description = "Default port blendfarm server listens on."; + default = 15000; + type = types.port; + }; + BroadcastPort = lib.mkOption { + description = "Default port blendfarm server advertises itself on."; + default = 16342; + type = types.port; + }; + + BypassScriptUpdate = lib.mkOption { + description = "Prevents blendfarm from replacing the .py self-generated scripts."; + default = false; + type = bool; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + networking.firewall = lib.optionalAttrs (cfg.openFirewall) { + allowedTCPPorts = [ cfg.serverConfig.Port ]; + allowedUDPPorts = [ cfg.serverConfig.BroadcastPort ]; + }; + + systemd.services.blendfarm-server = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + description = "blendfarm server"; + path = [ cfg.blenderPackage ]; + preStart = '' + rm -f ServerSettings + install -m640 ${configFile} ServerSettings + if [ ! -d "BlenderData/nix-blender-linux64" ]; then + mkdir -p BlenderData/nix-blender-linux64 + echo "nix-blender" > VersionCustom + fi + rm -f BlenderData/nix-blender-linux64/blender + ln -s ${lib.getExe cfg.blenderPackage} BlenderData/nix-blender-linux64/blender + '' + + lib.optionalString (cfg.basicSecurityPasswordFile != null) '' + BLENDFARM_PASSWORD=$(${pkgs.systemd}/bin/systemd-creds cat BLENDFARM_PASS_FILE) + sed -i "s/null/\"$BLENDFARM_PASSWORD\"/g" ServerSettings + ''; + serviceConfig = { + ExecStart = "${cfg.package}/bin/LogicReinc.BlendFarm.Server"; + DynamicUser = true; + LogsDirectory = "blendfarm"; + StateDirectory = "blendfarm"; + WorkingDirectory = "/var/lib/blendfarm"; + User = cfg.user; + Group = cfg.group; + StateDirectoryMode = "0755"; + LoadCredential = lib.optional (cfg.basicSecurityPasswordFile != null) "BLENDFARM_PASS_FILE:${cfg.basicSecurityPasswordFile}"; + ReadWritePaths = ""; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "@chown" + ]; + RestrictRealtime = true; + LockPersonality = true; + UMask = "0066"; + ProtectHostname = true; + }; + }; + + users.users.blendfarm = { + isSystemUser = true; + group = "blendfarm"; + }; + users.groups.blendfarm = { }; + }; +} From 3c93bb5ce20e0941af4b31d05d21f2c8672db7e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:54:47 +0000 Subject: [PATCH 274/562] albert: 0.24.2 -> 0.24.3 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 101327cb6453..338f09ca8520 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; + hash = "sha256-9vR6G/9FSy1mqZCo19Mf0RuvW63DbnhEzp/h0p6eXqs="; fetchSubmodules = true; }; From f3f52741e62202a3e67d54a5f4dd3c76ef31f42e Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 14 Jul 2024 08:49:24 -0700 Subject: [PATCH 275/562] tandoor-recipes: pin to python311 --- pkgs/applications/misc/tandoor-recipes/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index b2bda05d5496..d4e453897889 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -1,10 +1,11 @@ { callPackage , nixosTests -, python3 +, python311 , fetchFromGitHub }: let - python = python3.override { + # python-ldap-3.4.4 does not work with python3(12) + python = python311.override { packageOverrides = self: super: { validators = super.validators.overridePythonAttrs (_: rec { version = "0.20.0"; From 1f803e4edb952f78e777d623e34adeff77d61d18 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 14 Jul 2024 08:49:57 -0700 Subject: [PATCH 276/562] tandoor-recipes: pin lxml to 5.1.0 --- pkgs/applications/misc/tandoor-recipes/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index d4e453897889..7114cbb3cf76 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -29,6 +29,15 @@ let pytest-django ]; }); + + # python3.11-extruct-0.16.0 doesn't work with lxml-5.2.2 + lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { + version = "5.1.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; + }; + }); }; }; From 7423c47d8609a6ee2c1eb81759b923b45a9cf850 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 14 Jul 2024 19:19:59 +0300 Subject: [PATCH 277/562] stats: 2.10.19 -> 2.11.1 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.1 Diff: https://github.com/exelban/stats/compare/v2.10.19...v2.11.1 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 39d1ed2442a3..14073bc8d2cd 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.19"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI="; + hash = "sha256-/6QFchDpWrJZEKuIsQi6FcGprVOa8J8THJ9Kt3ESrwY="; }; sourceRoot = "."; From 7be8dd2857b99824571c570a9277ec341343150a Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 14 Jul 2024 18:36:07 +0200 Subject: [PATCH 278/562] maintainers: add rorosen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2561cf449740..1ab6f4c1294f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17398,6 +17398,12 @@ githubId = 55679162; keys = [ { fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; } ]; }; + rorosen = { + email = "robert.rose@mailbox.org"; + github = "rorosen"; + githubId = 76747196; + name = "Robert Rose"; + }; rosehobgoblin = { name = "J. L. Bowden"; github = "rosehobgoblin"; From b9f397d445b52316eaf08b9d5072fe194ab482ec Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 14 Jul 2024 18:36:25 +0200 Subject: [PATCH 279/562] k3s: add rorosen as maintainer --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d5fd82892822..833aebadb86f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -502,6 +502,7 @@ with lib.maintainers; euank marcusramberg mic92 + rorosen superherointj wrmilling yajo From 67052c60269d765bc398eace05f15c3f9ed22af9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 16:37:27 +0000 Subject: [PATCH 280/562] xlights: 2024.12 -> 2024.13 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 4deffbe85eff..8475c7b7dc7e 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.12"; + version = "2024.13"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-ebF7G/2C9KiFnMjtBg0QwniAXBQgpIduxuMnidr+Wg8="; + hash = "sha256-Oiavnnk5geFao7lq0GpmNg+xs1FeUOt3JhSbLUV8GkE="; }; meta = { From bc2251120c0019b913943ab4c953a5792fb08692 Mon Sep 17 00:00:00 2001 From: ruby0b <106119328+ruby0b@users.noreply.github.com> Date: Sun, 14 Jul 2024 03:48:56 +0200 Subject: [PATCH 281/562] python312Packages.dukpy: init at 0.4.0 --- .../python-modules/dukpy/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/dukpy/default.nix diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix new file mode 100644 index 000000000000..e6a44449106f --- /dev/null +++ b/pkgs/development/python-modules/dukpy/default.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + mutf8, + webassets, + pytestCheckHook, + pytest-cov, + mock, +}: + +buildPythonPackage rec { + pname = "dukpy"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "amol-"; + repo = "dukpy"; + rev = "refs/tags/${version}"; + hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ mutf8 ]; + + optional-dependencies = { + webassets = [ webassets ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + mock + ] ++ optional-dependencies.webassets; + + disabledTests = [ "test_installer" ]; + + preCheck = '' + rm -r dukpy + ''; + + pythonImportsCheck = [ "dukpy" ]; + + meta = { + description = "Simple JavaScript interpreter for Python"; + homepage = "https://github.com/amol-/dukpy"; + changelog = "https://github.com/amol-/dukpy/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ruby0b ]; + mainProgram = "dukpy"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..f2f61f715a93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3671,6 +3671,8 @@ self: super: with self; { dugong = callPackage ../development/python-modules/dugong { }; + dukpy = callPackage ../development/python-modules/dukpy { }; + dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) gnupg; }; From cde51ec87855d4088253dbff0d60c92a41fd5844 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Mon, 15 Jul 2024 01:35:48 +0800 Subject: [PATCH 282/562] circt: 1.76.0 -> 1.77.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index a893166082d5..54702bbc744e 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.76.0"; + version = "1.77.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-L8ELchwUzweS1gzZ8EfnddZu5xMJIVURViwwtPpxylo="; + hash = "sha256-eiXyGwvObrhyhj7Nj9wIafmcaRYjZt0Qy4D3D+fEsGs="; fetchSubmodules = true; }; From 0b8eaf081fafbf495104038e1378dcbfc63d4862 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 12 Jul 2024 14:42:22 -0400 Subject: [PATCH 283/562] fetchCrate: sha256 -> hash Should cause no rebuilds, as this is just updating attributes. --- pkgs/applications/misc/globe-cli/default.nix | 2 +- pkgs/applications/misc/krabby/default.nix | 2 +- pkgs/applications/misc/leetcode-cli/default.nix | 2 +- pkgs/applications/misc/oxker/default.nix | 2 +- pkgs/applications/misc/process-viewer/default.nix | 2 +- pkgs/applications/misc/toipe/default.nix | 2 +- pkgs/applications/networking/feedreaders/tuifeed/default.nix | 2 +- pkgs/applications/science/electronics/dwfv/default.nix | 2 +- pkgs/by-name/ca/cargo-wasi/package.nix | 2 +- pkgs/by-name/re/refinery-cli/package.nix | 2 +- pkgs/by-name/tw/twiggy/package.nix | 2 +- pkgs/development/embedded/elf2uf2-rs/default.nix | 2 +- pkgs/development/tools/analysis/svlint/default.nix | 2 +- pkgs/development/tools/build-managers/fac/default.nix | 2 +- pkgs/development/tools/dprint/default.nix | 2 +- pkgs/development/tools/gen-license/default.nix | 2 +- pkgs/development/tools/graphql-client/default.nix | 2 +- pkgs/development/tools/misc/slint-lsp/default.nix | 2 +- pkgs/development/tools/perseus-cli/default.nix | 2 +- pkgs/development/tools/rust/bindgen/unwrapped.nix | 2 +- pkgs/development/tools/rust/cargo-apk/default.nix | 2 +- pkgs/development/tools/rust/cargo-bazel/default.nix | 2 +- pkgs/development/tools/rust/cargo-binutils/default.nix | 2 +- pkgs/development/tools/rust/cargo-bolero/default.nix | 2 +- pkgs/development/tools/rust/cargo-chef/default.nix | 2 +- pkgs/development/tools/rust/cargo-hf2/default.nix | 2 +- pkgs/development/tools/rust/cargo-license/default.nix | 2 +- pkgs/development/tools/rust/cargo-outdated/default.nix | 2 +- pkgs/development/tools/rust/cargo-update/default.nix | 2 +- pkgs/development/tools/rust/cargo2junit/default.nix | 2 +- pkgs/development/tools/rust/cauwugo/default.nix | 2 +- pkgs/development/tools/rust/panamax/default.nix | 2 +- pkgs/development/tools/rust/rust-audit-info/default.nix | 2 +- pkgs/development/tools/spr/default.nix | 2 +- pkgs/development/tools/swc/default.nix | 2 +- pkgs/development/tools/the-way/default.nix | 2 +- pkgs/development/tools/toml2json/default.nix | 2 +- pkgs/development/tools/toml2nix/default.nix | 2 +- pkgs/games/shticker-book-unwritten/unwrapped.nix | 2 +- pkgs/servers/dns/doh-proxy-rust/default.nix | 2 +- pkgs/tools/X11/inputplug/default.nix | 2 +- pkgs/tools/graphics/svgbob/default.nix | 2 +- pkgs/tools/misc/asciinema-scenario/default.nix | 2 +- pkgs/tools/misc/bottom-rs/default.nix | 2 +- pkgs/tools/misc/clini/default.nix | 2 +- pkgs/tools/misc/eva/default.nix | 2 +- pkgs/tools/misc/gh-cal/default.nix | 2 +- pkgs/tools/misc/hacksaw/default.nix | 2 +- pkgs/tools/misc/mandown/default.nix | 2 +- pkgs/tools/misc/melody/default.nix | 2 +- pkgs/tools/misc/skim/default.nix | 2 +- pkgs/tools/misc/star-history/default.nix | 2 +- pkgs/tools/misc/writedisk/default.nix | 2 +- pkgs/tools/misc/xq/default.nix | 2 +- pkgs/tools/security/b3sum/default.nix | 2 +- pkgs/tools/security/bao/default.nix | 2 +- pkgs/tools/security/sheesy-cli/default.nix | 2 +- pkgs/tools/text/frawk/default.nix | 2 +- pkgs/tools/text/fst/default.nix | 2 +- pkgs/tools/text/huniq/default.nix | 2 +- pkgs/tools/text/runiq/default.nix | 2 +- pkgs/tools/text/rust-petname/default.nix | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix index 66f15ca7781c..fdc53e74b078 100644 --- a/pkgs/applications/misc/globe-cli/default.nix +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; + hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; }; cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index d006ec00b918..e6edfd9c4ab1 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; + hash = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; }; cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 0784ff3ddc94..f2e217404eb4 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; + hash = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; }; cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs="; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index bfa2278e8b86..23194ee9ed25 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-dBehxqr/UCXIQDMrGFN6ID+v0NYi50JTHuML3su2O0A="; + hash = "sha256-dBehxqr/UCXIQDMrGFN6ID+v0NYi50JTHuML3su2O0A="; }; cargoHash = "sha256-wI7yqRvaszBP4OtlWbWIZ9RLf5y7dx2KufYLaK+PWps="; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 94327ef3e4db..8b3b9acae774 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; + hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index 31a468b3bc49..32e8825239f2 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; + hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; cargoHash = "sha256-ShJ7dbd3oNo3qZJ5+ut+NfLF9j8kPPZy9yC2zl/s56k="; diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index be76874b2fcc..0465fc31cf64 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; + hash = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; }; cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix index 415cc29812d3..52c4ab1006b7 100644 --- a/pkgs/applications/science/electronics/dwfv/default.nix +++ b/pkgs/applications/science/electronics/dwfv/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version pname; - sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7"; + hash = "sha256-JzOD0QQfDfIkJQATxGpyJBrFg5l6lkkAXY2qv9bir3c="; }; cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy"; diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index ec264275502c..b0fe56c9fb69 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; pname = "cargo-wasi-src"; - sha256 = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; + hash = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; }; cargoHash = "sha256-yXtxznUp2gECq2CvRByiFzbTjYtWvTheDjGoynJWb+o="; diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 609a2618f86c..c70e69bee988 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "refinery_cli"; inherit version; - sha256 = "sha256-gHW+5WWzk1H2O5B2sWdl6QcOeUbNvbdZZBD10SmE1GA="; + hash = "sha256-gHW+5WWzk1H2O5B2sWdl6QcOeUbNvbdZZBD10SmE1GA="; }; cargoHash = "sha256-Go7+LZSze/IrNwEl+11Dm5O9RcREyPSkHPjlE9SPO70="; diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix index 29e99a6841ed..b4e77337f0a4 100644 --- a/pkgs/by-name/tw/twiggy/package.nix +++ b/pkgs/by-name/tw/twiggy/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk="; + hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk="; }; cargoSha256 = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM="; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index e02b54a8d12c..b3091df1e3f6 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; + hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index ef859f2a66a2..b4fb2512596a 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; + hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; }; cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index c5253edb53e9..06095fb0325a 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "fac"; - sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; + hash = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 3586317cd986..090d080fb546 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-eiZrgxOAUwq9rhTASXih8txg0KNerWETJgzYiz7KKVo="; + hash = "sha256-eiZrgxOAUwq9rhTASXih8txg0KNerWETJgzYiz7KKVo="; }; cargoHash = "sha256-CTcoJ09UqeHumEg00RbI9TTTE8ja2O5cte4OYfB8v4s="; diff --git a/pkgs/development/tools/gen-license/default.nix b/pkgs/development/tools/gen-license/default.nix index fda5322d4cca..d875574ab04a 100644 --- a/pkgs/development/tools/gen-license/default.nix +++ b/pkgs/development/tools/gen-license/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; + hash = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; }; cargoHash = "sha256-2PT20eoXxBPhGsmHlEEGE2ZDyhyrD7tFdwnn3khjKNo="; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 05b49c7a03ff..eb365325a3be 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - sha256 = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; + hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 126167b475e6..9fee7cca7f7e 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0="; + hash = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0="; }; cargoHash = "sha256-XjVXhXoGEhxWc+LZa0EsPiw3Gq2pg03YjKONTptSQvA="; diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index a72ceab056ef..b6fdd048f3f7 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; + hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 036c3b76f19e..5051949d08b6 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -12,7 +12,7 @@ in rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; + hash = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; }; cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix index d8231b876662..a468e03e859d 100644 --- a/pkgs/development/tools/rust/cargo-apk/default.nix +++ b/pkgs/development/tools/rust/cargo-apk/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; + hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; }; cargoSha256 = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 3cb68b11c62e..fb97482c5076 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; + hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; }; cargoSha256 = "+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index ddb5e3c199bf..126b149a3103 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; + hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; }; cargoSha256 = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix index 550ced495ef2..7d3985dcb11d 100644 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ b/pkgs/development/tools/rust/cargo-bolero/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk="; + hash = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk="; }; cargoSha256 = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M="; diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 9269dfa0e6ab..50025c628f10 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; + hash = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; }; cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index b49f7904812f..a4e04277d5e7 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; + hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; cargoSha256 = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index ee00c71c11da..868ad03f5068 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; + hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; }; cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI="; diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 26027a51ab80..c90582563317 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-+GPP8Mdoc3LsR2puNu3/pzKg4Umvjd7CxivkHC8YxgM="; + hash = "sha256-+GPP8Mdoc3LsR2puNu3/pzKg4Umvjd7CxivkHC8YxgM="; }; cargoHash = "sha256-Lkl7F5ZVlYLBeL3tubdMQ4/KbHYd2dD5IJAX9FO0XUg="; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index e24fe156332f..45f5f93eea89 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw="; + hash = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw="; }; cargoHash = "sha256-pdWVp9+CLnNO7+U0a8WXWHZ+EeGNYx9J7WWAI1MTDvc="; diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix index d674c5b04071..907d92e3c437 100644 --- a/pkgs/development/tools/rust/cargo2junit/default.nix +++ b/pkgs/development/tools/rust/cargo2junit/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; + hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; }; cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM="; diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/development/tools/rust/cauwugo/default.nix index 29a7fed01102..d5a3dad06f78 100644 --- a/pkgs/development/tools/rust/cauwugo/default.nix +++ b/pkgs/development/tools/rust/cauwugo/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; pname = "bpaf_cauwugo"; - sha256 = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; + hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; }; cargoSha256 = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0073c6087736..16d8176de4eb 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; + hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/development/tools/rust/rust-audit-info/default.nix index b0793e11ca38..19bfd811e93d 100644 --- a/pkgs/development/tools/rust/rust-audit-info/default.nix +++ b/pkgs/development/tools/rust/rust-audit-info/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; + hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; }; cargoSha256 = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index f2689c4692b1..aa2ceb69820b 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; + hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix index 7847c253e7e5..ff3287c8940b 100644 --- a/pkgs/development/tools/swc/default.nix +++ b/pkgs/development/tools/swc/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "swc_cli"; inherit version; - sha256 = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; + hash = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; }; cargoSha256 = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g="; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 6b43e603a6e7..550553385828 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; + hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; }; cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8="; diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/development/tools/toml2json/default.nix index a24eae7141f4..6d7a8dcf6a36 100644 --- a/pkgs/development/tools/toml2json/default.nix +++ b/pkgs/development/tools/toml2json/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; + hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; }; cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI="; diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/development/tools/toml2nix/default.nix index ac971435bc41..b34f40933b76 100644 --- a/pkgs/development/tools/toml2nix/default.nix +++ b/pkgs/development/tools/toml2nix/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; + hash = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index 1d49a220235f..d87a7f45a956 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "shticker_book_unwritten"; - sha256 = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4="; + hash = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4="; }; cargoSha256 = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc="; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 370388db89a2..244ec35a6768 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; + hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; }; cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/tools/X11/inputplug/default.nix index 80d97190a0ce..a899de8a4749 100644 --- a/pkgs/tools/X11/inputplug/default.nix +++ b/pkgs/tools/X11/inputplug/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "00gv2i2pxy56l6ysslbscxinr4r0mpk9p2ivkrnjnwhc8j3v8v7h"; + hash = "sha256-8Gy0h0QMcittnjuKm+atIJNsY2d6Ua29oab4fkUU+wE="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index d852e3d17d88..7789148c1502 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4="; + hash = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4="; }; cargoHash = "sha256-Fj1qjG4SKlchUWW4q0tBC+9fHFFuY6MHngJCFz6J5JY="; diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index 91102ab46eae..4568f4542adf 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ="; + hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ="; }; cargoSha256 = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c="; diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/tools/misc/bottom-rs/default.nix index f9a24537676f..e41c1230d971 100644 --- a/pkgs/tools/misc/bottom-rs/default.nix +++ b/pkgs/tools/misc/bottom-rs/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "bottomify"; - sha256 = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc="; + hash = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc="; }; cargoSha256 = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI="; diff --git a/pkgs/tools/misc/clini/default.nix b/pkgs/tools/misc/clini/default.nix index b5bd82582149..b6190a1141d9 100644 --- a/pkgs/tools/misc/clini/default.nix +++ b/pkgs/tools/misc/clini/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; + hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; }; cargoHash = "sha256-hOPj3c3WIISRqP/9Kpc/Yh9Z/wfAkHQ/731+BkWElIQ="; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 3d07baeb5903..1615c928a3a6 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec="; + hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec="; }; cargoSha256 = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms="; diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix index 98334e0afd55..60bd0e0f78df 100644 --- a/pkgs/tools/misc/gh-cal/default.nix +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; + hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; }; cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix index 5532fa181f64..2240eceea00a 100644 --- a/pkgs/tools/misc/hacksaw/default.nix +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "1l6i91xb81p1li1j2jm0r2rx8dbzl2yh468cl3dw0lqpqy4i65hx"; + hash = "sha256-HRYTiccXU8DboAwZAr2gfzXUs8igSiFDpOEGtHpI0dA="; }; cargoSha256 = "1rykc06lq3bkblsrj68rbil63yqdnvxkxlppq1w74wf0d6cwjc08"; diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix index cff5d74a9bd2..fa9bb1695fab 100644 --- a/pkgs/tools/misc/mandown/default.nix +++ b/pkgs/tools/misc/mandown/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-8SHZR8frDHLGj2WYlnFGBWY3B6xv4jByET7CODt2TGw="; + hash = "sha256-8SHZR8frDHLGj2WYlnFGBWY3B6xv4jByET7CODt2TGw="; }; cargoHash = "sha256-/IvPvJo5zwvLY+P5+hsdbR56/pfopfwncEz9UGUS1Oc="; diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix index b4284a63eec1..b7da7fe8a025 100644 --- a/pkgs/tools/misc/melody/default.nix +++ b/pkgs/tools/misc/melody/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "melody_cli"; inherit version; - sha256 = "sha256-sJVZ4dRP6mAx9g7iqwI3L2cMa5x4qQuzKWPXvOOq6q8="; + hash = "sha256-sJVZ4dRP6mAx9g7iqwI3L2cMa5x4qQuzKWPXvOOq6q8="; }; cargoHash = "sha256-8UWz+gYUxf2UNWZCnhQlGiSX6kPsHPlYcdl7wD3Rchs="; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index b6a77485d1ce..bb51fd8899bd 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0="; + hash = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index e2f51addf2ae..bb84b843a9ea 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Ymocx843DVxvtTHBS3PdyYDLgYJJtUMpmdOnOmFKJZE="; + hash = "sha256-Ymocx843DVxvtTHBS3PdyYDLgYJJtUMpmdOnOmFKJZE="; }; cargoHash = "sha256-xDO+Qdg8gDj0Eny7QtaRiAxwdXycOsInf5L1YZKv++g="; diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/tools/misc/writedisk/default.nix index cbceb9b7cb10..dd1267467136 100644 --- a/pkgs/tools/misc/writedisk/default.nix +++ b/pkgs/tools/misc/writedisk/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; pname = "writedisk"; - sha256 = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY="; + hash = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY="; }; cargoSha256 = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g="; diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index e0b7d61616f2..1de537e071a5 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; + hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; cargoHash = "sha256-R2ng5l2l/5vWnTJ3kt3cURNWL4Lo55yGbSE+9hjQu20="; diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 3695a5007285..98cdf4cd8cd5 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version pname; - sha256 = "sha256-PH7dP7Ytdgy28d2KLp8H3FCt7eFM4dchyEYqN1Yv7JI="; + hash = "sha256-PH7dP7Ytdgy28d2KLp8H3FCt7eFM4dchyEYqN1Yv7JI="; }; cargoHash = "sha256-ex029iu7VZ3VtcGIqqX4ztn2ZXo0+yDv1JM9sz8vcJs="; diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix index 0a6c615fb5a6..5531b7c3323c 100644 --- a/pkgs/tools/security/bao/default.nix +++ b/pkgs/tools/security/bao/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; pname = "${pname}_bin"; - sha256 = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; + hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; }; cargoHash = "sha256-SNsRN5XgchZq6/BZnMeahIqnkP4Jq6bZxbE5cDVpsQA="; diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix index 50aee190a763..dfa26c0399a1 100644 --- a/pkgs/tools/security/sheesy-cli/default.nix +++ b/pkgs/tools/security/sheesy-cli/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version pname; - sha256 = "1l21ji9zqy8x1g2gvqwdhya505max07ibx1hh88s36k0jbvdb7xc"; + hash = "sha256-rJ/V9pJgmqERgjD0FQ/oqhZQlIeN4/3ECx15/FOUQdA="; }; cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3"; diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix index ed1da3f36039..d0365e046f31 100644 --- a/pkgs/tools/text/frawk/default.nix +++ b/pkgs/tools/text/frawk/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; + hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; }; cargoSha256 = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs="; diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix index 0ad2075de08f..1f1b2950e160 100644 --- a/pkgs/tools/text/fst/default.nix +++ b/pkgs/tools/text/fst/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "fst-bin"; - sha256 = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; + hash = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; }; cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/tools/text/huniq/default.nix index 3bb1252ae0c6..bb4d50173ecd 100644 --- a/pkgs/tools/text/huniq/default.nix +++ b/pkgs/tools/text/huniq/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; + hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; }; cargoSha256 = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix index 330c4cdbf930..022667798109 100644 --- a/pkgs/tools/text/runiq/default.nix +++ b/pkgs/tools/text/runiq/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; + hash = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; }; cargoHash = "sha256-WSMV0GNKNckN9uSPN647iDloGkNtaKcrZbeyglUappc="; diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix index 3abc8a0210f6..8879dd282cfa 100644 --- a/pkgs/tools/text/rust-petname/default.nix +++ b/pkgs/tools/text/rust-petname/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "petname"; - sha256 = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; + hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; }; cargoHash = "sha256-R1Xahr9R4G8Tr2cGRJ2oydVaLohPz2VM6tnbtE8Hysk="; From 7f9dcdbbe9330bb1648cdf1937e4835e219d3bef Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 13:46:04 -0400 Subject: [PATCH 284/562] rure: sha256 -> hash, update Cargo.lock --- pkgs/development/libraries/rure/Cargo.lock | 24 +++++++++++----------- pkgs/development/libraries/rure/pin.json | 2 +- pkgs/development/libraries/rure/update.sh | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index a5ba9527382e..9984478e480f 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,30 +4,30 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rure" diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/development/libraries/rure/pin.json index 7e6b1101702e..9825f6e29ab9 100644 --- a/pkgs/development/libraries/rure/pin.json +++ b/pkgs/development/libraries/rure/pin.json @@ -1,5 +1,5 @@ { "pname": "rure", "version": "0.2.2", - "sha256": "0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06" + "hash": "sha256-BuTFOTmWrtGXNl5X0Nx+b7XdKnMN5XdowOy5rNBKTFg=" } diff --git a/pkgs/development/libraries/rure/update.sh b/pkgs/development/libraries/rure/update.sh index 6e85d7cf03a7..d9a31cf68a80 100755 --- a/pkgs/development/libraries/rure/update.sh +++ b/pkgs/development/libraries/rure/update.sh @@ -27,7 +27,7 @@ cat > pin.json < Date: Sun, 14 Jul 2024 18:59:37 +0100 Subject: [PATCH 285/562] yaml-filter: init at 0.2.0 Release: https://github.com/OpenSCAP/yaml-filter/releases/tag/v0.2.0 --- pkgs/by-name/ya/yaml-filter/package.nix | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ya/yaml-filter/package.nix diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix new file mode 100644 index 000000000000..1f7f19b9ddef --- /dev/null +++ b/pkgs/by-name/ya/yaml-filter/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libyaml, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "yaml-filter"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "OpenSCAP"; + repo = "yaml-filter"; + rev = "v${version}"; + hash = "sha256-HDHjOapMFjuDcWW5+opKD2tllbwz4YBw/EI4W7Wf/6g="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ libyaml ]; + + meta = { + description = "YAML document filtering for libyaml"; + homepage = "https://github.com/OpenSCAP/yaml-filter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "yamlp"; + platforms = lib.platforms.all; + }; +} From 4ee284a879304d202ac948456844d4fff8b78870 Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 22:03:25 -0400 Subject: [PATCH 286/562] home-assistant-custom-components.elevenlabs_tts: init at 2.3.0 --- .../custom-components/default.nix | 2 ++ .../elevenlabs_tts/default.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..13cca201ffbf 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,6 +10,8 @@ better_thermostat = callPackage ./better_thermostat {}; + elevenlabs_tts = callPackage ./elevenlabs_tts {}; + emporia_vue = callPackage ./emporia_vue {}; epex_spot = callPackage ./epex_spot {}; diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix new file mode 100644 index 000000000000..f69117f21547 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: + +buildHomeAssistantComponent rec { + owner = "carleeno"; + domain = "elevenlabs_tts"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "carleeno"; + repo = "elevenlabs_tts"; + rev = "refs/tags/${version}"; + hash = "sha256-7/Di3K7b0IzxatqBXqgVeMziRwalOVmIJ5IuEWJVjkE="; + }; + + meta = with lib; { + changelog = "https://github.com/carleeno/elevenlabs_tts/releases/tag/${version}"; + description = "Home Assistant Eleven Labs TTS Integration"; + homepage = "https://github.com/carleeno/elevenlabs_tts"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} From d0c8078b2cac37323446c96b8975116aca20c981 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:06:48 +0200 Subject: [PATCH 287/562] siyuan: 3.0.11 -> 3.1.0 --- pkgs/by-name/si/siyuan/package.nix | 44 ++++++++++++++++++------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 9f52ab47095b..1059a5726439 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -13,23 +13,30 @@ let pnpm = pnpm_9; + + platformIds = { + "x86_64-linux" = "linux"; + "aarch64-linux" = "linux-arm64"; + }; + + platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}"); in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.0.11"; + version = "3.1.0"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-s82g5os944us85V2TBnm+HNd37vVzNjaOJYrbBrgLSI="; + hash = "sha256-UIPASTSW7YGpxJJHfCq28M/U6CzyqaJiISZGtE0aDPw="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-onZBrw0fDsjqXgQF06C40ArxNmsbFDIwD57fJ0jB0ls="; + vendorHash = "sha256-s4dW43Qy3Lrc5WPpugQpN6BDEFVxqnorXpp40SGFk7I="; patches = [ (substituteAll { @@ -70,28 +77,32 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-9+4pAEka6+tymkh6calacjPbcJ++HuNTA6qBEAQ7zPg="; + hash = "sha256-QSaBNs0m13Pfrvl8uUVqRpP3m8PoOBIY5VU5Cg/G2jY="; }; sourceRoot = "${finalAttrs.src.name}/app"; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + postConfigure = '' + # remove prebuilt pandoc archives + rm -r pandoc + + # link kernel into the correct starting place so that electron-builder can copy it to it's final location + mkdir kernel-${platformId} + ln -s ${finalAttrs.kernel}/bin/kernel kernel-${platformId}/SiYuan-Kernel + ''; + buildPhase = '' runHook preBuild pnpm build - substituteInPlace electron-builder-linux.yml \ - --replace-fail '- target: "AppImage"' "" \ - --replace-fail '- target: "tar.gz"' '- target: "dir"' - - # add extra fields to resolve the electron provided by nixpkgs - sed -e 1i'electronDist: ${electron}/libexec/electron' \ - -e 1i'electronVersion: ${electron.version}' \ - -i electron-builder-linux.yml - - pnpm run dist-linux + npm exec electron-builder -- \ + --dir \ + --config electron-builder-${platformId}.yml \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} runHook postBuild ''; @@ -102,9 +113,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/siyuan cp -r build/*-unpacked/{locales,resources{,.pak}} $out/share/siyuan - mkdir $out/share/siyuan/resources/kernel - ln -s ${finalAttrs.kernel}/bin/kernel $out/share/siyuan/resources/kernel/SiYuan-Kernel - makeWrapper ${lib.getExe electron} $out/bin/siyuan \ --chdir $out/share/siyuan/resources \ --add-flags $out/share/siyuan/resources/app \ @@ -121,6 +129,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.agpl3Plus; mainProgram = "siyuan"; maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.linux; + platforms = lib.attrNames platformIds; }; }) From d6b008f3b0529189760c08c83d7210bd984c846f Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 22:24:44 -0400 Subject: [PATCH 288/562] home-assistant-custom-components.samsungtv-smart: init at 0.13.5 --- .../custom-components/default.nix | 2 + .../samsungtv-smart/default.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..b6af82ffe197 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -42,6 +42,8 @@ prometheus_sensor = callPackage ./prometheus_sensor {}; + samsungtv-smart = callPackage ./samsungtv-smart {}; + sensi = callPackage ./sensi {}; smartir = callPackage ./smartir {}; diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix new file mode 100644 index 000000000000..f4af035e51fe --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + aiofiles, + casttube, + websocket-client, + wakeonlan, +}: + +buildHomeAssistantComponent rec { + owner = "ollo69"; + domain = "samsungtv_smart"; + version = "0.13.5"; + + src = fetchFromGitHub { + owner = "ollo69"; + repo = "ha-samsungtv-smart"; + rev = "refs/tags/v${version}"; + hash = "sha256-12wx8HaTEFQZOnxfcuAKFOXPdDpfAl608N1E6gmWqBI="; + }; + + dependencies = [ + aiofiles + casttube + websocket-client + wakeonlan + ]; + + meta = with lib; { + changelog = "https://github.com/ollo69/ha-samsungtv-smart/releases/tag/v${version}"; + description = "Home Assistant Samsung TV Integration "; + homepage = "https://github.com/ollo69/ha-samsungtv-smart"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} From 4b72d38641bb75ee020da3e1222b6c592ecea891 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jul 2024 17:13:25 +0200 Subject: [PATCH 289/562] ruff: 0.5.1 -> 0.5.2 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.5.1...0.5.2 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.5.2 --- pkgs/development/tools/ruff/Cargo.lock | 85 +++++++++++++------------ pkgs/development/tools/ruff/default.nix | 40 +----------- 2 files changed, 47 insertions(+), 78 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 07e945a5164c..77ac3ebd9783 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -666,7 +666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -680,7 +680,7 @@ checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -928,12 +928,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" @@ -950,7 +944,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1037,12 +1031,12 @@ dependencies = [ [[package]] name = "imara-diff" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" +checksum = "af13c8ceb376860ff0c6a66d83a8cdd4ecd9e464da24621bbffcd02b49619434" dependencies = [ "ahash", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -1062,7 +1056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1532,6 +1526,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordermap" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5a8e22be64dfa1123429350872e7be33594dbf5ae5212c90c5890e71966d1d" +dependencies = [ + "indexmap", +] + [[package]] name = "os_str_bytes" version = "6.6.1" @@ -1861,6 +1864,7 @@ name = "red_knot" version = "0.0.0" dependencies = [ "anyhow", + "clap", "countme", "crossbeam", "ctrlc", @@ -1882,8 +1886,10 @@ name = "red_knot_module_resolver" version = "0.0.0" dependencies = [ "anyhow", + "camino", "compact_str", "insta", + "once_cell", "path-slash", "ruff_db", "ruff_python_stdlib", @@ -1901,8 +1907,8 @@ version = "0.0.0" dependencies = [ "anyhow", "bitflags 2.6.0", - "hashbrown 0.14.5", - "indexmap", + "hashbrown", + "ordermap", "red_knot_module_resolver", "ruff_db", "ruff_index", @@ -1995,7 +2001,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "argfile", @@ -2090,13 +2096,13 @@ dependencies = [ "dashmap 6.0.1", "filetime", "insta", - "once_cell", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "tempfile", "tracing", "zip", ] @@ -2177,7 +2183,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2443,7 +2449,6 @@ version = "0.2.2" dependencies = [ "anyhow", "crossbeam", - "globset", "insta", "jod-thread", "libc", @@ -2587,11 +2592,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2601,15 +2607,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -2709,9 +2715,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -2729,9 +2735,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -2751,9 +2757,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2791,9 +2797,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.2" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "serde", "serde_derive", @@ -2802,9 +2808,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.2" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ "darling", "proc-macro2", @@ -2911,9 +2917,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -3305,9 +3311,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64", "flate2", @@ -3315,7 +3321,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "url", "webpki-roots", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index c0d31e390d9d..aa96d8dbe363 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-2tW/p9A7jpQg8ZmSF7KRuN6kBNKK1cfjnS9KlvnCpQA="; + hash = "sha256-g71RqbEoCpmCjd0CKkc++yv00ohoORDeMYAwYEHKhW4="; }; cargoLock = { @@ -31,17 +31,6 @@ rustPlatform.buildRustPackage rec { }; }; - # Fix compatibility with cargo-auditable - # https://github.com/astral-sh/ruff/pull/12275 - # TODO: this will be included in the next release - patches = [ - (fetchpatch { - name = "fix-compatibility-with-cargo-auditable"; - url = "https://github.com/astral-sh/ruff/commit/d0298dc26d471666acc01dacdb603e3e95aca06f.patch"; - hash = "sha256-Shf1Gw1pY98ZE+h9OhlpkJwq/S52EAJqUUk/uHix2fg="; - }) - ]; - nativeBuildInputs = [ installShellFiles ]; @@ -52,31 +41,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - # tests expect no colors - preCheck = '' - export NO_COLOR=1 - ''; - - # Failing for an unclear reason. - # According to the maintainers, those tests are from an experimental crate that isn't actually - # used by ruff currently and can thus be safely skipped. - checkFlags = [ - "--skip=semantic::tests::expression_scope" - "--skip=semantic::tests::reachability_trivial" - "--skip=semantic::types::infer::tests::follow_import_to_class" - "--skip=semantic::types::infer::tests::if_elif" - "--skip=semantic::types::infer::tests::if_elif_else" - "--skip=semantic::types::infer::tests::ifexpr_walrus" - "--skip=semantic::types::infer::tests::ifexpr_walrus_2" - "--skip=semantic::types::infer::tests::join_paths" - "--skip=semantic::types::infer::tests::literal_int_arithmetic" - "--skip=semantic::types::infer::tests::maybe_unbound" - "--skip=semantic::types::infer::tests::narrow_none" - "--skip=semantic::types::infer::tests::resolve_base_class_by_name" - "--skip=semantic::types::infer::tests::resolve_module_member" - "--skip=semantic::types::infer::tests::resolve_visible_def" - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ From 2d284d65aae747cf618d42cdd93703b35cc0102a Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 21:54:25 -0400 Subject: [PATCH 290/562] home-assistant-custom-components.alarmo: init at 1.10.4 --- .../custom-components/alarmo/default.nix | 31 +++++++++++++++++++ .../custom-components/default.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/alarmo/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/pkgs/servers/home-assistant/custom-components/alarmo/default.nix new file mode 100644 index 000000000000..ace6633a8c6e --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/alarmo/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: + +buildHomeAssistantComponent rec { + owner = "nielsfaber"; + domain = "alarmo"; + version = "1.10.4"; + + postInstall = '' + cd $out/custom_components/alarmo/frontend + ls . | grep -v dist | xargs rm -rf + ''; + + src = fetchFromGitHub { + owner = "nielsfaber"; + repo = "alarmo"; + rev = "refs/tags/v${version}"; + hash = "sha256-/hNzGPckLHUX0mrBF3ugAXstrOc1mWdati+nRJCwldc="; + }; + + meta = with lib; { + changelog = "https://github.com/nielsfaber/alarmo/releases/tag/v${version}"; + description = "Alarm System for Home Assistant"; + homepage = "https://github.com/nielsfaber/alarmo"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..5138c56f5aaf 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -4,6 +4,8 @@ { adaptive_lighting = callPackage ./adaptive_lighting {}; + alarmo = callPackage ./alarmo {}; + auth-header = callPackage ./auth-header {}; awtrix = callPackage ./awtrix {}; From 9ca507365baf1d6fd0012fb688b249e41ddaef6d Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 14 Jul 2024 11:33:00 -0700 Subject: [PATCH 291/562] osquery: restore tests in passthru previous update accidentally removed the tests --- pkgs/tools/system/osquery/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1946a6f82005..4c9d5b54cb0f 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -12,6 +12,7 @@ , writeShellApplication , jq , removeReferencesTo +, nixosTests }: let @@ -118,6 +119,9 @@ stdenvNoCC.mkDerivation rec { passthru = { inherit extractOpensslInfo opensslSrc toolchain; + tests = { + inherit (nixosTests) osquery; + }; }; meta = with lib; { From f634371d2115c3f0b6ec8e4df81e1f36e4675cd7 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Tue, 9 Jul 2024 13:12:14 +0200 Subject: [PATCH 292/562] {blackmagic-desktop-video,decklink}: init at 14.0.1a2 --- .../applications/video/obs-studio/default.nix | 4 + .../bl/blackmagic-desktop-video/package.nix | 108 ++++++++++++++++++ pkgs/os-specific/linux/decklink/default.nix | 49 ++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/linux-kernels.nix | 2 +- 5 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/bl/blackmagic-desktop-video/package.nix create mode 100644 pkgs/os-specific/linux/decklink/default.nix diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 82b557d449e1..418d9adf8263 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -48,6 +48,8 @@ , nlohmann_json , websocketpp , asio +, decklinkSupport ? false +, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -165,6 +167,8 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL + ] ++ optionals decklinkSupport [ + blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix new file mode 100644 index 000000000000..211ee2fce81f --- /dev/null +++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix @@ -0,0 +1,108 @@ +{ stdenv +, cacert +, curl +, runCommandLocal +, lib +, autoPatchelfHook +, libcxx +, libGL +, gcc7 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "blackmagic-desktop-video"; + version = "14.0.1a2"; + + buildInputs = [ + autoPatchelfHook + libcxx + libGL + gcc7.cc.lib + ]; + + # yes, the below download function is an absolute mess. + # blame blackmagicdesign. + src = + let + # from the URL that the POST happens to, see browser console + DOWNLOADID = "d73a63095b6a4a189916fb2baa5a0ef3"; + in + runCommandLocal "${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}-src.tar.gz" + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-jkKzUqfirvsVIefjWLx4NlqznXanWDtvhTsIThWFTo4="; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + + nativeBuildInputs = [ curl ]; + + # ENV VARS + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + inherit DOWNLOADID; + # from the URL the download page where you click the "only download" button is at + REFERID = "76801bc1d84147da9cb1a16e663ac33e"; + SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; + + USERAGENT = builtins.concatStringsSep " " [ + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" + "AppleWebKit/537.36 (KHTML, like Gecko)" + "Chrome/77.0.3865.75" + "Safari/537.36" + ]; + + REQJSON = builtins.toJSON { + "country" = "nl"; + "downloadOnly" = true; + "platform" = "Linux"; + "policy" = true; + }; + + } '' + RESOLVEURL=$(curl \ + -s \ + -H "$USERAGENT" \ + -H 'Content-Type: application/json;charset=UTF-8' \ + -H "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \ + --data-ascii "$REQJSON" \ + --compressed \ + "$SITEURL") + curl \ + --retry 3 --retry-delay 3 \ + --compressed \ + "$RESOLVEURL" \ + > $out + ''; + + postUnpack = + let + arch = stdenv.hostPlatform.uname.processor; + in + '' + tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" finalAttrs.version)}/other/${arch}/desktopvideo-${finalAttrs.version}-${arch}.tar.gz + unpacked=$NIX_BUILD_TOP/desktopvideo-${finalAttrs.version}-${stdenv.hostPlatform.uname.processor} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/doc,lib/systemd/system} + cp -r $unpacked/usr/share/doc/desktopvideo $out/share/doc + cp $unpacked/usr/lib/*.so $out/lib + cp $unpacked/usr/lib/systemd/system/DesktopVideoHelper.service $out/lib/systemd/system + cp $unpacked/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper $out/bin/ + substituteInPlace $out/lib/systemd/system/DesktopVideoHelper.service \ + --replace-fail "/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper" "$out/bin/DesktopVideoHelper" + runHook postInstall + ''; + + # need to tell the DesktopVideoHelper where to find its own library + appendRunpaths = [ "${placeholder "out"}/lib" ]; + + meta = with lib; { + homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; + maintainers = [ maintainers.naxdy ]; + license = licenses.unfree; + description = "Supporting applications for Blackmagic Decklink. Doesn't include the desktop applications, only the helper required to make the driver work"; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/os-specific/linux/decklink/default.nix b/pkgs/os-specific/linux/decklink/default.nix new file mode 100644 index 000000000000..4916b8630ad4 --- /dev/null +++ b/pkgs/os-specific/linux/decklink/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, blackmagic-desktop-video +, kernel +}: +stdenv.mkDerivation (finalAttrs: { + pname = "decklink"; + + # the download is a horrible curl mess. we reuse it between the kernel module + # and desktop service, since the version of the two have to match anyways. + # See pkgs/by-name/bl/blackmagic-desktop-video/package.nix for more. + inherit (blackmagic-desktop-video) src version; + + KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + INSTALL_MOD_PATH = placeholder "out"; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + postUnpack = let + arch = stdenv.hostPlatform.uname.processor; + in '' + tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" finalAttrs.version)}/other/${arch}/desktopvideo-${finalAttrs.version}-${arch}.tar.gz + moduleRoot=$NIX_BUILD_TOP/desktopvideo-${finalAttrs.version}-${stdenv.hostPlatform.uname.processor}/usr/src + sourceRoot=$moduleRoot + ''; + + buildPhase = '' + runHook preBuild + make -C $moduleRoot/blackmagic-${finalAttrs.version} -j$NIX_BUILD_CORES + make -C $moduleRoot/blackmagic-io-${finalAttrs.version} -j$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make -C $KERNELDIR M=$moduleRoot/blackmagic-${finalAttrs.version} modules_install + make -C $KERNELDIR M=$moduleRoot/blackmagic-io-${finalAttrs.version} modules_install + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; + maintainers = [ maintainers.naxdy ]; + license = licenses.unfree; + description = "Kernel module for the Blackmagic Design Decklink cards"; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5871a61f155e..0bdae658b8ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -134,7 +134,6 @@ mapAliases ({ bitwarden = bitwarden-desktop; # Added 2024-02-25 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 - blackmagic-desktop-video = throw "blackmagic-desktop-video has been due to being unmaintained"; # Added 2024-07-02 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bc80ec658846..104d8821ff6a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -343,7 +343,7 @@ in { dddvb = callPackage ../os-specific/linux/dddvb { }; - decklink = throw "The decklink kernel module has been removed due to being unmaintained"; # Module removed on 2024-07-02 + decklink = callPackage ../os-specific/linux/decklink { }; digimend = callPackage ../os-specific/linux/digimend { }; From 73ffe01d1af42f0aa70b76b83b742c930b75df02 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Tue, 9 Jul 2024 23:38:23 +0200 Subject: [PATCH 293/562] nixos/decklink: init --- nixos/modules/hardware/decklink.nix | 18 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/hardware/decklink.nix diff --git a/nixos/modules/hardware/decklink.nix b/nixos/modules/hardware/decklink.nix new file mode 100644 index 000000000000..ca0ed389f8cc --- /dev/null +++ b/nixos/modules/hardware/decklink.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.decklink; + kernelPackages = config.boot.kernelPackages; +in +{ + options.hardware.decklink.enable = lib.mkEnableOption "hardware support for the Blackmagic Design Decklink audio/video interfaces"; + + config = lib.mkIf cfg.enable { + # snd_blackmagic-io can cause issues with pipewire, + # so we do not enable it by default + boot.kernelModules = [ "blackmagic" "blackmagic-io" ]; + boot.extraModulePackages = [ kernelPackages.decklink ]; + systemd.packages = [ pkgs.blackmagic-desktop-video ]; + systemd.services.DesktopVideoHelper.wantedBy = [ "multi-user.target" ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fc62e9db1785..0a2e9ff19e30 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -59,6 +59,7 @@ ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix ./hardware/cpu/x86-msr.nix + ./hardware/decklink.nix ./hardware/device-tree.nix ./hardware/digitalbitbox.nix ./hardware/flipperzero.nix From 965f4470a449924e6e2e4ab7b4bbaa75c7551cdf Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:39:08 -0400 Subject: [PATCH 294/562] python3Packages.pyaprilaire: init at 0.7.4 --- .../python-modules/pyaprilaire/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pyaprilaire/default.nix diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix new file mode 100644 index 000000000000..6c99394c31a3 --- /dev/null +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + crc, + setuptools, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pyaprilaire"; + version = "0.7.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chamberlain2007"; + repo = "pyaprilaire"; + rev = "refs/tags/${version}"; + hash = "sha256-+/yQO0JF2nkxaM71iNj6ODB8raM9s4qiLLi6/borcr4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ crc ]; + + pythonImportsCheck = [ "pyaprilaire" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/chamberlain2007/pyaprilaire/releases/tag/${version}"; + description = "Python library for interacting with Aprilaire thermostats."; + homepage = "https://github.com/chamberlain2007/pyaprilaire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..fd5062c253f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9928,6 +9928,8 @@ self: super: with self; { psrpcore = callPackage ../development/python-modules/psrpcore { }; + pyaprilaire = callPackage ../development/python-modules/pyaprilaire { }; + pybars3 = callPackage ../development/python-modules/pybars3 { }; pymeta3 = callPackage ../development/python-modules/pymeta3 { }; From 3f8d5446a12a49dd3c836adec001134101900c83 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:40:15 -0400 Subject: [PATCH 295/562] home-assistant: support pyaprilaire component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..c8cdeeaaa561 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -209,7 +209,8 @@ apprise ]; "aprilaire" = ps: with ps; [ - ]; # missing inputs: pyaprilaire + pyaprilaire + ]; "aprs" = ps: with ps; [ aprslib geopy @@ -5266,6 +5267,7 @@ "apple_tv" "application_credentials" "apprise" + "aprilaire" "aprs" "aranet" "arcam_fmj" From 4b42512dc9273133997693a37fd410b642da86e2 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:49:31 -0400 Subject: [PATCH 296/562] python3Packages.apsystems-ez1: init at 1.3.3 --- .../python-modules/apsystems-ez1/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/apsystems-ez1/default.nix diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix new file mode 100644 index 000000000000..d5005a1d1ca3 --- /dev/null +++ b/pkgs/development/python-modules/apsystems-ez1/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + aiohttp, + poetry-core, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "apsystems-ez1"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SonnenladenGmbH"; + repo = "APsystems-EZ1-API"; + rev = "refs/tags/${version}"; + hash = "sha256-V6GcTSupjhjGEOsO+C9pImYJRnvdDbttW3Zh0PDYt5I="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "APsystemsEZ1" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/${version}"; + description = "Streamlined interface for interacting with the local API of APsystems EZ1 Microinverters."; + homepage = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..93cb8bff2f51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -701,6 +701,8 @@ self: super: with self; { apscheduler = callPackage ../development/python-modules/apscheduler { }; + apsystems-ez1 = callPackage ../development/python-modules/apsystems-ez1 { }; + apsw = callPackage ../development/python-modules/apsw { }; apycula = callPackage ../development/python-modules/apycula { }; From 7d6b2964f7395750768d7a49358f3d6127097100 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:50:15 -0400 Subject: [PATCH 297/562] home-assistant: support apsystems component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..ad2660db0a91 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -215,7 +215,8 @@ geopy ]; "apsystems" = ps: with ps; [ - ]; # missing inputs: apsystems-ez1 + apsystems-ez1 + ]; "aquacell" = ps: with ps; [ fnv-hash-fast ifaddr @@ -5267,6 +5268,7 @@ "application_credentials" "apprise" "aprs" + "apsystems" "aranet" "arcam_fmj" "aseko_pool_live" From ab9078d49fdd2c84c0a082909bc334de37618600 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 14 Jul 2024 15:01:54 -0300 Subject: [PATCH 298/562] k3s: document onboarding maintainer --- .../cluster/k3s/docs/ONBOARDING_MAINTAINER.md | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md diff --git a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md new file mode 100644 index 000000000000..3ee0897b5768 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md @@ -0,0 +1,45 @@ +# Onboarding Maintainer + +Anyone willing can become a maintainer, no pre-requisite knowledge is required. Willingness to learn is enough. + +A K3s maintainer, maintains K3s's: + +- [documentation](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/README.md) +- [issues](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+k3s) +- [pull requests](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%226.topic%3A+k3s%22) +- [NixOS tests](https://github.com/NixOS/nixpkgs/tree/master/nixos/tests/k3s) +- [NixOS service module](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/cluster/k3s/default.nix) +- [update script](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/update-script.sh) (the process of updating) +- updates (the act of updating) and [r-ryantm bot logs](https://r.ryantm.com/log/k3s/) +- deprecations +- CVEs +- NixOS releases +- dependencies (runc, containerd, ipset) + +Anything that is due, basically. + +As a maintainer, feel free to improve anything and everything at your discretion. Meaning, at your pace and according to your capabilities and interests. + +Only consensus is required to move forward any proposal. Consensus meaning the approval of others. + +If you cause a regression (we've all been there), you are responsible for fixing it, but in case you can't fix it (it happens), feel free to ask for help. That's fine, just let us know. + +To merge code, you need to be a commiter, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-commiter, once you have approved a PR you need to forward the request to a commiter. For deciding which commiter, give preference initially to K3s commiters, but any commiter can commit. A commiter usually has a green approval in PRs. + +K3s's commiters currently are: superherointj, marcusramberg, Mic92. + +@euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves. + +@mic92 stepped up when @superherointj stepped down a time ago, as Mic92 has a broad responsibility in nixpkgs (he is responsible for far too many things already, nixpkgs-reviews, sops-nix, release manager, bot-whatever), we avoid giving him chore work for `nixos-unstable`, only pick him as commiter last. As Mic92 runs K3s in a `nixos-stable` setting, he might help in testing stable backports. + +On how to handle requests, it's the usual basics, such as, when reviewing PRs, issues, be welcoming, helpful, provide hints whenever possible, try to move things forward, assume good will, ignore [as don't react to] any negativity [since it spirals badly], delay and sort any (severe) disagreement in private. Even on disagrements, be thankful to people for their dedicated time, no matter what happens. In essence, on any unfortunate event, **always put people over code**. + +Dumbshit happens, we make mistakes, the CI, reviews, fellow maintainers are there to nudge us on a better direction, no need to over think interactions, if a problem happens, we'll handle it. + +We should optimize for maintainers satisfaction, because it is maintainers that make the service great. The best kind of win we have is when someone new steps up for being a maintainer. This multiplies our capabilities of doing meaningful work and increases our knowledge pool. + +Know that your participation matters most for us. And we thank you for stepping up. It's good to have you here! + +We welcome you and wish you the best in this new journey! + +K3s Maintainers From 2182206180b32b440b9e6ffb08e0fa0298c01034 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jul 2024 22:17:32 +0300 Subject: [PATCH 299/562] teamspeak5_client: add mesa dependency It doesn't require mesa.drivers, but it does require libgbm --- .../networking/instant-messengers/teamspeak/client5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index e577aa110fc9..c66c765a5038 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon + mesa nss xorg.libX11 xorg.libXScrnSaver From a850bde6a6516edb00dcda94f24eed19be7b079d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 14 Jul 2024 21:20:04 +0200 Subject: [PATCH 300/562] bdf2psf: 1.228 -> 1.229 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index da5be8a6ce09..7daaa02fb215 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.228"; + version = "1.229"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-wx6JRblOsMcI/1UN0FaN41vc/lVC1lOPMHt90JVf3Vo="; + sha256 = "sha256-RQz3ny2a77jzR4wrGpXOl7Gvkw2dGae4xwnwu3EeeeY="; }; nativeBuildInputs = [ dpkg ]; From 7e150e2e4386cbf8bab296149b0a8e948615d1db Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:39:17 -0400 Subject: [PATCH 301/562] budgie{,Plugins}: format with nixfmt --- .../budgie/budgie-backgrounds/default.nix | 15 +- .../budgie/budgie-control-center/default.nix | 144 +++++++++--------- .../budgie/budgie-desktop-view/default.nix | 25 +-- .../budgie/budgie-desktop/default.nix | 87 +++++------ .../budgie/budgie-desktop/wrapper.nix | 19 ++- .../budgie-gsettings-overrides/default.nix | 58 +++---- .../budgie/budgie-screensaver/default.nix | 35 ++--- .../budgie/budgie-session/default.nix | 55 +++---- pkgs/desktops/budgie/default.nix | 30 ++-- pkgs/desktops/budgie/magpie/default.nix | 97 ++++++------ .../budgie-analogue-clock-applet/default.nix | 21 +-- .../budgie-media-player-applet/default.nix | 15 +- .../budgie-user-indicator-redux/default.nix | 29 ++-- pkgs/desktops/budgie/plugins/default.nix | 3 +- 14 files changed, 330 insertions(+), 303 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index f46a330247d6..3421da2e1212 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, imagemagick -, jhead -, meson -, ninja +{ + lib, + stdenv, + fetchFromGitHub, + imagemagick, + jhead, + meson, + ninja, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1964b0ce5230..f9629021dee7 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -1,62 +1,63 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, accountsservice -, adwaita-icon-theme -, budgie-desktop -, cheese -, clutter -, clutter-gtk -, colord -, colord-gtk -, cups -, docbook-xsl-nons -, fontconfig -, gcr -, gdk-pixbuf -, gettext -, glib -, glib-networking -, glibc -, gnome -, gnome-desktop -, gnome-user-share -, gsettings-desktop-schemas -, gsound -, gtk3 -, ibus -, libcanberra-gtk3 -, libepoxy -, libgnomekbd -, libgtop -, libgudev -, libhandy -, libkrb5 -, libnma -, libpulseaudio -, libpwquality -, librsvg -, libsecret -, libwacom -, libxml2 -, libxslt -, meson -, modemmanager -, networkmanager -, networkmanagerapplet -, ninja -, pkg-config -, polkit -, samba -, shadow -, shared-mime-info -, tzdata -, udisks2 -, upower -, webp-pixbuf-loader -, wrapGAppsHook3 -, enableSshSocket ? false +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + accountsservice, + adwaita-icon-theme, + budgie-desktop, + cheese, + clutter, + clutter-gtk, + colord, + colord-gtk, + cups, + docbook-xsl-nons, + fontconfig, + gcr, + gdk-pixbuf, + gettext, + glib, + glib-networking, + glibc, + gnome, + gnome-desktop, + gnome-user-share, + gsettings-desktop-schemas, + gsound, + gtk3, + ibus, + libcanberra-gtk3, + libepoxy, + libgnomekbd, + libgtop, + libgudev, + libhandy, + libkrb5, + libnma, + libpulseaudio, + libpwquality, + librsvg, + libsecret, + libwacom, + libxml2, + libxslt, + meson, + modemmanager, + networkmanager, + networkmanagerapplet, + ninja, + pkg-config, + polkit, + samba, + shadow, + shared-mime-info, + tzdata, + udisks2, + upower, + webp-pixbuf-loader, + wrapGAppsHook3, + enableSshSocket ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -76,7 +77,12 @@ stdenv.mkDerivation (finalAttrs: { src = ./paths.patch; budgie_desktop = budgie-desktop; gcm = gnome.gnome-color-manager; - inherit cups glibc libgnomekbd shadow; + inherit + cups + glibc + libgnomekbd + shadow + ; inherit networkmanagerapplet tzdata; }) ]; @@ -136,9 +142,7 @@ stdenv.mkDerivation (finalAttrs: { upower ]; - mesonFlags = [ - (lib.mesonBool "ssh" enableSshSocket) - ]; + mesonFlags = [ (lib.mesonBool "ssh" enableSshSocket) ]; preConfigure = '' # For ITS rules @@ -148,12 +152,14 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Pull in WebP support for gnome-backgrounds. # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - librsvg - webp-pixbuf-loader - ]; - }}" + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + librsvg + webp-pixbuf-loader + ]; + } + }" ''; preFixup = '' diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index d2653e775d6c..4c822e94e2f2 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, glib -, gtk3 -, intltool -, meson -, ninja -, pkg-config -, vala -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + glib, + gtk3, + intltool, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 4dc5be53260e..4687c52e4f9b 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -1,39 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, accountsservice -, alsa-lib -, budgie-screensaver -, docbook-xsl-nons -, glib -, gnome -, gnome-desktop -, graphene -, gst_all_1 -, gtk-doc -, gtk3 -, ibus -, intltool -, libcanberra-gtk3 -, libgee -, libGL -, libnotify -, libpeas -, libpulseaudio -, libuuid -, libwnck -, magpie -, mesa -, meson -, ninja -, pkg-config -, polkit -, sassc -, upower -, vala -, xfce -, wrapGAppsHook3 -, zenity +{ + lib, + stdenv, + fetchFromGitHub, + accountsservice, + alsa-lib, + budgie-screensaver, + docbook-xsl-nons, + glib, + gnome, + gnome-desktop, + graphene, + gst_all_1, + gtk-doc, + gtk3, + ibus, + intltool, + libcanberra-gtk3, + libgee, + libGL, + libnotify, + libpeas, + libpulseaudio, + libuuid, + libwnck, + magpie, + mesa, + meson, + ninja, + pkg-config, + polkit, + sassc, + upower, + vala, + xfce, + wrapGAppsHook3, + zenity, }: stdenv.mkDerivation (finalAttrs: { @@ -48,9 +49,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo="; }; - patches = [ - ./plugins.patch - ]; + patches = [ ./plugins.patch ]; nativeBuildInputs = [ docbook-xsl-nons @@ -97,14 +96,16 @@ stdenv.mkDerivation (finalAttrs: { libpeas ]; - passthru.providedSessions = [ - "budgie-desktop" - ]; + passthru.providedSessions = [ "budgie-desktop" ]; meta = { description = "Feature-rich, modern desktop designed to keep out the way of the user"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; - license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; + license = with lib.licenses; [ + gpl2Plus + lgpl21Plus + cc-by-sa-30 + ]; platforms = lib.platforms.linux; maintainers = lib.teams.budgie.members; }; diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix index d25643e6603f..409884134434 100644 --- a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix +++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, glib -, xorg -, wrapGAppsHook3 -, budgie-desktop -, plugins ? [ ] +{ + lib, + stdenv, + glib, + xorg, + wrapGAppsHook3, + budgie-desktop, + plugins ? [ ], }: stdenv.mkDerivation { @@ -13,9 +14,7 @@ stdenv.mkDerivation { src = null; - paths = [ - budgie-desktop - ] ++ plugins; + paths = [ budgie-desktop ] ++ plugins; passAsFile = [ "paths" ]; diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix index a9f427450883..f45a033a8732 100644 --- a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix +++ b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix @@ -1,15 +1,16 @@ -{ lib -, runCommand -, budgie-desktop -, budgie-desktop-view -, glib -, gsettings-desktop-schemas -, gnome -, nixos-artwork -, nixos-background-light ? nixos-artwork.wallpapers.nineish -, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray -, extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [] +{ + lib, + runCommand, + budgie-desktop, + budgie-desktop-view, + glib, + gsettings-desktop-schemas, + gnome, + nixos-artwork, + nixos-background-light ? nixos-artwork.wallpapers.nineish, + nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray, + extraGSettingsOverrides ? "", + extraGSettingsOverridePackages ? [ ], }: let @@ -55,24 +56,27 @@ let ''; gsettingsOverridePackages = [ - budgie-desktop - budgie-desktop-view - gsettings-desktop-schemas - gnome.mutter + budgie-desktop + budgie-desktop-view + gsettings-desktop-schemas + gnome.mutter ] ++ extraGSettingsOverridePackages; in - runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } '' - data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" - schema_dir="$data_dir/glib-2.0/schemas" - mkdir -p "$schema_dir" +runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } '' + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" + mkdir -p "$schema_dir" - ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} + ${concatMapStringsSep "\n" ( + pkg: + "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"" + ) gsettingsOverridePackages} - chmod -R a+w "$data_dir" - cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF - ${gsettingsOverrides} - EOF + chmod -R a+w "$data_dir" + cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF + ${gsettingsOverrides} + EOF - ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" - '' + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" +'' diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index 55b4be851642..dc1ad85634c9 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, dbus-glib -, glib -, gnome-desktop -, gtk3 -, intltool -, libgnomekbd -, libX11 -, linux-pam -, meson -, ninja -, pkg-config -, systemd -, wrapGAppsHook3 -, xorg +{ + lib, + stdenv, + fetchFromGitHub, + dbus-glib, + glib, + gnome-desktop, + gtk3, + intltool, + libgnomekbd, + libX11, + linux-pam, + meson, + ninja, + pkg-config, + systemd, + wrapGAppsHook3, + xorg, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 3815af26c21d..1bd9c3e58b75 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -1,30 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, meson -, ninja -, pkg-config -, gnome -, adwaita-icon-theme -, glib -, gtk3 -, gsettings-desktop-schemas -, gnome-desktop -, dbus -, json-glib -, libICE -, xmlto -, docbook_xsl -, docbook_xml_dtd_412 -, python3 -, libxslt -, gettext -, makeWrapper -, systemd -, xorg -, libepoxy -, bash +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + meson, + ninja, + pkg-config, + gnome, + adwaita-icon-theme, + glib, + gtk3, + gsettings-desktop-schemas, + gnome-desktop, + dbus, + json-glib, + libICE, + xmlto, + docbook_xsl, + docbook_xml_dtd_412, + python3, + libxslt, + gettext, + makeWrapper, + systemd, + xorg, + libepoxy, + bash, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 52f47d00bdeb..ad3879038e4c 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -1,15 +1,19 @@ { lib, newScope }: -lib.makeScope newScope (self: let - inherit (self) callPackage; -in { - budgie-backgrounds = callPackage ./budgie-backgrounds { }; - budgie-control-center = callPackage ./budgie-control-center { }; - budgie-desktop = callPackage ./budgie-desktop { }; - budgie-desktop-view = callPackage ./budgie-desktop-view { }; - budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; - budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; - budgie-screensaver = callPackage ./budgie-screensaver { }; - budgie-session = callPackage ./budgie-session { }; - magpie = callPackage ./magpie { }; -}) +lib.makeScope newScope ( + self: + let + inherit (self) callPackage; + in + { + budgie-backgrounds = callPackage ./budgie-backgrounds { }; + budgie-control-center = callPackage ./budgie-control-center { }; + budgie-desktop = callPackage ./budgie-desktop { }; + budgie-desktop-view = callPackage ./budgie-desktop-view { }; + budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; + budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; + budgie-screensaver = callPackage ./budgie-screensaver { }; + budgie-session = callPackage ./budgie-session { }; + magpie = callPackage ./magpie { }; + } +) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 5f42b1986ce6..fa234e668872 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -1,54 +1,59 @@ -{ fetchFromGitHub -, runCommand -, lib -, fetchpatch -, stdenv -, pkg-config -, gnome -, gettext -, gobject-introspection -, cairo -, colord -, lcms2 -, pango -, json-glib -, libstartup_notification -, libcanberra -, ninja -, xvfb-run -, xkeyboard_config -, libxcvt -, libxkbfile -, libXdamage -, libxkbcommon -, libXtst -, libinput -, libdrm -, gsettings-desktop-schemas -, glib -, gtk3 -, gnome-desktop -, pipewire -, libgudev -, libwacom -, mesa -, meson -, xorgserver -, python3 -, wrapGAppsHook3 -, gi-docgen -, sysprof -, libsysprof-capture -, desktop-file-utils -, libcap_ng -, graphene +{ + fetchFromGitHub, + runCommand, + lib, + fetchpatch, + stdenv, + pkg-config, + gnome, + gettext, + gobject-introspection, + cairo, + colord, + lcms2, + pango, + json-glib, + libstartup_notification, + libcanberra, + ninja, + xvfb-run, + xkeyboard_config, + libxcvt, + libxkbfile, + libXdamage, + libxkbcommon, + libXtst, + libinput, + libdrm, + gsettings-desktop-schemas, + glib, + gtk3, + gnome-desktop, + pipewire, + libgudev, + libwacom, + mesa, + meson, + xorgserver, + python3, + wrapGAppsHook3, + gi-docgen, + sysprof, + libsysprof-capture, + desktop-file-utils, + libcap_ng, + graphene, }: stdenv.mkDerivation (finalAttrs: { pname = "magpie"; version = "0.9.3"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + "devdoc" + ]; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; @@ -146,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { libdir = "${finalAttrs.finalPackage}/lib/magpie-0"; tests = { - libdirExists = runCommand "magpie-libdir-exists" {} '' + libdirExists = runCommand "magpie-libdir-exists" { } '' if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." exit 1 diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 3792a19f99e9..501a009700ee 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, vala -, budgie -, gtk3 -, libpeas +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + budgie, + gtk3, + libpeas, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix index 38b3888c74f6..37e2429ac2c7 100644 --- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, meson -, ninja -, python3Packages +{ + lib, + stdenv, + fetchFromGitHub, + glib, + meson, + ninja, + python3Packages, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 273f87d51dbd..5839f511e9b6 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, accountsservice -, budgie -, gtk3 -, intltool -, libgee -, libpeas -, meson -, ninja -, pkg-config -, sassc -, vala +{ + lib, + stdenv, + fetchFromGitHub, + accountsservice, + budgie, + gtk3, + intltool, + libgee, + libpeas, + meson, + ninja, + pkg-config, + sassc, + vala, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index 1958a8ef9ea2..ad9da6bb4b85 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,4 +1,5 @@ -{ callPackage }: { +{ callPackage }: +{ budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; budgie-media-player-applet = callPackage ./budgie-media-player-applet { }; budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; From ba97c97f321f0f7f0ea8d51f180dd6d1bd026309 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:41:13 -0400 Subject: [PATCH 302/562] budgie-backgrounds: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../default.nix => by-name/bu/budgie-backgrounds/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/budgie/budgie-backgrounds/default.nix => by-name/bu/budgie-backgrounds/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 7f43a939970b..79df6b044a6a 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -121,7 +121,7 @@ in { environment.systemPackages = with pkgs; [ # Budgie Desktop. - budgie.budgie-backgrounds + budgie-backgrounds budgie-control-center (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/by-name/bu/budgie-backgrounds/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-backgrounds/default.nix rename to pkgs/by-name/bu/budgie-backgrounds/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index ad3879038e4c..729051251727 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-backgrounds = callPackage ./budgie-backgrounds { }; budgie-control-center = callPackage ./budgie-control-center { }; budgie-desktop = callPackage ./budgie-desktop { }; budgie-desktop-view = callPackage ./budgie-desktop-view { }; From 4c87e35ad2a05bd2f221b4201e849a0f2f706a02 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:23:00 -0400 Subject: [PATCH 303/562] budgie-backgrounds: modernize --- pkgs/by-name/bu/budgie-backgrounds/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-backgrounds/package.nix b/pkgs/by-name/bu/budgie-backgrounds/package.nix index 3421da2e1212..576f600fe731 100644 --- a/pkgs/by-name/bu/budgie-backgrounds/package.nix +++ b/pkgs/by-name/bu/budgie-backgrounds/package.nix @@ -6,6 +6,7 @@ jhead, meson, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -26,11 +27,16 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; - platforms = lib.platforms.linux; - maintainers = lib.teams.budgie.members; + changelog = "https://github.com/BuddiesOfBudgie/budgie-backgrounds/releases/tag/v${finalAttrs.version}"; license = lib.licenses.cc0; + maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; }; }) From 96bab1b8b0a81f41ef0e85509a5c31e5f6d98e67 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:42:48 -0400 Subject: [PATCH 304/562] budgie-control-center: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 6 +++--- .../bu/budgie-control-center/package.nix} | 6 +++--- .../budgie => by-name/bu}/budgie-control-center/paths.patch | 0 pkgs/desktops/budgie/default.nix | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{desktops/budgie/budgie-control-center/default.nix => by-name/bu/budgie-control-center/package.nix} (96%) rename pkgs/{desktops/budgie => by-name/bu}/budgie-control-center/paths.patch (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 79df6b044a6a..c4fcf1612846 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -40,7 +40,7 @@ let destination = "/share/gnome-background-properties/nixos.xml"; }; - budgie-control-center = pkgs.budgie.budgie-control-center.override { + budgie-control-center' = pkgs.budgie-control-center.override { enableSshSocket = config.services.openssh.startWhenNeeded; }; @@ -122,7 +122,7 @@ in { [ # Budgie Desktop. budgie-backgrounds - budgie-control-center + budgie-control-center' (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver @@ -243,7 +243,7 @@ in { # Register packages for DBus. services.dbus.packages = [ - budgie-control-center + budgie-control-center' ]; # Register packages for udev. diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/by-name/bu/budgie-control-center/package.nix similarity index 96% rename from pkgs/desktops/budgie/budgie-control-center/default.nix rename to pkgs/by-name/bu/budgie-control-center/package.nix index f9629021dee7..f4e0e583aaff 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -5,7 +5,7 @@ substituteAll, accountsservice, adwaita-icon-theme, - budgie-desktop, + budgie, cheese, clutter, clutter-gtk, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (substituteAll { src = ./paths.patch; - budgie_desktop = budgie-desktop; + budgie_desktop = budgie.budgie-desktop; gcm = gnome.gnome-color-manager; inherit cups @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( # Sound theme - --prefix XDG_DATA_DIRS : "${budgie-desktop}/share" + --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/budgie/budgie-control-center/paths.patch b/pkgs/by-name/bu/budgie-control-center/paths.patch similarity index 100% rename from pkgs/desktops/budgie/budgie-control-center/paths.patch rename to pkgs/by-name/bu/budgie-control-center/paths.patch diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 729051251727..09f4564bec5d 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-control-center = callPackage ./budgie-control-center { }; budgie-desktop = callPackage ./budgie-desktop { }; budgie-desktop-view = callPackage ./budgie-desktop-view { }; budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; From c4212408fa1ace475775cf374ab988b952173ff3 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:52:46 -0400 Subject: [PATCH 305/562] budgie-control-center: modernize --- pkgs/by-name/bu/budgie-control-center/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index f4e0e583aaff..10a7da2fdb3a 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -47,6 +47,7 @@ networkmanager, networkmanagerapplet, ninja, + nix-update-script, pkg-config, polkit, samba, @@ -176,12 +177,17 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Fork of GNOME Control Center for the Budgie 10 Series"; homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; + changelog = "https://github.com/BuddiesOfBudgie/budgie-control-center/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Plus; + maintainers = lib.teams.budgie.members; mainProgram = "budgie-control-center"; platforms = lib.platforms.linux; - maintainers = lib.teams.budgie.members; - license = lib.licenses.gpl2Plus; }; }) From e24214811979bc573cc1d457596835f0ccbd8940 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:53:19 -0400 Subject: [PATCH 306/562] budgie-control-center: add version test --- pkgs/by-name/bu/budgie-control-center/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 10a7da2fdb3a..10d29b162731 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -53,6 +53,7 @@ samba, shadow, shared-mime-info, + testers, tzdata, udisks2, upower, @@ -178,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; }; From 417179abbdfec986f31b712d64988818bc91176e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:50:03 -0400 Subject: [PATCH 307/562] budgie-desktop{,with-plugins}: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 6 +++--- nixos/tests/budgie.nix | 2 +- pkgs/by-name/bu/budgie-control-center/package.nix | 6 +++--- .../bu/budgie-desktop-with-plugins/package.nix} | 0 .../default.nix => by-name/bu/budgie-desktop/package.nix} | 7 +++---- .../budgie => by-name/bu}/budgie-desktop/plugins.patch | 0 pkgs/desktops/budgie/default.nix | 2 -- .../plugins/budgie-analogue-clock-applet/default.nix | 4 ++-- .../budgie/plugins/budgie-user-indicator-redux/default.nix | 4 ++-- 9 files changed, 14 insertions(+), 17 deletions(-) rename pkgs/{desktops/budgie/budgie-desktop/wrapper.nix => by-name/bu/budgie-desktop-with-plugins/package.nix} (100%) rename pkgs/{desktops/budgie/budgie-desktop/default.nix => by-name/bu/budgie-desktop/package.nix} (96%) rename pkgs/{desktops/budgie => by-name/bu}/budgie-desktop/plugins.patch (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index c4fcf1612846..777ae096fc81 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { services.displayManager.sessionPackages = with pkgs; [ - budgie.budgie-desktop + budgie-desktop ]; services.xserver.displayManager.lightdm.greeters.slick = { @@ -123,7 +123,7 @@ in { # Budgie Desktop. budgie-backgrounds budgie-control-center' - (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) + (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver budgie.budgie-session @@ -210,7 +210,7 @@ in { xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk # provides a XDG Portals implementation. ]; - xdg.portal.configPackages = mkDefault [ pkgs.budgie.budgie-desktop ]; + xdg.portal.configPackages = mkDefault [ pkgs.budgie-desktop ]; services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel. services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel. diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 203e718c8c6d..f9d873af95e3 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ" machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'") - machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'") + machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'") with subtest("Open run dialog"): machine.send_key("alt-f2") diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 10d29b162731..65feaa196b9b 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -5,7 +5,7 @@ substituteAll, accountsservice, adwaita-icon-theme, - budgie, + budgie-desktop, cheese, clutter, clutter-gtk, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (substituteAll { src = ./paths.patch; - budgie_desktop = budgie.budgie-desktop; + budgie_desktop = budgie-desktop; gcm = gnome.gnome-color-manager; inherit cups @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( # Sound theme - --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share" + --prefix XDG_DATA_DIRS : "${budgie-desktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop/wrapper.nix rename to pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/by-name/bu/budgie-desktop/package.nix similarity index 96% rename from pkgs/desktops/budgie/budgie-desktop/default.nix rename to pkgs/by-name/bu/budgie-desktop/package.nix index 4687c52e4f9b..34253793db2c 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, accountsservice, alsa-lib, - budgie-screensaver, + budgie, docbook-xsl-nons, glib, gnome, @@ -23,7 +23,6 @@ libpulseaudio, libuuid, libwnck, - magpie, mesa, meson, ninja, @@ -65,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice alsa-lib - budgie-screensaver + budgie.budgie-screensaver glib gnome-desktop gnome.gnome-settings-daemon @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libuuid libwnck - magpie + budgie.magpie mesa polkit sassc diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop/plugins.patch rename to pkgs/by-name/bu/budgie-desktop/plugins.patch diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 09f4564bec5d..033db368e653 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,9 +6,7 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-desktop = callPackage ./budgie-desktop { }; budgie-desktop-view = callPackage ./budgie-desktop-view { }; - budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 501a009700ee..873ee28d4e86 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -6,7 +6,7 @@ ninja, pkg-config, vala, - budgie, + budgie-desktop, gtk3, libpeas, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - budgie.budgie-desktop + budgie-desktop gtk3 libpeas ]; diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 5839f511e9b6..ddd0f45a34b5 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, accountsservice, - budgie, + budgie-desktop, gtk3, intltool, libgee, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice - budgie.budgie-desktop + budgie-desktop gtk3 libgee libpeas From 02cd3e363283c2d7afbf052ce4dab456dba68003 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:25:09 -0400 Subject: [PATCH 308/562] budgie-desktop: split outputs --- pkgs/by-name/bu/budgie-desktop/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 34253793db2c..a592608c5361 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo="; }; + outputs = [ + "out" + "dev" + "man" + ]; + patches = [ ./plugins.patch ]; nativeBuildInputs = [ From 5aa2e5ce36148051053406ce839a213db30240b8 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:58:49 -0400 Subject: [PATCH 309/562] budgie-desktop: modernize --- pkgs/by-name/bu/budgie-desktop/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index a592608c5361..08d7c2b6ccf6 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -26,6 +26,7 @@ mesa, meson, ninja, + nix-update-script, pkg-config, polkit, sassc, @@ -101,17 +102,21 @@ stdenv.mkDerivation (finalAttrs: { libpeas ]; - passthru.providedSessions = [ "budgie-desktop" ]; + passthru = { + providedSessions = [ "budgie-desktop" ]; + updateScript = nix-update-script { }; + }; meta = { description = "Feature-rich, modern desktop designed to keep out the way of the user"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; + changelog = "https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; - platforms = lib.platforms.linux; maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; }; }) From cbd92467d44cfd6feee3e3ee6e7c309194d73207 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:59:26 -0400 Subject: [PATCH 310/562] budgie-desktop: add validatePkgConfig hook --- pkgs/by-name/bu/budgie-desktop/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 08d7c2b6ccf6..7beb813fa79e 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -32,6 +32,7 @@ sassc, upower, vala, + validatePkgConfig, xfce, wrapGAppsHook3, zenity, @@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala + validatePkgConfig wrapGAppsHook3 ]; From 94b69c9c465fb32c55cbfd48350b2659abfa100f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:00:27 -0400 Subject: [PATCH 311/562] budgie-desktop: add pkg-config test --- pkgs/by-name/bu/budgie-desktop/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 7beb813fa79e..4970b6faa963 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -30,6 +30,7 @@ pkg-config, polkit, sassc, + testers, upower, vala, validatePkgConfig, @@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { providedSessions = [ "budgie-desktop" ]; + tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; }; @@ -120,5 +122,10 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; + pkgConfigModules = [ + "budgie-1.0" + "budgie-raven-plugin-1.0" + "budgie-theme-1.0" + ]; }; }) From a3881259e9d1e338bf3decadd6155077a8cb5576 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:01:47 -0400 Subject: [PATCH 312/562] budgie-desktop-with-plugins: fix meta info This fixes attributes such as `meta.position` --- .../bu/budgie-desktop-with-plugins/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix index 409884134434..2e09fcf99e41 100644 --- a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix @@ -48,5 +48,14 @@ stdenv.mkDerivation { ) ''; - inherit (budgie-desktop) meta; + meta = { + inherit (budgie-desktop.meta) + description + homepage + changelog + license + maintainers + platforms + ; + }; } From 9bfabc5a06a13cf02fda8a5b3bddb2aef86e5862 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:06:37 -0400 Subject: [PATCH 313/562] budgie-desktop-view: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 4 ++-- .../bu/budgie-desktop-view/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{desktops/budgie/budgie-desktop-view/default.nix => by-name/bu/budgie-desktop-view/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 777ae096fc81..64ef6e4f4b30 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -104,7 +104,7 @@ in { cursorTheme = mkDefault { name = "Qogir"; package = pkgs.qogir-icon-theme; }; }; - services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie.budgie-desktop-view ]; + services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ]; environment.extraInit = '' ${concatMapStrings (p: '' @@ -124,7 +124,7 @@ in { budgie-backgrounds budgie-control-center' (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) - budgie.budgie-desktop-view + budgie-desktop-view budgie.budgie-screensaver budgie.budgie-session diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop-view/default.nix rename to pkgs/by-name/bu/budgie-desktop-view/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 033db368e653..3561dce0b61e 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-desktop-view = callPackage ./budgie-desktop-view { }; budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; From 14dfaa831f8f07b4569fd8a286626f915ca60936 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:10:39 -0400 Subject: [PATCH 314/562] budgie-desktop-view: modernize --- pkgs/by-name/bu/budgie-desktop-view/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-desktop-view/package.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix index 4c822e94e2f2..601f43fae1e7 100644 --- a/pkgs/by-name/bu/budgie-desktop-view/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-view/package.nix @@ -8,6 +8,7 @@ intltool, meson, ninja, + nix-update-script, pkg-config, vala, wrapGAppsHook3, @@ -21,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BuddiesOfBudgie"; repo = "budgie-desktop-view"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE="; + hash = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE="; }; nativeBuildInputs = [ @@ -41,12 +42,17 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "werror" false) ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Official Budgie desktop icons application/implementation"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view"; - mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; + changelog = "https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - platforms = lib.platforms.linux; maintainers = lib.teams.budgie.members; + mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; + platforms = lib.platforms.linux; }; }) From 51bfa7985c4a2a5822e8e2e2887533c05cfc705f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:10:49 -0400 Subject: [PATCH 315/562] budgie-gsettings-override: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../bu/budgie-gsettings-overrides/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/budgie/budgie-gsettings-overrides/default.nix => by-name/bu/budgie-gsettings-overrides/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 64ef6e4f4b30..38c4142bc8a1 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -8,7 +8,7 @@ let nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish; nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray; - nixos-gsettings-overrides = pkgs.budgie.budgie-gsettings-overrides.override { + nixos-gsettings-overrides = pkgs.budgie-gsettings-overrides.override { inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages; inherit nixos-background-dark nixos-background-light; }; diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix rename to pkgs/by-name/bu/budgie-gsettings-overrides/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 3561dce0b61e..80def65811a9 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; magpie = callPackage ./magpie { }; From 228edade412a2856276b8c232791db859ceca8e3 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:13:01 -0400 Subject: [PATCH 316/562] budgie-screensaver: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- pkgs/by-name/bu/budgie-desktop/package.nix | 3 ++- .../default.nix => by-name/bu/budgie-screensaver/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/budgie/budgie-screensaver/default.nix => by-name/bu/budgie-screensaver/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 38c4142bc8a1..a711c3ff1c57 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -125,7 +125,7 @@ in { budgie-control-center' (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie-desktop-view - budgie.budgie-screensaver + budgie-screensaver budgie.budgie-session # Required by Budgie Menu. diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 4970b6faa963..7b2116950b68 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -5,6 +5,7 @@ accountsservice, alsa-lib, budgie, + budgie-screensaver, docbook-xsl-nons, glib, gnome, @@ -74,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice alsa-lib - budgie.budgie-screensaver + budgie-screensaver glib gnome-desktop gnome.gnome-settings-daemon diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-screensaver/default.nix rename to pkgs/by-name/bu/budgie-screensaver/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 80def65811a9..d5a68d4e978e 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; magpie = callPackage ./magpie { }; } From 94d8f9bcaa5fdfc80912ee32f2c14cf810f3a8ff Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:14:12 -0400 Subject: [PATCH 317/562] budgie-screensaver: modernize --- pkgs/by-name/bu/budgie-screensaver/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index dc1ad85634c9..1010ffd9c646 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -12,6 +12,7 @@ linux-pam, meson, ninja, + nix-update-script, pkg-config, systemd, wrapGAppsHook3, @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BuddiesOfBudgie"; repo = "budgie-screensaver"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; + hash = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; }; nativeBuildInputs = [ @@ -51,12 +52,17 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; + changelog = "https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + maintainers = lib.teams.budgie.members; mainProgram = "budgie-screensaver"; platforms = lib.platforms.linux; - maintainers = lib.teams.budgie.members; - license = lib.licenses.gpl2Only; }; }) From 9af16f0c401b6f0e9c1ee51aca1bce0ea1631f7c Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:17:24 -0400 Subject: [PATCH 318/562] budgie-screensaver: split outputs --- pkgs/by-name/bu/budgie-screensaver/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 1010ffd9c646..f32f6522b8a2 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; }; + outputs = [ + "out" + "man" + ]; + nativeBuildInputs = [ intltool meson From 32a481458583c34eed92602821d15de234a16a60 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:14:57 -0400 Subject: [PATCH 319/562] budgie-screensaver: add version test --- pkgs/by-name/bu/budgie-screensaver/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index f32f6522b8a2..339b800800f4 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -15,6 +15,7 @@ nix-update-script, pkg-config, systemd, + testers, wrapGAppsHook3, xorg, }: @@ -58,6 +59,11 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "budgie-screensaver-command --version"; + }; + updateScript = nix-update-script { }; }; From 50124d6c9f3cc0c6d55e6ca0cf4f0dfdc1513ace Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:16:27 -0400 Subject: [PATCH 320/562] budgie-session: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../budgie => by-name/bu}/budgie-session/fix-paths.patch | 0 .../default.nix => by-name/bu/budgie-session/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/budgie => by-name/bu}/budgie-session/fix-paths.patch (100%) rename pkgs/{desktops/budgie/budgie-session/default.nix => by-name/bu/budgie-session/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index a711c3ff1c57..3748ad036c96 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -126,7 +126,7 @@ in { (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie-desktop-view budgie-screensaver - budgie.budgie-session + budgie-session # Required by Budgie Menu. gnome-menus diff --git a/pkgs/desktops/budgie/budgie-session/fix-paths.patch b/pkgs/by-name/bu/budgie-session/fix-paths.patch similarity index 100% rename from pkgs/desktops/budgie/budgie-session/fix-paths.patch rename to pkgs/by-name/bu/budgie-session/fix-paths.patch diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/by-name/bu/budgie-session/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-session/default.nix rename to pkgs/by-name/bu/budgie-session/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index d5a68d4e978e..82e0f2cceddf 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-session = callPackage ./budgie-session { }; magpie = callPackage ./magpie { }; } ) From d623736294070d367157cea695e8ed5769f13766 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:19:28 -0400 Subject: [PATCH 321/562] budgie-session: split outputs --- pkgs/by-name/bu/budgie-session/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 1bd9c3e58b75..aa6af162344b 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-mz+Yh3NK2Tag+MWVofFFXYYXspxhmYBD6YCiuATpZSI="; }; + outputs = [ + "out" + "man" + ]; + patches = [ (substituteAll { src = ./fix-paths.patch; From 0470485ff946998fe1fe96b3f264b222b7590d01 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:20:49 -0400 Subject: [PATCH 322/562] budgie-session: modernize --- pkgs/by-name/bu/budgie-session/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index aa6af162344b..0dfd4dc60824 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -22,6 +22,7 @@ libxslt, gettext, makeWrapper, + nix-update-script, systemd, xorg, libepoxy, @@ -47,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (substituteAll { src = ./fix-paths.patch; - gsettings = "${glib.bin}/bin/gsettings"; - dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - bash = "${bash}/bin/bash"; + gsettings = lib.getExe' glib "gsettings"; + dbusLaunch = lib.getExe' dbus "dbus-launch"; + bash = lib.getExe bash; }) ]; @@ -98,9 +99,14 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Session manager for Budgie"; homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; + changelog = "https://github.com/BuddiesOfBudgie/budgie-session/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; From fef55ad1caac960eb1cd352ceed8118cbb1b6f6c Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:28:51 -0400 Subject: [PATCH 323/562] magpie: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- pkgs/by-name/bu/budgie-desktop/package.nix | 4 ++-- .../magpie/default.nix => by-name/ma/magpie/package.nix} | 0 pkgs/desktops/budgie/default.nix | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{desktops/budgie/magpie/default.nix => by-name/ma/magpie/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 3748ad036c96..64df1804680e 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -248,7 +248,7 @@ in { # Register packages for udev. services.udev.packages = with pkgs; [ - budgie.magpie + magpie ]; # Shell integration for MATE Terminal. diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 7b2116950b68..7ba153090d30 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, accountsservice, alsa-lib, - budgie, budgie-screensaver, docbook-xsl-nons, glib, @@ -24,6 +23,7 @@ libpulseaudio, libuuid, libwnck, + magpie, mesa, meson, ninja, @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libuuid libwnck - budgie.magpie + magpie mesa polkit sassc diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/by-name/ma/magpie/package.nix similarity index 100% rename from pkgs/desktops/budgie/magpie/default.nix rename to pkgs/by-name/ma/magpie/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 82e0f2cceddf..a2ac816b7c84 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -5,7 +5,5 @@ lib.makeScope newScope ( let inherit (self) callPackage; in - { - magpie = callPackage ./magpie { }; - } + { } ) From 285f1f32d97357db12cda7a93b17bb10e939261b Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:43:25 -0400 Subject: [PATCH 324/562] magpie: use validatePkgConfig hook --- pkgs/by-name/ma/magpie/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index fa234e668872..3f9dfda74a05 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -34,6 +34,7 @@ libwacom, mesa, meson, + validatePkgConfig, xorgserver, python3, wrapGAppsHook3, @@ -95,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 + validatePkgConfig wrapGAppsHook3 gi-docgen xorgserver From ca1ec13de5886b56a12ecd8c769ef42a814f7816 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:44:04 -0400 Subject: [PATCH 325/562] magpie: add pkg-config test --- pkgs/by-name/ma/magpie/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 3f9dfda74a05..66b6e40723e3 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -40,6 +40,7 @@ wrapGAppsHook3, gi-docgen, sysprof, + testers, libsysprof-capture, desktop-file-utils, libcap_ng, @@ -160,6 +161,8 @@ stdenv.mkDerivation (finalAttrs: { fi touch $out ''; + + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; }; @@ -169,5 +172,11 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; + pkgConfigModules = [ + "libmagpie-0" + "magpie-clutter-0" + "magpie-cogl-0" + "magpie-cogl-pango-0" + ]; }; }) From ece9778f28f7b5616ff27b75c6543d196eee07c1 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:45:00 -0400 Subject: [PATCH 326/562] magpie: modernize --- pkgs/by-name/ma/magpie/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 66b6e40723e3..176c81fae2b8 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -34,6 +34,7 @@ libwacom, mesa, meson, + nix-update-script, validatePkgConfig, xorgserver, python3, @@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; - sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + hash = "sha256-/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) ]; @@ -164,11 +165,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; + + updateScript = nix-update-script { }; }; meta = { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; + changelog = "https://github.com/BuddiesOfBudgie/magpie/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; From 26f83d251c2efbe92701238b55662a310d66c6dd Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:29:22 -0400 Subject: [PATCH 327/562] budgie: drop scope --- pkgs/desktops/budgie/default.nix | 9 --------- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 pkgs/desktops/budgie/default.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix deleted file mode 100644 index a2ac816b7c84..000000000000 --- a/pkgs/desktops/budgie/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, newScope }: - -lib.makeScope newScope ( - self: - let - inherit (self) callPackage; - in - { } -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..1f8dddfc002d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -158,6 +158,9 @@ mapAliases ({ bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 + + budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 + inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a66aaf888fc3..c73774bbfcfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37145,7 +37145,6 @@ with pkgs; appls = [ prio ]; }; - budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); cdesktopenv = callPackage ../desktops/cdesktopenv { }; From 731fb7477cffb5578f674d1bec0f6dafc6e3416b Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:30:23 -0400 Subject: [PATCH 328/562] budgie-analogue-clock-applet: move from budgiePlugins scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- nixos/tests/budgie.nix | 2 +- .../bu/budgie-analogue-clock-applet/package.nix} | 0 pkgs/desktops/budgie/plugins/default.nix | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix => by-name/bu/budgie-analogue-clock-applet/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 64df1804680e..e94a9e015935 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -80,7 +80,7 @@ in { description = "Extra plugins for the Budgie desktop"; type = types.listOf types.package; default = []; - example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]"; + example = literalExpression "[ pkgs.budgie-analogue-clock-applet ]"; }; }; diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index f9d873af95e3..9f24ea71de1d 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -25,7 +25,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.xserver.desktopManager.budgie = { enable = true; extraPlugins = [ - pkgs.budgiePlugins.budgie-analogue-clock-applet + pkgs.budgie-analogue-clock-applet ]; }; }; diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix similarity index 100% rename from pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix rename to pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index ad9da6bb4b85..885e7c01bb67 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,6 +1,5 @@ { callPackage }: { - budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; budgie-media-player-applet = callPackage ./budgie-media-player-applet { }; budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; } From 4c3e9f67f6dabcb4028c8ce68afcbd5e96d55905 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:32:33 -0400 Subject: [PATCH 329/562] budgie-analogue-clock-applet: ensure updateScript & meta.changelog --- pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index 873ee28d4e86..ebc2947a4e5b 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -9,6 +9,7 @@ budgie-desktop, gtk3, libpeas, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -35,9 +36,14 @@ stdenv.mkDerivation (finalAttrs: { libpeas ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; + changelog = "https://github.com/samlane-ma/analogue-clock-applet/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; From cb1ef2ba8b65b95a6d4a2376e6f2ec81d08c3be8 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:33:05 -0400 Subject: [PATCH 330/562] budgie-media-player-applet: move from budgiePlugins scope to top-level --- .../bu/budgie-media-player-applet/package.nix} | 0 pkgs/desktops/budgie/plugins/default.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{desktops/budgie/plugins/budgie-media-player-applet/default.nix => by-name/bu/budgie-media-player-applet/package.nix} (100%) diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix similarity index 100% rename from pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix rename to pkgs/by-name/bu/budgie-media-player-applet/package.nix diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index 885e7c01bb67..66d60303d55a 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,5 +1,4 @@ { callPackage }: { - budgie-media-player-applet = callPackage ./budgie-media-player-applet { }; budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; } From ec4ac2bffc45829ca972e22460dee1aadc6b8a98 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:34:40 -0400 Subject: [PATCH 331/562] budgie-media-player-applet: ensure updateScript & meta.changelog --- pkgs/by-name/bu/budgie-media-player-applet/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 37e2429ac2c7..ee883480d3cb 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -5,6 +5,7 @@ glib, meson, ninja, + nix-update-script, python3Packages, }: @@ -41,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: { patchPythonScript "$out/lib/budgie-desktop/plugins/budgie-media-player-applet/applet.py" ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Media Control Applet for the Budgie Panel"; homepage = "https://github.com/zalesyc/budgie-media-player-applet"; + changelog = "https://github.com/zalesyc/budgie-media-player-applet/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = lib.teams.budgie.members; From 6a8e6c209fcf02a02e52d478aec036d590d0428e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:35:23 -0400 Subject: [PATCH 332/562] budgie-user-indicator-redux: move from budgiePlugins scope to top-level --- .../bu/budgie-user-indicator-redux/package.nix} | 0 pkgs/desktops/budgie/plugins/default.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{desktops/budgie/plugins/budgie-user-indicator-redux/default.nix => by-name/bu/budgie-user-indicator-redux/package.nix} (100%) diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix similarity index 100% rename from pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix rename to pkgs/by-name/bu/budgie-user-indicator-redux/package.nix diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index 66d60303d55a..b9e7043e3883 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,4 +1,3 @@ { callPackage }: { - budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; } From e287c7a3d248cc84a55a1dac19f0d77e43097b43 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:36:36 -0400 Subject: [PATCH 333/562] budgie-user-indicator-redux: add updateScript --- pkgs/by-name/bu/budgie-user-indicator-redux/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix index ddd0f45a34b5..dd95b40ceca9 100644 --- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix +++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix @@ -10,6 +10,7 @@ libpeas, meson, ninja, + nix-update-script, pkg-config, sassc, vala, @@ -43,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: { sassc ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Manage your user session from the Budgie panel"; homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux"; From d419ba0b56bd46acd87e88cda19fb819133f92f5 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:37:01 -0400 Subject: [PATCH 334/562] budgiePlugins: drop scope --- pkgs/desktops/budgie/plugins/default.nix | 3 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 pkgs/desktops/budgie/plugins/default.nix diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix deleted file mode 100644 index b9e7043e3883..000000000000 --- a/pkgs/desktops/budgie/plugins/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ callPackage }: -{ -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f8dddfc002d..ad60920f3f81 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -160,6 +160,7 @@ mapAliases ({ bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 + budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c73774bbfcfc..7eca524039bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37145,8 +37145,6 @@ with pkgs; appls = [ prio ]; }; - budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); - cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); From 1b26960b0561305bac2a3a604f651153a0c591ff Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 20:14:16 -0400 Subject: [PATCH 335/562] nixos/doc/rl-2411: `budgie` and `budgiePlugins` have been removed --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 30be270e8ca1..7e1127ba6cb1 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -85,6 +85,10 @@ Processes also now run as a dynamically allocated user by default instead of root. +- The `budgie` and `budgiePlugins` scope have been removed and their packages + moved into the top level scope (i.e., `budgie.budgie-desktop` is now + `budgie-desktop`) + - `services.cgit` now runs as the cgit user by default instead of root. This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. From f0f3d0dc56a495058c4d7f31da1273835995062f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 20:19:11 -0400 Subject: [PATCH 336/562] maintainers/team-list: add getchoo to budgie --- maintainers/team-list.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 833aebadb86f..e0472b808170 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -95,7 +95,10 @@ with lib.maintainers; }; budgie = { - members = [ bobby285271 ]; + members = [ + bobby285271 + getchoo + ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; }; From 4bd01dd76948a71de6bfd9ccaadcbc0de9d9f9f3 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 20:15:18 -0400 Subject: [PATCH 337/562] budgie-desktop: passthru nixosTests.budgie --- pkgs/by-name/bu/budgie-desktop/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 7ba153090d30..e75704944f7a 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -28,6 +28,7 @@ meson, ninja, nix-update-script, + nixosTests, pkg-config, polkit, sassc, @@ -108,7 +109,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { providedSessions = [ "budgie-desktop" ]; - tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + + tests = { + inherit (nixosTests) budgie; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + }; + updateScript = nix-update-script { }; }; From 1a576071569739cb123834a02559b718b033787d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 19:38:39 +0000 Subject: [PATCH 338/562] python312Packages.langsmith: 0.1.80 -> 0.1.85 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 97ed19193113..8c68c36105ef 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.80"; + version = "0.1.85"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-bkbJKg2ikdkTenAP+GD+Ss13nF8KrizLNM72oDgQgJM="; + hash = "sha256-IPbamCfaurikFAqKnvMp8+x5ULCeQ61d5oZFO9+s4SQ="; }; sourceRoot = "${src.name}/python"; From d2ebb01d11a550dc00bd88964aeafd9b43324e8d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Jul 2024 20:57:22 +0100 Subject: [PATCH 339/562] hostapd: add nixosTests.wpa_supplicant to passthru.tests --- pkgs/os-specific/linux/hostapd/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 13ea53eabb85..5988dc0436dc 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnl, openssl, sqlite ? null }: +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + libnl, + openssl, + nixosTests, + sqlite ? null, +}: stdenv.mkDerivation rec { pname = "hostapd"; @@ -148,6 +158,10 @@ stdenv.mkDerivation rec { install -vD hostapd_cli.1 -t $man/share/man/man1 ''; + passthru.tests = { + inherit (nixosTests) wpa_supplicant; + }; + meta = with lib; { homepage = "https://w1.fi/hostapd/"; description = "User space daemon for access point and authentication servers"; From f8d18763ecc5e6c1dcd8780c5aed5de9f86259cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 20:11:25 +0000 Subject: [PATCH 340/562] jenkins: 2.452.2 -> 2.452.3 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 875d065d0293..6bf019819afd 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.452.2"; + version = "2.452.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-Ng78hDjbmkuiB3KYHUJXz+aDe/DD+4yOmyJT2M5rozk="; + hash = "sha256-Rf0rh3+XCaUrmE2cfW9DW8Bfat7mEpHSLTC18ej9jFk="; }; nativeBuildInputs = [ makeWrapper ]; From 5c1ee085cd750f9fb125420f38098b6532d057ad Mon Sep 17 00:00:00 2001 From: Philipp David Date: Fri, 12 Jul 2024 08:08:06 +0200 Subject: [PATCH 341/562] python312Packages.pyecotrend-ista: init at 3.3.2 --- .../pyecotrend-ista/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/pyecotrend-ista/default.nix diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix new file mode 100644 index 000000000000..23edfcbcc00a --- /dev/null +++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + dataclasses-json, + requests, + pytestCheckHook, + pytest-xdist, + requests-mock, + syrupy, +}: + +buildPythonPackage rec { + pname = "pyecotrend-ista"; + version = "3.3.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "Ludy87"; + repo = "pyecotrend-ista"; + rev = "refs/tags/${version}"; + hash = "sha256-TZDHEaDc7UACIAHNX1fStJH74qLKf+krWbTDtemXahA="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ setuptools ]; + + dependencies = [ + dataclasses-json + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + requests-mock + syrupy + ]; + + pythonImportsCheck = [ "pyecotrend_ista" ]; + + meta = { + changelog = "https://github.com/Ludy87/pyecotrend-ista/releases/tag/${version}"; + description = "Unofficial python library for the pyecotrend-ista API"; + homepage = "https://github.com/Ludy87/pyecotrend-ista"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oynqr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..011c9e2b39ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11135,6 +11135,8 @@ self: super: with self; { pyeconet = callPackage ../development/python-modules/pyeconet { }; + pyecotrend-ista = callPackage ../development/python-modules/pyecotrend-ista { }; + pyecowitt = callPackage ../development/python-modules/pyecowitt { }; pyedimax = callPackage ../development/python-modules/pyedimax { }; From 80dd59f5af619a6af2d0943950cc5341c30098d6 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Fri, 12 Jul 2024 08:24:08 +0200 Subject: [PATCH 342/562] home-assistant: support ista_ecotrend component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..1d943f41500b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2150,7 +2150,8 @@ "iss" = ps: with ps; [ ]; # missing inputs: pyiss "ista_ecotrend" = ps: with ps; [ - ]; # missing inputs: pyecotrend-ista + pyecotrend-ista + ]; "isy994" = ps: with ps; [ pyisy ]; @@ -5561,6 +5562,7 @@ "ipp" "iqvia" "isal" + "ista_ecotrend" "isy994" "izone" "jellyfin" From 17ff5dcccd22988d4e1528c25cd760294904174c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jul 2024 13:57:02 -0700 Subject: [PATCH 343/562] python312Packages.aiosolaredge: init at 0.2.0 --- .../python-modules/aiosolaredge/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/aiosolaredge/default.nix diff --git a/pkgs/development/python-modules/aiosolaredge/default.nix b/pkgs/development/python-modules/aiosolaredge/default.nix new file mode 100644 index 000000000000..b05f1b84cc6e --- /dev/null +++ b/pkgs/development/python-modules/aiosolaredge/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + yarl, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "aiosolaredge"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiosolaredge"; + rev = "refs/tags/v${version}"; + hash = "sha256-1C74U5HWDTJum1XES21t1uIJwm0YW3l041mwvqY/dA4="; + }; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "aiosolaredge" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.rev}/CHANGELOG.md"; + description = "Asyncio SolarEdge API client"; + homepage = "https://github.com/bdraco/aiosolaredge"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..944da7ff3381 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -421,6 +421,8 @@ self: super: with self; { aiosmtplib = callPackage ../development/python-modules/aiosmtplib { }; + aiosolaredge = callPackage ../development/python-modules/aiosolaredge { }; + aiosomecomfort = callPackage ../development/python-modules/aiosomecomfort { }; aiosqlite = callPackage ../development/python-modules/aiosqlite { }; From ff657fa634ef8f278bd563e7a46ac2726cbea7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jul 2024 14:04:10 -0700 Subject: [PATCH 344/562] home-assistant: support solaredge component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..cb3fb0e688ed 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4178,8 +4178,9 @@ zeroconf ]; "solaredge" = ps: with ps; [ + aiosolaredge stringcase - ]; # missing inputs: aiosolaredge + ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ @@ -5870,6 +5871,7 @@ "snips" "snmp" "snooz" + "solaredge" "solax" "soma" "somfy_mylink" From dd1e81c7d399fc4a13f6500349b177779730814b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 16:17:25 +0000 Subject: [PATCH 345/562] trompeloeil: 47 -> 48 --- pkgs/development/libraries/trompeloeil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 1a2ec33dae5f..09c7ff795d3d 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-eVMlepthJuy9BQnR2u8PFSfuWNg8QxDOJyV5qzcztOE="; + sha256 = "sha256-7MXMbqksHqcyvwJsW8+wPWfnKTbQhUlGa4GcidpiBFw="; }; nativeBuildInputs = [ cmake ]; From 368fc1c5b12afcd3e3a606917b3f7b79538c91a6 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Sat, 13 Jul 2024 00:15:12 +0100 Subject: [PATCH 346/562] dotnet: strip signature files from NuGet packages --- .../dotnet/make-nuget-deps/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index cd048bcc30e5..a89771eea112 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -1,15 +1,35 @@ -{ linkFarmFromDrvs, fetchurl }: +{ linkFarmFromDrvs, fetchurl, runCommand, zip }: { name, nugetDeps ? import sourceFile, sourceFile ? null }: linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { fetchNuGet = { pname, version, sha256 ? "", hash ? "" , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: - fetchurl { - name = "${pname}.${version}.nupkg"; - # There is no need to verify whether both sha256 and hash are - # valid here, because nuget-to-nix does not generate a deps.nix - # containing both. - inherit url sha256 hash; - }; -}) // { + let + src = fetchurl { + name = "${pname}.${version}.nupkg"; + # There is no need to verify whether both sha256 and hash are + # valid here, because nuget-to-nix does not generate a deps.nix + # containing both. + inherit url sha256 hash; + }; + in + # NuGet.org edits packages by signing them during upload, which makes + # those packages nondeterministic depending on which source you + # get them from. We fix this by stripping out the signature file. + # Signing logic is https://github.com/NuGet/NuGet.Client/blob/128a5066b1438627ac69a2ffe9de564b2c09ee4d/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveIOUtility.cs#L518 + # Non-NuGet.org sources might not have a signature file; in that case, zip + # exits with code 12 ("zip has nothing to do", per `man zip`). + runCommand src.name + { + inherit src; + nativeBuildInputs = [ zip ]; + } + '' + zip "$src" --temp-path "$TMPDIR" --output-file "$out" --delete .signature.p7s || { + (( $? == 12 )) + install -Dm644 "$src" "$out" + } + ''; +}) +// { inherit sourceFile; } From b6f41f5cf819199ff4f82e145bea4e64788753e8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:39:26 +0200 Subject: [PATCH 347/562] haskell.packages.ghc8107.wai-extra: disable haddock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently, the haddock version shipped with GHC < 9.0 doesn't support haddock syntax like this: module Foo -- * Heading ( bar -- … ) --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index a631a2f60db3..33b2da04f771 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -119,6 +119,10 @@ self: super: { algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; }); + # Uses haddock placement that isn't supported by the versions of haddock + # bundled with GHC < 9.0. + wai-extra = dontHaddock super.wai-extra; + # Overly-strict bounds introducted by a revision in version 0.3.2. text-metrics = doJailbreak super.text-metrics; From 1d946cc24882fde03e04bdefd39711feb590e2b4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:42:33 +0200 Subject: [PATCH 348/562] haskell.packages.ghc98.ghc-tags: pin to 1.8 `ghc-tags == 1.9` only works for GHC >= 9.10. --- .../configuration-ghc-9.8.x.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) 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 8a4ca3622221..ad0e9317df05 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -72,6 +72,7 @@ self: super: { th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 singletons-th = self.singletons-th_3_3; singletons-base = self.singletons-base_3_3; + ghc-tags = self.ghc-tags_1_8; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4bb9bd7fadc1..1ea6e3df61ab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -119,6 +119,7 @@ extra-packages: - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.* - ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.* + - ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.* - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc67f135a866..852cf5c761d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120788,6 +120788,29 @@ self: { mainProgram = "ghc-tags"; }) {}; + "ghc-tags_1_8" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, deepseq, directory, filepath, ghc-lib, ghc-paths + , optparse-applicative, process, stm, temporary, text, time, vector + , yaml + }: + mkDerivation { + pname = "ghc-tags"; + version = "1.8"; + sha256 = "0gljssyq1ahgl65vnqqa5s1vglzdisx8wp5p2hwh09diwa2ms9mw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring containers deepseq directory + filepath ghc-lib ghc-paths optparse-applicative process stm + temporary text time vector yaml + ]; + description = "Utility for generating ctags and etags with GHC API"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-tags"; + }) {}; + "ghc-tags" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, deepseq, directory, filepath, ghc-lib, ghc-paths From ecc0c27b12af9c0cb143f8bb02d4a5b6edc75a68 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:43:35 +0200 Subject: [PATCH 349/562] haskellPackages.gi-gdk_4_0_8: migrate override from 4.0.7 --- 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 0086e6157aef..2a877a4478ef 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1351,7 +1351,7 @@ self: super: builtins.intersectAttrs super { gi-javascriptcore gi-webkit2webextension gi-gtk_4_0_8 - gi-gdk_4_0_7 + gi-gdk_4_0_8 gi-gsk gi-adwaita ; From ca1274a533ab3435cea449fac6b9008d7e94bfe8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:44:48 +0200 Subject: [PATCH 350/562] darcs: build with latest dependencies as requested darcs requests - the latest versions of tls and crypton-connection - and a recently released version of directory which is available with GHC 9.6.6 (or GHC versions from newer series), so we can't use haskellPackages temporarily. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 959b221b9ffc..a48be42dd0e1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2098,9 +2098,11 @@ self: super: { # https://github.com/faylang/fay/pull/474 fay = doJailbreak super.fay; - # Too strict version bounds on cryptonite. - # Issue reported upstream, no bug tracker url yet. - darcs = doJailbreak super.darcs; + # Requests latest versions of crypton-connection and tls + darcs = super.darcs.overrideScope (self: super: { + crypton-connection = self.crypton-connection_0_4_0; + tls = self.tls_2_0_6; + }); # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88fa73fdafda..189f24442712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29886,8 +29886,9 @@ with pkgs; daktilo = callPackage ../tools/misc/daktilo { }; + # TODO(@sternenseemann): remove ghc version special casing when haskellPackages has caught up darcs = haskell.lib.compose.disableCabalFlag "library" - (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); + (haskell.lib.compose.justStaticExecutables haskell.packages.ghc966.darcs); darkman = callPackage ../applications/misc/darkman { }; From 027d5e7197d251440b1ac4b4d29ffff2d248e138 Mon Sep 17 00:00:00 2001 From: Quentin Frey <51170829+Limosine@users.noreply.github.com> Date: Sun, 14 Jul 2024 23:57:59 +0200 Subject: [PATCH 351/562] vnote: 3.18.0 -> 3.18.1 --- pkgs/by-name/vn/vnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index a787f4a09e4b..7022955db0cd 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.18.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-OpQjMngSEnmtTMLXLllDlIzucdSLSqdFU4ZtPb7ytvQ="; + hash = "sha256-IONa9oLRm3IZsjLScZReH/V6U6WMd6wNzIRvCxP22uE="; }; nativeBuildInputs = [ From b2deb40d3d8030a23e62b0e518ea084c34b20d12 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 14 Jul 2024 23:37:38 +0200 Subject: [PATCH 352/562] haskellPackages: Mark failing builds broken --- .../configuration-hackage2nix/broken.yaml | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 82254967cda3..ecfeede3dc52 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -400,6 +400,7 @@ broken-packages: - bet # failure in job https://hydra.nixos.org/build/233205655 at 2023-09-02 - betris # failure in job https://hydra.nixos.org/build/233200110 at 2023-09-02 - bff-mono # failure in job https://hydra.nixos.org/build/252710505 at 2024-03-16 + - bglib # failure in job https://hydra.nixos.org/build/265955624 at 2024-07-14 - bgmax # failure in job https://hydra.nixos.org/build/233222709 at 2023-09-02 - bgzf # failure in job https://hydra.nixos.org/build/233224580 at 2023-09-02 - bhoogle # failure in job https://hydra.nixos.org/build/252712137 at 2024-03-16 @@ -569,6 +570,7 @@ broken-packages: - bumper # failure in job https://hydra.nixos.org/build/233234378 at 2023-09-02 - bunz # failure in job https://hydra.nixos.org/build/233193945 at 2023-09-02 - burst-detection # failure in job https://hydra.nixos.org/build/233254074 at 2023-09-02 + - bus-pirate # failure in job https://hydra.nixos.org/build/265955589 at 2024-07-14 - buster # failure in job https://hydra.nixos.org/build/233197502 at 2023-09-02 - Buster # failure in job https://hydra.nixos.org/build/233214182 at 2023-09-02 - bustle # failure in job https://hydra.nixos.org/build/252728683 at 2024-03-16 @@ -1530,6 +1532,7 @@ broken-packages: - enum-text # failure in job https://hydra.nixos.org/build/233194373 at 2023-09-02 - enum-utf8 # failure in job https://hydra.nixos.org/build/233234628 at 2023-09-02 - envelope # failure in job https://hydra.nixos.org/build/233199309 at 2023-09-02 + - env-extra # failure in job https://hydra.nixos.org/build/265267827 at 2024-07-14 - env-parser # failure in job https://hydra.nixos.org/build/233237933 at 2023-09-02 - envstatus # failure in job https://hydra.nixos.org/build/233257940 at 2023-09-02 - envy-extensible # failure in job https://hydra.nixos.org/build/233229313 at 2023-09-02 @@ -1804,6 +1807,7 @@ broken-packages: - formattable # failure in job https://hydra.nixos.org/build/233230195 at 2023-09-02 - formura # failure in job https://hydra.nixos.org/build/233193674 at 2023-09-02 - Fortnite-Hack-Cheats-Free-V-Bucks-Generator # failure in job https://hydra.nixos.org/build/233233147 at 2023-09-02 + - fortran-src # failure in job https://hydra.nixos.org/build/265955626 at 2024-07-14 - fortran-vars # failure in job https://hydra.nixos.org/build/233257719 at 2023-09-02 - fortytwo # failure in job https://hydra.nixos.org/build/233209552 at 2023-09-02 - foscam-filename # failure in job https://hydra.nixos.org/build/233237326 at 2023-09-02 @@ -1824,6 +1828,7 @@ broken-packages: - free-algebras # failure in job https://hydra.nixos.org/build/252728477 at 2024-03-16 - free-applicative-t # failure in job https://hydra.nixos.org/build/252715728 at 2024-03-16 - free-concurrent # failure in job https://hydra.nixos.org/build/233257070 at 2023-09-02 + - free-foil # failure in job https://hydra.nixos.org/build/265268910 at 2024-07-14 - f-ree-hack-cheats-free-v-bucks-generator # failure in job https://hydra.nixos.org/build/233225159 at 2023-09-02 - free-http # failure in job https://hydra.nixos.org/build/233227362 at 2023-09-02 - freenect # failure in job https://hydra.nixos.org/build/233196105 at 2023-09-02 @@ -1896,6 +1901,7 @@ broken-packages: - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13 - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 + - fxpak # failure in job https://hydra.nixos.org/build/265955610 at 2024-07-14 - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02 - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16 - gameclock # failure in job https://hydra.nixos.org/build/233234964 at 2023-09-02 @@ -1986,6 +1992,7 @@ broken-packages: - ghc-gc-hook # failure in job https://hydra.nixos.org/build/233195053 at 2023-09-02 - ghc-generic-instances # failure in job https://hydra.nixos.org/build/233259298 at 2023-09-02 - ghc-hotswap # failure in job https://hydra.nixos.org/build/233220146 at 2023-09-02 + - ghcide-bench # failure in job https://hydra.nixos.org/build/265539170 at 2024-07-14 - ghcide-test-utils # failure in job https://hydra.nixos.org/build/253687657 at 2024-03-31 - ghci-diagrams # failure in job https://hydra.nixos.org/build/233194407 at 2023-09-02 - ghci-haskeline # failure in job https://hydra.nixos.org/build/233216940 at 2023-09-02 @@ -1998,8 +2005,8 @@ broken-packages: - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghcjs-websockets # Does not work on the js backend added in 9.6+, only on ghcjs, where we markUnbroken + - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 - ghclive # failure in job https://hydra.nixos.org/build/233231592 at 2023-09-02 - ghc-man-completion # failure in job https://hydra.nixos.org/build/233245740 at 2023-09-02 @@ -2032,6 +2039,7 @@ broken-packages: - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-gtksource # failure in job https://hydra.nixos.org/build/233215342 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 + - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14 - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02 - ginsu # failure in job https://hydra.nixos.org/build/233223259 at 2023-09-02 - gipeda # failure in job https://hydra.nixos.org/build/233228149 at 2023-09-02 @@ -2245,6 +2253,8 @@ broken-packages: - halive # failure in job https://hydra.nixos.org/build/233215317 at 2023-09-02 - halma # failure in job https://hydra.nixos.org/build/233245758 at 2023-09-02 - halves # failure in job https://hydra.nixos.org/build/233214240 at 2023-09-02 + - ham # failure in job https://hydra.nixos.org/build/265955715 at 2024-07-14 + - HaMinitel # failure in job https://hydra.nixos.org/build/265955632 at 2024-07-14 - hampp # failure in job https://hydra.nixos.org/build/233239269 at 2023-09-02 - hamsql # failure in job https://hydra.nixos.org/build/233241294 at 2023-09-02 - hamtmap # failure in job https://hydra.nixos.org/build/233225685 at 2023-09-02 @@ -2790,6 +2800,8 @@ broken-packages: - hs-dotnet # failure in job https://hydra.nixos.org/build/233232755 at 2023-09-02 - hs-duktape # failure in job https://hydra.nixos.org/build/233223882 at 2023-09-02 - hsebaysdk # failure in job https://hydra.nixos.org/build/233251126 at 2023-09-02 + - hsec-sync # failure in job https://hydra.nixos.org/build/265274250 at 2024-07-14 + - hsec-tools # failure in job https://hydra.nixos.org/build/265287998 at 2024-07-14 - hsenv # failure in job https://hydra.nixos.org/build/233196846 at 2023-09-02 - HSet # failure in job https://hydra.nixos.org/build/233202216 at 2023-09-02 - hs-excelx # failure in job https://hydra.nixos.org/build/233230761 at 2023-09-02 @@ -3036,6 +3048,7 @@ broken-packages: - ihaskell-hvega # failure in job https://hydra.nixos.org/build/241514418 at 2023-11-20 - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 + - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 - imagepaste # failure in job https://hydra.nixos.org/build/233211716 at 2023-09-02 @@ -3299,6 +3312,7 @@ broken-packages: - keycloak-hs # failure in job https://hydra.nixos.org/build/233193019 at 2023-09-02 - keyed # failure in job https://hydra.nixos.org/build/233251186 at 2023-09-02 - key # failure in job https://hydra.nixos.org/build/252710595 at 2024-03-16 + - keysafe # failure in job https://hydra.nixos.org/build/265284122 at 2024-07-14 - khph # failure in job https://hydra.nixos.org/build/233258109 at 2023-09-02 - kickass-torrents-dump-parser # failure in job https://hydra.nixos.org/build/233210355 at 2023-09-02 - kickchan # failure in job https://hydra.nixos.org/build/233216091 at 2023-09-02 @@ -3306,6 +3320,7 @@ broken-packages: - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 + - knead-arithmetic # failure in job https://hydra.nixos.org/build/266355645 at 2024-07-14 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 - koneko # failure in job https://hydra.nixos.org/build/233204838 at 2023-09-02 @@ -3362,6 +3377,7 @@ broken-packages: - language-conf # failure in job https://hydra.nixos.org/build/233208178 at 2023-09-02 - language-csharp # failure in job https://hydra.nixos.org/build/233240911 at 2023-09-02 - language-dart # failure in job https://hydra.nixos.org/build/233220340 at 2023-09-02 + - language-dickinson # failure in job https://hydra.nixos.org/build/265284074 at 2024-07-14 - language-dockerfile # failure in job https://hydra.nixos.org/build/233197924 at 2023-09-02 - language-ecmascript # failure in job https://hydra.nixos.org/build/252712957 at 2024-03-16 - language-elm # failure in job https://hydra.nixos.org/build/233214012 at 2023-09-02 @@ -3544,6 +3560,7 @@ broken-packages: - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02 - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02 - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 + - llvm-extension # failure in job https://hydra.nixos.org/build/266355631 at 2024-07-14 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-hs-pure # failure in job https://hydra.nixos.org/build/252721738 at 2024-03-16 @@ -3599,6 +3616,7 @@ broken-packages: - L-seed # failure in job https://hydra.nixos.org/build/233222324 at 2023-09-02 - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 + - lsp-client # failure in job https://hydra.nixos.org/build/265539053 at 2024-07-14 - ltext # failure in job https://hydra.nixos.org/build/255686825 at 2024-04-16 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 @@ -3672,6 +3690,7 @@ broken-packages: - massiv-scheduler # failure in job https://hydra.nixos.org/build/233196778 at 2023-09-02 - massiv-serialise # failure in job https://hydra.nixos.org/build/233242284 at 2023-09-02 - master-plan # failure in job https://hydra.nixos.org/build/233208718 at 2023-09-02 + - matcha # failure in job https://hydra.nixos.org/build/265271888 at 2024-07-14 - matcher # failure in job https://hydra.nixos.org/build/233198640 at 2023-09-02 - mathflow # failure in job https://hydra.nixos.org/build/233195457 at 2023-09-02 - math-grads # failure in job https://hydra.nixos.org/build/233222629 at 2023-09-02 @@ -4145,10 +4164,12 @@ broken-packages: - numtype-tf # failure in job https://hydra.nixos.org/build/233243483 at 2023-09-02 - Nutri # failure in job https://hydra.nixos.org/build/233244244 at 2023-09-02 - NXTDSL # failure in job https://hydra.nixos.org/build/233193483 at 2023-09-02 + - NXT # failure in job https://hydra.nixos.org/build/265955670 at 2024-07-14 - nylas # failure in job https://hydra.nixos.org/build/233193540 at 2023-09-02 - oanda-rest-api # failure in job https://hydra.nixos.org/build/233250190 at 2023-09-02 - oasis-xrd # failure in job https://hydra.nixos.org/build/233199264 at 2023-09-02 - oauthenticated # failure in job https://hydra.nixos.org/build/233257682 at 2023-09-02 + - obd # failure in job https://hydra.nixos.org/build/265955660 at 2024-07-14 - Object # failure in job https://hydra.nixos.org/build/233191909 at 2023-09-02 - ObjectIO # failure in job https://hydra.nixos.org/build/233242132 at 2023-09-02 - ocaml-export # failure in job https://hydra.nixos.org/build/233218217 at 2023-09-02 @@ -4876,6 +4897,8 @@ broken-packages: - rakhana # failure in job https://hydra.nixos.org/build/233256901 at 2023-09-02 - rakuten # failure in job https://hydra.nixos.org/build/233196803 at 2023-09-02 - ralist # failure in job https://hydra.nixos.org/build/233195682 at 2023-09-02 + - ral-lens # failure in job https://hydra.nixos.org/build/265286119 at 2024-07-14 + - ral-optics # failure in job https://hydra.nixos.org/build/265292108 at 2024-07-14 - raml # failure in job https://hydra.nixos.org/build/233212517 at 2023-09-02 - rando # failure in job https://hydra.nixos.org/build/233257817 at 2023-09-02 - random-access-list # failure in job https://hydra.nixos.org/build/233233464 at 2023-09-02 @@ -5768,6 +5791,7 @@ broken-packages: - suitable # failure in job https://hydra.nixos.org/build/233225075 at 2023-09-02 - summer # failure in job https://hydra.nixos.org/build/252728622 at 2024-03-16 - summoner # failure in job https://hydra.nixos.org/build/233232530 at 2023-09-02 + - sump # failure in job https://hydra.nixos.org/build/265955678 at 2024-07-14 - sum-type-boilerplate # failure in job https://hydra.nixos.org/build/233251040 at 2023-09-02 - sunlight # failure in job https://hydra.nixos.org/build/233212375 at 2023-09-02 - sunroof-compiler # failure in job https://hydra.nixos.org/build/233228734 at 2023-09-02 @@ -5824,6 +5848,7 @@ broken-packages: - syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02 - synthesizer # failure in job https://hydra.nixos.org/build/233259139 at 2023-09-02 - synthesizer-filter # failure in job https://hydra.nixos.org/build/252718079 at 2024-03-16 + - synthesizer-llvm # failure in job https://hydra.nixos.org/build/266355681 at 2024-07-14 - Sysmon # failure in job https://hydra.nixos.org/build/233224152 at 2023-09-02 - system-canonicalpath # failure in job https://hydra.nixos.org/build/233254297 at 2023-09-02 - system-command # failure in job https://hydra.nixos.org/build/233239356 at 2023-09-02 @@ -6028,6 +6053,7 @@ broken-packages: - tictactoe3d # failure in job https://hydra.nixos.org/build/233193080 at 2023-09-02 - TicTacToe # failure in job https://hydra.nixos.org/build/233256784 at 2023-09-02 - tidal-midi # failure in job https://hydra.nixos.org/build/233194389 at 2023-09-02 + - tidal-serial # failure in job https://hydra.nixos.org/build/265955616 at 2024-07-14 - tidal-vis # failure in job https://hydra.nixos.org/build/234465445 at 2023-09-13 - tie-knot # failure in job https://hydra.nixos.org/build/233201321 at 2023-09-02 - tiempo # failure in job https://hydra.nixos.org/build/233250728 at 2023-09-02 @@ -6057,6 +6083,7 @@ broken-packages: - tinyid # failure in job https://hydra.nixos.org/build/233249999 at 2023-09-02 - TinyLaunchbury # failure in job https://hydra.nixos.org/build/233233671 at 2023-09-02 - tinylog # failure in job https://hydra.nixos.org/build/233198434 at 2023-09-02 + - tinyMesh # failure in job https://hydra.nixos.org/build/265955590 at 2024-07-14 - tiny-scheduler # failure in job https://hydra.nixos.org/build/233224849 at 2023-09-02 - tinytemplate # failure in job https://hydra.nixos.org/build/233208032 at 2023-09-02 - TinyURL # failure in job https://hydra.nixos.org/build/233200716 at 2023-09-02 @@ -6373,7 +6400,9 @@ broken-packages: - vcf # failure in job https://hydra.nixos.org/build/233246613 at 2023-09-02 - vcswrapper # failure in job https://hydra.nixos.org/build/233228400 at 2023-09-02 - Vec-Boolean # failure in job https://hydra.nixos.org/build/233218305 at 2023-09-02 + - vec-lens # failure in job https://hydra.nixos.org/build/265284617 at 2024-07-14 - Vec-OpenGLRaw # failure in job https://hydra.nixos.org/build/233230560 at 2023-09-02 + - vec-optics # failure in job https://hydra.nixos.org/build/265281367 at 2024-07-14 - vect-floating # failure in job https://hydra.nixos.org/build/233196146 at 2023-09-02 - vect-opengl # failure in job https://hydra.nixos.org/build/233230142 at 2023-09-02 - vector-bytestring # failure in job https://hydra.nixos.org/build/233209167 at 2023-09-02 From 90a2ea7cfedc2b4dd30d62937a9629d91936307c Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 14 Jul 2024 23:37:38 +0200 Subject: [PATCH 353/562] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../transitive-broken.yaml | 2 + .../haskell-modules/hackage-packages.nix | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7c7e004f6cf9..5c3440ffb4c0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -844,6 +844,7 @@ dont-distribute-packages: - clash-verilog - clash-vhdl - clashilator + - classify-frog - classy-effects - classy-effects-th - classy-miso @@ -1406,6 +1407,7 @@ dont-distribute-packages: - forms-data-format - forsyde-deep - forth-hll + - fortran-src-extras - foscam-directory - foscam-sort - fpco-api diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 852cf5c761d0..7e49060032eb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10236,6 +10236,8 @@ self: { libraryHaskellDepends = [ base bytestring serialport stm ]; description = "An Haskell library to drive the french Minitel through a serial port"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HaPy" = callPackage @@ -15150,6 +15152,8 @@ self: { ]; description = "A Haskell interface to Lego Mindstorms NXT"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -48200,7 +48204,9 @@ self: { ]; description = "Implementation of the BGAPI serial protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "bglibtest"; + broken = true; }) {}; "bgmax" = callPackage @@ -56271,6 +56277,8 @@ self: { ]; description = "Haskell interface to the Bus Pirate binary interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "buster" = callPackage @@ -66413,6 +66421,7 @@ self: { ]; description = "Classify sounds produced by Xenopus laevis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "classify-frog"; }) {}; @@ -100023,6 +100032,8 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "env-guard" = callPackage @@ -111746,7 +111757,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; + broken = true; }) {}; "fortran-src-extras" = callPackage @@ -111777,6 +111790,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Common functions and utils for fortran-src"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src-extras"; }) {}; @@ -112659,6 +112673,8 @@ self: { ]; description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "free-functors" = callPackage @@ -115443,6 +115459,8 @@ self: { libraryHaskellDepends = [ base bytestring serialport ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "g-npm" = callPackage @@ -121357,7 +121375,9 @@ self: { testToolDepends = [ ghcide ]; description = "An LSP client for running performance experiments on HLS"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "ghcide-bench"; + broken = true; }) {}; "ghcide-test-utils" = callPackage @@ -123251,6 +123271,8 @@ self: { libraryPkgconfigDepends = [ keybinder ]; description = "Libkeybinder bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) keybinder;}; "gi-notify" = callPackage @@ -136516,7 +136538,9 @@ self: { ]; testHaskellDepends = [ base bytestring ]; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "hamlog"; + broken = true; }) {}; "hamid" = callPackage @@ -160984,7 +161008,9 @@ self: { ]; description = "Synchronize with the Haskell security advisory database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsec-sync"; + broken = true; }) {}; "hsec-tools" = callPackage @@ -161017,7 +161043,9 @@ self: { ]; description = "Tools for working with the Haskell security advisory database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsec-tools"; + broken = true; }) {}; "hsemail" = callPackage @@ -171508,6 +171536,8 @@ self: { ]; description = "IPython standard widgets for IHaskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ihp-hsx" = callPackage @@ -183562,7 +183592,9 @@ self: { ]; description = "back up a secret key securely to the cloud"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "keysafe"; + broken = true; }) {}; "keystore" = callPackage @@ -184119,6 +184151,8 @@ self: { ]; description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "knit" = callPackage @@ -186467,7 +186501,9 @@ self: { doHaddock = false; description = "A language for generative literature"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "emd"; + broken = true; }) {}; "language-docker_11_0_0" = callPackage @@ -194602,6 +194638,8 @@ self: { ]; description = "Processor specific intrinsics for the llvm interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "llvm-extra" = callPackage @@ -197202,6 +197240,8 @@ self: { ]; description = "Haskell library for Language Server Protocol clients"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lsp-test" = callPackage @@ -201026,7 +201066,9 @@ self: { testHaskellDepends = [ base ]; description = "A micro web framework based on pattern matching"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "matcha-exe"; + broken = true; }) {}; "matchable" = callPackage @@ -222766,6 +222808,8 @@ self: { testHaskellDepends = [ base ]; description = "Communicate to OBD interfaces over ELM327"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "obdd" = callPackage @@ -253411,6 +253455,8 @@ self: { libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ral-optics" = callPackage @@ -253422,6 +253468,8 @@ self: { libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ralist" = callPackage @@ -294396,6 +294444,8 @@ self: { ]; description = "A Haskell interface to SUMP-compatible logic analyzers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sundown" = callPackage @@ -297209,6 +297259,8 @@ self: { doHaddock = false; description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "synthesizer-midi" = callPackage @@ -306614,6 +306666,8 @@ self: { ]; description = "Serial support for tidal"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tidal-vis" = callPackage @@ -307880,6 +307934,8 @@ self: { ]; description = "TinyMesh - communicating with auto-meshing sensor network"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tinyXml" = callPackage @@ -322112,6 +322168,8 @@ self: { libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vec-optics" = callPackage @@ -322123,6 +322181,8 @@ self: { libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vect" = callPackage From 03f3d633b0982773c80958c5deb585da3bb307cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 22:19:45 +0000 Subject: [PATCH 354/562] python312Packages.binance-connector: 3.7.0 -> 3.8.0 --- pkgs/development/python-modules/binance-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 914ab4c6acd0..a432d4f5f015 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.7.0"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hmn8WKr+krzOzHNJ/aynXAbf+rHxDfyKDgycdQQU3xk="; + hash = "sha256-hW6pTfPaDQRRX8hBNKtpRcI3htlu5DrD37wYHu0BpNY="; }; propagatedBuildInputs = [ From 7d7b2a54bcfc93c0351675bb4efff56ba98b8e47 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 13 Jul 2024 18:34:03 -0300 Subject: [PATCH 355/562] cot: mark as broken on Python 3.12 or superior --- .../python-modules/cot/default.nix | 33 ++++++++++--------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a007283c43d6..4bf8d775131e 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,19 +1,20 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - pythonOlder, colorlog, - pyvmomi, - requests, - verboselogs, - pyopenssl, - setuptools, + fetchPypi, mock, + pyopenssl, pytest-mock, pytestCheckHook, + pythonAtLeast, + pythonOlder, + pyvmomi, qemu, + requests, + setuptools, + stdenv, + verboselogs, }: buildPythonPackage rec { @@ -21,8 +22,6 @@ buildPythonPackage rec { version = "2.2.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; @@ -75,15 +74,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "COT" ]; - meta = with lib; { + meta = { + homepage = "https://github.com/glennmatthews/cot"; description = "Common OVF Tool"; mainProgram = "cot"; longDescription = '' - COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, - with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. + COT (the Common OVF Tool) is a tool for editing Open Virtualization Format + (.ovf, .ova) virtual appliances, with a focus on virtualized network + appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. ''; - homepage = "https://github.com/glennmatthews/cot"; - license = licenses.mit; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evanjs ]; + broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..35275960f917 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2526,7 +2526,7 @@ self: super: with self; { cose = callPackage ../development/python-modules/cose { }; cot = callPackage ../development/python-modules/cot { - qemu = pkgs.qemu; + inherit (pkgs) qemu; }; courlan = callPackage ../development/python-modules/courlan { }; From ba5d08be2b00fe3af88d894cc2fe7bebfbb00695 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 9 Jul 2024 22:53:47 +0800 Subject: [PATCH 356/562] python312Packages.tlslite-ng: 0.7.6 -> 0.8.0b1-unstable-2024-06-24 Co-Authored-By: Martin Weinelt --- .../python-modules/tlslite-ng/default.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 450f40234378..1d715c6758f7 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,30 +1,45 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, + fetchFromGitHub, + setuptools, ecdsa, + hypothesis, + pythonAtLeast, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tlslite-ng"; - version = "0.7.6"; - format = "setuptools"; + version = "0.8.0b1-unstable-2024-06-24"; + pyproject = true; - # https://github.com/tlsfuzzer/tlslite-ng/issues/501 - disabled = pythonAtLeast "3.12"; - - src = fetchPypi { - inherit pname version; - sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00"; + src = fetchFromGitHub { + owner = "tlsfuzzer"; + repo = "tlslite-ng"; + rev = "4d2c6b8fc8d14bb5c90c8360bdb6f617e8e38591"; + hash = "sha256-VCQjxZIs4rzlFrIakXI7YeLz7Ws9WRf8zGPcSryO9Ko="; }; - buildInputs = [ ecdsa ]; + build-system = [ setuptools ]; + + dependencies = [ ecdsa ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + # This file imports asyncore which is removed in 3.12 + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "tlslite/integration/tlsasyncdispatchermixin.py" + ]; meta = with lib; { + changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v${version}"; description = "Pure python implementation of SSL and TLS"; - homepage = "https://pypi.python.org/pypi/tlslite-ng"; - license = licenses.lgpl2; + homepage = "https://github.com/tlsfuzzer/tlslite-ng"; + license = licenses.lgpl21Only; maintainers = [ ]; }; } From 719efe45a8c4b2c1f77254ece3df683f83db0105 Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 16:16:43 -0400 Subject: [PATCH 357/562] python311Packages.knocki: init at 0.3.1 --- .../python-modules/knocki/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/knocki/default.nix diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix new file mode 100644 index 000000000000..b37f50cd5ac8 --- /dev/null +++ b/pkgs/development/python-modules/knocki/default.nix @@ -0,0 +1,60 @@ +{ + aiohttp, + aioresponses, + lib, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pythonOlder, + pytestCheckHook, + pytest-aiohttp, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "knocki"; + version = "0.3.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "swan-solutions"; + repo = "knocki-homeassistant"; + rev = "v${version}"; + hash = "sha256-tWtANsujAcdIddoUBrKWIPfiPzDqWhW94Goz0QQ2BfE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "addopts = \"--cov\"" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytestCheckHook + pytest-aiohttp + syrupy + ]; + + pythonImportsCheck = [ "knocki" ]; + + meta = with lib; { + description = "Asynchronous Python client for Knocki vibration / door sensors"; + homepage = "https://github.com/swan-solutions/knocki-homeassistant"; + license = licenses.mit; + maintainers = with maintainers; [ mindstorms6 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..34fa85898970 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6560,6 +6560,8 @@ self: super: with self; { kneed = callPackage ../development/python-modules/kneed { }; + knocki = callPackage ../development/python-modules/knocki { }; + knx-frontend = callPackage ../development/python-modules/knx-frontend { }; kombu = callPackage ../development/python-modules/kombu { }; From d1a90efa79daeed5bb34c4c97290cb5471f856c2 Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sun, 14 Jul 2024 20:00:10 -0400 Subject: [PATCH 358/562] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..956481e11441 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2271,7 +2271,8 @@ pykmtronic ]; "knocki" = ps: with ps; [ - ]; # missing inputs: knocki + knocki + ]; "knx" = ps: with ps; [ fnv-hash-fast home-assistant-frontend @@ -5574,6 +5575,7 @@ "kira" "kitchen_sink" "kmtronic" + "knocki" "knx" "kodi" "konnected" From db27ef752da7bc6f2815f8a1bfb566fdf4f598af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 00:25:04 +0000 Subject: [PATCH 359/562] geographiclib: 2.3 -> 2.4 --- pkgs/development/libraries/geographiclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix index 70eba2c3a384..cb733559ccb7 100644 --- a/pkgs/development/libraries/geographiclib/default.nix +++ b/pkgs/development/libraries/geographiclib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; rev = "v${version}"; - hash = "sha256-FVA2y1q0WjRSCltCN2qntWC//Zj94TXO/fTebFfQ9NY="; + hash = "sha256-1CuB3H4KFFRo8wdFaa9NQLBdT8HxK2AdiVkEhbeYagM="; }; nativeBuildInputs = [ cmake doxygen ]; From 0b5fb2f36b025a1096e7cbfd73c02b099651d3fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 00:26:42 +0000 Subject: [PATCH 360/562] abracadabra: 2.5.0 -> 2.5.1 --- pkgs/applications/radio/abracadabra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index a9de02d1fa80..f1177fe5419e 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-w/WAcTorLCzqHLwQjbZwaHGytLXHr4eW7Yx768on67Q="; + hash = "sha256-EaHVHfyhQTxxLtb3wsJV7Fea2jyENnfn6Lv/3GwAKdk="; }; nativeBuildInputs = [ From 7d968d346faf58cc06f53ede287a361871ebf955 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 00:39:05 +0000 Subject: [PATCH 361/562] python312Packages.homematicip: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/homematicip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index f4aa29cfcb8d..28a7cfb3b969 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-VMHInAmNO0Nw0ohZnIJ9c77h35YSSNNnPNYaUpBlKOQ="; + hash = "sha256-f1KjBYwLqQbA6TbQ3ZZ8TgvGe1USbYYNjsni2vsnTP8="; }; build-system = [ From e3fa8771d8fc0e1a9df5be06d3eb6d12d96ec21b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 00:51:16 +0000 Subject: [PATCH 362/562] ardugotools: 0.5.2 -> 0.6.0 --- pkgs/by-name/ar/ardugotools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/ardugotools/package.nix b/pkgs/by-name/ar/ardugotools/package.nix index 3e6604320786..833984c9408d 100644 --- a/pkgs/by-name/ar/ardugotools/package.nix +++ b/pkgs/by-name/ar/ardugotools/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "0.5.2"; + version = "0.6.0"; in buildGoModule { pname = "ardugotools"; @@ -15,7 +15,7 @@ buildGoModule { owner = "randomouscrap98"; repo = "ardugotools"; rev = "refs/tags/v${version}"; - hash = "sha256-ugYkcYrVHoGC58u6zQNEjlWspAFONmEQVnVDWdWeVnw="; + hash = "sha256-lYpUb+AiQrcrBGBvnOwzDC4aX1F8o21DUnad56qb7zo="; }; vendorHash = "sha256-Z9ObsS+GwVsz6ZlXCgN0WlShHzbmx4WLa/1/XLSSAAs="; From f9decceab11197c0c7039fbc11564933608cdb8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 01:03:17 +0000 Subject: [PATCH 363/562] bmake: 20240625 -> 20240711 --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 6a13dcd0cf68..5c2f1d351a8b 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240625"; + version = "20240711"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-tcBsLyiWtOTZtERLFV3IWxXJDkAlPsw4iakspFevcWQ="; + hash = "sha256-z+2sCduQhqytVeejoNIkBo90tMARxbZK1x8dhoCHjOA="; }; patches = [ From 706b879e91ca3cd6ebc98069627b5782a81d5654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 01:16:34 +0000 Subject: [PATCH 364/562] maskromtool: 2024-06-23 -> 2024-07-14 --- pkgs/tools/graphics/maskromtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix index 62afa6ef8dc0..b98652ce00b1 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2024-06-23"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-b/mmp8byb+4PZJNtiXB2XYbLaQPEDKaVc4gSHfytFUc="; + hash = "sha256-BPmjoD7LnY6RhLKBhq3oP3w6LXl+FrG+fLWYd4Wstno="; }; buildInputs = [ From 40eb217fa5e5720d9876d44a7e1b1576fa68dd98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 01:29:36 +0000 Subject: [PATCH 365/562] wasmer: 4.3.3 -> 4.3.4 --- pkgs/development/interpreters/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index b021c43ab9d7..bc58f89ea51c 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k0XyVdSbb0sP4CwU6q0yiY+Ki6don742hCmL0zaj1tQ="; + hash = "sha256-lpWgitQAZ+voGNj3Bo2FjbjDXPRSb067rx3/bIX+C9Y="; }; - cargoHash = "sha256-5OxBrYCNBBr7d+wdnJma/RJ3P9vc+nRVrzFGu8UmPWc="; + cargoHash = "sha256-1/krpq7+E2p70d/SlSj0vCHr/9w6SbO15OhfkQiWf2k="; nativeBuildInputs = [ rustPlatform.bindgenHook From 494ce2b85339d5e04e2091b6497c463074dd19f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 01:35:43 +0000 Subject: [PATCH 366/562] granted: 0.29.0 -> 0.29.1 --- pkgs/tools/admin/granted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index b8eb0facea4f..6b2a558c9105 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C9VzFrhIehGsGzYfXkPiYjE1vuSK6Sh3exm81PdhLKo="; + sha256 = "sha256-GrmY7R37F9hc8jGHMqMRwyapFXupa3M76/q8pPVch/Q="; }; vendorHash = "sha256-/X7kHaBZyDV4IqvKqyR7pAQLgYqIvcvSSh0NdrA5d3I="; From 8923ec72b511cf2dbb91623d189de3ad796b0216 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 14 Jul 2024 23:33:07 -0400 Subject: [PATCH 367/562] lxcfs: lxc.mount.hook: add coreutils to PATH --- pkgs/by-name/lx/lxcfs/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 6105b6ecd6a6..db006cea566d 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -12,6 +12,7 @@ pkg-config, python3, util-linux, + coreutils, }: stdenv.mkDerivation rec { @@ -51,8 +52,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # `mount` hook requires access to the `mount` command from `util-linux`: - wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin" + # `mount` hook requires access to the `mount` command from `util-linux` and `readlink` from `coreutils`: + wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : ${lib.makeBinPath [ coreutils util-linux ]} ''; postFixup = '' From c2e6a0cf7ffa1663072ac5f9af79443bb66a0198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 03:47:11 +0000 Subject: [PATCH 368/562] k3s_1_29: 1.29.6+k3s1 -> 1.29.6+k3s2 --- .../applications/networking/cluster/k3s/1_29/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 6e07b2658c00..73d9f0587e73 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.29.6+k3s1"; - k3sCommit = "83ae095ab9197f168a6bd3f6bd355f89bce39a9c"; - k3sRepoSha256 = "0gv7xh08mhgc2cyzpsvdi69xknifcpdy6znbim6r3r4lbcw2bkl9"; - k3sVendorHash = "sha256-OiZLUjQUCwso+NHg3aOrXx6/HSFOfwtzwVmLr/Fjfpw="; + k3sVersion = "1.29.6+k3s2"; + k3sCommit = "b4b156d9d14eeb475e789718b3a6b78aba00019e"; + k3sRepoSha256 = "0wagfh4vbvyi62np6zx7b4p6myn0xavw691y78rnbl32jckiy14f"; + k3sVendorHash = "sha256-o36gf3q7Vv+RoY681cL44rU2QFrdFW3EbRpw3dLcVTI="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; From eafccaac795440d3de103dc9943e784b39f77b6f Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Sun, 14 Jul 2024 23:55:56 -0400 Subject: [PATCH 369/562] stevenblack-blocklist: 3.14.84 -> 3.14.87 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index eb77d5936486..367cd1866063 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.14.84"; + version = "3.14.87"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-tahf6mdtmZofwMZfMsuDAqCR/V1qZt6vV+o6t4YTKG0="; + hash = "sha256-QkzDj4EUtmNmJltYu6YOZQBtxm8S23PGdg8nosCzK9M="; }; outputs = [ From d94a7ad3484f11f966a1b69449e447938e94570c Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 14 Jul 2024 20:33:11 -0700 Subject: [PATCH 370/562] llvmPackages_git: 19.0.0-git-2024-07-08 -> 19.0.0-git-2024-07-14 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ea0bba9d6ff3..f6f96c04ae35 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -23,9 +23,9 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.0.0-git".gitRelease = { - rev = "3f83a69bcb2c6b5fa3efbc41d1822e6fa69a6620"; - rev-version = "19.0.0-unstable-2024-07-08"; - sha256 = "sha256-nAKAm2sQrwOT+IKnKTv53O8QBm0iNF/j257OVRwjVXU="; + rev = "8da3852f44c64ac4535128741695b9e9d8ee27ef"; + rev-version = "19.0.0-unstable-2024-07-14"; + sha256 = "sha256-yGmbzueu1kkfGbQaIG+ImnpIS+RwaUl/Gx/+1w6SHRc="; }; } // llvmVersions; From 5db33d7d00cca9cf160792b37f0f1a59b3790f66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 04:51:59 +0000 Subject: [PATCH 371/562] warp-terminal: 0.2024.06.25.08.02.stable_01 -> 0.2024.07.09.08.01.stable_00 --- pkgs/by-name/wa/warp-terminal/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 18904753ae59..f8e8d51256b8 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-vogQAVbtiw2/U3oJrTj8SUexkEsEfYvmGq50nzy5aYo=", - "version": "0.2024.06.25.08.02.stable_01" + "hash": "sha256-ku1zQLrRDCvw8RJueWQb8rFJneW943mcPUJ5QB4SXzg=", + "version": "0.2024.07.09.08.01.stable_00" }, "linux": { - "hash": "sha256-Fc48bZzFBw9p636Mr8R+W/d1B3kIcOAu/Gd17nbzNfI=", - "version": "0.2024.06.25.08.02.stable_01" + "hash": "sha256-EZrANAhkXukquQuCmfA/bIhQnJExE003WZuKU/axr98=", + "version": "0.2024.07.09.08.01.stable_00" } } From 9b8aaf12dc6a1ecce15f07e328e59ec1bd41c34c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 04:52:09 +0000 Subject: [PATCH 372/562] melonDS: 0.9.5-unstable-2024-07-04 -> 0.9.5-unstable-2024-07-14 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 821dc4843130..c86eb061c267 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-07-04"; + version = "0.9.5-unstable-2024-07-14"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "25b5ac91bdcddf537e3ccd78c184eda1d8486086"; - hash = "sha256-AsiFovjRHg1y/wtHxON6RGaYETPPc71mWVs6xZUJdoc="; + rev = "94ba7c159427c88b85806a4e099a44287681778c"; + hash = "sha256-l38RgDWtDi8cVn0LL57F9pAT2bNmZIj6eo+1E+IJ7Lw="; }; nativeBuildInputs = [ From ce60c7bdd4f68638bf19af93878ed4586fb40d87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 04:52:11 +0000 Subject: [PATCH 373/562] python312Packages.twitchapi: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 6ceb6b531366..28bb7ba4adb3 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "4.2.0"; + version = "4.2.1"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-QAxLYujnsudaiz9UepwrBA835Pct5h4VcE9ZrbkwMmg="; + hash = "sha256-DT8Q8x+OvrxnoLWwdS/Gv8x5cepJPIF1ZPyOumnwq2E="; }; nativeBuildInputs = [ setuptools ]; From 45c22fa4a79c14610395bbf4aae8887a2d46edf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:40:04 +0000 Subject: [PATCH 374/562] oboete: 0.1.4 -> 0.1.5 --- pkgs/by-name/ob/oboete/Cargo.lock | 292 +++++++++++++++-------------- pkgs/by-name/ob/oboete/package.nix | 8 +- 2 files changed, 153 insertions(+), 147 deletions(-) diff --git a/pkgs/by-name/ob/oboete/Cargo.lock b/pkgs/by-name/ob/oboete/Cargo.lock index f64e35c3701c..181d46ed0bdc 100644 --- a/pkgs/by-name/ob/oboete/Cargo.lock +++ b/pkgs/by-name/ob/oboete/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.27" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -439,7 +439,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -468,13 +468,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -705,7 +705,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -774,9 +774,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" dependencies = [ "jobserver", "libc", @@ -818,14 +818,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1024,7 +1024,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1046,7 +1046,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "quote", "syn 1.0.109", @@ -1063,7 +1063,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.12.0" -source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" +source = "git+https://github.com/pop-os/cosmic-text.git#0e2d050a8d87c2e97e94ae205c9beda5858123b6" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "almost", "cosmic-config", @@ -1231,9 +1231,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1241,27 +1241,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1314,7 +1314,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1364,7 +1364,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1481,7 +1481,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1774,7 +1774,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1920,7 +1920,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2284,7 +2284,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.68", + "syn 2.0.70", "unic-langid", ] @@ -2298,7 +2298,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2327,7 +2327,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_accessibility", @@ -2345,7 +2345,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "accesskit", "accesskit_winit", @@ -2354,7 +2354,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2374,7 +2374,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "futures", "iced_core", @@ -2387,7 +2387,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2411,7 +2411,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2423,7 +2423,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_core", @@ -2435,7 +2435,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "iced_core", "once_cell", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bytemuck", "cosmic-text", @@ -2462,7 +2462,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2480,7 +2480,7 @@ dependencies = [ "smithay-client-toolkit 0.19.1", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.2", "wayland-sys", "wgpu", ] @@ -2488,7 +2488,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_renderer", @@ -2504,7 +2504,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_graphics", @@ -2811,7 +2811,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "apply", "ashpd", @@ -2864,7 +2864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3364,7 +3364,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3455,7 +3455,7 @@ dependencies = [ [[package]] name = "oboete" -version = "0.1.4" +version = "0.1.5" dependencies = [ "ashpd", "dirs", @@ -3486,9 +3486,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -3551,7 +3551,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3562,11 +3562,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.0", ] [[package]] @@ -3591,7 +3591,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3645,7 +3645,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3705,7 +3705,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3904,9 +3904,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] @@ -4128,9 +4128,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.40" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" dependencies = [ "bytemuck", ] @@ -4190,9 +4190,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -4201,22 +4201,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.68", + "syn 2.0.70", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -4373,9 +4373,9 @@ dependencies = [ [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", @@ -4401,22 +4401,22 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4439,7 +4439,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4602,8 +4602,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.1", - "wayland-protocols-wlr 0.3.1", + "wayland-protocols 0.32.2", + "wayland-protocols-wlr 0.3.2", "wayland-scanner", "xkbcommon", "xkeysym", @@ -4997,9 +4997,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -5064,7 +5064,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -5147,9 +5147,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5188,7 +5188,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -5220,7 +5220,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.15", ] [[package]] @@ -5256,9 +5256,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", @@ -5287,7 +5287,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -5350,6 +5350,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +[[package]] +name = "ttf-parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" + [[package]] name = "type-map" version = "0.5.0" @@ -5640,7 +5646,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -5674,7 +5680,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5702,9 +5708,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" dependencies = [ "cc", "downcast-rs", @@ -5716,9 +5722,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" dependencies = [ "bitflags 2.6.0", "rustix 0.38.34", @@ -5739,9 +5745,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" dependencies = [ "rustix 0.38.34", "wayland-client", @@ -5762,9 +5768,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +checksum = "1794d82d869f38439d15c24b26f06f6c8603d27d47b4f786d5197c99044de415" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -5800,22 +5806,22 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +checksum = "fa43c961473aed713d44c1f616f775186249dfca657f256d8841ca0690366aba" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.2", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" dependencies = [ "proc-macro2", "quick-xml", @@ -5824,9 +5830,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" dependencies = [ "dlib", "log", @@ -6048,7 +6054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6057,7 +6063,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6106,7 +6112,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6141,18 +6147,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "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", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6169,9 +6175,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6187,9 +6193,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6205,15 +6211,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6229,9 +6235,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6247,9 +6253,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6265,9 +6271,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6283,9 +6289,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -6453,9 +6459,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "yazi" @@ -6566,7 +6572,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "zvariant_utils 2.0.0", ] @@ -6600,22 +6606,22 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -6683,7 +6689,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "zvariant_utils 2.0.0", ] @@ -6706,5 +6712,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index c351b1d7b6b4..1e524d116ab5 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "oboete"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; rev = "refs/tags/${version}"; - hash = "sha256-fEnjjxuAoEkJFHyB9mtMEQW0K/Bt3nSpcFTZTZy2UYY="; + hash = "sha256-y3lHiAIhIt5XL/88HBuCqVQlRzNcw9VAKjqgQJmyziU="; }; cargoLock = { @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-1l1X4LtfTOo28MDILiH3vxE5AyJp7XkMYRR34Wvqa9M="; + "cosmic-config-0.1.0" = "sha256-p/1ABYyXGSr34ZC7ozu2syBjkmElA9oI2bzyWhaxKnc="; "cosmic-settings-daemon-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo="; - "cosmic-text-0.12.0" = "sha256-x7UMzlzYkWySFgSQTO1rRn+pyPG9tXKpJ7gzx/wpm8U="; + "cosmic-text-0.12.0" = "sha256-VUUCcW5XnkmCB8cQ5t2xT70wVD5WKXEOPNgNd2xod2A="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; From ef6a5b71eae8726f0b0429baa2fed7d97f8b2749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:43:18 +0000 Subject: [PATCH 375/562] envision-unwrapped: 0-unstable-2024-06-25 -> 0-unstable-2024-07-03 --- pkgs/by-name/en/envision-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 1f57987aa3bc..136491c5c142 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-06-25"; + version = "0-unstable-2024-07-03"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "b594f75778961c281daca398011914e9ac14b753"; - hash = "sha256-felt9KdgVrXSgoufw/+gDlluqdv8vySDqwskQ0t2JOM="; + rev = "6cf5e40b96d1cbd99a3cfcef1f03899356e79448"; + hash = "sha256-a/IUNGoq9OKEC3uCg6PUp2TRHkfm4mTT3QQ8SfA29RU="; }; strictDeps = true; From b948dc68a6de885fd2a995ede97af7dea8a256fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:14:40 +0000 Subject: [PATCH 376/562] tinymist: 0.11.14 -> 0.11.15 --- .../myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/Cargo.lock | 557 ++++++------------ pkgs/by-name/ti/tinymist/package.nix | 4 +- 3 files changed, 174 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 8b29f3dbd15d..56460f2655ba 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-byylRSPfuMBsZsnV/cUJFKrPWiLZFPKGB20Stpe6b0Y="; + hash = "sha256-ekbk4nBigsBOW5bc2ETVCygFjLFqZgLNMbFKprb1HqE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 4178b9c5babc..50431aa2c13c 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -176,13 +176,13 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -191,24 +191,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "await-tree" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626aa057fb6d254883c2750ef6bcbe6f6a5ce45daff839b538708411794f794d" -dependencies = [ - "coarsetime", - "derive_builder", - "flexstr", - "indextree", - "itertools 0.11.0", - "parking_lot", - "pin-project", - "tokio", - "tracing", - "weak-table", -] - [[package]] name = "az" version = "1.2.1" @@ -421,14 +403,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.101" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" [[package]] name = "cfg-if" @@ -462,11 +439,9 @@ checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -502,15 +477,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "serde", ] [[package]] name = "clap" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -518,14 +493,14 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", "unicase", "unicode-width", @@ -533,9 +508,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.6" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbca90c87c2a04da41e95d1856e8bcd22f159bdbfa147314d2ce5218057b0e58" +checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" dependencies = [ "clap", ] @@ -552,14 +527,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -570,25 +545,14 @@ checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clap_mangen" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b70fc13e60c0e1d490dc50eb73a749be6d81f4ef03783df1d9b7b0c62bc937" +checksum = "f50dde5bc0c853d6248de457e5eb6e5a674a54b93810a34ded88d882ca1fe2de" dependencies = [ "clap", "roff", ] -[[package]] -name = "coarsetime" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" -dependencies = [ - "libc", - "wasix", - "wasm-bindgen", -] - [[package]] name = "cobs" version = "0.2.3" @@ -647,7 +611,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -658,7 +622,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -798,72 +762,37 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.68", + "strsim", + "syn 2.0.70", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.14.4", + "darling_core", "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core 0.20.9", - "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -901,37 +830,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - [[package]] name = "dhat" version = "0.3.3" @@ -942,7 +840,7 @@ dependencies = [ "lazy_static", "mintex", "parking_lot", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "thousands", @@ -1008,7 +906,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1103,7 +1001,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1198,15 +1096,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flexstr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d50aef14619d336a54fca5a592d952eb39037b1a1e7e6afd9f91c892ac7ef65" -dependencies = [ - "static_assertions", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -1343,7 +1232,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1432,19 +1321,6 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "globmatch" version = "0.2.5" @@ -1624,9 +1500,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1824,7 +1700,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1921,12 +1797,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" -[[package]] -name = "indextree" -version = "4.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6f7e29c1619ec492f411b021ac9f30649d5f522ca6f287f2467ee48c8dfe10" - [[package]] name = "inotify" version = "0.9.6" @@ -2021,24 +1891,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2054,15 +1906,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -2128,18 +1971,6 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - [[package]] name = "libm" version = "0.2.8" @@ -2156,24 +1987,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2217,9 +2030,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" @@ -2269,9 +2082,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2414,9 +2227,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2429,9 +2242,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2461,7 +2274,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2509,7 +2322,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2532,7 +2345,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2601,7 +2414,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2619,26 +2432,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2668,14 +2461,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -2801,6 +2593,15 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.36" @@ -2912,7 +2713,7 @@ dependencies = [ "parking_lot", "path-clean", "rkyv", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "serde_repr", @@ -2935,7 +2736,7 @@ dependencies = [ "parking_lot", "reflexo", "rpds", - "rustc-hash", + "rustc-hash 1.1.0", "typst", ] @@ -2963,7 +2764,7 @@ dependencies = [ "reflexo", "reflexo-vfs", "reqwest", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "sha2", @@ -3076,9 +2877,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" dependencies = [ "bytemuck", ] @@ -3183,6 +2984,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3338,29 +3145,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.118" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3375,7 +3182,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3401,9 +3208,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "base64 0.22.1", "chrono", @@ -3419,14 +3226,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ - "darling 0.20.9", + "darling", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3586,12 +3393,6 @@ dependencies = [ "float-cmp", ] -[[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" @@ -3626,7 +3427,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3639,7 +3440,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3686,9 +3487,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -3697,7 +3498,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.14" +version = "0.11.15" dependencies = [ "anyhow", "clap", @@ -3729,7 +3530,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3836,7 +3637,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.14" +version = "0.11.15" dependencies = [ "insta", "lsp-server", @@ -3863,7 +3664,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3933,14 +3734,12 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.14" +version = "0.11.15" dependencies = [ "anyhow", "async-trait", - "await-tree", "base64 0.22.1", "cargo_metadata", - "chrono", "clap", "clap_builder", "clap_complete", @@ -3953,7 +3752,7 @@ dependencies = [ "env_logger", "futures", "hyper", - "itertools 0.12.1", + "itertools 0.13.0", "log", "lsp-server", "lsp-types", @@ -3967,7 +3766,7 @@ dependencies = [ "serde", "serde_json", "sync-lsp", - "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tokio", @@ -3994,17 +3793,17 @@ dependencies = [ [[package]] name = "tinymist-assets" -version = "0.11.14" +version = "0.11.15" [[package]] name = "tinymist-assets" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e5159484d14f149de53df7cf5f04d9cff4a4d414688cc0cc81910162d74892" +checksum = "9a903925a80e7eb0726472180da9b8a7cc7d14bc97f639e32110aa597f77f6e4" [[package]] name = "tinymist-query" -version = "0.11.14" +version = "0.11.15" dependencies = [ "anyhow", "biblatex", @@ -4012,13 +3811,12 @@ dependencies = [ "dashmap", "ecow 0.2.2", "ena", - "fxhash", "hashbrown 0.14.5", "hex", "if_chain", "indexmap 2.2.6", "insta", - "itertools 0.12.1", + "itertools 0.13.0", "log", "lsp-types", "once_cell", @@ -4029,7 +3827,7 @@ dependencies = [ "regex", "rust_iso3166", "rust_iso639", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "serde_yaml", @@ -4050,7 +3848,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.14" +version = "0.11.15" dependencies = [ "base64 0.22.1", "log", @@ -4072,9 +3870,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4112,7 +3910,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4182,7 +3980,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.15", ] [[package]] @@ -4209,9 +4007,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap 2.2.6", "serde", @@ -4251,7 +4049,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4323,6 +4121,14 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "typlite" +version = "0.11.15" +dependencies = [ + "insta", + "typst-syntax 0.11.1", +] + [[package]] name = "typst" version = "0.11.1" @@ -4398,7 +4204,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4428,9 +4234,8 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.14" +version = "0.11.15" dependencies = [ - "await-tree", "clap", "comemo 0.4.0", "env_logger", @@ -4440,7 +4245,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "tokio-tungstenite", "typst", @@ -4552,7 +4357,7 @@ dependencies = [ "reflexo", "reflexo-vfs", "reflexo-world", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "tar", @@ -4586,7 +4391,7 @@ dependencies = [ "path-clean", "rayon", "reflexo", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "serde_repr", @@ -4636,19 +4441,15 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.28" +version = "0.11.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cfef0bd8b71907de640287bef88b33e4e55b6a6ff5227bb8f36ae308a0e2da" +checksum = "e9faebdb185575bc0f43a0f2af010c7cff314764c7df896a506ea1b55f0a82b8" dependencies = [ "anyhow", - "clap", "itertools 0.13.0", - "once_cell", "pretty", "typst-syntax 0.11.1", "vergen", - "walkdir", - "wasm-bindgen", ] [[package]] @@ -4858,9 +4659,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "vcpkg" @@ -4870,14 +4671,13 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cargo_metadata", "cfg-if", - "git2", "regex", "rustc_version", "rustversion", @@ -4915,15 +4715,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasix" -version = "0.12.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" -dependencies = [ - "wasi", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -4945,7 +4736,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -4979,7 +4770,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5030,12 +4821,6 @@ dependencies = [ "indexmap-nostd", ] -[[package]] -name = "weak-table" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" - [[package]] name = "web-sys" version = "0.3.69" @@ -5095,7 +4880,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5113,7 +4898,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5133,18 +4918,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "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", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5155,9 +4940,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5167,9 +4952,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5179,15 +4964,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5197,9 +4982,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5209,9 +4994,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5221,9 +5006,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5233,9 +5018,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5349,28 +5134,28 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -5390,7 +5175,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "synstructure", ] @@ -5426,5 +5211,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 083ec3f60745..f2b856032cd1 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.14"; + version = "0.11.15"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-6dUI0w9GKubK2hVK8fOkAYoUdEII9umPEZZ6uSh7XjE="; + hash = "sha256-s0TGi0HNZrl5BdI/QmDB33lsKkoO/RH1FOJheWYvS8k="; }; cargoLock = { From 6ee491a2f25002144e2dba415c39210dbfb946d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:53:37 +0000 Subject: [PATCH 377/562] python312Packages.aiolifx-themes: 0.4.18 -> 0.4.21 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 8f30f735364b..73c3f1b2f05c 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.18"; + version = "0.4.21"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-6oV6pyVwSS6sYrTokcJ/1KBkuv7EHNr+2bJ5ujengTY="; + hash = "sha256-GRB4Hj+WjiEqskq4KnaD6aDpoESLBTs77Xj23+0/A6k="; }; prePatch = '' From 0118b68af229012ad4b1549d35a2e0030c00f22e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:54:47 +0000 Subject: [PATCH 378/562] reposilite: 3.5.13 -> 3.5.14 --- pkgs/by-name/re/reposilite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 8ae98f2c292b..27f10aa98562 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "Reposilite"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar"; - hash = "sha256-G9J1nOK1dM8XC+3Mj8uUnNvM5BiUPzOIRT/T5CZzvqo="; + hash = "sha256-qZXYpz6SBXDBj8c0IZkfVgxEFe/+DxMpdhLJsjks8cM="; }; dontUnpack = true; From 717235bcd232f6f9b9cdbaf2f76470931aa063b7 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Mon, 15 Jul 2024 08:05:50 +0200 Subject: [PATCH 379/562] tuifimanager: 4.0.6 -> 4.1.7 (#326616) --- pkgs/by-name/tu/tuifimanager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 7ccb8e4b237f..8b214453a788 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -19,14 +19,14 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) python3.pkgs.buildPythonApplication rec { pname = "tuifimanager"; - version = "4.0.6"; + version = "4.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; rev = "v.${version}"; - hash = "sha256-pppPlpPA1UYjUCKvGCjUo9jFNyOOkk6aF7/v5sXIptI="; + hash = "sha256-kljodLSSjvGcjhD7IhAVAAGd6LoiM6IYwMXuSsIJ198="; }; nativeBuildInputs = [ From 9fdd1c1e586c337abdf881f51b0088f234a55b34 Mon Sep 17 00:00:00 2001 From: liam-murphy14 Date: Mon, 12 Feb 2024 20:25:23 -0800 Subject: [PATCH 380/562] maintainers: add liammurphy14 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ffc8ff09f9f..c0f22d6a6881 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11426,6 +11426,12 @@ githubId = 1769386; name = "Liam Diprose"; }; + liammurphy14 = { + email = "liam.murphy137@gmail.com"; + github = "liam-murphy14"; + githubId = 54590679; + name = "Liam Murphy"; + }; liarokapisv = { email = "liarokapis.v@gmail.com"; github = "liarokapisv"; From 8012d2fdefa632a416af503213156a7022839359 Mon Sep 17 00:00:00 2001 From: liam-murphy14 Date: Sun, 28 Apr 2024 19:48:35 -0700 Subject: [PATCH 381/562] electron-chromedriver: init at 29.4.4, 30.2.0, 31.2.0 Co-Authored-By: Yaya --- .../tools/electron/chromedriver/default.nix | 14 +++ .../tools/electron/chromedriver/generic.nix | 96 +++++++++++++++++++ .../tools/electron/chromedriver/info.json | 35 +++++++ pkgs/top-level/all-packages.nix | 6 ++ 4 files changed, 151 insertions(+) create mode 100644 pkgs/development/tools/electron/chromedriver/default.nix create mode 100644 pkgs/development/tools/electron/chromedriver/generic.nix create mode 100644 pkgs/development/tools/electron/chromedriver/info.json diff --git a/pkgs/development/tools/electron/chromedriver/default.nix b/pkgs/development/tools/electron/chromedriver/default.nix new file mode 100644 index 000000000000..87c45f5d566a --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/default.nix @@ -0,0 +1,14 @@ +let + infoJson = builtins.fromJSON (builtins.readFile ./info.json); +in + +{ lib, callPackage }: + +let + mkElectronChromedriver = callPackage ./generic.nix { }; +in +lib.mapAttrs' (majorVersion: info: + lib.nameValuePair + "electron-chromedriver_${majorVersion}" + (mkElectronChromedriver info.version info.hashes) +) infoJson diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix new file mode 100644 index 000000000000..edd648713e27 --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchurl +, glib +, xorg +, nspr +, nss +, autoPatchelfHook +, unzip +}: + +version: hashes: +let + pname = "electron-chromedriver"; + + meta = with lib; { + homepage = "https://www.electronjs.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. This is + an unofficial build of ChromeDriver compiled by the Electronjs + project. + ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + maintainers = with maintainers; [ liammurphy14 yayayayaka ]; + platforms = ["x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" "aarch64-darwin"]; + mainProgram = "chromedriver"; + }; + + fetcher = vers: tag: hash: fetchurl { + url = "https://github.com/electron/electron/releases/download/v${vers}/chromedriver-v${vers}-${tag}.zip"; + sha256 = hash; + }; + + tags = { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armv7l"; + x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; + }; + + get = as: platform: as.${platform.system} or (throw "Unsupported system: ${platform.system}"); + + common = platform: { + inherit pname version meta; + src = fetcher version (get tags platform) (get hashes platform); + + buildInputs = [ + stdenv.cc.cc.lib + glib + xorg.libxcb + nspr + nss + ]; + }; + + linux = { + nativeBuildInputs = [ autoPatchelfHook unzip ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + unzip $src + install -m777 -D chromedriver $out/bin/chromedriver + runHook postInstall + ''; + }; + + darwin = { + nativeBuildInputs = [ unzip ]; + + dontUnpack = true; + dontBuild = true; + + # darwin distributions come with libffmpeg dependecy + icudtl.dat file + installPhase = '' + runHook preInstall + unzip $src + install -m777 -D chromedriver $out/bin/chromedriver + cp libffmpeg.dylib $out/bin/libffmpeg.dylib + cp icudtl.dat $out/bin/icudtl.dat + runHook postInstall + ''; + }; +in + stdenv.mkDerivation ( + (common stdenv.hostPlatform) // + (if stdenv.isDarwin then darwin else linux) + ) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json new file mode 100644 index 000000000000..96154ff77965 --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -0,0 +1,35 @@ +{ + "29": { + "hashes": { + "aarch64-darwin": "82e4158d2fc3f854911d665643d8fe9dfa90795c9599df797d01044d7381501b", + "aarch64-linux": "14ac2a9db3b183d51ed967700c93d56d38868695a180d40d8427a860162d6d2c", + "armv7l-linux": "7f35fa76df7c0e02c424b1461622c0620d45e7f4e56611626045136d9fa4ff04", + "headers": "194vq6lcppf76ly7cz4b1299h8wfw6xvwfgfndqsqm1sg6g1hrmg", + "x86_64-darwin": "b80fed41b99d4713fe7b44edbac0a74e5a6aafcfb019ae564c03b1380c6b8ac1", + "x86_64-linux": "b64425fe356aec15f4c8adf1e6a8b2caaccd989378bbe9d19632dd77a020ddfe" + }, + "version": "29.4.4" + }, + "30": { + "hashes": { + "aarch64-darwin": "12447d8fca855c84b2fe23e6db80beb2ba37780ed0ddf42025e1981d9eaf4939", + "aarch64-linux": "df9072d486e86451e37e7bf680a9a7ab744b41e5ccdf1121a91ad9cc02166a8d", + "armv7l-linux": "25f5406e0dfa05fd8a0bc5fbcb6c7377dd7fec9d17f5a39554f1f39cb4ce5fba", + "headers": "1y8nyib0a9k5q01smy55ddkj9sl01rj625afx32h5pf815r5asmf", + "x86_64-darwin": "a00dd14044bef8383bbdeaf11ad049876a1d545ee8e39c953d8053d4efbce8fe", + "x86_64-linux": "a7def33c6d32555acb0eb299c839d1f609b31877ba53f8d82dd12aae29924fb7" + }, + "version": "30.2.0" + }, + "31": { + "hashes": { + "aarch64-darwin": "6335fb15beeaaa6601a325a9b616b059a289063fc560ff66efd5353d4ab4fcbe", + "aarch64-linux": "de793d036dbce9dbda8603992db8d57d40e37f97ee9bc5808fcb5ec492cb1e10", + "armv7l-linux": "fe4ab8af208fd5d882c9b1cc25f33a0816a6eec4d75f0911b8fa320e9c8cadcc", + "headers": "00i9y8ya03drd5hdhv1pmlai66bjmh04zfc39g65skbgz9yjihmj", + "x86_64-darwin": "5423016c84cde9513ace0d68d06fecd376ab945bae22e2cb39eaf2a6e83813a8", + "x86_64-linux": "70182bd0980458607ed7d1684ded9de88bfd00793e680bb23b9cef595a24a5d6" + }, + "version": "31.2.0" + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a6911fe6603..2986270ba88c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17802,6 +17802,11 @@ with pkgs; electron_29-bin electron_30-bin; + inherit (callPackages ../development/tools/electron/chromedriver { }) + electron-chromedriver_29 + electron-chromedriver_30 + electron-chromedriver_31; + electron_24 = electron_24-bin; electron_27 = electron_27-bin; electron_28 = electron_28-bin; @@ -17809,6 +17814,7 @@ with pkgs; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron = electron_30; electron-bin = electron_30-bin; + electron-chromedriver = electron-chromedriver_30; autobuild = callPackage ../development/tools/misc/autobuild { }; From ca66c0dadbc164e4c7b7c6d6ee80d4daf92e810b Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 14 Jul 2024 13:09:44 +0200 Subject: [PATCH 382/562] electron: support updating chromedriver with update.py --- pkgs/development/tools/electron/update.py | 101 +++++++++++++++++++++- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index d547bcdc5f6c..962ca0e34073 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -73,6 +73,9 @@ SOURCE_INFO_JSON = "info.json" # Relatice path to the electron-bin info.json BINARY_INFO_JSON = "binary/info.json" +# Relative path the the electron-chromedriver info.json +CHROMEDRIVER_INFO_JSON = "chromedriver/info.json" + # Number of spaces used for each indentation level JSON_INDENT = 4 @@ -85,6 +88,7 @@ click_log.basic_config(logger) nixpkgs_path = os.path.dirname(os.path.realpath(__file__)) + "/../../../.." + class Repo: fetcher: str args: dict @@ -277,6 +281,42 @@ class ElectronBinRepo(GitHubRepo): return out +class ElectronChromedriverRepo(ElectronBinRepo): + def __init__(self, rev: str) -> None: + super().__init__("electron", "electron", rev) + self.systems = { + "i686-linux": "linux-ia32", + "x86_64-linux": "linux-x64", + "armv7l-linux": "linux-armv7l", + "aarch64-linux": "linux-arm64", + "x86_64-darwin": "darwin-x64", + "aarch64-darwin": "darwin-arm64", + } + + def get_hashes(self, major_version: str) -> dict: + """Returns a dictionary of hashes for a given major version""" + m, _ = get_latest_version(major_version) + version: str = m["version"] + + out = {} + out[major_version] = { + "hashes": {}, + "version": version, + } + + hashes: list = self.get_shasums256(version) + + for nix_system, electron_system in self.systems.items(): + filename = f"*chromedriver-v{version}-{electron_system}.zip" + if any([x.endswith(filename) for x in hashes]): + out[major_version]["hashes"][nix_system] = [ + x.split(" ")[0] for x in hashes if x.endswith(filename) + ][0] + out[major_version]["hashes"]["headers"] = self.get_headers(version) + + return out + + # Releases that have reached end-of-life no longer receive any updates # and it is rather pointless trying to update those. # @@ -305,10 +345,10 @@ def supported_version_range() -> range: @memory.cache def get_repo_hash(fetcher: str, args: dict) -> str: - expr = f'with import {nixpkgs_path} {{}};{fetcher}{{' + expr = f"with import {nixpkgs_path} {{}};{fetcher}{{" for key, val in args.items(): expr += f'{key}="{val}";' - expr += '}' + expr += "}" cmd = ["nurl", "-H", "--expr", expr] print(" ".join(cmd), file=sys.stderr) out = subprocess.check_output(cmd) @@ -412,6 +452,15 @@ def get_electron_bin_info(major_version: str) -> Tuple[str, str, ElectronBinRepo return (major_version, m, electron_repo) +def get_electron_chromedriver_info( + major_version: str, +) -> Tuple[str, str, ElectronChromedriverRepo]: + m, rev = get_latest_version(major_version) + + electron_repo: ElectronChromedriverRepo = ElectronChromedriverRepo(rev) + return (major_version, m, electron_repo) + + def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]: m, rev = get_latest_version(major_version) @@ -523,6 +572,36 @@ def update_bin(major_version: str, commit: bool) -> None: commit_result(package_name, old_version, new_version, BINARY_INFO_JSON) +def update_chromedriver(major_version: str, commit: bool) -> None: + """Update a given electron-chromedriver release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron-chromedriver_{major_version}" + print(f"Updating {package_name}") + + electron_chromedriver_info = get_electron_chromedriver_info(major_version) + (_major_version, _version, repo) = electron_chromedriver_info + + old_info = load_info_json(CHROMEDRIVER_INFO_JSON) + new_info = repo.get_hashes(major_version) + + out = old_info | new_info + + save_info_json(CHROMEDRIVER_INFO_JSON, out) + + old_version = ( + old_info[major_version]["version"] if major_version in old_info else None + ) + new_version = new_info[major_version]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, CHROMEDRIVER_INFO_JSON) + + def update_source(major_version: str, commit: bool) -> None: """Update a given electron-source release @@ -643,7 +722,11 @@ def commit_result( ) init_msg = f"init at {new_version}" update_msg = f"{old_version} -> {new_version}" - diff = f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" if old_version != None else "" + diff = ( + f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" + if old_version != None + else "" + ) commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg} - Changelog: https://github.com/electron/electron/releases/tag/v{new_version} @@ -682,6 +765,13 @@ def eval(version): print(json.dumps(tree, indent=JSON_INDENT, default=vars, sort_keys=True)) +@cli.command("update-chromedriver", help="Update a single major release") +@click.option("-v", "--version", help="The major version, e.g. '23'") +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update_chromedriver_cmd(version: str, commit: bool) -> None: + update_chromedriver(version, commit) + + @cli.command("update", help="Update a single major release") @click.option("-v", "--version", help="The major version, e.g. '23'") @click.option( @@ -719,6 +809,8 @@ def update(version: str, bin_only: bool, source_only: bool, commit: bool) -> Non update_bin(version, commit) update_source(version, commit) + update_chromedriver(version, commit) + @cli.command("update-all", help="Update all releases at once") @click.option( @@ -765,6 +857,9 @@ def update_all(bin_only: bool, source_only: bool, commit: bool) -> None: update_all_source(commit) + for major_version, _ in filtered_bin_info.items(): + update_chromedriver(major_version, commit) + if __name__ == "__main__": cli() From 8f4567a448a115c6abd799bad70024ae4ebc3fc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2024 16:07:11 +1000 Subject: [PATCH 383/562] kyverno: 1.12.4 -> 1.12.5 (#326612) --- pkgs/applications/networking/cluster/kyverno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index f9becbdf5bad..0e4b11a8f918 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-TVtE1mdOai2G2+KCp9r5G+E9QhGQ5TmUFCN9x5EKM7o="; + hash = "sha256-j6/x0fITP6FbI7LvaaB+Dwg9ewFjZ/eqjG0TzQeDsmI="; }; ldflags = [ From f0e87420c94bb89fb46b95f7701bf7b9fca8ce57 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 08:52:11 +0300 Subject: [PATCH 384/562] linux_6_10: init at 6.10 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c64356df9c08..849cbef19396 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -34,5 +34,9 @@ "6.9": { "version": "6.9.9", "hash": "sha256:1f8y88rif3z5lp1bq00g66fd0xs1227qlqkxd2zs6fdjgr45pq1b" + }, + "6.10": { + "version": "6.10", + "hash": "sha256:09p2z3z8c3aq6ipqdc58x6s52sy0cmyg6mj4f0g5yk755r19hikp" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..decb4d03019e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -766,6 +766,7 @@ mapAliases ({ linuxPackages_6_7 = linuxKernel.packages.linux_6_7; linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_6_9 = linuxKernel.packages.linux_6_9; + linuxPackages_6_10 = linuxKernel.packages.linux_6_10; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -794,6 +795,7 @@ mapAliases ({ linux_6_7 = linuxKernel.kernels.linux_6_7; linux_6_8 = linuxKernel.kernels.linux_6_8; linux_6_9 = linuxKernel.kernels.linux_6_9; + linux_6_10 = linuxKernel.kernels.linux_6_10; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bc80ec658846..b28b9884b587 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -208,6 +208,14 @@ in { ]; }; + linux_6_10 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.10"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -620,6 +628,7 @@ in { linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9); + linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -689,7 +698,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_9; + linux_latest = packages.linux_6_10; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; From deeb2477f57dd045b61ea9e7c7274fb51c39d238 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Wed, 12 Jun 2024 13:13:24 +0200 Subject: [PATCH 385/562] kodiPackages.orftvthek: 0.12.12 -> 1.0.2+matrix.1 --- .../video/kodi/addons/orftvthek/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix index 416cb9a30a6b..64b822c35510 100644 --- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix +++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix @@ -1,27 +1,27 @@ -{ lib, buildKodiAddon, fetchFromGitHub, future, kodi-six, simplejson, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, inputstream-adaptive, inputstreamhelper, routing }: buildKodiAddon rec { pname = "orftvthek"; namespace = "plugin.video.orftvthek"; - version = "0.12.12"; + version = "1.0.2+matrix.1"; src = fetchFromGitHub { owner = "s0faking"; repo = namespace; rev = version; - sha256 = "sha256-4VLr4DFxioCrlq5JtiPyd7E4a+++cWgxCnRb3KPppWE="; + sha256 = "sha256-bCVsR7lH0REJmG3OKU8mRRvw/PhSrLfhufmVBmw05+k="; }; propagatedBuildInputs = [ - future - kodi-six - simplejson + # Needed for content decryption with Widevine. + inputstream-adaptive inputstreamhelper + routing ]; meta = with lib; { homepage = "https://github.com/s0faking/plugin.video.orftvthek"; - description = "Addon that gives you access to the ORF TVthek Video Platform"; + description = "Addon for accessing the Austrian ORF ON streaming service"; license = licenses.gpl2Only; maintainers = teams.kodi.members; }; From 37a7071f1523e939f7b93da90167ea21d9dbd7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Jul 2024 08:43:49 +0200 Subject: [PATCH 386/562] thunderbird: cleanup patch filenames - drop old no-buildconfig.patch, forgotten from thunderbird 102 - rename the -115 version to no-buildconfig.patch (without changes) --- .../thunderbird/no-buildconfig-115.patch | 13 ------------- .../mailreaders/thunderbird/no-buildconfig.patch | 10 +++++----- .../networking/mailreaders/thunderbird/packages.nix | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch deleted file mode 100644 index f386ee5a5d7f..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -120,9 +120,6 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html -- - comm.jar: - % content communicator %content/communicator/ - content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index c4e29f6355cf..f386ee5a5d7f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,13 +1,13 @@ Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -119,9 +119,6 @@ messenger.jar: +@@ -120,9 +120,6 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - + -* content/messenger/buildconfig.html (content/buildconfig.html) -% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - - # L10n resources and overrides. - % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd - % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd + comm.jar: + % content communicator %content/communicator/ + content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 01ba91f43e1d..a3307782b9d1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -13,7 +13,7 @@ let }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig-115.patch + ./no-buildconfig.patch ]; meta = with lib; { From c1e3f47f9abdc9a64dc99d7f33dbf43f921f1a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:01:14 +0200 Subject: [PATCH 387/562] {bitcoin-unlimited, bitcoind-unlimited}: remove --- .../blockchains/bitcoin-unlimited/default.nix | 64 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 9 --- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 pkgs/applications/blockchains/bitcoin-unlimited/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix deleted file mode 100644 index 4cd60294a81d..000000000000 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 -, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null -, Foundation, ApplicationServices, AppKit }: - -stdenv.mkDerivation rec { - pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; - version = "1.10.0.0"; - - src = fetchFromGitLab { - owner = "bitcoinunlimited"; - repo = "BCHUnlimited"; - rev = "BCHunlimited${version}"; - hash = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc util-linux protobuf libevent ] - ++ lib.optionals withGui [ qtbase qttools qrencode ] - ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "Peer-to-peer electronic cash system (Unlimited client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - The Bitcoin Unlimited (BU) project seeks to provide a voice to all - stakeholders in the Bitcoin ecosystem. - - Every node operator or miner can currently choose their own blocksize limit - by modifying their client. Bitcoin Unlimited makes the process easier by - providing a configurable option for the accepted and generated blocksize via - a GUI menu. Bitcoin Unlimited further provides a user-configurable failsafe - setting allowing you to accept a block larger than your maximum accepted - blocksize if it reaches a certain number of blocks deep in the chain. - - The Bitcoin Unlimited client is not a competitive block scaling proposal - like BIP-101, BIP-102, etc. Instead it tracks consensus. This means that it - tracks the blockchain that the hash power majority follows, irrespective of - blocksize, and signals its ability to accept larger blocks via protocol and - block versioning fields. - - If you support an increase in the blocksize limit by any means - or just - support Bitcoin conflict resolution as originally envisioned by its founder - - consider running a Bitcoin Unlimited client. - ''; - homepage = "https://www.bitcoinunlimited.info/"; - maintainers = with maintainers; [ DmitryTsygankov ]; - license = licenses.mit; - broken = true; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..28c12de5a3a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -131,6 +131,8 @@ mapAliases ({ bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 + bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 + bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwarden = bitwarden-desktop; # Added 2024-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..11e8e58f8c9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35565,15 +35565,6 @@ with pkgs; withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = true; - }; - bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = false; - }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; From b3b493b7e8dc7ab57391dc4d37b93ac1cb9c4d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:07:30 +0200 Subject: [PATCH 388/562] tabula: remove --- pkgs/applications/misc/tabula/default.nix | 41 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/misc/tabula/default.nix diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix deleted file mode 100644 index c4b7749b5304..000000000000 --- a/pkgs/applications/misc/tabula/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: - - -stdenv.mkDerivation rec { - pname = "tabula"; - version = "1.2.1"; - - - src = fetchzip { - url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip"; - sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi"; - }; - - - nativeBuildInputs = [ makeWrapper ]; - - - installPhase = '' - mkdir -pv $out/share/tabula - cp -v * $out/share/tabula - - makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar" - ''; - - - meta = with lib; { - description = "Tool for liberating data tables locked inside PDF files"; - longDescription = '' - If you’ve ever tried to do anything with data provided to you in PDFs, you - know how painful it is — there's no easy way to copy-and-paste rows of data - out of PDF files. Tabula allows you to extract that data into a CSV or - Microsoft Excel spreadsheet using a simple, easy-to-use interface. - ''; - homepage = "https://tabula.technology/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = [ maintainers.dpaetzel ]; - platforms = platforms.all; - broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..fd5f820ea5b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1341,6 +1341,7 @@ mapAliases ({ ### T ### + tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 tangogps = foxtrotgps; # Added 2020-01-26 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..4ffdaa7d2c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34264,8 +34264,6 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; - tabula = callPackage ../applications/misc/tabula { }; - tabula-java = callPackage ../applications/misc/tabula-java { }; tasknc = callPackage ../applications/misc/tasknc { }; From c160df10972c2a7557602f7634ad86a53db3cac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:12:08 +0200 Subject: [PATCH 389/562] starspace: remove --- .../machine-learning/starspace/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/applications/science/machine-learning/starspace/default.nix diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix deleted file mode 100644 index f4ca74ef5bbf..000000000000 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, zlib }: - -stdenv.mkDerivation rec { - pname = "starspace"; - version = "unstable-2019-12-13"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = pname; - rev = "8aee0a950aa607c023e5c91cff518bec335b5df5"; - sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; - }; - - buildInputs = [ boost zlib ]; - - makeFlags = [ - "CXX=${stdenv.cc.targetPrefix}c++" - "BOOST_DIR=${boost.dev}/include" - ]; - - preBuild = '' - cp makefile_compress makefile - ''; - - installPhase = '' - mkdir -p $out/bin - mv starspace $out/bin - ''; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "General-purpose neural model for efficient learning of entity embeddings"; - homepage = "https://ai.facebook.com/tools/starspace/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.mausch ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..81792a002d27 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1329,6 +1329,7 @@ mapAliases ({ ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 + starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..0f37bf41e03e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36845,8 +36845,6 @@ with pkgs; stardust = callPackage ../games/stardust { }; - starspace = callPackage ../applications/science/machine-learning/starspace { }; - stockfish = callPackage ../games/stockfish { }; steamPackages = recurseIntoAttrs (callPackage ../games/steam { }); From 4ba3b6339c1d208f423ce855b9de2067a2114dd9 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 15 Jul 2024 15:16:22 +0800 Subject: [PATCH 390/562] greetd.dlm: remove I found this package while cleaning cargoSha256. Its cargoSha256 was actually wrong and included git dependencies, but it has never been corrected. I tried fixing it in https://github.com/NixOS/nixpkgs/pull/324316 and requested a maintainer review, but the maintainer didn't respond to me for the next two weeks. Upstream was last updated four years ago. Considering we now have much better login managers for greetd, we should no longer need this package. --- .../display-managers/greetd/dlm.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/display-managers/greetd/dlm.nix diff --git a/pkgs/applications/display-managers/greetd/dlm.nix b/pkgs/applications/display-managers/greetd/dlm.nix deleted file mode 100644 index a73a96c779a8..000000000000 --- a/pkgs/applications/display-managers/greetd/dlm.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromSourcehut -}: - -rustPlatform.buildRustPackage rec { - pname = "dlm"; - version = "2020-01-07"; - - src = fetchFromSourcehut { - owner = "~kennylevinsen"; - repo = pname; - rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66"; - sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p"; - }; - - cargoSha256 = "01a8k60qnx2pgxb2adgw30c2hjb60w6230khm5hyqgmp7z4rm8k8"; - - meta = with lib; { - description = "Stupid simple graphical login manager"; - mainProgram = "dlm"; - homepage = "https://git.sr.ht/~kennylevinsen/dlm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74e5060f2e7..fb1087f2778f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30532,7 +30532,7 @@ with pkgs; }; greetd = recurseIntoAttrs { - dlm = callPackage ../applications/display-managers/greetd/dlm.nix { }; + dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; #Added 2024-07-15 greetd = callPackage ../applications/display-managers/greetd { }; gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; From fe5958dd08b355872a13a53cde5f29edda306ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 08:59:15 +0200 Subject: [PATCH 391/562] aeon: remove --- .../applications/blockchains/aeon/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/applications/blockchains/aeon/default.nix diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix deleted file mode 100644 index b380af13663a..000000000000 --- a/pkgs/applications/blockchains/aeon/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz -, boost, miniupnpc, openssl, unbound, cppzmq -, pcsclite, readline, libsodium -}: - -let - version = "0.14.2.2"; -in -stdenv.mkDerivation { - pname = "aeon"; - inherit version; - - src = fetchFromGitHub { - owner = "aeonix"; - repo = "aeon"; - rev = "v${version}-aeon"; - fetchSubmodules = true; - hash = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4="; - }; - - nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; - - buildInputs = [ - boost miniupnpc openssl unbound - cppzmq pcsclite readline libsodium - ]; - - cmakeFlags = [ - "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - ]; - - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "Private, secure, untraceable currency"; - homepage = "http://www.aeon.cash/"; - license = licenses.bsd3; - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..8939696e7b8a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09 advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 + aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" agebox = throw "agebox has been removed due to lack of upstream maintenance"; # Added 2024-07-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcc91394192..2d1e4f1de38a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35519,8 +35519,6 @@ with pkgs; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS - aeon = callPackage ../applications/blockchains/aeon { }; - alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; }; From 4550de42e2c7a80816790871c8b96ccfdb5c855f Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 15 Jul 2024 09:30:13 +0200 Subject: [PATCH 392/562] fprintd-tod: fix build --- pkgs/tools/security/fprintd/tod.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix index e1c836e76b25..633985989b3a 100644 --- a/pkgs/tools/security/fprintd/tod.nix +++ b/pkgs/tools/security/fprintd/tod.nix @@ -33,6 +33,11 @@ url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; }) + (fetchpatch { + name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; + sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; + }) ]; postPatch = oldAttrs.postPatch or "" + '' From fdfe59f7b34f6ab4e024ea58d633292bdd73c03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:30:53 +0200 Subject: [PATCH 393/562] xmr-stak: remove --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/misc/xmr-stak.nix | 89 --------------------- pkgs/applications/misc/xmr-stak/default.nix | 50 ------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 nixos/modules/services/misc/xmr-stak.nix delete mode 100644 pkgs/applications/misc/xmr-stak/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1e5787e44b55..1fc92a3eba7a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -841,7 +841,6 @@ ./services/misc/wastebin.nix ./services/misc/weechat.nix ./services/misc/workout-tracker.nix - ./services/misc/xmr-stak.nix ./services/misc/xmrig.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a4c0f0d5c25e..f5000cbbb767 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -106,6 +106,7 @@ in as the underlying package isn't being maintained. Working alternatives are libinput and synaptics. '') + (mkRemovedOptionModule [ "services" "xmr-stak" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") (mkRemovedOptionModule [ "services" "racoon" ] '' The racoon module has been removed, because the software project was abandoned upstream. diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix deleted file mode 100644 index 3015e3cb12a8..000000000000 --- a/nixos/modules/services/misc/xmr-stak.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, config, pkgs, ... }: - -with lib; - -let - - cfg = config.services.xmr-stak; - - pkg = pkgs.xmr-stak.override { - inherit (cfg) openclSupport; - }; - -in - -{ - options = { - services.xmr-stak = { - enable = mkEnableOption "xmr-stak miner"; - openclSupport = mkEnableOption "support for OpenCL (AMD/ATI graphics cards)"; - - extraArgs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "--noCPU" "--currency monero" ]; - description = "List of parameters to pass to xmr-stak."; - }; - - configFiles = mkOption { - type = types.attrsOf types.str; - default = {}; - example = literalExpression '' - { - "config.txt" = ''' - "verbose_level" : 4, - "h_print_time" : 60, - "tls_secure_algo" : true, - '''; - "pools.txt" = ''' - "currency" : "monero7", - "pool_list" : - [ { "pool_address" : "pool.supportxmr.com:443", - "wallet_address" : "my-wallet-address", - "rig_id" : "", - "pool_password" : "nixos", - "use_nicehash" : false, - "use_tls" : true, - "tls_fingerprint" : "", - "pool_weight" : 23 - }, - ], - '''; - } - ''; - description = '' - Content of config files like config.txt, pools.txt or cpu.txt. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.xmr-stak = { - wantedBy = [ "multi-user.target" ]; - bindsTo = [ "network-online.target" ]; - after = [ "network-online.target" ]; - - preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: '' - ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}' - '')); - - serviceConfig = let rootRequired = cfg.openclSupport; in { - ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}"; - # xmr-stak generates cpu and/or gpu configuration files - WorkingDirectory = "/tmp"; - PrivateTmp = true; - DynamicUser = !rootRequired; - LimitMEMLOCK = toString (1024*1024); - }; - }; - }; - - imports = [ - (mkRemovedOptionModule ["services" "xmr-stak" "configText"] '' - This option was removed in favour of `services.xmr-stak.configFiles` - because the new config file `pools.txt` was introduced. You are - now able to define all other config files like cpu.txt or amd.txt. - '') - ]; -} diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix deleted file mode 100644 index 81f35447863c..000000000000 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, fetchpatch -, fetchFromGitHub, cmake, libmicrohttpd, openssl -, opencl-headers, ocl-icd, hwloc -, devDonationLevel ? "0.0" -, openclSupport ? true -}: - -stdenv.mkDerivation rec { - pname = "xmr-stak"; - version = "2.10.8"; - - src = fetchFromGitHub { - owner = "fireice-uk"; - repo = "xmr-stak"; - rev = version; - sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj"; - }; - - env.NIX_CFLAGS_COMPILE = "-O3"; - - patches = [ (fetchpatch { - name = "fix-libmicrohttpd-0-9-71.patch"; - url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch"; - excludes = [ "CMakeLists.txt.user" ]; - hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0="; - }) ]; - - cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] - ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd openssl hwloc ] - ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; - - postPatch = '' - substituteInPlace xmrstak/donate-level.hpp \ - --replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}' - ''; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "Unified All-in-one Monero miner"; - homepage = "https://github.com/fireice-uk/xmr-stak"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ bfortz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..69db976b12b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1478,6 +1478,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xmlada = gnatPackages.xmlada; # Added 2024-02-25 + xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..348486bf37e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32423,8 +32423,6 @@ with pkgs; monitorcontrol = callPackage ../applications/misc/monitorcontrol { }; - xmr-stak = callPackage ../applications/misc/xmr-stak { }; - xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { }; From c3391ff0010eff82470a3ad2ca34068ff4526b88 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 10:33:34 +0300 Subject: [PATCH 394/562] nixos-alsa: remove `with lib;`, fix undefined references --- nixos/modules/services/audio/alsa.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 47cf094d8c74..fac0012b666d 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -1,15 +1,13 @@ # ALSA sound support. { config, lib, pkgs, ... }: -with lib; - { imports = [ - (mkRemovedOptionModule [ "sound" ] "The option was heavily overloaded and can be removed from most configurations.") + (lib.mkRemovedOptionModule [ "sound" ] "The option was heavily overloaded and can be removed from most configurations.") ]; - options.hardware.alsa.enablePersistence = mkOption { - type = types.bool; + options.hardware.alsa.enablePersistence = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable ALSA sound card state saving on shutdown. @@ -17,9 +15,9 @@ with lib; ''; }; - config = mkIf config.hardware.alsa.enablePersistence { + config = lib.mkIf config.hardware.alsa.enablePersistence { # ALSA provides a udev rule for restoring volume settings. - services.udev.packages = [ alsa-utils ]; + services.udev.packages = [ pkgs.alsa-utils ]; systemd.services.alsa-store = { description = "Store Sound Card State"; @@ -32,8 +30,8 @@ with lib; Type = "oneshot"; RemainAfterExit = true; ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa"; - ExecStart = "${alsa-utils}/sbin/alsactl restore --ignore"; - ExecStop = "${alsa-utils}/sbin/alsactl store --ignore"; + ExecStart = "${pkgs.alsa-utils}/sbin/alsactl restore --ignore"; + ExecStop = "${pkgs.alsa-utils}/sbin/alsactl store --ignore"; }; }; }; From 1369570e0623401fae166c48e7c32341e842e6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:35:08 +0200 Subject: [PATCH 395/562] pivxd: remove --- .../applications/blockchains/pivx/default.nix | 79 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 9 --- 3 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 pkgs/applications/blockchains/pivx/default.nix diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix deleted file mode 100644 index 9e6894d760d4..000000000000 --- a/pkgs/applications/blockchains/pivx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, pkg-config -, autoreconfHook -, wrapQtAppsHook -, openssl -, db48 -, boost -, zlib -, miniupnpc -, gmp -, qrencode -, glib -, protobuf -, yasm -, libevent -, util-linux -, qtbase -, qttools -, enableUpnp ? false -, disableWallet ? false -, disableDaemon ? false -, withGui ? false -}: - -stdenv.mkDerivation rec { - pname = "pivx"; - version = "4.1.1"; - - src = fetchFromGitHub { - owner = "PIVX-Project"; - repo = "PIVX"; - rev = "v${version}"; - sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.optionals withGui [ wrapQtAppsHook ]; - - buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] - ++ lib.optionals withGui [ qtbase qttools qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optional enableUpnp "--enable-upnp-default" - ++ lib.optional disableWallet "--disable-wallet" - ++ lib.optional disableDaemon "--disable-daemon" - ++ lib.optionals withGui [ - "--with-gui=yes" - "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin" - ]; - - enableParallelBuilding = true; - doCheck = true; - postBuild = '' - mkdir -p $out/share/applications $out/share/icons - cp contrib/debian/pivx-qt.desktop $out/share/applications/ - cp share/pixmaps/*128.png $out/share/icons/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/test_pivx - ''; - - meta = with lib; { - broken = true; - description = "Open source crypto-currency focused on fast private transactions"; - longDescription = '' - PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with - ultra fast transactions, low fees, high network decentralization, and - Zero Knowledge cryptography proofs for industry-leading transaction anonymity. - ''; - license = licenses.mit; - homepage = "https://pivx.org"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..baf9bff769f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1114,6 +1114,8 @@ mapAliases ({ pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 + pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..b9bf07daef13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35685,15 +35685,6 @@ with pkgs; nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx { - withGui = false; - qtbase = null; - qttools = null; - wrapQtAppsHook = null; - autoreconfHook = buildPackages.autoreconfHook269; - }; - ethabi = callPackage ../applications/blockchains/ethabi { }; pycoin = with python3Packages; toPythonApplication pycoin; From 0bcfd8e38d360ba14d7b9e85ab4e6a5efcf76d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:43:48 +0200 Subject: [PATCH 396/562] tumpa: remove --- pkgs/applications/misc/tumpa/default.nix | 42 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/applications/misc/tumpa/default.nix diff --git a/pkgs/applications/misc/tumpa/default.nix b/pkgs/applications/misc/tumpa/default.nix deleted file mode 100644 index cc73b7fa6901..000000000000 --- a/pkgs/applications/misc/tumpa/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, wrapQtAppsHook -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tumpa"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "kushaldas"; - repo = "tumpa"; - rev = "v${version}"; - hash = "sha256-sT+IasupBxkfYoOULRvG429ZHA94uAJoYfFd1Whs0J4="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - setuptools - johnnycanencrypt - pyside2 - ]; - - nativeBuildInputs = [ - wrapQtAppsHook - ]; - - dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - doCheck = false; - - meta = with lib; { - description = "OpenPGP key creation and smartcard access"; - homepage = "https://github.com/kushaldas/tumpa"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ _0x4A6F ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..7664574edace 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1376,6 +1376,7 @@ mapAliases ({ trezor_agent = trezor-agent; # Added 2024-01-07 trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 + tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 tvbrowser-bin = tvbrowser; # Added 2023-03-02 typst-fmt = typstfmt; # Added 2023-07-15 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc3b24d45590..55be78496303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34548,10 +34548,6 @@ with pkgs; tudu = callPackage ../applications/office/tudu { }; - tumpa = callPackage ../applications/misc/tumpa { - inherit (pkgs.libsForQt5) wrapQtAppsHook; - }; - tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; tunefish = callPackage ../applications/audio/tunefish { From 0a043133084f735fb009333c56331649a783c8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jul 2024 00:49:34 -0700 Subject: [PATCH 397/562] python312Packages.solaredge: drop --- .../python-modules/solaredge/default.nix | 38 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/python-modules/solaredge/default.nix diff --git a/pkgs/development/python-modules/solaredge/default.nix b/pkgs/development/python-modules/solaredge/default.nix deleted file mode 100644 index 1d942f8ca6ac..000000000000 --- a/pkgs/development/python-modules/solaredge/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python-dateutil, - pythonOlder, - pytz, - requests, -}: - -buildPythonPackage rec { - pname = "solaredge"; - version = "0.0.4"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz"; - }; - - propagatedBuildInputs = [ - python-dateutil - pytz - requests - ]; - - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "solaredge" ]; - - meta = with lib; { - description = "Python wrapper for Solaredge monitoring service"; - homepage = "https://github.com/bertouttier/solaredge"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4b887b0e4249..24afbe6eafd1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -521,6 +521,7 @@ mapAliases ({ smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smpp_pdu = smpp-pdu; # added 2024-03-05 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 + solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 spacy_models = spacy-models; # added 2024-04-21 SPARQLWrapper = sparqlwrapper; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f5156b3fc55..61395628a1c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14401,8 +14401,6 @@ self: super: with self; { softlayer = callPackage ../development/python-modules/softlayer { }; - solaredge = callPackage ../development/python-modules/solaredge { }; - solax = callPackage ../development/python-modules/solax { }; solc-select = callPackage ../development/python-modules/solc-select { }; From a94ad5c533681f0ec84275fe419d38f4d9435279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:19:34 +0000 Subject: [PATCH 398/562] organicmaps: 2024.06.19-3 -> 2024.07.08-3 --- pkgs/applications/misc/organicmaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index d21e306c8a7a..4230b3e2799a 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.06.19-3"; + version = "2024.07.08-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-LB3yLBoO6nXRvfuWWB2JofeAgQQFtEgqNo2QFQ3k/vc="; + hash = "sha256-+mug3KH5uyiRyp3vG+GeK/+kq6keHU8SOuQ0010nZhY="; fetchSubmodules = true; }; From 4a5cc1d9aef7d01db529ac01603cff81efedcc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jul 2024 00:54:49 -0700 Subject: [PATCH 399/562] python312Packages.miniaudio: 1.59 -> 1.60 Diff: https://github.com/irmen/pyminiaudio/compare/refs/tags/v1.59...v1.60 Changelog: https://github.com/irmen/pyminiaudio/releases/tag/v1.60 --- .../python-modules/miniaudio/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index ce4638f6e3ba..527bd34728e8 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -2,8 +2,8 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, + setuptools, miniaudio, cffi, pytestCheckHook, @@ -24,41 +24,41 @@ let in buildPythonPackage rec { pname = "miniaudio"; - version = "1.59"; - - disabled = pythonOlder "3.6"; - - format = "setuptools"; + version = "1.60"; + pyproject = true; src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-tMQOGqEThtownW3cnNpCzWye0Uo/Es7E8abVySo1QnQ="; + hash = "sha256-Bw9zq98RJmfp6KoZ43SNsh7vVrhUe6GNzcM4flxPJ60="; }; postPatch = '' rm -r miniaudio ln -s ${miniaudio'} miniaudio substituteInPlace build_ffi_module.py \ - --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; substituteInPlace miniaudio.c \ - --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; ''; + build-system = [ setuptools ]; + buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "miniaudio" ]; meta = with lib; { + changelog = "https://github.com/irmen/pyminiaudio/releases/tag/v${version}"; description = "Python bindings for the miniaudio library and its decoders"; homepage = "https://github.com/irmen/pyminiaudio"; license = licenses.mit; From b05c8baed0f3a4e5310755b3790b9f855a1ac54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jul 2024 01:04:45 -0700 Subject: [PATCH 400/562] imagemagick: 7.1.1-34 -> 7.1.1-35 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-34...7.1.1-35 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0819a314bd27..0486e7e424cc 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -51,13 +51,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-34"; + version = "7.1.1-35"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU="; + hash = "sha256-ac0xvCwwH/qsdewBAO6POcPY74kBPkcnW6ywVvnegKw="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 0bcf999487495f4213980fd40c97f1be86e6b954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:58:37 +0200 Subject: [PATCH 401/562] hyprspace: remove --- .../networking/hyprspace/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/applications/networking/hyprspace/default.nix diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix deleted file mode 100644 index 77a310742062..000000000000 --- a/pkgs/applications/networking/hyprspace/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, iproute2mac }: - -buildGoModule rec { - pname = "hyprspace"; - version = "0.2.2"; - - propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; - }; - - vendorHash = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; - - meta = with lib; { - description = "Lightweight VPN Built on top of Libp2p for Truly Distributed Networks"; - homepage = "https://github.com/hyprspace/hyprspace"; - license = licenses.asl20; - maintainers = with maintainers; [ yusdacra ]; - platforms = platforms.linux ++ platforms.darwin; - broken = true; # build fails with go > 1.17 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c531a2a06b4c..59de9528762a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -600,6 +600,7 @@ mapAliases ({ hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 ht-rust = xh; # Added 2021-02-13 hydra-unstable = hydra_unstable; # added 2022-05-10 + hyprspace = throw "hyprspace has been removed from nixpkgs because it is broken"; # Added 2024-07-15 hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 hyper-haskell-server-with-packages = throw "'hyper-haskell-server-with-packages' has been removed. reason: has been broken for a long time"; # Added 2024-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9450e906fa82..74286c58766d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25491,10 +25491,6 @@ with pkgs; hydron = callPackage ../servers/hydron { }; - hyprspace = callPackage ../applications/networking/hyprspace { - inherit (darwin) iproute2mac; - }; - ic-keysmith = callPackage ../tools/security/ic-keysmith { }; icecream = callPackage ../servers/icecream { }; From e58cfebe72e63b4309a9b910207a45846d4af3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 10:18:49 +0200 Subject: [PATCH 402/562] {ib-tws,ib-controller}: remove --- .../office/ib/controller/default.nix | 165 ------------------ pkgs/applications/office/ib/tws/default.nix | 96 ---------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 2 insertions(+), 265 deletions(-) delete mode 100644 pkgs/applications/office/ib/controller/default.nix delete mode 100644 pkgs/applications/office/ib/tws/default.nix diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix deleted file mode 100644 index c0f49a516311..000000000000 --- a/pkgs/applications/office/ib/controller/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, jdk, ib-tws, xpra }: - -stdenv.mkDerivation rec { - version = "2.14.0"; - pname = "ib-controller"; - - src = fetchFromGitHub { - owner = "ib-controller"; - repo = "ib-controller"; - rev = version; - sha256 = "sha256-R175CKb3uErjBNe73HEFMI+bNmmuH2nWGraCSh5bXwc="; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ jdk ib-tws ]; - - installPhase = '' - mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController - cp resources/*.jar $out/share/IBController/. - cp resources/*.ini $out/etc/ib/controller/. - classpath="" - for jar in ${ib-tws}/share/IBJts/*.jar; do - classpath="$classpath:$jar" - done - for jar in $out/share/IBController/*.jar; do - classpath="$classpath:$jar" - done - # strings to use below; separated to avoid nix specific substitutions - javaOptions={JAVA_OPTIONS:--Xmx1024M} - ibProfileDir={IB_PROFILE_DIR:-~/IB/} - cat< $out/bin/ib-tws-c - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi - if [[ \$1 == "-q" ]]; then - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null - fi - exit 0 - fi - if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then - ( sleep infinity ) & - WAIT_DUMMY_PID=\$! - ( trap "" INT; - DISPLAYNUM=100 - while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done - mkdir -p \$IB_USER_PROFILE/xpra - cd \$IB_USER_PROFILE - nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ - --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ - && kill \$WAIT_DUMMY_PID &> /dev/null \ - && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBController \$IB_USER_PROFILE/IBController.ini" \ - --exit-with-children \ - --no-pulseaudio \ - --no-mdns \ - --no-notification \ - --no-daemon \ - &> \$IB_USER_PROFILE/xpra/server.log - rm -f \$IB_USER_PROFILE/xpra/run - rm -f /tmp/.X\$DISPLAYNUM-lock - ) & - wait \$WAIT_DUMMY_PID - exit 0 - fi - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --windows \ - --no-speaker \ - --no-microphone \ - --no-tray \ - --title="\$IB_USER_PROFILE_TITLE: @title@" \ - &> \$IB_USER_PROFILE/xpra/client.log - fi - EOF - chmod u+x $out/bin/ib-tws-c - cat< $out/bin/ib-gw-c - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi - if [[ \$1 == "-q" ]]; then - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null - fi - exit 0 - fi - if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then - ( sleep infinity ) & - WAIT_DUMMY_PID=\$! - ( trap "" INT; - DISPLAYNUM=100 - while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done - mkdir -p \$IB_USER_PROFILE/xpra - cd \$IB_USER_PROFILE - nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ - --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ - && kill \$WAIT_DUMMY_PID &> /dev/null \ - && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBGatewayController \$IB_USER_PROFILE/IBController.ini" \ - --exit-with-children \ - --no-pulseaudio \ - --no-mdns \ - --no-notification \ - --no-daemon \ - &> \$IB_USER_PROFILE/xpra/server.log - rm -f \$IB_USER_PROFILE/xpra/run - rm -f /tmp/.X\$DISPLAYNUM-lock - ) & - wait \$WAIT_DUMMY_PID - exit 0 - fi - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --windows \ - --no-speaker \ - --no-microphone \ - --no-tray \ - --title="\$IB_USER_PROFILE_TITLE: @title@" \ - &> \$IB_USER_PROFILE/xpra/client.log - fi - EOF - chmod u+x $out/bin/ib-gw-c - ''; - - - meta = with lib; { - description = "Automation Controller for the Trader Work Station of Interactive Brokers"; - broken = true; # Ref: https://github.com/NixOS/nixpkgs/issues/40784 - homepage = "https://github.com/ib-controller/ib-controller"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix deleted file mode 100644 index ff8e40199c96..000000000000 --- a/pkgs/applications/office/ib/tws/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv, requireFile, jdk }: - -stdenv.mkDerivation rec { - version = "9542"; - pname = "ib-tws"; - - src = requireFile rec { - name = "ibtws_${version}.jar"; - message = '' - This nix expression requires that ${name} is already part of the store. - Download the TWS from - https://download2.interactivebrokers.com/download/unixmacosx_latest.jar, - rename the file to ${name}, and add it to the nix store with - "nix-prefetch-url file://\$PWD/${name}". - ''; - sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; - }; - - buildInputs = [ jdk ]; - - buildPhase = '' - jar -xf IBJts/jts.jar - cp trader/common/images/ibapp_icon.gif ibtws_icon.gif - ''; - - unpackPhase = '' - jar xf ${src} - ''; - - installPhase = '' - mkdir -p $out $out/bin $out/etc/ib/tws $out/share/IBJts $out/share/icons - cp IBJts/*.jar $out/share/IBJts/. - cp IBJts/*.ini $out/etc/ib/tws/. - cp ibtws_icon.gif $out/share/icons/. - classpath="" - for jar in $out/share/IBJts/*.jar; do - classpath="$classpath:$jar" - done - # strings to use below; separated to avoid nix specific substitutions - javaOptions={JAVA_OPTIONS:-'-Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dsun.java2d.xrender=True -Dsun.java2d.opengl=False'} - # OTHER JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java - ibProfileDir={IB_PROFILE_DIR:-~/IB/} - cat< $out/bin/ib-tws - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - ${jdk}/bin/java -cp $classpath \$$javaOptions jclient.LoginFrame \$IB_USER_PROFILE - EOF - chmod u+x $out/bin/ib-tws - cat< $out/bin/ib-gw - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - ${jdk}/bin/java -cp $classpath -Dsun.java2d.noddraw=true \$$javaOptions ibgateway.GWClient \$IB_USER_PROFILE - EOF - chmod u+x $out/bin/ib-gw - ''; - - meta = with lib; { - description = "Trader Work Station of Interactive Brokers"; - broken = true; # Ref: https://github.com/NixOS/nixpkgs/issues/40784 - homepage = "https://www.interactivebrokers.com"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d59992da0c0f..c125f7efc364 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -606,6 +606,8 @@ mapAliases ({ ### I ### i3-gaps = i3; # Added 2023-01-03 + ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 + ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d810788feb8c..9c88af594fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39701,10 +39701,6 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi { }; - ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; - - ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vcluster = callPackage ../applications/networking/cluster/vcluster { }; sshportal = callPackage ../servers/sshportal { }; From b59deeee5bc7c39983e03021fd41075508b3b304 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Jul 2024 10:23:45 +0200 Subject: [PATCH 403/562] displaylink: update the help message --- pkgs/os-specific/linux/displaylink/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 016ec76efcdc..024cf5299b24 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu6.0-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} + + Alternatively, you can use the following command to download the + file directly: + + nix-prefetch-url --name ${name} https://www.synaptics.com/sites/default/files/exe_files/2024-05/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu6.0-EXE.zip ''; }; From 35e972e3a41a5fa6d3f58259aa9c66ac8e2bed9e Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Mon, 17 Jun 2024 22:31:12 +0200 Subject: [PATCH 404/562] vimPluginsUpdater: make development easier `nix develop .#vimPluginsUpdater` now lets you enter a shell where you can run `pkgs/applications/editors/vim/plugins/update.py` and iteratively develop ! - removed `warn` warning from python by using `warning` instead - `plugin2nix` was calling the same bit of code over and over thus slowing down the generator by a lot --- maintainers/scripts/__init__.py | 0 maintainers/scripts/pluginupdate.py | 14 +++-- .../editors/vim/plugins/update.py | 56 +++++++++++-------- .../editors/vim/plugins/updater.nix | 16 +++--- .../lua-modules/updater/updater.py | 2 +- 5 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 maintainers/scripts/__init__.py diff --git a/maintainers/scripts/__init__.py b/maintainers/scripts/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index ce4f55ae1e3c..2e38023301a0 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -142,7 +142,7 @@ class Repo: return loaded def prefetch(self, ref: Optional[str]) -> str: - print("Prefetching") + print("Prefetching %s", self.uri) loaded = self._prefetch(ref) return loaded["sha256"] @@ -266,6 +266,7 @@ class PluginDesc: @staticmethod def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc": + log.debug("Loading row %s", row) branch = row["branch"] repo = make_repo(row["repo"], branch.strip()) repo.token = config.github_token @@ -328,7 +329,7 @@ def load_plugins_from_csv( -def run_nix_expr(expr, nixpkgs: str): +def run_nix_expr(expr, nixpkgs: str, **args): ''' :param expr nix expression to fetch current plugins :param nixpkgs Path towards a nixpkgs checkout @@ -347,7 +348,7 @@ def run_nix_expr(expr, nixpkgs: str): nix_path, ] log.debug("Running command: %s", " ".join(cmd)) - out = subprocess.check_output(cmd, timeout=90) + out = subprocess.check_output(cmd, **args) data = json.loads(out) return data @@ -736,6 +737,7 @@ def rewrite_input( redirects: Redirects = {}, append: List[PluginDesc] = [], ): + log.info("Rewriting input file %s", input_file) plugins = load_plugins_from_csv( config, input_file, @@ -744,10 +746,14 @@ def rewrite_input( plugins.extend(append) if redirects: + log.debug("Dealing with deprecated plugins listed in %s", deprecated) + cur_date_iso = datetime.now().strftime("%Y-%m-%d") with open(deprecated, "r") as f: deprecations = json.load(f) + # TODO parallelize this step for pdesc, new_repo in redirects.items(): + log.info("Rewriting input file %s", input_file) new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias) old_plugin, _ = prefetch_plugin(pdesc) new_plugin, _ = prefetch_plugin(new_pdesc) @@ -791,7 +797,7 @@ def update_plugins(editor: Editor, args): start_time = time.time() redirects = update() duration = time.time() - start_time - print(f"The plugin update took {duration}s.") + print(f"The plugin update took {duration:.2f}s.") editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects) autocommit = not args.no_commit diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index e7e50c21d475..a8525b9018b5 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -40,7 +40,9 @@ ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe import pluginupdate import importlib from pluginupdate import run_nix_expr, PluginDesc -import treesitter + +treesitter = importlib.import_module('nvim-treesitter.update') + HEADER = ( @@ -54,14 +56,37 @@ class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False def generate_nix( - self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str + self, + plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], + outfile: str ): + log.info("Generating nix code") sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) + log.debug("Loading nvim-treesitter revision from nix...") nvim_treesitter_rev = pluginupdate.run_nix_expr( - "(import { }).vimPlugins.nvim-treesitter.src.rev", self.nixpkgs + "(import { }).vimPlugins.nvim-treesitter.src.rev", + self.nixpkgs, + timeout=10 ) + GET_PLUGINS_LUA = """ + with import {}; + lib.attrNames lua51Packages""" + log.debug("Loading list of lua plugins...") + luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs, timeout=30) + + def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + """ + Whether it's a neovim-only plugin + We can check if it's available in lua packages + """ + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + with open(outfile, "w+") as f: + log.debug("Writing to %s", outfile) f.write(HEADER) f.write( textwrap.dedent( @@ -74,7 +99,7 @@ class VimEditor(pluginupdate.Editor): ) ) for pdesc, plugin in sorted_plugins: - content = self.plugin2nix(pdesc, plugin) + content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin)) f.write(content) if ( plugin.name == "nvim-treesitter" @@ -84,27 +109,10 @@ class VimEditor(pluginupdate.Editor): f.write("\n}\n") print(f"updated {outfile}") - def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: - GET_PLUGINS_LUA = """ - with import {}; - lib.attrNames lua51Packages""" - luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs) + def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str: repo = pdesc.repo - def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: - """ - Whether it's a neovim-only plugin - We can check if it's available in lua packages - """ - # global luaPlugins - if plug.normalized_name in luaPlugins: - log.debug("%s is a neovim plugin", plug) - return True - return False - - isNeovim = _isNeovimPlugin(plugin) - content = f" {plugin.normalized_name} = " src_nix = repo.as_nix(plugin) content += """{buildFn} {{ @@ -159,8 +167,8 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - log.debug(f"Loading from {ROOT}/../get-plugins.nix") - with open(f"{ROOT}/../get-plugins.nix") as f: + log.debug(f"Loading from {ROOT}/get-plugins.nix") + with open(f"{ROOT}/get-plugins.nix") as f: GET_PLUGINS = f.read() editor = VimEditor( "vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS diff --git a/pkgs/applications/editors/vim/plugins/updater.nix b/pkgs/applications/editors/vim/plugins/updater.nix index afa245d9be9e..00fb8b8dedc5 100644 --- a/pkgs/applications/editors/vim/plugins/updater.nix +++ b/pkgs/applications/editors/vim/plugins/updater.nix @@ -7,14 +7,14 @@ , nurl # optional -, vimPlugins -, neovim +, neovim-unwrapped }: buildPythonApplication { - format = "other"; pname = "vim-plugins-updater"; version = "0.1"; + format = "other"; + nativeBuildInputs = [ makeWrapper python3Packages.wrapPython @@ -29,16 +29,18 @@ buildPythonApplication { installPhase = '' mkdir -p $out/bin $out/lib cp ${./update.py} $out/bin/vim-plugins-updater - cp ${./get-plugins.nix} $out/get-plugins.nix - cp ${./nvim-treesitter/update.py} $out/lib/treesitter.py - cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + cp ${./get-plugins.nix} $out/bin/get-plugins.nix # wrap python scripts makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ - nix nix-prefetch-git neovim nurl ]}" --prefix PYTHONPATH : "$out/lib" ) + nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts}" ) wrapPythonPrograms ''; + shellHook = '' + export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts:$PYTHONPATH + ''; + meta.mainProgram = "vim-plugins-updater"; } diff --git a/pkgs/development/lua-modules/updater/updater.py b/pkgs/development/lua-modules/updater/updater.py index f0a91a313919..335e15c44427 100755 --- a/pkgs/development/lua-modules/updater/updater.py +++ b/pkgs/development/lua-modules/updater/updater.py @@ -177,7 +177,7 @@ def generate_pkg_nix(plug: LuaPlugin): "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name ) - log.warn(msg) + log.warning(msg) log.debug("Updating from rockspec %s", plug.rockspec) cmd.append(plug.rockspec) From bb439c319100bb9c9c27d9bc61d7f7ad69e446ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 08:44:44 +0000 Subject: [PATCH 405/562] python312Packages.python-gitlab: 4.6.0 -> 4.7.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 8d7d40c4a734..571ce5d5148d 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-tWrjY4kDdMrt6FPvVS6SxBVR1gWADeHGS6YbzyXyN7A="; + hash = "sha256-t5jN29nRZreVcebWyXVCl40KOV3lcWnHCX0JIQp2am0="; }; nativeBuildInputs = [ setuptools ]; From 2083cdd4b334df1f8f87de108efad52f5d6b70eb Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Mon, 15 Jul 2024 12:51:27 +0400 Subject: [PATCH 406/562] atlauncher: 3.4.36.9 -> 3.4.36.10 Changelog: Fixes - Issue with NeoForge searching on Modrinth not working correctly --- pkgs/by-name/at/atlauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 876b68fa86a1..254c2374e604 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -22,11 +22,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.9"; + version = "3.4.36.10"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-2kO7CRkA3RlWcNqv2d5sJIaLPupUU0ox2wc3T16i7e8="; + hash = "sha256-JZTiYcea5ik8a4RmNLxZcuea7spGWftUGRiRW2Ive7c="; }; env.ICON = fetchurl { From 4082aa53c5ca698f4564aab0c4daef548a4ee312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 09:02:58 +0000 Subject: [PATCH 407/562] python312Packages.litellm: 1.41.19 -> 1.41.21 --- pkgs/development/python-modules/litellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index a3094b8310a8..611c957abc42 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.41.19"; + version = "1.41.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-IM91EHrfgYdsG+/9Ro/SV0Dko1dc7KOLDU76ar7/lew="; + hash = "sha256-JVW60jq+C/eSaB5E6D/1cTE9LOqz/HT+bV9KJKdN+zs="; }; build-system = [ poetry-core ]; From bb430608c7354cd3b76e48236b3a292e0bf43780 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Mon, 15 Jul 2024 10:59:23 +0530 Subject: [PATCH 408/562] inferno: 0.11.18 -> 0.11.20 Diff: https://github.com/jonhoo/inferno/compare/v0.11.18...v0.11.20 Changelog: https://github.com/jonhoo/inferno/blob/v0.11.20/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/development/tools/inferno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 4e8351cb4ddf..9657129fd0cb 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.18"; + version = "0.11.20"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-JP0n1sepH9kFOdrKTmt7Q79pe4GQInYKQH3xi2/G59s="; + hash = "sha256-+A27B50hRAQvk0QrcCP0QQe6zJkVUIX7qggL8kjJmQY="; fetchSubmodules = true; }; - cargoHash = "sha256-YCa4WL2sgdITKfdfH3PGdiRHbSkE6JSJRHipaN00GwA="; + cargoHash = "sha256-XmxB18IQh2Bvbez6BowoV+P0qghmOcHpC0ZH4PgsIZo="; # skip flaky tests checkFlags = [ From 5d2257ba7b6d351dfc6fffb265a6f5fddf7f6727 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 14 Jul 2024 12:12:06 +0100 Subject: [PATCH 409/562] doc/vim.section.md: fix references to the old update.py script Running the `update.py` script directly doesn't work anymore, so instead replace all usages of it in the documentation with `nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater'`. --- doc/languages-frameworks/vim.section.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index ea10d5045583..ffca98cabced 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -226,18 +226,18 @@ Some plugins require overrides in order to function properly. Overrides are plac } ``` -Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`. +Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `nix-shell -p vimPluginsUpdater --run vim-plugins-updater` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`. -To add a new plugin, run `./update.py add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. +To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater add "[owner]/[name]"'`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. -Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. +Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. ## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs} Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py +nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_API_TOKEN environment variable ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. From c034861a469b961ee96a74b1145336573edd1b80 Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Sun, 14 Jul 2024 11:10:22 +0000 Subject: [PATCH 410/562] vimPlugins.url-open: init at 2024-02-03 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b5dd69ab4d6e..6136619be516 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -977,6 +977,7 @@ https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, +https://github.com/sontungexpt/url-open/,HEAD, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, https://github.com/KabbAmine/vCoolor.vim/,, From f591407c7524be8bdfda25b31cafc1f11b9c7cc5 Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Sun, 14 Jul 2024 11:24:46 +0000 Subject: [PATCH 411/562] vimPlugins: update on 2024-07-14 --- .../editors/vim/plugins/generated.nix | 1052 +++++++++-------- 1 file changed, 533 insertions(+), 519 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 478145cd5e72..afa194a0ed99 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-07-03"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "1f603f9074118ee9975b2af0308452ca324640e5"; - sha256 = "0p9rrhlxa1dy5ym85jhr8zxai7zng0sikf5v0ywdi09vryknygxb"; + rev = "45af7e1fed5273b027105ecf4026e4c452cc7508"; + sha256 = "0c4kcnb8h7rllsl3f9zdsqmpj37vqk2wjkr63q5q2gbc8is3ny9r"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-07-03"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ea67d004f86ac10e29708fbb4de84f72b87df612"; - sha256 = "15pdsx91cbl4ig7ph5nbrqm42l08wbs9dvn2d80p922ywm4vjxdq"; + rev = "feb7ca9c6281ee6d2954d8de3455879a31389767"; + sha256 = "1nk3dn4i0d6k52l823h3c9rj4gjg3wa2f2dhzs8fv8ywcz64kgh2"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-07-02"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b606847df9f91ab6a7d0484c2e3fae096c9fe028"; - sha256 = "13whydyh7wrw0wfpbx9sn330nybbggcks5866fqpx05zdkcv1kfc"; + rev = "37274739232b6a888be7c6ca5f1a2d58510a9a84"; + sha256 = "0r0a854z0glxjqk5g8jx55j5363vm1ldp39gssd0svj2lgqcajnk"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-07-03"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "e2250a99f7c3c0247d7e7456ee1bceb17aee1927"; - sha256 = "13152c34vzxpag8k6r3z0sk2mh1nyl3v76l893iwdi3q9hw8r9wr"; + rev = "c11f86991cd935d79b46819a15c3569c48c22da4"; + sha256 = "0wz5gdfj9nacf26435z412j1fys0fqxkdpiqpp4cp9a7i0zkqray"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -607,12 +607,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-07-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "a35fa4d732220914d620deccbc8ef68fa1bff96f"; - sha256 = "17afk45cs61zvk01kg9brl86k4czgfvsrg87zdaszw2abhxrqgi4"; + rev = "48d73c87c3c321e6298755abc5449267192d07e6"; + sha256 = "0zrwv58w4hjznjp6b4vpipamgb7ad05vv5il0xbjckxp3dq1p3nb"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -727,12 +727,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-06-17"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "ab0cb19c32181126f92b8239700cec97ba81b0fd"; - sha256 = "187glbn1lysawl4rs9rzvzqwd26yl6kkc72sabx1hs9wn3xl3x0i"; + rev = "a5468ae2ccd1b727308ac10f83bd5ec7c7e4703d"; + sha256 = "06rcj3brax6q4flkkai86drmz6xbyxgdp454cpx3q8j5yywr0h1x"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -871,12 +871,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2024-06-14"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "31fc4eb67afca6d88a98cb9a17c206d72224423e"; - sha256 = "13h8xf5f5ny2rc50z1v1kbrypx9xlbfg2l0pafkg9m05w70kmc93"; + rev = "a5337b52ab8c72ebba7785787b9eb0e66f887da1"; + sha256 = "0yzf3nvx10f69mfjhpy7cxg310hj1843bqi1jfm8fcj6f0fkaajd"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -931,12 +931,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-07-02"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7b1b30d3424b7ca0fb4d12ce3f3d1977cf7c5691"; - sha256 = "0dqq4na08bcpw2668ykcih5rw83k3a138x3a6q9i26wzmviyvkq5"; + rev = "4b0728715e674ad9c18f1519127dcaed59f9981b"; + sha256 = "07yk89s02nvr2r69rqbsjgl4rr8rr6ii33wpnha06x863f896kfj"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1052,12 +1052,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-20"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "b67ea789efd5e81692c802d2b42629db79683da1"; - sha256 = "0j16j20psjqgl4jmzh3ajrz5zzz85fs0nyg5gyp247cka5zljhr9"; + rev = "8d86d4b5dec2e35392d53a82602d4f2b12e3f014"; + sha256 = "0nf2qzzix3ddgal217bhphwr29qssz797nxl53y2i98rvxdajljn"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1112,12 +1112,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-27"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "d4ffecc3e1a34f3ed9af6362529552eee79e57c2"; - sha256 = "11k0slasxzyj1xifvlj6fy1kajnlvk5kyv05f70c7k9a3kn79jpx"; + rev = "b17df65f6d423055e9fdfa4e7f55967c03862f29"; + sha256 = "13ic9gpqfllyac4q9yxc9giq5djxfdxm22v4ljx7i1p7w05fxxfx"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1160,12 +1160,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-01-21"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "7e86edafb8c7e73699e0320f225464a298b96d12"; - sha256 = "14srra6hx5wpr4kcvfmg0bj5zljl7lr6ahq40wnwghdvy06ck5x2"; + rev = "62015330fc831306f5229f24b2db981d07f816c1"; + sha256 = "0m0bg2d8b95mq665zab30kqvy70q9x2brfyrj1jbhqsx8q6dflkl"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1220,12 +1220,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-06-14"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "e7586def35c3584f1cc71fecf3e89e53dc4a40c6"; - sha256 = "030n232cbf5fhwddf59fv4jqqwsvbks7a0xksd14sccp8p1d92gc"; + rev = "d5c046b705e9485737ebfca40824a8baca0d4e4c"; + sha256 = "1ccyqxid41zvc83mjjb9la29pa27izhvr4hbj4lghbywb9glb021"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1316,12 +1316,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-06-25"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "81820cac7c85e51e4cf179f8a66d13dbf7b032d9"; - sha256 = "1z4i45gnh71ayqxkibd7zb07k1k9y0mk6pnldbmv73nhwi9m2ypw"; + rev = "aa16dafdc642594c7ade7e88d31a6119feb189d6"; + sha256 = "0sy72k5lppdnf52m6qj7z08pc8s0bww4jimbdqhv2m6ndk3y7vin"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1448,12 +1448,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-07-03"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "b6c406e2b941abbb334388d6d3e82a737e47ae11"; - sha256 = "0lw2q6hjc6yd8p6afkswp40lgg4i5agjyj161mp05lvdp06jb05x"; + rev = "6ac53b8c303235b8cfe00eef139505f6553caaca"; + sha256 = "1kj8zdh2rag61lzkxff8srl7iwldqib18bkbibkarrvf0hh0msgn"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1472,12 +1472,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-06-22"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "cced9374c8b15eb466d67ce1c56e854abd1f0d46"; - sha256 = "1gfxnc22warpbxw6qykrc3850k3ij1zyrhx85ln57kzhsngamy5x"; + rev = "7ad0e43e0098ae8aecdce81e920688afca95631c"; + sha256 = "0x54vbip7saswfqypcfh4hw8yrn59msz196hi92gc8ldg77ana0k"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1807,12 +1807,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-05-28"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e"; - sha256 = "0n66skklf71sbnk2vbsx23nqhs5a920w6aphfa5f3i1vrch2rz5f"; + rev = "22116bdffbe68bfc6ca05d52e9f217587cbfea8b"; + sha256 = "1zmw0mxfzh6gy5lqc3zi7q1mk8m7mip1fq62j2jrxqll26nj7d6d"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -2263,12 +2263,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-05-29"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "f0ce9ae23d6ce9d0cbabe73bdb738e45accc6f08"; - sha256 = "1ddf0y0ixb9aqjwax7jsnji6yhnvs13caml47c39bgcq80s37zk5"; + rev = "51692dc1d148f67f18573d1afeb4724dc5a06506"; + sha256 = "1a0ajf8wm942y0l1bpj26kqlp51hqmxjhdlvm40ls5knna7cn8qi"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2287,36 +2287,36 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-05-03"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825"; - sha256 = "0zssbn655hqxihmswbhih5w9k75gkhyqn9bm8n9vdqihygh5g9js"; + rev = "f6a2ef32a9e923cb0104a19d3e426b0e40e49505"; + sha256 = "0cijady83i5wixjfsgv979h9iggw76d5fwr6vrrnijwdkx7im6zi"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-06-19"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "7a01ffb1e6538fe634f294908a50a7b680039284"; - sha256 = "196a66my0jy4166irhwg908dayqc2pv0yiwqgsisi8srzybacm6f"; + rev = "e0342fde9474fdd0a36ff9692fe0031b7611a19f"; + sha256 = "1s2k680k274pkn6ikw5z924847s72f8r6lhfxf32q55mc5id709y"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; codesnap-nvim = buildVimPlugin { pname = "codesnap.nvim"; - version = "2024-05-08"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; - rev = "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b"; - sha256 = "1j1qw9wr2ymwj75k3yhby2fcq81b68yxp4wvd16xnq3ivyg74r3l"; + rev = "06d8e345e7be43a5b2bd67a86a3993da91c59781"; + sha256 = "1r3z9q3a6jfz08dz9brnizn68izl8p3b5xmbj7cima1l7xik0i4j"; }; meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; @@ -2383,12 +2383,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2024-03-28"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "e4618dc08695fbf3a1171f12e0fc803ac4a3a19b"; - sha256 = "0x1wh6v11nnmi1xfy6qk5bb3riindigxnmyi407pfpb14acvl51l"; + rev = "e2a0513c91a7ebdde23cab0b6724ba05292551ff"; + sha256 = "13i1ap2g5sg5ldky4y14m7lq8y9nb697gyvicl5n8hga535ah9wm"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2600,12 +2600,12 @@ final: prev: context-vim = buildVimPlugin { pname = "context.vim"; - version = "2023-06-13"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "wellle"; repo = "context.vim"; - rev = "108644e146c864995288dee7dacf219267917ac1"; - sha256 = "0ss5yckz2yqgaxnd007bn5nfcwqx7ngbpmqbndrv6m8rl716jaxx"; + rev = "a021ba7030ccb1ef6be774f41bbf32b10605a949"; + sha256 = "06bvzs9ykyakak7dw2xh9rlrrn8vz1y9w4y85gc8kh7qhhw1j64x"; }; meta.homepage = "https://github.com/wellle/context.vim/"; }; @@ -2648,12 +2648,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-21"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "0668308e68b0ac28b332b204b469fbe04601536a"; - sha256 = "0vhcdzhrkh3rs88kh481310z9ma775za1gf7nf8fq1x0znd2455w"; + rev = "25f73977033c597d530c7ab0e211d99b60927d2d"; + sha256 = "1s1jf98kvv7rfiyxyhj3ba091rissc7n953dshpikbj2n85inlma"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2840,12 +2840,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-07-03"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "998e6562cea3f86af74c489eeaf005ae82657886"; - sha256 = "0azwqlw14ipailh6xdlvflzlc6d2r7gn0syba5rs3cd42pdgk01f"; + rev = "d96290af1c2cffcfdadb266144097e5496d08fd3"; + sha256 = "0h40diq1klsd96120ncg9w5h0p79gvczl4x74mjgd8b22gcx7m52"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2876,24 +2876,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-07-01"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "e6e33b848f0e2fe5c13f6553c568764555c390a3"; - sha256 = "14nhv9jx0f92gp49bymr5wfnsvwkfllsmb8ax9nbvj68i22baq14"; + rev = "fabf5feec96185817c732d47d363f34034212685"; + sha256 = "0lf1sxj6fjb6m5z0pf32yg5z70rvkx7s2nljm1r00zkfgqwys9s4"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-06-14"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "bc691e879a3c1c7b92f62e830d58ec3f40331fbd"; - sha256 = "0paylwmbs15vnj25nxcqn4dw7nzw3xqp7xdq2mr4p6xdhyw4akvx"; + rev = "2f918996d0429b2923f01a51bf8ef88a659800f7"; + sha256 = "1wgqriibf56961zk3nk629abc7wpybdasxr20y6n11kiwwi407g4"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3370,12 +3370,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-02-25"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "8d8bddb8814c3e7e62d80dda65a9876f97eb699c"; - sha256 = "0jj60j09k1pdkjqdfj7akxrfwpaccvc2z2r3ksj3zm1gjrnfsyi3"; + rev = "fdf503e52ec1c8aae07353604d891fe5a3ed5201"; + sha256 = "1f032gwhr92w57mb5bfsgr14ayi7qg93rvjq04cy5kwdniqg92ij"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3394,12 +3394,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-06-15"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "79847a78ec0c58f5e5c0360192b03d0cee803e95"; - sha256 = "0k92lqkqfah0xgl3yq85f1fr8pryp6cfcgglwdbsqw1jwsh37687"; + rev = "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0"; + sha256 = "14548km67rn8rgpy529iihry8sh03wrl1j8pricqy94a1fjlmghh"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3418,12 +3418,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "95d2ccf1a962445eec8640a507b97ed10d7d865b"; - sha256 = "1islv5bd1x3s7l6x0gigi3xj9k28dz18riaakjhm0sl4p70hxc3v"; + rev = "2de1aede94569f643de438391f6c8b1712038d35"; + sha256 = "0mm428spxbpknzf9s6r3sjh3xj13b4j0ymxg7sm9c9f9jqa3zdv9"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3442,12 +3442,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-06-16"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "a8bc1d24798c80a391f1a5d898a50c41a7f93883"; - sha256 = "066963g4jykzw5fg3mhv301ksc67vmjgzw0fm9izip9qrpb9i91h"; + rev = "9ea7b22048f08a1a0d49a4a789e36c2fe1b8579f"; + sha256 = "01cbbdwc4b3knyikjv860hhgvjj04z9nj9dr638d0hc5kb84bzap"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3491,12 +3491,12 @@ final: prev: elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-06-14"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "ab10b425a4d4b34447b0699bd93aa42f97bdf4b5"; - sha256 = "180h1w5aka6kz9np5l2xr6kiyw9xkj238lqcgqqv2dx7chdssxsi"; + rev = "5e7596be469be0800e9cbe3415de971f7286c3d0"; + sha256 = "09k78g85mhhcr7sgv7rx7viznc2y4fv55c3h9rq5yr43axxjsasv"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3576,12 +3576,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "752a026157f5befaf705bccbcb2ddb5b67703e03"; - sha256 = "0715aaryz76dl9sqsfd8kyz7nwk0g803h6pxnnhlxzpigq9fcs8m"; + rev = "b49ba81e79b20d2b47bb71e98fa984bae90731be"; + sha256 = "11wvr3vrz45y2d1v7h2jm7bhbbkjjx4jzjc2qgsgcvs3m68fiyrr"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3672,12 +3672,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-05-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "8bc28b94a16304aad2f53b8c3653b14803748c28"; - sha256 = "0xwzzcfbp9g7kxni5wpq621dfbv4cif9daz5brpcgh7nqd5zh76z"; + rev = "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d"; + sha256 = "0dbkjpc266j4605zp0hh4rq5sncca79s7056q6b43b971lagllcw"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3708,12 +3708,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-05-19"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "ef99df04a1c53a453602421bc0f756997edc8289"; - sha256 = "1j0s31k8dszb0sq46c492hj27w0ag2zmxy75y8204f3j80dkz68s"; + rev = "d855eed8a06531a7e8fd0684889b2943f373c469"; + sha256 = "0lb8zbncdlq91f4x8jqijpqvaigjw7f8b79milxwa11wvm25sg3y"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3769,12 +3769,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2024-06-04"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "43f67935d388fbb540f8b40e8cbfd80de54f978a"; - sha256 = "0ib7cyk4dqnm0jyq21n3d0mqljwc4s3dyb5xpkrmw1kv6k9h3m2v"; + rev = "d0799ae43a581d9f190e182e2a1f389d2887c42a"; + sha256 = "00ssl7kw2rfxvsf9gsgisf03gcyw0sfap8y71923b3rmydbgmyya"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3913,12 +3913,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-06-17"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "682157939e57bd6a2c86277dfd4d6fbfce63dbac"; - sha256 = "16fivgnm9vzsk0gqjg8xjp15lrfdlq0w9wa00344yifqvbfam9qi"; + rev = "45a1b96e46efe5fce8af325d4bed45feb9d29d0f"; + sha256 = "1dvv9r27dc5arc1s3jx5xxcjxck3rhhrjq2mb8rz743i94k7kmrd"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -4021,12 +4021,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-07-02"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "3b91c1a471160bd8620bdca8f18743d954994daa"; - sha256 = "1qapr7nhp8kz9dzkzkkqzlsv51qdkdv5zr457pgnf7rpk3bnf4yj"; + rev = "3d214f8db4a4119723ab5148b7a333aab3fa9063"; + sha256 = "14x6ncsgg8n3hica44wdywhjpvvp5z268y20f69s1vp9b8czayhp"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4213,12 +4213,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-28"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7"; - sha256 = "1xaxi3v67wdrgyclcrimcpfd1ggfb0wxxy2iz9xmqlkvc3g3aws1"; + rev = "e9c4187c3774a46df2d086a66cf3a7e6bea4c432"; + sha256 = "1v14z5qpl2bdxdim7sb6mywcqcs88mgdj1h0n7f7giy9r6l6p0q5"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4285,12 +4285,12 @@ final: prev: godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-11-11"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "09b78f294ea26af678a9ac363b7d5ce8e20b696e"; - sha256 = "0g9zp1p9rpx4bixm6hdpd7w9a483yrz73p6vfl9pn5ky0vavaz25"; + rev = "777a454e310a6b03c498727449eff3caabd70fa1"; + sha256 = "05p22qnvhspqi2vbbg8q5can36i5fyksm5x6ra2l83nv0g42fcql"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -4429,12 +4429,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "23371661bac2b7fdd9769c685e4224990c3b9ab8"; - sha256 = "0f0kpwzl614zwbrc6rc8x5cl54dhdlngg41xr19wzcklnqzbl0w1"; + rev = "91f8170a31ae6e31670629cd339df297dbd5fd5f"; + sha256 = "0xpi8h8p19dlfpq3a5xfhwpcv6z5a7cdpc2ml1yxc7d0hk1k6b7x"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4453,12 +4453,12 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-07-02"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "fa8138d25c061b9cbfacdd3f4dd1929e2a6d92ce"; - sha256 = "007i6gkbapyn2fv19yr5izfsv859qw4qnbdxfp7kv0sidkqdk47p"; + rev = "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e"; + sha256 = "0hr9yf7cn6asq39szfr6nwvq40vcyz7hv9bph51z14gjkdv67pzs"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4489,12 +4489,12 @@ final: prev: guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; - version = "2024-06-19"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "nmac427"; repo = "guess-indent.nvim"; - rev = "6c75506e71836f34fe5c5efa322dfce3e0494e7b"; - sha256 = "0pg2jbksvdh6sy1ygygiax5r1d93axmdg6n0jdk6iyfa1jlzdhrw"; + rev = "6cd61f7a600bb756e558627cd2e740302c58e32d"; + sha256 = "0gb9bgyirlgfbnfdfha7k31gfcyzc4k9a3skvaixdyxn04pgsdcv"; }; meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; @@ -4596,12 +4596,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-07-01"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "239875d842ca25d4eb7dccac574ab9a5f5271c34"; - sha256 = "1w5m248lg7c3hnm4mdrchkhxr5ack76x3dp3p4m1vgix9gl8hbl9"; + rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036"; + sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4775,12 +4775,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-05-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "7f53e1d4fdc907e808999c83ad3592e336398add"; - sha256 = "0kn3jmzicpp2r6q3p1bdv2yw32b8rpilzafs25hpryanyngbswmk"; + rev = "5462d3eb5c191ab380ca911e1e931836d27f6a79"; + sha256 = "1dxdy80447ncjrj74rvrpxwx44ygbsxblv27q3lzrk6ycbjl51hs"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4883,12 +4883,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-27"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "7d021c94e231d491355f5e724ba357ace296f06d"; - sha256 = "1fjh1w07lwngyxa7aqxbxw6x0npz6x1zb7k73q8zihrkz0xrhcln"; + rev = "61c76515cfc3cdac8123ece9e9761b20c3dc1315"; + sha256 = "1alr35537j9agj7x58fmar3di5nc7hv6rmnlqyk9js512lmfr8pz"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4919,12 +4919,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2024-06-06"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "535b508c0cb14d00c1836ad901b3c531cb1152bb"; - sha256 = "0bng09gybbcm34xdj50m32s303ips319mdh0q7va99228zyf8nib"; + rev = "8ba77017ca468f3029bf88ef409c2d20476ea66b"; + sha256 = "01rapsr481ghxg4xr3qjnvrnnyk5hyh4bcv45a6vl9j2cnz83f59"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -5087,12 +5087,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-05-17"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "c993d018d11829528b0fe91eb9ba412e453071ea"; - sha256 = "04pc9m1zw02b1yz3j2ldw78asvcr9hfyx1sdx7zxb4pcx8l6i2p5"; + rev = "e6b78ec1bc56eab63b3a9112d348b3d79836b672"; + sha256 = "05qi8klifccrdl1pv9005hiz42n2w7if192qskgx6r88p6fspds8"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5123,12 +5123,12 @@ final: prev: jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2023-12-30"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "9bd79ee41ac59a33f5890fa50b6d6a446fcc38c7"; - sha256 = "04ikd9qhhjrm0ivzn79q45g53mxcsvgnxnpi3vma2v1z3rrz413g"; + rev = "130ce7fb7910b99b494b0d7ed665e40bfb6663bd"; + sha256 = "09x0pg9i509p68by29xbfw6ral59vdj7b4dz910zcwxqdnn0kjqz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -5353,48 +5353,48 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-07-02"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "d0921f5b9b3d2c5e09618da55a018228edcc4d16"; - sha256 = "1yl852zim52mrj4ddc30pfgyrp58wjkfcvmiyncqgj1nsibhdnxz"; + rev = "b02c9eae6a250f98908c146d1dc1a891f5019f0a"; + sha256 = "077rya8jmh3i52zgkrj30pzaxammqgx7pphr38f832mrqf7c9yyq"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-26"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8"; - sha256 = "04qdq0wz0qz0p2khm6jdzxy70pdya9dfjc9ij4liphxjc3pf0c9y"; + rev = "178093a8c57c56be975118171992b5c80f041032"; + sha256 = "14zmv9474fqdrx1p252v72vp311ch9fz3hif1v13hc4f8q1k6fhi"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-05-13"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "ad3e1ea592f9d13e86e0d4e850224d9d78069508"; - sha256 = "19prmdslqjbk40wd60is27zwsspsvxi5lsk5wp9yry5s7wzjrw7x"; + rev = "dc56df433bfbf107fee0139e187eb9750878fa84"; + sha256 = "0wvbr14yv4bgb91zns60rcb6r4fl97jdhqsx8flwq3naqj5qayq6"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-07-01"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a46a28499bae49f5f0e99d04134ba4617a213304"; - sha256 = "00621vmbyvrgqpwlshmndnmflggb9jhislqqlmps8amqryq57y5w"; + rev = "182703184edb866d7bfe878be358295e189c8223"; + sha256 = "0ymkhg3hdk26i0if61l6vdmb3fy6xa7q635x8lnxi4a59f52bin8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5425,24 +5425,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-20"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "eca8108dcd5f41fbde2a674dceb58b81ed887dc8"; - sha256 = "02sgp1lv4s7szqw2awsaavlhvji8jn24g8hzj7d56y6hjl6pz1id"; + rev = "c099aecaf858574909bd38cbadb8543c4dd16611"; + sha256 = "14yxi5axkgylrwkxfhfjcfvr3zy1vwa16pxafwa6mrampjqj6s68"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-29"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "847af406e688e172934ec91ba12088ffcd497e1f"; - sha256 = "1grp39x69i6yqmcflnwxj74knsv5pdxfa096sxn7h458nbdm3pma"; + rev = "3a7a91ef7b2d95bcda088d7a80c84a0fffa1850c"; + sha256 = "0wz7fkbyw7n94c4rk3a65g9h21njrxifg5zc3kg0k2hacbskpikp"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5892,12 +5892,12 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-04-05"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0a5a66803c7407767b799067986b4dc3036e1983"; - sha256 = "1llhfs5wgv87k5hv8mdyv4qjpw37zq27488lq0j063jicxszdhar"; + rev = "6a40b530539d2209f7dc0492f3681c8c126647ad"; + sha256 = "17plr9wq4w73dhpyldn9kp97dip0xr3z02iny3mgcf1jmzsclv0l"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -5917,24 +5917,24 @@ final: prev: luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; - version = "2024-06-16"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "alvarosevilla95"; repo = "luatab.nvim"; - rev = "93504f3eda13fc925834429d4caa419d65bc6a01"; - sha256 = "138wp7qm2w0p7y02hplnl6grgi49p9r9wbxfb6brx1zgyqqcxv09"; + rev = "7bc6e0f6957fbaa93c98529f2cf28052329002e0"; + sha256 = "106sl5c38ydjfzaa56cpzkqm0k5fyszxhqvyaax6rpkhv9q7xdds"; }; meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/"; }; lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-04-18"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; - sha256 = "0cacfxrvm1fx73q5mch72gglrg6hvi39w78wgfb7dfkby1j8hl8r"; + rev = "1b66ab197b177aabc2270a2c9cb8019fa5a367df"; + sha256 = "13718awdgxas1rgxpipqk6ckjd41jf6s36f8sxn2kmqz8d07fcdd"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5953,12 +5953,12 @@ final: prev: lz-n = buildNeovimPlugin { pname = "lz.n"; - version = "2024-07-03"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lz.n"; - rev = "4c790ba2c3789f580aa019712bbe3112f85e73a0"; - sha256 = "0vwpfagpm7vik1cg4cwx0r00fqvbq2id8b78wzrr090xp2a2cz50"; + rev = "3d36b6848fc67f6a13d2a52cf4f96fd3403c0c43"; + sha256 = "11ic8hylck3dvlp6d9kzblingbi167j2kcid155x4hpc2hhqf2aj"; }; meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; }; @@ -6037,14 +6037,15 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-06-28"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "f60219dce7283192d549f21847fcf8537bf6d260"; - sha256 = "E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ="; + rev = "fca6d732085c52637a03b594922f8c8e2d831823"; + sha256 = "0ijpk536cm81rn9b7zaxabb485iv7rs7vnycrlk4ylgmlyr3h0wm"; + fetchSubmodules = true; }; - meta.homepage = "https://github.com/OXY2DEV/markview.nvim"; + meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; }; mason-lspconfig-nvim = buildVimPlugin { @@ -6073,12 +6074,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-06-01"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "0950b15060067f752fde13a779a994f59516ce3d"; - sha256 = "1g8wb8j0jn0pakskdcxif0n2gp92cl2qlrlfxphhvhixgy7kwzyg"; + rev = "f96a31855fa8aea55599cea412fe611b85a874ed"; + sha256 = "05c85cwh3jb116hh90vpkwf41riamqyg73pkyfyjpjnnh2lx9czq"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -6193,12 +6194,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-07-02"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2"; - sha256 = "0mwgyr0x21pp788k7020bb5hyj755vs7m72c7m0bh09c4f3z7aj9"; + rev = "eb19e8442edd63b033c36daf8d29c0158c9f1eb9"; + sha256 = "1vzhrp7m36v1ljkkrmjmrrqfqr2gfrp60wsf7z7n0pq16v4pw16d"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6229,12 +6230,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-20"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "8065d69e73a2623203138bca9dc436df7784ef11"; - sha256 = "0gxzl1ly9cw9lqpxrrk4k28blrq4a7vcl7jl279zm981yvpbnba5"; + rev = "0fa1e682e35d46cd1a0102cedd05b0283e41d18d"; + sha256 = "0cflg2g4alhqhfcwz14k4d634lw482xx201k3ppfgx47g45gk40s"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6265,12 +6266,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-06-08"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "181dc38ddbcf9ad94d454cb06b13c859d4ff28d1"; - sha256 = "0q6r73irr5fk4z4garfx7h15bfxlacn2qynk0gg4jjrh6my0vdy8"; + rev = "f978043c34f4e967a5496b4fa78c2ad092315b00"; + sha256 = "137pzp3i2yldarz6ynygfkm3yif1r76ahs5l9cy5bml817rhyshi"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6289,12 +6290,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-07-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "1a5360c59dc68230aac867fe262e4efc53f1b2d9"; - sha256 = "1ns9lq4bj8s2amwkj4kil3h3lkhgsf7wvyf3w9m6419svlxvzh7h"; + rev = "eb6d0fe33e14989b0f1fbe25d9732889ee57bd1a"; + sha256 = "0prm7i4fl5lbfgdk9s9n9sn05a0hrbfdjgb5g393hjjkid8f4haf"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6625,12 +6626,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-07-01"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776"; - sha256 = "0x6i732x7jxjry09fk2shn39winxgl58pjwd06v6incy1p33a9dk"; + rev = "23f24edab5f78465a0bc3320678e038664b9aa6e"; + sha256 = "1qf0n23kyfhn8db27im6zmfynjylzvmy83r132xwaiqvzhgg6319"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6661,12 +6662,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-06-04"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "02893eeb9d6e8503817bd52385e111cba9a90500"; - sha256 = "0var4hv2wdbmh4fjrhiqm6mc89hv3sn5idwdjs7k7gwd1vdk4j5y"; + rev = "46aa467dca16cf3dfe27098042402066d2ae242d"; + sha256 = "0hyn02f8cpbnnhq4570nicfjdw88kkww3il8nmy6ban8iybg7s44"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6701,8 +6702,8 @@ final: prev: src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "e1bcfc87f3566fc43b875cc714ea348c8f88931a"; - sha256 = "1rvai4z77rv6i1p1iyy49mwl7l067a295izf3wflfkq15mhq2k8b"; + rev = "a20031fb5d7d12148764764059243135085e5c9b"; + sha256 = "0wl0v9p6gwyrnpl74msdmfmkrrrqndn5pgczn998z0vnjm9vjic1"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6769,36 +6770,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-07-01"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "99b32492b836b64a5ff4544d4c466496f0aec9bd"; - sha256 = "0hjbllib07aqzb531fb9lflid3p09ny9bii8ds4fnpvkbic2wl48"; + rev = "721fd28f39ba2cb0978e410bd9a7668f8c74ccca"; + sha256 = "03g1nc3dns0svcml5qfv374hqdmp02z2v3h89gg7l52zgj38f5zp"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-06-19"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "fe255a3432ce639de7a374ccfb8602f517244dcd"; - sha256 = "0w86sh0pfff7qipjwgfqhsvm95j0hlv1srn9p2fphg1jsixfd5jm"; + rev = "b4ca2f231fdf7dd915848111e6a041fe4355009a"; + sha256 = "052yv34vz6286kkh4j2ln13y1c1sd343y8y65hg609zk7hadb4gw"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-05-27"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "a731f66f1d39ec6175fd201c5bf849e54abda99c"; - sha256 = "1f9f5gqn1kbrhwfblqcsjacm7y17qai931xmrlny7hqlv1c6a26i"; + rev = "a7f5953dbfbe7069568f2d0ed23a9709a56725ab"; + sha256 = "012jvfkmi2x28h1bpx83mbn836h576fl09zv8a25xnran78m8qwq"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6841,12 +6842,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-19"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "26ed90509c377d10dbdebd25b7094a886323b32b"; - sha256 = "1b0pw875qnisxxraxwwsb4r6b6234a3na1vhs6r1hz6h5xrxzqmf"; + rev = "32ff2ac21135a372a42b38ae131e531e64833bd3"; + sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6976,12 +6977,12 @@ final: prev: neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-07-02"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "ce8b10e4e4f670b6f79224139053679864fa810b"; - sha256 = "1hbfdv8aw4bv8a69jscr7kynd0ik0506546qsvd39mh7mr257mc1"; + rev = "b48bd1621b532106ab8d1ba18e8a7bda4463ccc6"; + sha256 = "1biqiv7l8p8ml0fslwpwrb7h2lfjh1h5dj3dw9ns27kzmd7f92i1"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7036,12 +7037,12 @@ final: prev: neotest-playwright = buildVimPlugin { pname = "neotest-playwright"; - version = "2024-06-18"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "thenbe"; repo = "neotest-playwright"; - rev = "f61463f5c74d53fc5975b7e086b7c6e9356d9215"; - sha256 = "18d9qqxqrgng373xlkiinxcp9s13zj40sjxsibhdccji75pr3ziy"; + rev = "6266945039dac27a354de33d2f2a66e75485d5e9"; + sha256 = "1gkiv2a9g80qh5h52pa6ysxjx7nxli4jvb1lcq5qyn4fnig0mrlk"; }; meta.homepage = "https://github.com/thenbe/neotest-playwright/"; }; @@ -7348,12 +7349,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-30"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "6994cf0476f1d834fb9d0b5f454b7efe650e1d24"; - sha256 = "1j16ih24yypqcsd1grd5ymczzkqd26lppdl2989mc3wwycvbvdz2"; + rev = "04501c31f77ede7d4a6d6c538c0b62e1bda9eab6"; + sha256 = "0c9bkrz3143j4pzrdyk6jpx5jih233ris9iqyfyw0qlj8q0q5wr5"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7372,12 +7373,12 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-05-30"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "caf86fbc3cf390cac8c5fba599f1500f49f622d7"; - sha256 = "0kgcrsinb1lsla9y6yf4svnbay2s75zc5yhil2j149n64ff08gqa"; + rev = "b164c148d497b843ad7c5255fee58ea8b6c5dd41"; + sha256 = "0dfxksaj0gn7x84nb4aqk0fvlb2j5wf5zxr310idsflhr10a35gi"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; @@ -7408,12 +7409,12 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-27"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "03c6a75661e68012e30b0ed81f050358b1e2233c"; - sha256 = "0164qmf3kw0nml1sy32yl0lzkbi4g9j3vvpb1lwh8hjz7nvhpp8k"; + rev = "6263b6696811f0b11c88d8d2371134b1cc1762fc"; + sha256 = "1daqavkza35an0cffxrnf1xh98wgggg4w8srad6rqkc60hcgghjc"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -7516,12 +7517,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-29"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "7b73d1111cfb41f980d25c800d86d43ad802d8b8"; - sha256 = "05llkd2l1jwcjw7cd573b2dr03zb6dgwjf6xf0a5qrj6vh9chgay"; + rev = "bf477a6bbaa13348007482fff0416f3cb92ec55c"; + sha256 = "0p541gnc3gh7zpkg8mdby45ad714kn1m71kwyj6favhm9rwi0vfl"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7564,12 +7565,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-05-19"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "c15de7e7981f1111642e7e53799e1211d4606cb9"; - sha256 = "0nd175qdh4fr0qjvdj7fa89lxhzdrf6ilc5r5vajzbfmbj72lh30"; + rev = "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d"; + sha256 = "1fdk1l449hsshj9g02kqw30rv4ab664prnhcc9gnr6zsad65cprg"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7636,12 +7637,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-06-08"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; - sha256 = "0qn7yz2nqp1k5p337nys0d2sr34ybs52s8sx4gg9krl76l91zlgf"; + rev = "7e348da6e5085ac447144a2ef4b637220ba27209"; + sha256 = "08zsm2bgi03vw18bkvv4yx0qp5fqmjn2dr52p5046s11b05dhjh4"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7660,12 +7661,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-05-18"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "8145048ae68e05f31979c13b0adf7aa99f04f4c0"; - sha256 = "1wjsgqinfrhcgcpb6vgp03h9dsc2xwpdvfbmsrgdz5b1mvwy2x8m"; + rev = "adfd1eb87e0804b6b86126e03611db6f62bb2909"; + sha256 = "19acpgh3n0ma8idl2wbgf9mb2dw9j6xv5gzdb4ya3lmkq8k8ivsz"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -7768,12 +7769,12 @@ final: prev: nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-05-27"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1"; - sha256 = "1msz8fiwsvjdda870k2y85plb4wg7xs3fh5w7hg8iwgmx6ykxh07"; + rev = "3999f0744e80d2dba5775189fc7c7a5e9846053e"; + sha256 = "1m77vqhpd0q3nqia42i3j7cpzjp83hr5fg46mqb3apak6b0mwmlq"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7792,12 +7793,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-05-28"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b7267003ba4dd860350be86f75b9d9ea287cedca"; - sha256 = "0sz6p8n58gw1mbvk6y6pjfz1pdp979msxy2za0b492wwxwqbhqln"; + rev = "a5606bc5958db86f8d92803bea7400ee26a8d7e4"; + sha256 = "1wwh70bj2798nyv5md1s2a1h3ayni8lajwzm6jby4ddx51x9fvi9"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7816,12 +7817,12 @@ final: prev: nvim-dbee = buildVimPlugin { pname = "nvim-dbee"; - version = "2024-04-24"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "kndndrj"; repo = "nvim-dbee"; - rev = "85622c8d95b53f62329627fd461c52fca7cb612b"; - sha256 = "1nhbs8lniblx4cn9x232qlg6gj0vgmyzqqw49d0994ap9fx90dc2"; + rev = "5062efbe5dfa3c0c6a51f5112c671f6625053f39"; + sha256 = "1d90f9562n9yv71xwksfy6rq4qasgbsmrh11pym264bzv7a2jjkr"; }; meta.homepage = "https://github.com/kndndrj/nvim-dbee/"; }; @@ -7888,12 +7889,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-20"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "07ea6edb98b63cb625ab4230d0479b5ccb20ebb9"; - sha256 = "049hibr0q6if429908v49gxijwpxghjph0981n70dzn2vk0ddkz0"; + rev = "8b10f06735e1ecef93be61347e6c083d5263b331"; + sha256 = "1kgaf7knjjgjnx9sgnhcgc8bdcp5kjcmqgjzs7k4flc3n740bh9j"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7924,12 +7925,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-06-07"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c6982939cdd0046a89d0849383476b69569d5462"; - sha256 = "1km15lghjs7v9b5dx9dnzqml4ay7w6s6dmidzk957i7n2j8wn1vw"; + rev = "83a6fcc41eb55db93eee37199600b547638d3a28"; + sha256 = "0bc5i88ggpr92ar6rz352psbf9xn3n87qm3yp650yssgyg8x0sqz"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7960,12 +7961,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-06-06"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d"; - sha256 = "1abrx6a3d2yd6dlykhbjwfvqw18w126qkr4y4va9xv26k78p17gw"; + rev = "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7"; + sha256 = "10178jwv5mzq4lgxpspyfvjrylxix6gpm0pcy98h8gisxz8kv0yh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -8079,12 +8080,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-07-03"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cf97d2485fc3f6d4df1b79a3ea183e24c272215e"; - sha256 = "1vs6cwa07a18p1c8q4z8gfqp7iki4qwdk10ahyv4sfgk0s1wdk9j"; + rev = "216deb2d1b5fbf24398919228208649bbf5cbadf"; + sha256 = "105a1k91gp7a73bpib3k2n07dnxx43vir6bprb18b9vdr8h6x2vr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8199,12 +8200,12 @@ final: prev: nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-06-09"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "7969e0a8ffabdf210edd7978ec954a47a737bbcc"; - sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; + rev = "a428f309119086dc78dd4b19306d2d67be884eee"; + sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -8259,12 +8260,12 @@ final: prev: nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2024-03-30"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "8dd4ffd6ee0d798026f9ad6cf04344560207b9f1"; - sha256 = "0kqd87m58ya9faijs2ldzirps5ayillfmcdgd19b342jw0q393k6"; + rev = "dd851b3a17e393b6837c26ee14fc96db9ffdef82"; + sha256 = "084vc5rfqa8k9ir5pd5rwfssmkq8yi2ndg3gr8mj2fylr14lp9z7"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; }; @@ -8343,12 +8344,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-07-01"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "965f10569d033c4e704327ef9a22d306ac20847a"; - sha256 = "0zc5dd65bcm85nwvlc9vpfzn0n7pn1xl80lm2f76nn1s4hzzxzzf"; + rev = "afc67708a5a5585553dee132ffbc4761bb135faf"; + sha256 = "14qb97g5zcdvby9w8i0mqmnhcxx23d82kjf0r6hrkmpmfwxkrhnv"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8367,24 +8368,24 @@ final: prev: nvim-snippets = buildVimPlugin { pname = "nvim-snippets"; - version = "2024-06-10"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "garymjr"; repo = "nvim-snippets"; - rev = "5c978b3ba0c504dc9f94ca93d17029f26064d229"; - sha256 = "1s8hdcwg92w0n24drknpndsjxdsy18xr3fbchdid8l002a7apnxy"; + rev = "56b4052f71220144689caaa2e5b66222ba5661eb"; + sha256 = "0a7s5rz3w8mm5gsq42g418rdhlas5ga3q5w81jix81xwkalllg6l"; }; meta.homepage = "https://github.com/garymjr/nvim-snippets/"; }; nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-06-10"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "f25299bd83f4257d0e4d00bcb90578ddd248ae3a"; - sha256 = "0cww81nmw9wmqr9zyvkkfkagjg0v7lp1nqgnkz7m59gd2mj9szvc"; + rev = "02a0ac1e16a7190a22bb6e31b15d484442bd2fdd"; + sha256 = "1cvvzkd87piydlqik6wswwlpfr84p2alwhg61xf9iss9zphyi52a"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8415,24 +8416,24 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-25"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "49fae98ef2bfa8342522b337892992e3495065d5"; - sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; + rev = "9a28f926d3371b7ef02243cbbb653a0478d06e31"; + sha256 = "156v7by8hyzrc4r1h0nrpjpb5hd4hdplysm1j4dkbzzgb478gj33"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-06-04"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "b17d85c086d963852b7e3f543e0cd187b5112bc5"; - sha256 = "0cnmmsiq3pknsa1kmh1i7qb5a97ysir86a1k10idzw3qfjffsjnz"; + rev = "c0f757f63da340636ff2be53e39eabc42f5fa727"; + sha256 = "1wf43gzp2z6i42v14mhqx9yqlj1qml2n1la9y4c8sfkahdp3xxdx"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -8487,36 +8488,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-23"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "8b2c5c678be4b49dff6a2df794877000113fd77b"; - sha256 = "160sk29hg0xqg02q26gi27h9si9ara4ljazqrd280igvh32xpyj5"; + rev = "f9ff00bc06d7cb70548a3847d7a2a05e928bc988"; + sha256 = "10vvshhl3c9vda8giqlsz3jqzn7xx8ca9c698h7q4rnbbz7s97nj"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-07-02"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6cd4ce6cab184e8787f164a182954534221f2af2"; - sha256 = "04r0gd33fkxchhnd2cdfln6g0zqn8nkad1ik5f4v06k6mk3fy729"; + rev = "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33"; + sha256 = "0bf5rsc2b017j5f027wi6ic8dydwfh3kj5ra3qm6m52dhdhy4scp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-07-02"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "cc908326c93473041d44398d5ebfa2bb4169d649"; - sha256 = "0gy1d7wmqvij8g5xrh5w1w5mr74sz0f4x704526wf8a40b7hpqz8"; + rev = "f56a1430f21334868a86eb980b12e0af55690e98"; + sha256 = "1mnzvnfr6v420nw6ys6bw29mgxf4w3fg44l3n8lrzss35jyjj0df"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8583,36 +8584,36 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-21"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1"; - sha256 = "0nyrbgr0dl85i6ycyjlrzihfqz5g2s7arndhd6vlgf5xg2yj0gdy"; + rev = "323a3e16ed603e2e17b26b1c836d1e86c279f726"; + sha256 = "0n73hwgx5ybllb2446idrphj5w4sm6zidf0rlva0cpsxl9k4glfz"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-07-03"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe"; - sha256 = "163nj4y192ik63a4c3d8z6qpxyic6xflifm5nnhq0plzws4hqnc1"; + rev = "6b5f95aa4d24f2c629a74f2c935c702b08dbde62"; + sha256 = "1fqncyiw747s6dq9kjkz4d463ni18liik8c559alx0avhfsrrp5i"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-06-06"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aa2e676af592b4e99c105d80d6eafd1afc215d99"; - sha256 = "1311x43lsfkkqa22xzqnas76p3qqhwnhz5xa77gkry5k43jnycyy"; + rev = "1b5f2838099f283857729e820cc05e2b19df7a2c"; + sha256 = "0z7n03dgbz6gsjsnncdd6xvfl8phhk2a3gg08m3w7zd1v0w3c1d5"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8715,12 +8716,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-27"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "e170641143704068233ba1d301e75684b67fc07c"; - sha256 = "06z445zphqz7icz65gajpj17c4g133kivnv59jw73d31rvja3jzj"; + rev = "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b"; + sha256 = "0af1l5dqxgq91nvbz3jx7z360c8hkhj5hhc3maixw8yh9llw97sq"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8751,24 +8752,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-23"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "7731ca4e31b32c176a383642ffcd7d593ac17774"; - sha256 = "1gfwplw9zfxlx04b9sa0ljya1900qkdd992sn771ifnmkc4zhl6f"; + rev = "aa5dfa573220a0a511a25ee14ce1570b6c23e56a"; + sha256 = "17n2c9arihdy1qh7wn133h03wm12n7jbz09gg85s29c63w6sic4x"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-02"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54"; - sha256 = "1aw3ddn2cg9h0z5cxmvpyjs29crhr4sb1yfs0481m0sprfqi6ywj"; + rev = "10fbfdd37b6904c0776c5db1a27ab47eecba335e"; + sha256 = "07dvl1n63gy3858brjz0j1d47psq93f63zhh3xhrk7j3nnapmk6j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8824,12 +8825,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-05-11"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "8e4b79b0e6495ddf29552178eceba1e147e6cecf"; - sha256 = "1xxa0q9val9hl5jby2zqn7wlh0vkibj3s8mbmj8vfba4afqlqi0q"; + rev = "fae34f7c635797f4bf62fb00e7d0516efa8abe37"; + sha256 = "1l5kvpnmp83mdm8xw28rgc26rzksywvbw978fsksxrdq0vils1ac"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8860,12 +8861,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-07-02"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "69256ee61f29727760c3d28020baf1e7b951fa12"; - sha256 = "1xy3kz5ng0lnygvgw4wb6rs40hn7j217pfv5qsdkl89jrlq9cjsf"; + rev = "f90c110a4944d8d520229d6c6bd8040bfca31a63"; + sha256 = "1ikpqmf0wng8sn37g4ci0xf0wxb1jldzdz6kw63lgg5k1qy1m3lq"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8944,12 +8945,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-02"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "7a256b5a87e8c81a034661e9904c739f89961323"; - sha256 = "096ya9zqqhdpg25xwvdn05zw0q40nk27byprfr0bq1g6q71x3535"; + rev = "95fb795a422f0455e03d13a3f83525f1d00793ad"; + sha256 = "1vkim1mjf1ccz8f1aj6ah9cp80fbfgpcf3a1imcb83dw6fklx8z1"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8968,36 +8969,36 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-07-01"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e8787988f2f51dc4678aa13c4553613fff0132b5"; - sha256 = "0a967hspxg2r8rzj02m8l0n8b6y47gg9p56jm9m5z9jgzn6s5039"; + rev = "0765951b40914ea895f644fdd18489e0c6553456"; + sha256 = "0gl4dhz7slaxc5l1734a0blwxbcjcyxpnasdr5xhrk9kachrr0zn"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-06-05"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "028e0bc8ad3d511e9fc1f0678594a608eb908ee5"; - sha256 = "1ng8pg64cvgaagx8dri172z9qwv34ld4293amy48fddm9xxgmdqw"; + rev = "2175b6da5b7b5be9de14fd3f54383a17f5e4609c"; + sha256 = "1mlk5i8xrw32038g7s67pl3xy1647ns7nb2ax59my8a9nw1ndhak"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-07-01"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "8bda5b073de30533e04f61b661cb7c22d7fa4f23"; - sha256 = "03i9lvsr01ml76l1m0dzvbgwk9k25lajmgxazqn5i282s2d6bb35"; + rev = "15b6249eaf71ebbc8bf0ed279e045f2bc1f28007"; + sha256 = "0x5gj8nrhys9qznzk32jky26ar9amhxg4axanqh7ka8xd4mifjai"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9017,12 +9018,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-02-18"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "45acce5b12ce824332d8000cc2c91805b6710446"; - sha256 = "19aaswkjx7q85c091p80zypx6az0m5z2jccapng5clvh2j4qw7qf"; + rev = "018bc10e28b00e28e239b1fff7c497304f8b1bf5"; + sha256 = "0i7hvr8gp4jf7jrds7fa8h09gs8763802j515f8l8q9pa5nnh4s6"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -9137,12 +9138,12 @@ final: prev: persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2024-06-12"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96"; - sha256 = "1hmwrr15w8ybvy8m2jrn34n5dq2svklf498k7j431mw9y1knj68v"; + rev = "1e7d01fc7f465af6c935361918bb5406cec736f9"; + sha256 = "1s5lqhs9h4giq454zx1xjqc54ywl1ps8qnvcq8c9iqzsl337a6qy"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -9301,7 +9302,7 @@ final: prev: rev = "2a566f03eb06859298eff837f3a6686dfa5304a5"; sha256 = "XLcyRB4ow5nPoQ0S29bx0utV9Z/wogg7c3rozYSqlWE="; }; - meta.homepage = "https://github.com/tris203/precognition.nvim"; + meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; presence-nvim = buildVimPlugin { @@ -9463,24 +9464,24 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-06-30"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "09fabb62d414e56ee3245c558aaedbdc662b6493"; - sha256 = "005lf0iq0gfkxvknkw727h516kd4ghd5nc9cayxayjlpvr65gnm3"; + rev = "eed598983fa4040eed77191f69462c1348770b8a"; + sha256 = "0za72ishz4gbc43887r18n7qlzayx05i5apfix1v77pn0c8fwwnr"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; quick-scope = buildVimPlugin { pname = "quick-scope"; - version = "2023-08-08"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "256d81e391a22eeb53791ff62ce65f870418fa71"; - sha256 = "037x5lrpgli46a71x05x35ig9jh8l9qsv2azx5s0g78xja6kih2d"; + rev = "4d35d3b2bc6794666353dcc241b2680bd560416f"; + sha256 = "1hllww9s2wzs7rjxi9pwi0wda8bxbhdyrf3dvxmdgfl5irv1gdlp"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -9535,11 +9536,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-06-14"; + version = "2024-07-07"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "5c9660801ce345cd3835e1947c12b54290ab7e71"; - sha256 = "0jm02hp7g5pqfrv2jr93gd4zz8v33w4cb220m7akq07gwhj7fag8"; + rev = "b29da4a6061a88270e875b38367d82c04c856128"; + sha256 = "0iy1vjp2a9w46q5cwswv8j5j06fz8898f2bh4zc8n14i2acxp1w1"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9618,24 +9619,24 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-22"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4"; - sha256 = "1fajahgd20cn75xaz4qq0dhvqr2rqr788l874n9qvk4mq4qqvnj2"; + rev = "d07218748c48e756c27aa6859bfa6e62a3d271af"; + sha256 = "14ckyn81czdiymsk8gvjjpaz10ny9232qb118fdl311q1ln794fk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2023-12-30"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "22bb98f93a423252fffeb3531f7bc12a3e07b63f"; - sha256 = "0fjzbffrg2mlkll8djbl01cwxmc3431kkng2zq3rksf73qwhik7w"; + rev = "17df665d3fd8995b69a1a434cb285a25ab22cc49"; + sha256 = "0szlfn9prqx5v36wn7bqkcasdjxfgcr0vg7k6vfm1c9h4kxbrvd0"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -9664,18 +9665,6 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; - render-markdown = buildVimPlugin { - pname = "render-markdown"; - version = "2024-07-07"; - src = fetchFromGitHub { - owner = "MeanderingProgrammer"; - repo = "markdown.nvim"; - rev = "0dfd0203e0125f959f28f03932495d0d82443b65"; - sha256 = "08fnyg1cnar5v9jw26xqq0k9qmyk2ir3snr74bps4scpjzb8cg6j"; - }; - meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/"; - }; - replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; @@ -9810,12 +9799,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-06-29"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "af4de6a35d128ce71c75a9a7846bf089aea76f50"; - sha256 = "14hxzaxsasrfridhkpsa8wva9ych633n268mlipsmibyq56i5isv"; + rev = "047f9c9d8cd2861745eb9de6c1570ee0875aa795"; + sha256 = "0q06rkg8dfzxvlwp7svp8sjkk0f2x5vvjkv6grdmm302s43jj7rk"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -10002,12 +9991,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2023-11-18"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b"; - sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z"; + rev = "21bf127e51a2d92069283c6094fc48080ecaddfb"; + sha256 = "0asrpgalvjsp8bwcc802a2q1qbsaz2c9hk71w1k9p01zy651yy08"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -10051,12 +10040,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-29"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "e186518f9d7eb4b1e43fbbe0c52bf323637194d0"; - sha256 = "01qfr9qiq39qg4d4a3wv2i6i85bwlr77l7h54xfsa3n98h93vlhh"; + rev = "95833675cd92538bf9cded1d2d58d1fc271c5428"; + sha256 = "1gsh96czf2g1g84r4fmz41b9n0vlb9j6hx15a5yvlk2bm4fk7haf"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10135,12 +10124,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "16fa31a410183ce945e58d834a74f161a2dce5aa"; - sha256 = "0sa82fcibwwp3dvakqd9wa0lkgwgi0hr89ffal2y3c37lslzvm4s"; + rev = "598d29bef1cdea1eef4749c96824af0ae2f9350c"; + sha256 = "12q9zi5vn5mvs4kl8r6wfsk4l66f7lmk9yx0acyvszl3isgyq085"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10390,12 +10379,12 @@ final: prev: pname = "startup.nvim"; version = "2023-12-20"; src = fetchFromGitHub { - owner = "startup-nvim"; + owner = "max397574"; repo = "startup.nvim"; rev = "c6ba324f9eba0c23b675b53af431346aab893268"; sha256 = "0vp4vfrlb39z4s4617v1xkzjkx6l5sxfravfj2wkkwzpjrqfs2bl"; }; - meta.homepage = "https://github.com/startup-nvim/startup.nvim/"; + meta.homepage = "https://github.com/max397574/startup.nvim/"; }; statuscol-nvim = buildVimPlugin { @@ -10412,12 +10401,12 @@ final: prev: styler-nvim = buildVimPlugin { pname = "styler.nvim"; - version = "2024-01-19"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "styler.nvim"; - rev = "2cd29996d08cec8b31270c6de64465f716ef9d71"; - sha256 = "0lml1hizypx26n80ghaibh3wkazd21phak0af5936y46c54xi2dk"; + rev = "5855bd037e0d107ae3d6a6684cd4ea99e50ac45d"; + sha256 = "11xrrypsd0gb4qmfkn3wh8d83z6x8j3737ggg80saa4vk0wvm129"; }; meta.homepage = "https://github.com/folke/styler.nvim/"; }; @@ -10436,12 +10425,12 @@ final: prev: substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2024-05-29"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "8b93e792747520b6490237b5b32963e256fbde24"; - sha256 = "1ndi6s8w5kyyzk9cjk7vq70sg3cnmgi2inpm2gfnhmv8yqy8rqbg"; + rev = "97f49d16f8eea7967d41db4f657dd63af53eeba1"; + sha256 = "017g2y3hmwa5ar778djr86x9v2nc9lg84njx82rajs6lx28a8m94"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -10458,6 +10447,18 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; + supermaven-nvim = buildVimPlugin { + pname = "supermaven-nvim"; + version = "2024-07-12"; + src = fetchFromGitHub { + owner = "supermaven-inc"; + repo = "supermaven-nvim"; + rev = "df3ecf7823a1a28fe47233c5502db513d95d5d6d"; + sha256 = "00wmbl3882j2nydy38mgcar73x7im8qyiw7svi0dcdb108yqi4xz"; + }; + meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; + }; + supertab = buildVimPlugin { pname = "supertab"; version = "2024-06-07"; @@ -10508,12 +10509,12 @@ final: prev: swift-vim = buildVimPlugin { pname = "swift.vim"; - version = "2023-08-02"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "bb62135c4364c84b56499f4b54e1a6b8eca72eec"; - sha256 = "1cgyr8hfp1dmrfxx7s0jvdrmw6cg9vw2yc4852ki3bdksmraqaj1"; + rev = "87ea6da902553c533b2916bd800ddabbfcd80973"; + sha256 = "0cbqmvliljil979w564plbvddhib1jmr8y8cin78i556317izjsv"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -10557,12 +10558,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-06-10"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "229605a2ccf36798f77eb7d1b55b5905df487162"; - sha256 = "1pdzjxrd2938r2slb67dw1hrm23dsx9h8dvx288ian040prbpyf1"; + rev = "8d0216f543c07a89897d1021213793ea7d8991a1"; + sha256 = "0pkf6z7dfahb1f286sabilj942161z442kl2fbgdgmd20v6ljy82"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10702,12 +10703,12 @@ final: prev: targets-vim = buildVimPlugin { pname = "targets.vim"; - version = "2023-02-22"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "642d3a4ce306264b05ea3219920b13ea80931767"; - sha256 = "0mwi2m75j8cxwa0nx53ivg53vc67v2ncq8gx86s8bvwyfl4249q7"; + rev = "6325416da8f89992b005db3e4517aaef0242602e"; + sha256 = "0kk80245vx544ydhdxlpaji2rj3b3q1574p9b7ywmw7bkzhcn5sf"; }; meta.homepage = "https://github.com/wellle/targets.vim/"; }; @@ -10811,12 +10812,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-21"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "f3f93253797714aecfb95ef7e25f8ff7693430b9"; - sha256 = "1kmikgn75i93ajbi9v9rdm2v2z4gnsslfq9acy2h7lrzng4z9gav"; + rev = "880e89eadbc92e9da27c85dce0b9535dcef9b057"; + sha256 = "02m2rggpxms9drvmg14m5hlc1biic482llkj8yrd2qj3gjr0hazn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -11028,12 +11029,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-06-23"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "3f565ad0c0643d6592b5c3fc44b09b4fb2badc21"; - sha256 = "0xcg0wj45ijkgrpgv6vr4qx2rpbm6v94sdjcwjv3ghh16hh1wc3n"; + rev = "9c23e2fce1c0c7445f68f7765e5f3e512920184b"; + sha256 = "1cf2pwkbdnsm8qaqizjcidn12sfgn7yamxxr87h13cy5jl9v861x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -11173,12 +11174,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-02-23"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "d62c63a4e9a996c7321885937ab89920fca2c1c8"; - sha256 = "027cgrh0xwnfgakzibzxj3wh8n8q0x5yqjsvhjgcg53pq0yfdss4"; + rev = "d6122bcf12ebca7751af4a2e082dec6ed5e95386"; + sha256 = "0rphmzj14p9h4c3m0bjryzzjc7m9lk7f7cmachhkk19qw6pqpm91"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -11281,12 +11282,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-06-12"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "51e10f838e84b4756c16311d0b1ef0972c6482d2"; - sha256 = "06kbz52ddr0nkvzm92c71wghm1kngwa3bnn329k6wl13qy2j7i09"; + rev = "d61567557e2ff5c548c74e96b2d9f8d33e5fcb34"; + sha256 = "17n42gvhrb3ia9qanqw8fczhgkzm8h497my09awbxgqcrx59ggab"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11318,12 +11319,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-07-03"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "c8177ab6fe216f121cc0c4f59e7f1ce59670ce41"; - sha256 = "00sm68wswk2gc2sgaww6x9klbdiz69sx18a9zm9r2if41ymabyzc"; + rev = "b357de8d1d8d0d90be0d7f7750c7aa7eb7f4b020"; + sha256 = "1nw4a352hhgfivf9vi2zmail0dlrvzc9d6bag7h800vaifx37han"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11366,12 +11367,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-05-28"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "f98deb33805485b56a8d44d1a27d16874af00d7f"; - sha256 = "0w20crwgnf2l8hl71hq1drif2czc2yhbac2m50lgrf6nk8s7x4i9"; + rev = "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2"; + sha256 = "0wjhhzs65myl3hrwi12v4vqgjcqdmkh5cczpx164vcxkqa0zz06p"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11415,12 +11416,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-29"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "e5d0e04121c662ce29190a57dd03655d43c59d44"; - sha256 = "1mqdsy0ainbq7rrr5jf1skw6akyr222krgajawzxbzx696hj46l0"; + rev = "03c1fbf518bef683422a3be9643c3da190903488"; + sha256 = "0rr00chkqzj2cy3fb8xsj5nlppijiax2yrr3p4mwi78wzpcbalss"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11451,12 +11452,12 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-06-10"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "c075b4ee00f6e111b44bf99a8cfd5a4cfce9258a"; - sha256 = "1w1lgd0hpslxa47iyqmfdri2agsra5sq1b7qwzpry5nidm2w81yi"; + rev = "8504d06d4f02e7ca6e65c635cef881cefba573d5"; + sha256 = "153hnprcxszbdnsc8z2yk5s8d1170xv1czsw86gq89vaw50yfdpp"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; @@ -11487,12 +11488,12 @@ final: prev: twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2023-09-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4"; - sha256 = "0j3vvj1hdsxj36pi4fnfcnj34hk26igicnvzk6xch4rwjlakqlaq"; + rev = "2b632c169a4b51b1eba5be90fde22a80c51c990e"; + sha256 = "12s5ki2ypwq99c9sr3wg5srf24b221m774dv4wd80vmwyacivcny"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -11595,12 +11596,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-07-02"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "a74d4e8cb9cd860ebd79e348f8012f57625e2239"; - sha256 = "0m8dc3lixww9x9zasxf2n6g00jimqx6mzlszmggmawhj52sg76gj"; + rev = "ce5c9feb6ef71e5a70550c8a102f39f0409c0e00"; + sha256 = "14nqi99a4y938s8g4c11zjw4zj7vz35gakxxv17p9kxnladgbgai"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11617,6 +11618,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; + url-open = buildVimPlugin { + pname = "url-open"; + version = "2024-02-03"; + src = fetchFromGitHub { + owner = "sontungexpt"; + repo = "url-open"; + rev = "9f8f4a56ac709f26aa17d8ef921b272bf2262a30"; + sha256 = "0caphlqkvz8labx54ap7nasvyx5kgsnp49zw98cvrd43hn60mrsa"; + }; + meta.homepage = "https://github.com/sontungexpt/url-open/"; + }; + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; version = "2024-06-04"; @@ -11691,12 +11704,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-07-01"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "225c0552f55b443340eaf5505f6bee3b83fad54a"; - sha256 = "1xbiq6n1p8j8sh0yx14nxynsz26rll2ax5hwrcjc6g8ahgj38sz8"; + rev = "d44bb199ed3a47891051a1d4cdd4d33b9d1267f9"; + sha256 = "0kfl7z86vzlbhvyilf8s6bdc3ppz9ab7gjiv29bpkwggaqavlc1m"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -11715,12 +11728,12 @@ final: prev: vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; - version = "2024-06-15"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "c5ae86e2b010fc4e89d16ae0512b5f01a38dfb3c"; - sha256 = "1m0r0vazqrfg0ap4q4iirgf8j75d4hrn9xa3v75kq5ab0agcihgr"; + rev = "ba8fa4202ccdcfc89362bca37a3dcec2a84395b7"; + sha256 = "09929sx48nm2xc31wnih4hp5g9gm4gl92x8vkbzg6501yz3ajvmg"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -12771,12 +12784,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-06-24"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "2527310098e7458488e61a528614da142aa2dc42"; - sha256 = "15zjqzpap035g29f0rf0yw9017r6aapv8w351ikaivfdp05ypdbr"; + rev = "f74a31e8c6c5a9dccc63450a09d5cd64a9294330"; + sha256 = "1xb4p47hc9knx2lwhz4qdc6hb06ygjkp0fkccd45h2czmss55kwi"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12999,11 +13012,11 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-01"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c23000a030bf14f721d10c0d74e5f8721ac2f9cd"; + rev = "84a0de7f53d80dc01f63fd6819e412d061e6a67c"; sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; @@ -13191,12 +13204,12 @@ final: prev: vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; - version = "2023-03-26"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f2be859ea48a761fd25a07efa037514f84abdf30"; - sha256 = "16rl00c3w7gsjqdk7irgd6cfvf75ws2ni4cnnr8c1bbadxiy1a34"; + rev = "fa1201dd55802e442e17e0fbd164cf546246dad1"; + sha256 = "1a9v6jmxbgxbmd4q4yf11mgdcvv1z83f0nf5zydqi310waw884fy"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -13323,12 +13336,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-26"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe"; - sha256 = "0g3bx7jnyra8ia11k7bqv0j41pwkbdz7bxzffxn20dyc69vkahxz"; + rev = "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc"; + sha256 = "1njc46mdvpipci7l2gcljsi0nxxjzwjr7s8pfkvr2l25bi3irz09"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13407,12 +13420,12 @@ final: prev: vim-git = buildVimPlugin { pname = "vim-git"; - version = "2023-03-26"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "105fd5559bd9df3f1204ecdcac2a587614e1a4be"; - sha256 = "1bgczw9i0p76cabkdfb1x11kmq59qaih1nz3q9hmqjd3964x92q0"; + rev = "55583e3d109a87b7f55b76643cf33150b7767e23"; + sha256 = "1yk6a6wcqgkfrgi4lysjhj8vy22b342zzcvlsy8w72kgvy7mp66b"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -13431,12 +13444,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2024-04-29"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "e801371917e52805a4ceb1e93f55ed1fba712f82"; - sha256 = "0aa3fphgl0c0y3lmivvfmvrqrs5iqn5dkvdv2jhl1q73y6pnhxiz"; + rev = "bed580ab8b53f9a6cc0c81c8e91747a780b623ec"; + sha256 = "10bmmssvxx51kd1qhi9s1qbs81pl6jw9sv2mwfy02grlcj9af074"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13515,12 +13528,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-12-11"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1"; - sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; + rev = "278526b656404903d64d39f129284e421cc1bdad"; + sha256 = "0rsgmpimcbm6f9cp113acvfz0wg4ignyc2ayllr11668k9naqndr"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -14081,12 +14094,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-22"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "c771fb5f00fd219833600c8164e6befe3c163b9a"; - sha256 = "0jlyy64m6zwvjs3w61vp2zv9rwdds1g3pk4wknvq493fcyxc59wa"; + rev = "8c3f95d5f784972e2e8823d89cd6e1757f055ed8"; + sha256 = "0xx9l58mqrlfc4x8l8balhm2343j850lvahllj63hxkc5rcjjbv0"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14345,12 +14358,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-06-13"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "3debb34bf6fac8e1cb195d9e89a23b7ea98bee47"; - sha256 = "0pdw13m2xn4fih0kk9acbhlgq660a7p6c7ppp4jb310jf0l3xg3i"; + rev = "4bb4c92db42ff9f96868578195af6726c92d5126"; + sha256 = "14ysapcq9bnv6k4qhcz31zfra41c0s89xm7lx4ymr3h9ymdj2sgb"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14454,12 +14467,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-04-12"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "05d6538ccef1d33f2d26f2515c0eacaa93d2e061"; - sha256 = "0x9vq6qi7m532la56i9pnp9l4q1s7iy1g7w36451w4c03lsw39is"; + rev = "9b6ff787fdd50299e18c8b5bf1b5dc319fdbf435"; + sha256 = "1j9xysvwhvp087ak3vvdcbkskkp78hlrr20jbldfx53vys4syagh"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -15102,12 +15115,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-06-19"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "d863d0783236e1a46291f7791347740891186154"; - sha256 = "0h8np5gfqa1r2089sxmrpfg5rfggsms3d688c2d7fb9vsba8ghhi"; + rev = "d80f495fabff8446972b8695ba251ca636a047b0"; + sha256 = "01mlw9nl3yb4s90xd197is7wjagizjz2gm4531bfn03k49idkhkp"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -15330,12 +15343,12 @@ final: prev: vim-quickrun = buildVimPlugin { pname = "vim-quickrun"; - version = "2024-06-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "c6c50a9926ca18605ae2472a343b8212f3a2af29"; - sha256 = "0zl3fh0b1s5p330p1fyz1mkwc3mag651a11mh1sa3gif1bxvg3sy"; + rev = "77b4d6ea9972a206f02c736882c2398c36d2983c"; + sha256 = "1dfpkvfzagv21ykbxgi6lzwlm34va3xas5wximqqlfifrnhkb08j"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -15402,12 +15415,12 @@ final: prev: vim-repeat = buildVimPlugin { pname = "vim-repeat"; - version = "2021-01-25"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-repeat"; - rev = "24afe922e6a05891756ecf331f39a1f6743d3d5a"; - sha256 = "0y18cy5wvkb4pv5qjsfndrpcvz0dg9v0r6ia8k9isp4agdmxkdzj"; + rev = "65846025c15494983dafe5e3b46c8f88ab2e9635"; + sha256 = "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"; }; meta.homepage = "https://github.com/tpope/vim-repeat/"; }; @@ -15462,12 +15475,12 @@ final: prev: vim-salve = buildVimPlugin { pname = "vim-salve"; - version = "2022-04-15"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "81f131b494cd7baa8e4e1f9242721e7107ea2f2b"; - sha256 = "0kl2nq1lqj2kgimz477xafnyh7z9fa44mwl2qajw5qchvx4f9h0a"; + rev = "92f6553654c3d2b6de0158fc4a59c4496dfc8105"; + sha256 = "0ixw0nrwqm2fjygx24jpn9lf5waw44alvzgz88vljd4wccpl4qp8"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -16411,12 +16424,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-06-30"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "525521677deb8401b62054bbbbc9b17f8486de3d"; - sha256 = "0i8n47y9xg1583908sa8lhkvz146ch65i9afcmgrsngjys1ihaqb"; + rev = "38b0e8d94a5499ccc17d6159763d32c79f53417b"; + sha256 = "03gn3wdi1gk3z8nki6cgcsad2xyabwwczxiip6dxmzmwfbg0s34y"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16832,12 +16845,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-24"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2dc2a5435809c13f6f4aa07964be4ef19a7864f5"; - sha256 = "1s3w4kbdvwvqmpv82hkdizcr28dyx61mwxfg0k6hkhnpr7fimz6a"; + rev = "80c9bc179784c30192d482741a43f176c859daa1"; + sha256 = "0kkmyh51x5rfi1yrdl7cw5b4g3y6066kb01kjqmq08wf22zlldk3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16976,24 +16989,24 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-06-07"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "0099511294f16b81c696004fa6a403b0ae61f7a0"; - sha256 = "1n6cs9590n9r24yxm4yf74bqmk1ky6hc7i9c8n7sc4icjkagkz65"; + rev = "4d5b8959fd2a4df065ff76ccb39019aaa70cb0dc"; + sha256 = "0gcabgj2a6lncifv7lzqlzmqhyv05k8azgw3njmwazd8fv0353q4"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2024-02-13"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "34d319e07f86a628deeb237133088f01f8432bc0"; - sha256 = "1gkxw6zhkgjvwg4jcpfiv2xkg7vk0q1prj4sh5swiznmyswsr0ay"; + rev = "e196282cd6b01ff0ce736751146fd4db49a42205"; + sha256 = "15b5f4fcxn837gxhza4dkfa2sm01iay6d1janbp31pl81q0lhacl"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; @@ -17012,12 +17025,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-29"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "e8cf7e92220fc1ed3c20c8744a511b917afba7b5"; - sha256 = "13fic83d631xxfaks2ncda3id5y8dy072sa56nkr9fr7yx9nbw6h"; + rev = "d65fcef243d273787106a1328ff5cad5b1e2a918"; + sha256 = "0lmz6q9h68zsbgz8nmmlkhbdvhxcdcki8hmk75mzcj7w20vdy6p4"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17144,12 +17157,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-03-23"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33"; - sha256 = "1q0j06lkkg60f62bjqxq7x6a8wxgcqdh1ldi6rp5sg6rkad8kzd7"; + rev = "7aefcc970ea56dc0a89dafdf9f5eb0de7b1ee58c"; + sha256 = "157vdbbrqqal1jhh68bzwvgv3wn12yfmhkjkvwp3jb4h40m974zs"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -17205,14 +17218,15 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-06-29"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "05849f390175f2ba8fd277b224d4fd9e35455895"; - sha256 = "zj+lmxsOEW+YaCk5hb7u454gACUmqYPA/IeW6av4D7k="; + rev = "9981b783813c3ff2bd49f6dbc5b2bc88161a0fb3"; + sha256 = "00q9v34zp09k5fyc4j9wpfcdvk7h80fcr0ajly6zfyliw62y3fy1"; + fetchSubmodules = true; }; - meta.homepage = "https://github.com/DreamMaoMao/yazi.nvim"; + meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; yescapsquit-vim = buildVimPlugin { @@ -17265,12 +17279,12 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2024-01-21"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "78557d972b4bfbb7488e17b5703d25164ae64e6a"; - sha256 = "0sa7fykwi2qzb14xc8jwf7y8pygh8v1lg531ykjln0y48nrc17qv"; + rev = "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830"; + sha256 = "0xpcarsrsdip1mznfn19f943z79g9r25p7aagkxiik1819sfb8v7"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -17361,12 +17375,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-27"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "31fcfb02c47952d5c75aec893b93b2878abe5fbb"; - sha256 = "0n883l071d197xqfji5dj3qgi3dvk1v9vmr1fdr1gnc9fmcpa672"; + rev = "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700"; + sha256 = "15cpz3jy97lkpdq32ypbk6wa29vplx9y42ic35ygc15ikxp470s7"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17409,12 +17423,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-06-24"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "f3e3ba2b47b57fc501b096a38b37bfc12f22f298"; - sha256 = "1ph3g127qynf797vnlq5kramkslj062bjzhpnxcsr9vjsn5a9x78"; + rev = "6d6bae56a002a4da507ba263776e9691f47deb5f"; + sha256 = "103j8jcj82pdzjj06bn0avkm2ng2k83fm95ivc31fjbcd5gp1dmp"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17457,12 +17471,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-28"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "568a0cb8595f1e5363dc220f01ca6f18517ff80a"; - sha256 = "0c3ihcl10mskp5jd1f9xnvypyrf0x5db1gks2i1fb63cmh64ibld"; + rev = "17016f9e7d2cfb64e94e091d4748463b09936d7a"; + sha256 = "05kvnx4c5sm80l5qs2lhcgi9f5zs8g9kz7zw8bjjcr8h5ij7jw9n"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17481,12 +17495,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-29"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "3c9e5cb6499f66a02c365f073145a835124a19ac"; - sha256 = "0bghzwkyqgp3g76irbadv3bx4npvnq2x16j6fdxc01906nn3iz95"; + rev = "6c1a615319796a627adb221f04ab2d962db86c9d"; + sha256 = "1c7a6555zr3fhdr7s2l8zwh4fbzmw4sh2wps3rjsiqcpmnnycjv2"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17515,6 +17529,18 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; + render-markdown = buildVimPlugin { + pname = "render-markdown"; + version = "2024-07-14"; + src = fetchFromGitHub { + owner = "MeanderingProgrammer"; + repo = "markdown.nvim"; + rev = "3578523f497a8ad3b4a356d1e54e609838ce0922"; + sha256 = "1bcc39azw53b6x6jxx4c6361d1x6q70pw5gfqjz26g04a8fmm20f"; + }; + meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/"; + }; + restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; @@ -17529,12 +17555,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-27"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "e10c9c6436556405ec6b187fd459a718f5c55156"; - sha256 = "0d7cv268gzrz47brax66h2kv2b4b6ks3vzdz97si8khh70jds59d"; + rev = "dded5c15e9d27ac95ad1e803b35a752d80f3f42b"; + sha256 = "1xj8hmpbrw20508k4qqil7vqqm1a9rjm2hkspk814rjblnvbavn1"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17587,17 +17613,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - supermaven-nvim = buildVimPlugin { - pname = "supermaven-nvim"; - version = "2024-07-01"; - src = fetchFromGitHub { - owner = "supermaven-inc"; - repo = "supermaven-nvim"; - rev = "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b"; - sha256 = "sha256-TeRWReHeEqP5I3tgfJdMDmHvL83NDCENRMcQrKbPiqg="; - }; - meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; - }; - } From 1ffc08ea9a0b479327fe8a999377b496258f2e06 Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Sun, 14 Jul 2024 11:33:03 +0000 Subject: [PATCH 412/562] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/deprecated.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 60a28dd327db..11fb22d6e1b2 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-07-03", + "date": "2024-07-14", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-07-03", + "date": "2024-07-14", "new": "zarchive-vim-fsharp" }, "vim-jade": { From d3c2dea19f2a5b33c0f1d2992ce61f15b2f4fc5c Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Sun, 14 Jul 2024 11:33:49 +0000 Subject: [PATCH 413/562] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 204 ++++++++++-------- 1 file changed, 112 insertions(+), 92 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 84865e730044..8cdd9906432d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -204,12 +204,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=82fa8f0"; + version = "0.0.0+rev=31a64b2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "82fa8f05f41a33e9bc830f85d74a9548f0291738"; - hash = "sha256-5GkU3/yVMCnNvNssad3vEIN8PlbLeQsRBlwgH2KUrBo="; + rev = "31a64b28292aac6adf44071e449fa03fb80eaf4e"; + hash = "sha256-WBOA6CIW56RuiHhwiuP9R+K2kK6Chfx05TP3mdjMxo0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -524,6 +524,17 @@ location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf"; }; + editorconfig = buildGrammar { + language = "editorconfig"; + version = "0.0.0+rev=c5f8368"; + src = fetchFromGitHub { + owner = "ValdezFOmar"; + repo = "tree-sitter-editorconfig"; + rev = "c5f83685a64117872ae750ce14333a7a1dddcf0b"; + hash = "sha256-kmQ3+QTwWd/92wL6YS6UchI819eLnD9YfT5TPANvCXA="; + }; + meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; + }; eds = buildGrammar { language = "eds"; version = "0.0.0+rev=0ad62cb"; @@ -603,12 +614,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=da275db"; + version = "0.0.0+rev=19ca500"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "da275db3ae46bbd00f97d11f888d8c58c14faa6d"; - hash = "sha256-05V1VLmafWgdAHaNiBj4YYl9/W54j6TNSH5CLnh0fjY="; + rev = "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"; + hash = "sha256-5WUuy8+O9yujzoAjO2sNGM1+IEnaS7HEphTKcvFJJNo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -702,12 +713,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=f73d473"; + version = "0.0.0+rev=dde9829"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f73d473e3530862dee7cbb38520f28824e7804f6"; - hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds="; + rev = "dde9829554b831cf6cbf927294f22dfb9a8f0419"; + hash = "sha256-QvEKisBE4Qrnv1CjeCMhIt/L1BdXEJLCprw/hJoAE20="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -887,6 +898,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; + goctl = buildGrammar { + language = "goctl"; + version = "0.0.0+rev=f107937"; + src = fetchFromGitHub { + owner = "chaozwn"; + repo = "tree-sitter-goctl"; + rev = "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"; + hash = "sha256-4I0T+CoMCo3e7hkpdR+ipMol0THbJYg+UXAnIa0o5Ns="; + }; + meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl"; + }; godot_resource = buildGrammar { language = "godot_resource"; version = "0.0.0+rev=2ffb90d"; @@ -966,12 +988,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=6c5c881"; + version = "0.0.0+rev=f361500"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "6c5c8813233fe326e24c5ef032858d13f8006a8d"; - hash = "sha256-NursRJ7DBmlbA7EOzC+WwoxDkjMUZYANcdX48DyjEIY="; + rev = "f3615006429251a966d7452bd46a0171364bcb7b"; + hash = "sha256-n3haDlldeFk9FzHY7k5zhzDNHA6TzjncZpsQuHl/Q00="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -999,12 +1021,12 @@ }; hare = buildGrammar { language = "hare"; - version = "0.0.0+rev=0705249"; + version = "0.0.0+rev=4af5d82"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-hare"; - rev = "070524937539eb8bb4f10debd9c83b66c434f3a2"; - hash = "sha256-NUvbkMYA1nZmS84vLNguto/Fo7wdrDmRCBnveR88ry0="; + rev = "4af5d82cf9ec39f67cb1db5b7a9269d337406592"; + hash = "sha256-QEnE5IQJ60PXb6QjgEE5L4p7Fjy0p+N+dyDTMh3YsRg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; }; @@ -1143,12 +1165,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=2dacda9"; + version = "0.0.0+rev=e061995"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "2dacda923bafcfeae487e457df0fc1c95f6d1848"; - hash = "sha256-JunYDINufbrbVduLrrX73rD8L6MC5dEie8yq92qTFe4="; + rev = "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8"; + hash = "sha256-zwPIO75l3OBmuWX1ABZNA6ZulJUtSsp3Xs7+dcnxLCo="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1176,12 +1198,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=966797b"; + version = "0.0.0+rev=1a495f4"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "966797b8c581526efdd2252f815dde6de1a8f932"; - hash = "sha256-q2aBAXUVjhcoHH7iZQllLkDF5ZMuIxNjWu72Xt+YdXA="; + rev = "1a495f4520fdd85ae4c9286fb69d9d92fb623343"; + hash = "sha256-tV1Y+XvCV4KLhGeTdXZr1Lm7XQkxSMz/9EhIr7gsgpU="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1242,12 +1264,12 @@ }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=391a8fc"; + version = "0.0.0+rev=12e4537"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "391a8fcc48a11f63bf18ec9885f6f069e760949a"; - hash = "sha256-GOIhkoiiUhkTpUhDm/sfLtsNhOrVoGx2uiXEteruT2g="; + rev = "12e45374422f6051648717be62f0ffc40a279ee2"; + hash = "sha256-KBEJFpOIP4MFbkxcIF2HsHvwblTdb2UuisKMn4Pnm1w="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1452,12 +1474,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=0419ac4"; + version = "0.0.0+rev=7862a34"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "0419ac4868585320eee8615c90b864a1b04ef433"; - hash = "sha256-1FPDsQSPM86NvMrmxIOVnIC65bUOFtKEwRuAtMDbw6M="; + rev = "7862a3424832c3a9d45eb21143b375837bd6573b"; + hash = "sha256-F/nP+zXySjKHX9Y9zqexhwn02sZejUXMPDcWRh6s7Yo="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1619,12 +1641,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=268bc99"; + version = "0.0.0+rev=affbd6f"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "268bc99020f7ba7a219f839e3a6a31c36ad0826b"; - hash = "sha256-jXcnM+LEY35GZd2HYtFE5Of4CBga1zZuGCPazKWAppA="; + rev = "affbd6f3b08155826a22cfa8373147acbf60f1f1"; + hash = "sha256-zIbtvtpLQmXhFj5KDQRwsUJfUi6AkZjfp55n0X5lN4o="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1664,12 +1686,12 @@ }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=961c279"; + version = "0.0.0+rev=897e5d3"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "961c2798cec9250c44f7d7225ddb33d47d25856a"; - hash = "sha256-zFT316pJwJvPRLJcBk4kvPmwNgdkYG5/10VktNBQwL8="; + rev = "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"; + hash = "sha256-JwR5Og1pGDTHI49rFsnfStrTcZ7hOseK6YyFIVlQ1o4="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1817,7 +1839,7 @@ rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; }; - meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; + meta.homepage = "https://github.com/Isopod/tree-sitter-pascal"; }; passwd = buildGrammar { language = "passwd"; @@ -1854,24 +1876,24 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=4f124bc"; + version = "0.0.0+rev=575a080"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "575a0801f430c8672db70b73493c033a9dcfc328"; + hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=4f124bc"; + version = "0.0.0+rev=575a080"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "575a0801f430c8672db70b73493c033a9dcfc328"; + hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1967,28 +1989,26 @@ problog = buildGrammar { language = "problog"; version = "0.0.0+rev=d8bc22c"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "foxy"; + src = fetchFromGitHub { + owner = "foxyseta"; repo = "tree-sitter-prolog"; rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; }; location = "grammars/problog"; - meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; prolog = buildGrammar { language = "prolog"; version = "0.0.0+rev=d8bc22c"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "foxy"; + src = fetchFromGitHub { + owner = "foxyseta"; repo = "tree-sitter-prolog"; rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; }; location = "grammars/prolog"; - meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; promql = buildGrammar { language = "promql"; @@ -2092,12 +2112,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=71778c2"; + version = "0.0.0+rev=ccc2408"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "71778c2a472ed00a64abf4219544edbf8e4b86d7"; - hash = "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y="; + rev = "ccc2408e558029ad82b0dea63ff55ada495965da"; + hash = "sha256-h6vz8Dpr+uqjN5UHxJ58GSQVAyRjxsnObIr6UKBBmps="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2191,12 +2211,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=88d8ed4"; + version = "0.0.0+rev=8d8e65a"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"; - hash = "sha256-z7Ls0SXh18bRMX+FpVIzaeeuItyeCTOnGgQ3tDyrtSU="; + rev = "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99"; + hash = "sha256-M72rShapD813gpBbWUIil6UgcnoF1DVTffMSnTpejgg="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2356,15 +2376,15 @@ }; scfg = buildGrammar { language = "scfg"; - version = "0.0.0+rev=6deae0c"; - src = fetchFromSourcehut { - owner = "~rockorager"; + version = "0.0.0+rev=a551280"; + src = fetchFromGitHub { + owner = "rockorager"; repo = "tree-sitter-scfg"; - rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"; - hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk="; + rev = "a5512800ea0220da4abbae61b8aea8423d1549aa"; + hash = "sha256-Je6taNzniyd1c+2NRCF7TOvnpeW4qhYYhdAEcgpDOAA="; }; generate = true; - meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg"; + meta.homepage = "https://github.com/rockorager/tree-sitter-scfg"; }; scheme = buildGrammar { language = "scheme"; @@ -2493,12 +2513,12 @@ language = "sparql"; version = "0.0.0+rev=d853661"; src = fetchFromGitHub { - owner = "BonaBeavis"; + owner = "GordianDziwis"; repo = "tree-sitter-sparql"; rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58"; hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; - meta.homepage = "https://github.com/BonaBeavis/tree-sitter-sparql"; + meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql"; }; sql = buildGrammar { language = "sql"; @@ -2513,12 +2533,12 @@ }; squirrel = buildGrammar { language = "squirrel"; - version = "0.0.0+rev=0a50d31"; + version = "0.0.0+rev=072c969"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; - rev = "0a50d31098e83c668d34d1160a0f6c7d23b571cc"; - hash = "sha256-cLMAeDfZiHInA9+Td8FedRVSNv1vFE/bpCftRqV72d0="; + rev = "072c969749e66f000dba35a33c387650e203e96e"; + hash = "sha256-tJBmxTD4hi9zxXMEuAX+uslo45zEawh09+tgv56s/AU="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; @@ -2601,12 +2621,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=631f1e6"; + version = "0.0.0+rev=6248145"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"; - hash = "sha256-/nMRcZc5fWUJ+GpVnlERHjtahXGh6NwrNNQPkNM5Y9E="; + rev = "6248145bd1c221f75feb3460e59de57f81fda58f"; + hash = "sha256-/l9CMB5ypA2C9yvYPDkDXutJIrSdSwbJuh4Pb4i2Sjc="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2758,12 +2778,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=200f9da"; + version = "0.0.0+rev=bba02e7"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "200f9dab6b23f3b9bb8f67fc811221517f56c373"; - hash = "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E="; + rev = "bba02e79f85e335f310fc95e21c677e49f2c4439"; + hash = "sha256-FbOBkEtsFFD9jIWM2+fETstnvQyIj2DAF81v0dXjouo="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2787,7 +2807,7 @@ rev = "3937c5cd105ec4127448651a21aef45f52d19609"; hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ="; }; - meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt.git"; + meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt"; }; toml = buildGrammar { language = "toml"; @@ -2814,26 +2834,26 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=e45cb32"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "e45cb3225bf47a04da827e4575b9791523d953fd"; + hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; turtle = buildGrammar { language = "turtle"; - version = "0.0.0+rev=085437f"; + version = "0.0.0+rev=7f789ea"; src = fetchFromGitHub { - owner = "BonaBeavis"; + owner = "GordianDziwis"; repo = "tree-sitter-turtle"; - rev = "085437f5cb117703b7f520dd92161140a684f092"; - hash = "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA="; + rev = "7f789ea7ef765080f71a298fc96b7c957fa24422"; + hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA="; }; - meta.homepage = "https://github.com/BonaBeavis/tree-sitter-turtle"; + meta.homepage = "https://github.com/GordianDziwis/tree-sitter-turtle"; }; twig = buildGrammar { language = "twig"; @@ -2848,12 +2868,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=e45cb32"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "e45cb3225bf47a04da827e4575b9791523d953fd"; + hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2882,12 +2902,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=3924cb9"; + version = "0.0.0+rev=90f6af2"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "3924cb9ed9e0e62ce7df9c4fe0faa4c234795999"; - hash = "sha256-W8mNIASM85btE3XychvagVJofIb+CkNT4XeIhdQt8FU="; + rev = "90f6af21271dee246a9cafe109e2b456c5bc10a6"; + hash = "sha256-53BCAdQLpeV2l6kmfllrCU186svZ4RE/2+VVrWuFV8Y="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2949,12 +2969,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=e91f8a4"; + version = "0.0.0+rev=7f80a04"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "e91f8a42de7842f24f4ce600754f2b6651985fd4"; - hash = "sha256-38nerR7oZBwxXWd08QqEEMSxAZqXRHCRdLbMEbRhcQI="; + rev = "7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515"; + hash = "sha256-eTYqzdhxVI8jQXZ4FopReVYZJle2D0b31PjkZ2xC4f4="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3071,12 +3091,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=cab9479"; + version = "0.0.0+rev=cd7e653"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "cab94791450524a542324d8cbe8017d69c516d8e"; - hash = "sha256-R8b+UQmj+JtiIGDsvR5KBTGoX99m0k/HJx2bTGNxRH0="; + rev = "cd7e6534fd9a22e3e9a7a85feecf4e35461e47cb"; + hash = "sha256-/Lvo0YbdSaIoRFSm74kBQRM1sQTO3t9+OrxFK4/KyEo="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; From 40ebc3096e1169f0f3de3398115fed1345978c4f Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 09:43:30 +0300 Subject: [PATCH 414/562] linuxPackages_6_10.perf: fix build Revert upstream change that breaks things in a very strange way. See commit being reverted for details. --- pkgs/os-specific/linux/kernel/perf/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index a54e5c04e214..cff4dac83a5e 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , kernel , elfutils , python3 @@ -60,6 +61,23 @@ stdenv.mkDerivation { inherit (kernel) src; + # Fix 6.10.0 holding pkg-config completely wrong. + # Patches from perf-tools-next, should be in 6.11 or hopefully backported. + patches = lib.optionals (lib.versionAtLeast kernel.version "6.10") [ + (fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b"; + hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM="; + }) + (fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee"; + hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo="; + }) + (fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd"; + hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI="; + }) + ]; + postPatch = '' # Linux scripts patchShebangs scripts From a5a62ea2890eb6568f30161e7cb39021c4ecc8ae Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 11:03:12 +0300 Subject: [PATCH 415/562] linux_6_6: 6.6.39 -> 6.6.40 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 849cbef19396..b474c7f28284 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6" }, "6.6": { - "version": "6.6.39", - "hash": "sha256:0svpgakk81082mhhq17r8nlbz36zavq23d71232rapq928hx90r7" + "version": "6.6.40", + "hash": "sha256:0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw" }, "6.8": { "version": "6.8.12", From f8833878d43839e13ba2166bc81c82f8977f02a5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 11:03:21 +0300 Subject: [PATCH 416/562] linux_6_1: 6.1.98 -> 6.1.99 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b474c7f28284..3891333d959d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19" }, "6.1": { - "version": "6.1.98", - "hash": "sha256:01ilkykg65590f1gndhnp3s75wscqah6f4l9l1p5a03pgh9ckkcp" + "version": "6.1.99", + "hash": "sha256:1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0" }, "5.15": { "version": "5.15.162", From 800febbde1ed7210bfae70de41482e5261794910 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 11:03:49 +0300 Subject: [PATCH 417/562] linux-rt_5_10: 5.10.220-rt112 -> 5.10.221-rt113 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 3e3b38b550cd..3d560d387ef9 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.220-rt112"; # updated by ./update-rt.sh + version = "5.10.221-rt113"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw"; + sha256 = "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "149m51kkzhx9fhqdf6k7chi38rm2iw3ld18qzh8afmq8dc1dcimq"; + sha256 = "1aaamfnlhzhi4lj1sk2m082fpgr3qxs3b3a1ikh8zwmy89kw9i9x"; }; }; in [ rt-patch ] ++ kernelPatches; From 0c16414228e27fffb865fa964e1d4bda3a1173f2 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 11:04:16 +0300 Subject: [PATCH 418/562] linux_latest-libre: 19597 -> 19607 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d42d1541e6a0..db932be1a2d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19597"; - sha256 = "0bxljx9dgz23ax2pjvx07sqks4s7al2qhn3zcjyxfqv69a0awa8w"; + rev = "19607"; + sha256 = "1kf1hm553g8sh7wyh0jw7nl2nmrzg74b62z1q17bznq5a7qf87pn"; } , ... }: From a0be8a664fa6955fa8572f73257552db2ec9f35a Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 15 Jul 2024 17:26:00 +0800 Subject: [PATCH 419/562] ascii-draw: 0.3.4 -> 0.4.0 --- pkgs/by-name/as/ascii-draw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix index f2895ebdcdb9..6a845e2e2717 100644 --- a/pkgs/by-name/as/ascii-draw/package.nix +++ b/pkgs/by-name/as/ascii-draw/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ascii-draw"; - version = "0.3.4"; + version = "0.4.0"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; rev = "refs/tags/v${version}"; - hash = "sha256-S5tFK+mJeWtkdS2WjE+lZ2Gfg4N1S0a29AbbcGeKSD0="; + hash = "sha256-lBlIZrjzJo9R6KnzUSbqz5c/6UbuTv/pQu5Sans37Hc="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ''; meta = { - description = "App to draw diagrams or anything using only ASCII"; + description = "Draw diagrams or anything using only ASCII"; homepage = "https://github.com/Nokse22/ascii-draw"; license = lib.licenses.gpl3Plus; mainProgram = "ascii-draw"; From 184016cf9f9381ac7c25b583b05de5a5da36189e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:53:21 +0200 Subject: [PATCH 420/562] bibata-extra-cursors: remove --- pkgs/data/icons/bibata-cursors/extra.nix | 56 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/data/icons/bibata-cursors/extra.nix diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix deleted file mode 100644 index ed9a70a6d321..000000000000 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, fetchurl -, clickgen -, unzip -}: - -stdenvNoCC.mkDerivation rec { - pname = "bibata-extra-cursors"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "ful1e5"; - repo = "Bibata_Extra_Cursor"; - rev = "v${version}"; - sha256 = "0wndl4c547k99y0gq922hn7z1mwdgxvvyjfm6757g6shfbcmkz7m"; - }; - - bitmaps = fetchurl { - url = "https://github.com/ful1e5/Bibata_Extra_Cursor/releases/download/v${version}/bitmaps.zip"; - sha256 = "0vf14ln53wigaq3dkqdk5avarqplsq751nlv72da04ms6gqjfhdl"; - }; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ clickgen ]; - - buildPhase = '' - mkdir bitmaps - unzip $bitmaps -d bitmaps - rm -rf themes - cd builder && make build_unix - ''; - - installPhase = '' - install -dm 0755 $out/share/icons - cd ../ - cp -rf themes/* $out/share/icons/ - ''; - - postPatch = '' - substituteInPlace "builder/Makefile" \ - --replace "/bin/bash" "bash" - ''; - - meta = with lib; { - description = "Material Based Cursor Theme"; - homepage = "https://github.com/ful1e5/Bibata_Extra_Cursor"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; - # unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ab369ee5b3c..de57b82b3083 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -132,6 +132,7 @@ mapAliases ({ bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 + bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13a3a9dbb8e2..d441af35e552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27974,7 +27974,6 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; - bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; apple-cursor = callPackage ../data/icons/apple-cursor { }; From 467da8d5988eae06ff133a4efc51fea5824cdb3d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Jul 2024 13:43:24 +0400 Subject: [PATCH 421/562] geographiclib: migrate to by-name --- .../default.nix => by-name/ge/geographiclib/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/geographiclib/default.nix => by-name/ge/geographiclib/package.nix} (100%) diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/by-name/ge/geographiclib/package.nix similarity index 100% rename from pkgs/development/libraries/geographiclib/default.nix rename to pkgs/by-name/ge/geographiclib/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a66aaf888fc3..092d2af7623c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20613,8 +20613,6 @@ with pkgs; geogram = callPackage ../development/libraries/geogram { }; - geographiclib = callPackage ../development/libraries/geographiclib { }; - geoip = callPackage ../development/libraries/geoip { }; geoipjava = callPackage ../development/libraries/java/geoipjava { }; From 145d776259e3650adcaa3e20756a497d9a554467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 14:37:33 -0700 Subject: [PATCH 422/562] python312Packages.igraph: 0.11.5 -> 0.11.6 Diff: https://github.com/igraph/python-igraph/compare/refs/tags/0.11.5...0.11.6 Changelog: https://github.com/igraph/python-igraph/blob/refs/tags/0.11.6/CHANGELOG.md --- .../python-modules/igraph/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 53bd1e526909..3f13cf77b729 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.11.5"; + version = "0.11.6"; disabled = pythonOlder "3.8"; @@ -25,21 +25,24 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-nfXCAjTKxtslVk17h60+v/JQusQTmaTRCPvvFG4/OPk="; + postFetch = '' + # export-subst prevents reproducability + rm $out/.git_archival.json + ''; + hash = "sha256-DXYNFSvmKiulMnWL8w5l9lWGtS9Sff/Hn4x538nrvzo="; }; postPatch = '' rm -r vendor ''; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + nativeBuildInputs = [ pkg-config ]; + + build-system = [ setuptools ]; buildInputs = [ igraph ]; - propagatedBuildInputs = [ texttable ]; + dependencies = [ texttable ]; passthru.optional-dependencies = { cairo = [ cairocffi ]; From 61cb0c52c9a2028ad841c740a453eb131f3ec3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jul 2024 03:06:19 -0700 Subject: [PATCH 423/562] python312Packages.gbulb: fix build --- .../python-modules/gbulb/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index 4c192b43f666..8c4252e49029 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools-scm, pygobject3, pytestCheckHook, gtk3, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "gbulb"; version = "0.6.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "beeware"; @@ -21,10 +22,16 @@ buildPythonPackage rec { hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow="; }; - propagatedBuildInputs = [ - pygobject3 - gtk3 - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "==" ">=" + ''; + + build-system = [ setuptools-scm ]; + + dependencies = [ pygobject3 ]; + + buildInputs = [ gtk3 ]; nativeCheckInputs = [ pytestCheckHook From 1aa795cfa27dfc26c6f943709c2bbcad9d862b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jul 2024 03:11:44 -0700 Subject: [PATCH 424/562] python312Packages.skytemple-files: 1.6.5 -> 1.7.0 Diff: https://github.com/SkyTemple/skytemple-files/compare/1.6.5...1.7.0 --- .../skytemple-files/default.nix | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index ab4d8d085b26..01627db3b9ed 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, appdirs, dungeon-eos, explorerscript, @@ -10,12 +11,9 @@ pillow, setuptools, skytemple-rust, - tilequant, pyyaml, pmdsky-debug-py, range-typed-integers, - importlib-resources, - typing-extensions, pythonOlder, # optional dependancies for SpriteCollab aiohttp, @@ -31,43 +29,48 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.6.5"; + version = "1.7.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-files"; rev = version; - hash = "sha256-y6VHRfwQNoehp06BoZXuprYtsiGgoNL4rztJw40P4FI="; + hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0="; # Most patches are in submodules fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + name = "fix-tests.patch"; + url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch"; + hash = "sha256-dZM9n332IMiZIp3QL0Z+yJrIW1SJsqpjh7i3VRFFf7w="; + }) + ]; + postPatch = '' substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ - --replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" + --replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" ''; + build-system = [ setuptools ]; + buildInputs = [ armips ]; - propagatedBuildInputs = - [ - appdirs - dungeon-eos - explorerscript - ndspy - pillow - setuptools - skytemple-rust - tilequant - pyyaml - pmdsky-debug-py - range-typed-integers - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - typing-extensions - ]; + dependencies = [ + appdirs + dungeon-eos + explorerscript + ndspy + pillow + skytemple-rust + pyyaml + pmdsky-debug-py + range-typed-integers + ]; passthru.optional-dependencies = { spritecollab = [ @@ -78,7 +81,7 @@ buildPythonPackage rec { ] ++ gql.optional-dependencies.aiohttp; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook parameterized xmldiff From a73c8d0cbcc1fd8170767ac5cb1f8cfcab64239c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jul 2024 03:34:24 -0700 Subject: [PATCH 425/562] python312Packages.skytemple-dtef: fix build --- pkgs/development/python-modules/skytemple-dtef/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index f1320e68a867..2ce2555a25ca 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pillow, pytestCheckHook, pythonOlder, @@ -17,12 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-dtef"; rev = version; hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pillow skytemple-files ]; From 5e51fa2074208df081a016c1206f50dfa72e38de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jul 2024 03:36:24 -0700 Subject: [PATCH 426/562] python312Packages.skytemple-ssb-debugger: 1.6.4 -> 1.7.0 Diff: https://github.com/SkyTemple/skytemple-ssb-debugger/compare/1.6.4...1.7.0 --- .../python-modules/skytemple-ssb-debugger/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 0ea529c5ab28..e50bc2ae59aa 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, explorerscript, fetchFromGitHub, + setuptools, gobject-introspection, gtk3, gtksourceview4, @@ -23,16 +24,18 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.6.4"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-ssb-debugger"; rev = version; - hash = "sha256-whnwFwPYPGF+UtjrzRKgXJNPsUGvmE+HHKJcPf0qcuA="; + hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q="; }; + build-system = [ setuptools ]; + buildInputs = [ gtk3 gtksourceview4 @@ -41,7 +44,7 @@ buildPythonPackage rec { gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = [ + dependencies = [ explorerscript ndspy nest-asyncio From baf958aafaf3fbfa69b291f4fb970aa91d98d2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jul 2024 03:42:43 -0700 Subject: [PATCH 427/562] skytemple: fix build --- pkgs/applications/misc/skytemple/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 4442e79944ac..c510e8853708 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -15,11 +15,13 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple"; rev = "refs/tags/${version}"; hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI="; }; + build-system = with python3Packages; [ setuptools ]; + buildInputs = [ gtk3 gtksourceview4 @@ -34,7 +36,12 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + pythonRelaxDeps = [ + "skytemple-files" + "skytemple-ssb-debugger" + ]; + + dependencies = with python3Packages; [ cairosvg natsort ndspy From 0cbfd3a1771bd33e85ccdf73d7c10a4b7223cdcf Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Jul 2024 11:08:53 +0200 Subject: [PATCH 428/562] downonspot: unstable-2024-04-30 -> 0.5.0 --- pkgs/by-name/do/downonspot/Cargo.lock.patch | 32 ++++++++++----------- pkgs/by-name/do/downonspot/package.nix | 8 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/do/downonspot/Cargo.lock.patch b/pkgs/by-name/do/downonspot/Cargo.lock.patch index e224603a3070..692c03967b88 100644 --- a/pkgs/by-name/do/downonspot/Cargo.lock.patch +++ b/pkgs/by-name/do/downonspot/Cargo.lock.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index e6f1267..3bf16a5 100644 +index cccafd9..75d2a85 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1632,7 +1632,8 @@ dependencies = [ +@@ -1655,7 +1655,8 @@ dependencies = [ [[package]] name = "librespot" version = "0.4.2" @@ -12,7 +12,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "base64 0.13.1", "env_logger", -@@ -1658,7 +1659,8 @@ dependencies = [ +@@ -1681,7 +1682,8 @@ dependencies = [ [[package]] name = "librespot-audio" version = "0.4.2" @@ -22,7 +22,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes-ctr", "byteorder", -@@ -1673,7 +1675,8 @@ dependencies = [ +@@ -1696,7 +1698,8 @@ dependencies = [ [[package]] name = "librespot-connect" version = "0.4.2" @@ -32,7 +32,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "form_urlencoded", "futures-util", -@@ -1693,7 +1696,8 @@ dependencies = [ +@@ -1716,7 +1719,8 @@ dependencies = [ [[package]] name = "librespot-core" version = "0.4.2" @@ -42,7 +42,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes", "base64 0.13.1", -@@ -1733,7 +1737,8 @@ dependencies = [ +@@ -1756,7 +1760,8 @@ dependencies = [ [[package]] name = "librespot-discovery" version = "0.4.2" @@ -52,7 +52,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes-ctr", "base64 0.13.1", -@@ -1754,7 +1759,8 @@ dependencies = [ +@@ -1777,7 +1782,8 @@ dependencies = [ [[package]] name = "librespot-metadata" version = "0.4.2" @@ -62,7 +62,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "async-trait", "byteorder", -@@ -1767,7 +1773,8 @@ dependencies = [ +@@ -1790,7 +1796,8 @@ dependencies = [ [[package]] name = "librespot-playback" version = "0.4.2" @@ -72,7 +72,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "byteorder", "cpal", -@@ -1792,7 +1799,8 @@ dependencies = [ +@@ -1815,7 +1822,8 @@ dependencies = [ [[package]] name = "librespot-protocol" version = "0.4.2" @@ -83,15 +83,15 @@ index e6f1267..3bf16a5 100644 "glob", "protobuf 2.28.0", diff --git a/Cargo.toml b/Cargo.toml -index 40ca2c1..734a3fb 100644 +index c7e2fe2..28e895a 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -29,7 +29,7 @@ reqwest = "0.11" +@@ -30,7 +30,7 @@ reqwest = "0" colored = "2" - lame = "0.1" - aspotify = "0.7.1" + lame = "0" + aspotify = "0" -librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" } +librespot = "0.4.2" - async-std = { version = "1.12", features = ["attributes", "tokio1"] } - serde_json = "1.0" - async-stream = "0.3" + async-std = { version = "1", features = ["attributes", "tokio1"] } + serde_json = "1" + async-stream = "0" diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix index 10574358a869..587201dd7923 100644 --- a/pkgs/by-name/do/downonspot/package.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "unstable-2024-04-30"; + version = "0.5.0"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "669dbb18e105129fff4886ba3710596d54a5f33a"; - hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w="; + rev = "refs/tags/v${version}"; + hash = "sha256-PA11R/hVAmismayE8uU03P0eeNnrgpD2HxbMW0vlk3k="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ="; + cargoHash = "sha256-jdscYr4Emm2+mWXbxfhU1rp855tsGY5hrdJsDEfXeUo="; nativeBuildInputs = [ pkg-config From ed8babbc664581f535b18f40468d4e5d4551bc24 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 11:24:04 +0100 Subject: [PATCH 429/562] vimPlugins.nvim-spectre: update cargoHash --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 36b4997bf275..bea5f67bcb9d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1168,7 +1168,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-SqbU9YwZ5pvdFUr7XBAkkfoqiLHI0JwJRwH7Wj1JDNg="; + cargoHash = "sha256-J9L9j8iyeZQRMjiVqdI7V7BOAkZaiLGOtKDpgq2wyi0="; preCheck = '' mkdir tests/tmp/ From de5f6a1035d15f07a4b11674b466d6bd567cc091 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 11:26:50 +0100 Subject: [PATCH 430/562] vimPlugins.LeaderF: add missing setuptools --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index bea5f67bcb9d..3b8f4ca5a3d1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2031,6 +2031,7 @@ ''; }; LeaderF = super.LeaderF.overrideAttrs { + nativeBuildInputs = [ python3.pkgs.setuptools ]; buildInputs = [ python3 ]; # rm */build/ to prevent dependencies on gcc # strip the *.so to keep files small From b792c47139d6d1fdb7c299a9428e7fcf1d5051e0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 11:35:09 +0100 Subject: [PATCH 431/562] vimPlugins.codeium-nvim: 1.8.25 -> 1.8.80 --- pkgs/applications/editors/vim/plugins/overrides.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3b8f4ca5a3d1..101e8392098c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -335,12 +335,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.8.25"; + codeiumVersion = "1.8.80"; codeiumHashes = { - x86_64-linux = "sha256-6sIYDI6+1/p54Af+E/GmRAFlfDYJVwxhn0qF47ZH+Zg="; - aarch64-linux = "sha256-1ImcjAqCZm5KZZYHWhG1eO7ipAdrP4Qjj2eBxTst++s="; - x86_64-darwin = "sha256-yHthItxZYFejJlwJJ7BrM2csnLsZXjy/IbzF1iaCCyI="; - aarch64-darwin = "sha256-GIx0yABISj/rH/yVkkx6NBs5qF0P8nhpMyvnzXJ92mA="; + x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; + aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; + x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; + aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; }; codeium' = codeium.overrideAttrs rec { From 05762d699f286bd96b414d7e1dc154576eb1c827 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jul 2024 22:12:25 +0200 Subject: [PATCH 432/562] python311Packages.lightning-utilities: 0.11.3.post0 -> 0.11.5 Diff: https://github.com/Lightning-AI/utilities/compare/refs/tags/v0.11.3.post0...v0.11.5 Changelog: https://github.com/Lightning-AI/utilities/releases/tag/v0.11.5 --- .../lightning-utilities/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 504b5e616c12..c35d839b0600 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, - pythonAtLeast, # build setuptools, # runtime + looseversion, packaging, typing-extensions, @@ -18,19 +19,27 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.3.post0"; + version = "0.11.5"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-pOy8BCNwuPcM6cvUl295y+0QrcWOq2rT9iZMKyBxpqg="; + hash = "sha256-Ia+NF9WHU1rJHV/j3tRiqudK3TJNEolNKShFfUehxHU="; }; + postPatch = '' + substituteInPlace src/lightning_utilities/install/requirements.py \ + --replace-fail "from distutils.version import LooseVersion" "from looseversion import LooseVersion" + ''; + build-system = [ setuptools ]; dependencies = [ + looseversion packaging typing-extensions ]; @@ -61,18 +70,11 @@ buildPythonPackage rec { "src/lightning_utilities/install/requirements.py" ]; - pytestFlagsArray = [ - # warns about distutils removal in python 3.12 - "-W" - "ignore::DeprecationWarning" - ]; - meta = { changelog = "https://github.com/Lightning-AI/utilities/releases/tag/v${version}"; description = "Common Python utilities and GitHub Actions in Lightning Ecosystem"; homepage = "https://github.com/Lightning-AI/utilities"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; - broken = pythonAtLeast "3.12"; }; } From 0084fdcf8fd2eb69041ffad1a19c4c34ad33b730 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 11:02:37 +0000 Subject: [PATCH 433/562] azure-storage-azcopy: 10.25.0 -> 10.25.1 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index cfe38faafc45..773648fe2a4f 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.25.0"; + version = "10.25.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "refs/tags/v${version}"; - hash = "sha256-OjNezXjC9SyRV+8CDkKtIm7Mzks+Quuj92M7tR0LZX0="; + hash = "sha256-ELxTe1+wfQ813ah2ZHLojVYSRgQ4kW97gEfjEK0Ipkc="; }; subPackages = [ "." ]; - vendorHash = "sha256-/SNQl80szkOZwtRHVxyAmapCFxDwQBM0Go6p0ILrKRM="; + vendorHash = "sha256-96lyOX7v453A24ZO4xl9jA0pNuNavB0ibEEoS6x9ha0="; doCheck = false; From 1825030216f647880c628501e9b69c1fa885d059 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 11:23:02 +0000 Subject: [PATCH 434/562] pysqlrecon: 0.1.4 -> 0.2.0 --- pkgs/by-name/py/pysqlrecon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index d9d8c51bb828..32c98e42fdd6 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pysqlrecon"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Tw1sm"; repo = "PySQLRecon"; rev = "refs/tags/v${version}"; - hash = "sha256-v6IO5fQLvzJhpMPNaZ+ehmU4NYgRDfnDRwQYv5QVx00="; + hash = "sha256-AJCvGpOjnh5ih5HrrpI+x0zyB7P6rMGL70707UunhEM="; }; pythonRelaxDeps = [ From 889e27104dc208a23441fbf8fb261c37c44d5cd8 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Mon, 15 Jul 2024 21:30:00 +1000 Subject: [PATCH 435/562] networkd-notify: fix gobject-introspection typelib lookup (#327285) Co-authored-by: Sandro --- pkgs/tools/networking/networkd-notify/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/tools/networking/networkd-notify/default.nix index 120bb8111f02..6671983e1e7d 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/tools/networking/networkd-notify/default.nix @@ -5,6 +5,7 @@ , pygobject3 , systemd , wirelesstools +, wrapGAppsNoGuiHook }: buildPythonApplication rec { @@ -20,6 +21,10 @@ buildPythonApplication rec { hash = "sha256-fanP1EWERT2Jy4OnMo8OMdR9flginYUgMw+XgmDve3o="; }; + nativeBuildInputs = [ + wrapGAppsNoGuiHook + ]; + propagatedBuildInputs = [ dbus-python pygobject3 @@ -39,6 +44,13 @@ buildPythonApplication rec { install -D -m0644 networkd-notify.desktop -t "$out/share/applications/" ''; + # Let the Python wrapper add gappsWrapperArgs, to avoid two layers of wrapping. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Desktop notification integration for systemd-networkd"; mainProgram = "networkd-notify"; From de3f7651625b5b065a5aa386dadcd5b85267292b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 11:55:34 +0000 Subject: [PATCH 436/562] workout-tracker: 1.15.2 -> 1.16.1 --- pkgs/by-name/wo/workout-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index ad5cb683c4ce..41aec58d70f0 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "1.15.2"; + version = "1.16.1"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-NYRoIfhdOjyC9WPp3hsHFZWpAsDjbMk2vLn79PixhvE="; + hash = "sha256-A5HmNKRiHwo7aPrhQWHjPZUT29zaxCN6z4SR8jR9jOg="; }; vendorHash = null; From 8796a01aad2a9b8396551466eac95364dc5dd4b7 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:00:56 +0200 Subject: [PATCH 437/562] virtualboxGuestAdditions: cleanup --- .../virtualization/virtualbox/guest-additions/builder.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 72c0af9626f7..05b39e5fee00 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -37,7 +37,6 @@ in stdenv.mkDerivation (finalAttrs: { ''; patches = [ - #../gcc-13.patch ## https://www.virtualbox.org/changeset/100258/vbox ./no-legacy-xorg.patch ]; From e05605ec414618eab4a7a6aea8b38f6fbbcc8f08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 12:09:36 +0000 Subject: [PATCH 438/562] bun: 1.1.18 -> 1.1.20 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index a68bd4353baa..0cc03477db96 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.18"; + version = "1.1.20"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-USN4hMdTjoij1JQ3lWztk9ue4pB+kqaYvD7AuxWz4is="; + hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-JIaprZk36YW+oUe6DLWba0OIK69LuhVsq8cjnQ9o72A="; + hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-LSAfEQIXb0aQjVLaJ/4sDasVVAIxjUIMRQlMAzBlXEk="; + hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-n/HcFSSNtnmzEa4nBuzn8LuJ/IQ3/QUlTt3OO5T/ACQ="; + hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U="; }; }; updateScript = writeShellScript "update-bun" '' From 9eeb6815d242a3566150def5a54cfea9249dfa30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 12:18:59 +0000 Subject: [PATCH 439/562] python312Packages.knack: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/knack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 6953cd45b885..20d00b4c47fc 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "knack"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ="; + hash = "sha256-cfKmtCrpowLkMkMyD6Be2wmxkzn88fMx9bbQe/l/UpE="; }; propagatedBuildInputs = [ From 376aad5b57b5ab7daa1eb2ff2ef55aab2ad40da0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 12:39:59 +0000 Subject: [PATCH 440/562] allure: 2.29.0 -> 2.30.0 --- pkgs/development/tools/allure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index b711e38364a3..2db5d880138f 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.29.0"; + version = "2.30.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs="; + hash = "sha256-jYdinK7it2MDwrWZmxPHR5YqZhhVIo2vMZDCX38+igU="; }; dontConfigure = true; From 721ac05080812b5763f46a4711ff59a32b480ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jul 2024 00:29:15 -0700 Subject: [PATCH 441/562] onionshare: fix python 3.12 compatibility, use pkgs.callPackage --- .../networking/onionshare/default.nix | 52 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 49ce4fae1217..309bfc185aca 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -1,41 +1,25 @@ { lib , stdenv -, buildPythonApplication -, colorama , fetchFromGitHub , fetchpatch -, flask -, flask-compress -, flask-socketio -, gevent-websocket , obfs4 -, psutil -, packaging -, pycrypto -, pynacl -, pyside6 -, pysocks -, pytestCheckHook -, qrcode +, python3 , qt5 -, requests , snowflake -, stem , substituteAll , tor -, unidecode -, waitress -, werkzeug }: let version = "2.6.2"; + src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko="; }; + meta = with lib; { description = "Securely and anonymously send and receive files"; longDescription = '' @@ -63,10 +47,9 @@ let # TODO: package meek https://support.torproject.org/glossary/meek/ meek = "/meek-not-available"; - in rec { - onionshare = buildPythonApplication { + onionshare = python3.pkgs.buildPythonApplication { pname = "onionshare-cli"; inherit version; src = "${src}/cli"; @@ -77,8 +60,17 @@ rec { inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) + + # Remove distutils for Python 3.12 compatibility + # https://github.com/onionshare/onionshare/pull/1907 + (fetchpatch { + url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch"; + includes = [ "onionshare_cli/onion.py" ]; + stripLen = 1; + hash = "sha256-4XkqaEhMhvj6PyMssnLfXRazdP4k+c9mMDveho7pWg8="; + }) ]; - propagatedBuildInputs = [ + dependencies = with python3.pkgs; [ colorama flask flask-compress @@ -91,7 +83,6 @@ rec { pyside6 pysocks qrcode - qrcode requests stem unidecode @@ -104,7 +95,7 @@ rec { tor ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; @@ -129,7 +120,7 @@ rec { }; }; - onionshare-gui = buildPythonApplication { + onionshare-gui = python3.pkgs.buildPythonApplication { pname = "onionshare"; inherit version; src = "${src}/desktop"; @@ -147,9 +138,18 @@ rec { stripLen = 1; hash = "sha256-wfIjdPhdUYAvbK5XyE1o2OtFOlJRj0X5mh7QQRjdyP0="; }) + + # Remove distutils for Python 3.12 compatibility + # https://github.com/onionshare/onionshare/pull/1907 + (fetchpatch { + url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch"; + includes = [ "onionshare/update_checker.py" ]; + stripLen = 1; + hash = "sha256-mRRj9cALZVHw86CgU17sp9EglKhkRRcGfROyQpsXVfU="; + }) ]; - propagatedBuildInputs = [ + dependencies = with python3.pkgs; [ onionshare pyside6 qrcode diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12c48c9586da..29619cfcac57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33119,7 +33119,7 @@ with pkgs; omxplayer = callPackage ../applications/video/omxplayer { }; - inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + inherit (callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; openambit = qt5.callPackage ../applications/misc/openambit { }; From 05b4a52e0a65cc74f47eaafcb91115c834568f5a Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 15 Jul 2024 09:49:49 -0300 Subject: [PATCH 442/562] flatpak-builder: update test --- nixos/tests/installed-tests/flatpak-builder.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installed-tests/flatpak-builder.nix b/nixos/tests/installed-tests/flatpak-builder.nix index d5e04fcf975c..fd3df6bdea8f 100644 --- a/nixos/tests/installed-tests/flatpak-builder.nix +++ b/nixos/tests/installed-tests/flatpak-builder.nix @@ -5,8 +5,11 @@ makeInstalledTest { testConfig = { services.flatpak.enable = true; - xdg.portal.enable = true; - xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + config.common.default = "gtk"; + }; environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies; virtualisation.diskSize = 2048; }; From a61af8db2e6a8d9a8d419347116f642d9efb2e58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 11 Jul 2024 00:04:03 +0200 Subject: [PATCH 443/562] ray: 2.31.0 -> 2.32.0 Diff: https://github.com/ray-project/ray/compare/ray-2.31.0...ray-2.32.0 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.32.0 --- pkgs/development/python-modules/ray/binary-hashes.nix | 6 +++--- pkgs/development/python-modules/ray/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 802f7061a7c2..98c442139dca 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-iSKDUwJTakE1nStvaMvJ5RwS7+a9JiurOe8wcRjs7Ik="; + hash = "sha256-YlQ2hoW5MjQkOJ4L2/GsomlyX3rkNDjdC82hZ0RwzGw="; }; cp311 = { - hash = "sha256-SQ7tIqb+XWqWqUYxAT8PTT9SBnl1us6soJiy9zLHJQI="; + hash = "sha256-VhbwU8sSccbuybGCPGeEF+lXv9fGGtVs1+e4S5vOURI="; }; cp312 = { - hash = "sha256-ri2m867sokJjB3wB7yOEEQczRzMglzbCJ0vOomJDhGI="; + hash = "sha256-EYug39E5RXG8W8x7aQTajcbFmvq8FZiXxdiSKV3htBE="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index cad6772ed22a..3b6976d02f72 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -52,7 +52,7 @@ let pname = "ray"; - version = "2.31.0"; + version = "2.32.0"; in buildPythonPackage rec { inherit pname version; @@ -76,7 +76,7 @@ buildPythonPackage rec { // binary-hash ); - passthru.optional-dependencies = rec { + optional-dependencies = rec { data-deps = [ pandas pyarrow From 865a25ef49ee4348e484954321cb498ec749a1c8 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 15 Jul 2024 09:55:52 -0300 Subject: [PATCH 444/562] flatpak-builder: 1.4.2 -> 1.4.4 --- .../development/tools/flatpak-builder/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5752925e1451..8d01cbeb5db8 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -41,19 +41,16 @@ , attr }: -let - installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "flatpak-builder"; - version = "1.4.2"; + version = "1.4.4"; outputs = [ "out" "doc" "man" "installedTests" ]; # fetchFromGitHub fetches an archive which does not contain the full source (https://github.com/flatpak/flatpak-builder/issues/558) src = fetchurl { - # TODO: remove the '-fixed-libglnx' in the next release - url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}-fixed-libglnx.tar.xz"; - hash = "sha256-wEG5dOA6LC082oig7+Hs9p+a30KhdY6sNB1VXnedBZY="; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}.tar.xz"; + hash = "sha256-3CcVk5S6qiy1I/Uvh0Ry/1DRYZgyMyZMoqIuhQdB7Ho="; }; patches = [ @@ -124,7 +121,9 @@ in stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # Installed tests - postFixup = '' + postFixup = let + installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; + in '' for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh,test-builder-deprecated.sh}; do patchShebangs $file done From 526d5e59e015e30e033e4ae2d446740e87258aa1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jul 2024 13:39:59 +0200 Subject: [PATCH 445/562] cloud-hypervisor: move openssl to checkInputs This is only used by the test_infra crate. --- pkgs/applications/virtualization/cloud-hypervisor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index c208ec8f92d9..27df7ab81925 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; + buildInputs = lib.optional stdenv.isAarch64 dtc; + checkInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; From 5e68bcc4e0ae75ffe44da29932cbbd91f2722863 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 15 Jul 2024 09:11:57 -0400 Subject: [PATCH 446/562] python3Packages.python-fedora: remove nose (#327169) --- pkgs/development/python-modules/python-fedora/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-fedora/default.nix b/pkgs/development/python-modules/python-fedora/default.nix index f424a3f01b97..91f53f56d856 100644 --- a/pkgs/development/python-modules/python-fedora/default.nix +++ b/pkgs/development/python-modules/python-fedora/default.nix @@ -6,7 +6,6 @@ kitchen, lockfile, munch, - nose, openidc-client, pytestCheckHook, pythonOlder, @@ -43,7 +42,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose ]; disabledTestPaths = [ From 27acd6ca49fdc4df682604945068d92623629835 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 15 Jul 2024 10:22:19 -0300 Subject: [PATCH 447/562] lime3ds: 2114 -> 2115 --- pkgs/by-name/li/lime3ds/package.nix | 36 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index a030ea300272..a7317837d2d3 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -39,18 +39,20 @@ , enableCubeb ? true , cubeb , useDiscordRichPresence ? false , rapidjson }: let + inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; + compat-list = fetchurl { name = "lime3ds-compat-list"; - url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/b0c8b6b80d716db6b957ba103c7a9e17ead24d55/compatibility_list.json"; - hash = "sha256-2wNqtorcQo3o09tisikW+cj6cVLLQEiJ1Zcai5ptGEU="; + url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/fa9d49d22e698df2f238e53f2b34acda08b947f6/compatibility_list.json"; + hash = "sha256-dNZuU8uFXJ5gw/rmtF6bAjtrvVBXP8aUNXVdBY1dT34="; }; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2114"; + version = "2115"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-PGrKh10dBFAWn37G8m/2/ymqcgtAuxB+5Xib0FI+IMQ="; + hash = "sha256-sYdYuMl+22vZRU+qX7E/TZO2sTJELkqKS56RoU/6oME="; }; nativeBuildInputs = [ @@ -88,14 +90,14 @@ in stdenv.mkDerivation (finalAttrs: { xorg.libX11 xorg.libXext zstd - ] ++ lib.optionals enableQt (with kdePackages; [ + ] ++ optionals enableQt (with kdePackages; [ qtbase qtmultimedia qttools qtwayland - ]) ++ lib.optionals enableQtTranslations [kdePackages.qttools] - ++ lib.optionals enableCubeb [cubeb] - ++ lib.optional useDiscordRichPresence rapidjson; + ]) ++ optionals enableQtTranslations [kdePackages.qttools] + ++ optionals enableCubeb [cubeb] + ++ optional useDiscordRichPresence rapidjson; postPatch = '' # Fix file not found when looking in var/empty instead of opt @@ -112,24 +114,24 @@ in stdenv.mkDerivation (finalAttrs: { # Add gamemode substituteInPlace externals/gamemode/include/gamemode_client.h \ - --replace-fail "libgamemode.so.0" "${lib.getLib gamemode}/lib/libgamemode.so.0" + --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0" ''; postInstall = let - libs = lib.makeLibraryPath [ vulkan-loader ]; - in lib.optionalString enableSdl2Frontend '' + libs = makeLibraryPath [ vulkan-loader ]; + in optionalString enableSdl2Frontend '' for binfile in lime3ds-gui lime3ds-cli lime3ds-room do wrapProgram "$out/bin/$binfile" \ --prefix LD_LIBRARY_PATH : ${libs} - '' + lib.optionalString enableQt '' + '' + optionalString enableQt '' qtWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${libs} ) done ''; - cmakeFlags = with lib; [ + cmakeFlags = [ (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) (cmakeBool "USE_SYSTEM_LIBS" true) @@ -145,12 +147,12 @@ in stdenv.mkDerivation (finalAttrs: { (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) ]; - meta = with lib; { + meta = { description = "A Nintendo 3DS emulator based on Citra"; homepage = "https://github.com/Lime3DS/Lime3DS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ arthsmn ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ arthsmn ]; mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) From 3ec86ec2a9086b91b924d9baec0118400f491a32 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:35:43 +0100 Subject: [PATCH 448/562] pinta: move to pkgs/by-name --- pkgs/{applications/graphics => by-name/pi}/pinta/deps.nix | 0 .../graphics/pinta/default.nix => by-name/pi/pinta/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/graphics => by-name/pi}/pinta/deps.nix (100%) rename pkgs/{applications/graphics/pinta/default.nix => by-name/pi/pinta/package.nix} (100%) diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/by-name/pi/pinta/deps.nix similarity index 100% rename from pkgs/applications/graphics/pinta/deps.nix rename to pkgs/by-name/pi/pinta/deps.nix diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/by-name/pi/pinta/package.nix similarity index 100% rename from pkgs/applications/graphics/pinta/default.nix rename to pkgs/by-name/pi/pinta/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e361ef82213..fa00018dae2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33336,8 +33336,6 @@ with pkgs; pinpoint = callPackage ../applications/office/pinpoint { }; - pinta = callPackage ../applications/graphics/pinta { }; - pistol = callPackage ../tools/misc/pistol { }; piston-cli = callPackage ../tools/misc/piston-cli { }; From a3f54798bd1349ee7a7807bfe5bee36c9227ae7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 10:13:22 +0200 Subject: [PATCH 449/562] opendylan: remove --- pkgs/development/compilers/opendylan/bin.nix | 43 ------------------ .../compilers/opendylan/default.nix | 44 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 6 --- 4 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 pkgs/development/compilers/opendylan/bin.nix delete mode 100644 pkgs/development/compilers/opendylan/default.nix diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix deleted file mode 100644 index ef6dc0ce91ba..000000000000 --- a/pkgs/development/compilers/opendylan/bin.nix +++ /dev/null @@ -1,43 +0,0 @@ -# Binaries provided by Open Dylan to be used to bootstrap from source. -# The binaries can also be used as is. -{lib, stdenv, fetchurl, patchelf, boehmgc, gcc, makeWrapper}: - -stdenv.mkDerivation rec { - pname = "opendylan"; - version = "2013.2"; - - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86_64-linux.tar.bz2"; - sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; - } - else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86-linux.tar.bz2"; - sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; - } - else throw "platform ${stdenv.hostPlatform.system} not supported."; - - nativeBuildInputs = [ patchelf boehmgc makeWrapper ]; - - buildCommand = '' - mkdir -p "$out" - tar --strip-components=1 -xjf "$src" -C "$out" - - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for a in "$out"/bin/*; do - patchelf --set-interpreter "$interpreter" "$a" - patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" - done - for a in "$out"/lib/*.so; do - patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" - done - sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam - wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin - ''; - - meta = { - homepage = "https://opendylan.org"; - description = "Multi-paradigm functional and object-oriented programming language"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix deleted file mode 100644 index 42bd79c90519..000000000000 --- a/pkgs/development/compilers/opendylan/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Build Open Dylan from source using the binary builds to bootstrap. -{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: - -stdenv.mkDerivation { - pname = "opendylan"; - version = "2016.1pre"; - - src = fetchFromGitHub { - owner = "dylan-lang"; - repo = "opendylan"; - rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - hash = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ makeWrapper autoconf automake ]; - buildInputs = (if stdenv.hostPlatform.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ - opendylan-bootstrap boehmgc perl - ]; - - preConfigure = if stdenv.hostPlatform.system == "i686-linux" then '' - mkdir -p $TMPDIR/mps - tar --strip-components=1 -xf ${mps.src} -C $TMPDIR/mps - ./autogen.sh - '' - else '' - ./autogen.sh - ''; - - configureFlags = [ - (if stdenv.hostPlatform.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}") - ]; - buildPhase = "make 3-stage-bootstrap"; - - postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; - - meta = { - homepage = "https://opendylan.org"; - description = "Multi-paradigm functional and object-oriented programming language"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - broken = true; # last successful build 2020-12-11 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d59992da0c0f..873a2b160546 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1018,6 +1018,8 @@ mapAliases ({ openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 + opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 + opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d810788feb8c..d2b95cefc0a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11139,16 +11139,10 @@ with pkgs; opendkim = callPackage ../development/libraries/opendkim { }; - opendylan = callPackage ../development/compilers/opendylan { - opendylan-bootstrap = opendylan_bin; - }; - openfec = callPackage ../development/libraries/openfec { }; ophis = python3Packages.callPackage ../development/compilers/ophis { }; - opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; - open-ecard = callPackage ../tools/security/open-ecard { }; open-interpreter = with python3Packages; toPythonApplication open-interpreter; From 6492c4ee641378f1e0dcf9adb5fe3c79685d4ec7 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 15 Jul 2024 10:39:30 -0300 Subject: [PATCH 450/562] xwayland-run: 0.0.3 -> 0.0.4 --- pkgs/by-name/xw/xwayland-run/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index b229c66df918..9b5b4a514e64 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -20,14 +20,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "xwayland-run"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ofourdan"; repo = "xwayland-run"; rev = version; - hash = "sha256-yYULbbcFDT1zRFn1UWS0dyuchGYnOZypDmxqc14RYF4="; + hash = "sha256-FP/2KNPehZEGKXr+fKdVj4DXzRMpfc3x7K6vH6ZsGdo="; }; pyproject = false; @@ -48,12 +48,12 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : ${lib.makeBinPath (compositors ++ [ xwayland xorg.xauth ])} ''; - meta = with lib; { + meta = { changelog = "https://gitlab.freedesktop.org/ofourdan/xwayland-run/-/releases/${src.rev}"; description = "Set of small utilities revolving around running Xwayland and various Wayland compositor headless"; homepage = "https://gitlab.freedesktop.org/ofourdan/xwayland-run"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ arthsmn ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; }; } From 19353ae38b5731e4596291b5a289fb363473b0c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:40:22 +0100 Subject: [PATCH 451/562] pinta: 2.1.1 -> 2.1.2 --- pkgs/by-name/pi/pinta/deps.nix | 28 ++++++++++++++-------------- pkgs/by-name/pi/pinta/package.nix | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pi/pinta/deps.nix b/pkgs/by-name/pi/pinta/deps.nix index 5f637d347f5c..6d7e63396d76 100644 --- a/pkgs/by-name/pi/pinta/deps.nix +++ b/pkgs/by-name/pi/pinta/deps.nix @@ -2,18 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) - (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; sha256 = "067s9i5mjxlmw0nid3fblr9d0hy1b6zrjzhhi48rf4cs2j72pl64"; }) + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; hash = "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k="; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; hash = "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg="; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; hash = "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA="; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; hash = "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw="; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; hash = "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag="; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; hash = "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "NGettext"; version = "0.6.7"; hash = "sha256-fmIODwPZkNJsnoNJG+EL1J5mpbuxYI4BsrgD1B4N2NI="; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; hash = "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI="; }) + (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; hash = "sha256-jCT6rkghEqMuGwiVeiIAspHW+kuiB2jRl9ireBwhVV0="; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; hash = "sha256-ZsmWYdcr73k6Vd9HK1sKBrit6LLiSr+haH8l9h+UAbY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; hash = "sha256-xNArjhSaEZcRiRB+mb9ZwUPQUqbLjRYt4JV2WUtM+hg="; }) ] diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 7f9c815eff1f..ea8ff4ec20b8 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -10,15 +10,15 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.1.1"; + version = "2.1.2"; nativeBuildInputs = [ intltool wrapGAppsHook3 ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; runtimeDeps = [ gtk3 ]; buildInputs = runtimeDeps; @@ -35,12 +35,12 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0="; + hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg="; }; # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + env.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; # Do the autoreconf/Makefile job manually # TODO: use upstream build system From ece092568a08fb8609c38d106f713667f771e601 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 15:27:23 +0200 Subject: [PATCH 452/562] discourse: fix nix-shell package order The python environment needs to come early, or else we're getting another python, that does not have the bundled dependencies. --- pkgs/servers/web-apps/discourse/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 9d922de7c9cc..972054904b29 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler nix-update nurl "python3.withPackages (ps: with ps; [ requests click click-log packaging ])" prefetch-yarn-deps +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests click click-log packaging ])" bundix bundler nix-update nurl prefetch-yarn-deps from __future__ import annotations import click From 078b2393fdba04873dffa8fe3c9a080d19fa5b02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 15:28:06 +0200 Subject: [PATCH 453/562] discourse: 3.2.3 -> 3.2.4 https://meta.discourse.org/t/3-2-4-security-and-bug-fix-release/315984 Fixes: CVE-2024-38360 --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b85be3beb0e3..5ad3209fd56c 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -47,13 +47,13 @@ }@args: let - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-ehv81trN8eG7QRAD5ERiSql6ZRCJK9cz6VOT9OzjZhg="; + sha256 = "sha256-bwYMLkBtdfgfAX8vKpsFRg5tpBtoaURKGF0rs/CtJ2U="; }; ruby = ruby_3_2; From 7a6af823583d16d8cc1e113d9d5dc394187fd8d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 15:29:39 +0200 Subject: [PATCH 454/562] discourse: update plugins --- .../web-apps/discourse/plugins/discourse-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index ee3910b8e0ab..eb4e2861ed55 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "94c7b7da216c66d773f800a714493f087affaac9"; - sha256 = "sha256-4ZPv42fw5YdJ3+QUGOh5CJMWkXoUVs4bTVd9zuFekQM="; + rev = "11dcab84669462b05eba3f1a59401727cafe8188"; + sha256 = "sha256-zVzmEfaANwX24rMq91gom6XmhKsEGraWon8vJu8j7iY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; From 684bb61aec1286a5013053f4c8856f587fa4c999 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:40:54 +0100 Subject: [PATCH 455/562] pinta: reformat for RFC166 --- pkgs/by-name/pi/pinta/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index ea8ff4ec20b8..8dce17f0ac78 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -1,11 +1,12 @@ -{ lib -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -, glibcLocales -, gtk3 -, intltool -, wrapGAppsHook3 +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + glibcLocales, + gtk3, + intltool, + wrapGAppsHook3, }: buildDotnetModule rec { From 1cfa221982663dc3f9707df6ca90273b68b8ce2e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:44:39 +0100 Subject: [PATCH 456/562] pinta: add meta.changelog --- pkgs/by-name/pi/pinta/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 8dce17f0ac78..d6d27d09ce80 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -80,12 +80,13 @@ buildDotnetModule rec { -p:InstallPrefix="$out" ''; - meta = with lib; { + meta = { homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; - license = licenses.mit; - maintainers = with maintainers; [ thiagokokada ]; - platforms = with platforms; linux; + changelog = "https://github.com/PintaProject/Pinta/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thiagokokada ]; + platforms = lib.platforms.linux; mainProgram = "pinta"; }; } From 35b2e45ab3c81da180f1b7019f97d39a98a7fe28 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:34:40 +0200 Subject: [PATCH 457/562] python311Packages.holoviews: fix build --- .../python-modules/holoviews/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index ae765df32b4b..78633fe9ef6f 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,34 +1,36 @@ { lib, - bokeh, buildPythonPackage, colorcet, fetchPypi, - ipython, - matplotlib, - notebook, + hatch-vcs, + hatchling, numpy, pandas, panel, param, pythonOlder, pyviz-comms, - scipy, }: buildPythonPackage rec { pname = "holoviews"; version = "1.19.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-yrFSL3WptGN3+TZLZ1vv15gS4iAFlxRHCljiFHXVMbo="; }; - propagatedBuildInputs = [ + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ colorcet numpy pandas From a36feea6e422d96df24f23ed4ea91a91046aec98 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 15 Jul 2024 15:50:51 +0200 Subject: [PATCH 458/562] python311Packages.hvplot: fix build --- pkgs/development/python-modules/hvplot/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 408263164621..675e82cf2e57 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -7,21 +7,24 @@ holoviews, pandas, pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "hvplot"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; }; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ bokeh colorcet holoviews From d4eba7762c4d223076e915a6ed50f99df00ee9f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 16:00:43 +0200 Subject: [PATCH 459/562] python312Packages.sentry-sdk_2: 2.9.0 -> 2.10.0 https://github.com/getsentry/sentry-python/blob/2.10.0/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d29532748da4..4bfd35cae5ad 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -63,14 +63,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-0nk5ljHm1bv/Ay0tqR3zrAfw4RKgOVq8a4hJ82w73xo="; + hash = "sha256-sK3jd26zfGp707GXZEU9RwB1aFuqfTGl8rGfGreuj38="; }; postPatch = '' From 10c8868b7fa7fb6c5f0ffc5a88bf09a9e6cc2e54 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Mon, 15 Jul 2024 11:52:46 +0200 Subject: [PATCH 460/562] programs.ydotool: remove invalid systemd directive fixes #327156 --- nixos/modules/programs/ydotool.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/ydotool.nix b/nixos/modules/programs/ydotool.nix index 643a5d369f3f..3377ae426261 100644 --- a/nixos/modules/programs/ydotool.nix +++ b/nixos/modules/programs/ydotool.nix @@ -68,7 +68,6 @@ in ProtectKernelTunables = true; ProtectProc = "invisible"; ProtectSystem = "strict"; - ProtectUser = true; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; From 34b71eba0dc80eb9a305d008343ce45450cd2655 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 15:04:47 +0100 Subject: [PATCH 461/562] snes9x: 1.62.3-unstable-2024-04-22 -> 1.63 --- pkgs/by-name/sn/snes9x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 3f57aee0ed47..5ddcbeef7459 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snes9x" + lib.optionalString withGtk "-gtk"; - version = "1.62.3-unstable-2024-04-22"; + version = "1.63"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "582128bce7ccf4e3cf7848ae9f6a729a1ebad4c4"; + rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-fJ1g/L7oA9bhEawTsWjfLl1dDIKEGI+pcpWQCTutyR8="; + hash = "sha256-INMVyB3alwmsApO7ToAaUWgh7jlg2MeLxqHCEnUO88U="; }; nativeBuildInputs = [ From 516ed1c72c0cf1fdf9f45c6b478f25b097346f73 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 15:05:04 +0100 Subject: [PATCH 462/562] snes9x: enableParallelBuilding = true --- pkgs/by-name/sn/snes9x/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 5ddcbeef7459..e125d3ee9eb9 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + enableParallelBuilding = true; + meta = let interface = if withGtk then "GTK" else "X11"; in From a7cfe22c958b84aeab15da2f381119a567ed98be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 14:09:18 +0000 Subject: [PATCH 463/562] espup: 0.12.0 -> 0.12.1 --- pkgs/development/tools/espup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index f3624575f8f9..d0b68382e419 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-ofC9pBKZEKGNNirshhfcCkzWN4CvD7IfArZaikkfnmI="; + hash = "sha256-cbBfzx195zk98IbSNSx99CF1RqH+ySpy6SQk5y8rvq4="; }; - cargoHash = "sha256-fM1If/RnPzLDYjUImNkMViWkjXBc5YRIJHthypcJfmc="; + cargoHash = "sha256-N1TpBN5wULY+brBxUfwFrBTLKrVI8Cq3OX8fJqLHwAI="; nativeBuildInputs = [ pkg-config From 3320081e115b947399d461c31854cd74834cecb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 01:45:22 +0000 Subject: [PATCH 464/562] uni2ascii: 4.18 -> 4.20 --- pkgs/tools/text/uni2ascii/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index d83e9393f941..fab6ac79de16 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -2,13 +2,20 @@ stdenv.mkDerivation rec { pname = "uni2ascii"; - version = "4.18"; + version = "4.20"; src = fetchurl { url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; - sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; + hash = "sha256-7tjYOpwdLb0NfKTFJRmYg9cxfWiLQhtXjQmKJ7b/cFY="; }; + patches = [ + (fetchurl { + url = "https://github.com/Homebrew/formula-patches/raw/bb92449ad6b3878b4d6f472237152df28080df86/uni2ascii/uni2ascii-4.20.patch"; + hash = "sha256-JQpSntoTbQ7fnmO5Km/pX071360/lOb9jYdxOK2oV/g="; + }) + ]; + meta = { license = lib.licenses.gpl3; homepage = "http://billposer.org/Software/uni2ascii.html"; From c3c2ea4fb8e27c4eb4cce7bed4f2c43715f2f23d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jul 2024 05:26:55 +0000 Subject: [PATCH 465/562] tryton: 7.2.2 -> 7.2.3 --- pkgs/applications/office/tryton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index ddb0138e6897..2e16d0d4cc84 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.2"; + version = "7.2.3"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; + hash = "sha256-W5DXOLUr4c9w9Zcp9i5esNjSSIMewe+NJGh+h3PiD30="; }; nativeBuildInputs = [ From 61cc26eef6f3b2b2ede2451d1074a61c1c70899a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:15:05 -0400 Subject: [PATCH 466/562] jadx: fix finalAttrs.pname misuse --- pkgs/tools/security/jadx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index a857ed571416..a0c494fa3c63 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "skylot"; - repo = finalAttrs.pname; + repo = "jadx"; rev = "v${finalAttrs.version}"; hash = "sha256-3t2e3WfH/ohkdGWlfV3t9oHJ1Q6YM6nSLOgmzgJEkls="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; mitmCache = gradle.fetchDeps { - inherit (finalAttrs) pname; + pname = "jadx"; data = ./deps.json; }; From 15836e596774d4e9e44cda72f178dbfaa96320f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jul 2024 02:29:33 +0000 Subject: [PATCH 467/562] rshell: 0.0.32 -> 0.0.33 --- pkgs/development/embedded/rshell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index 7791ba72e907..926832ec6ea5 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.32"; + version = "0.0.33"; src = fetchPypi { inherit pname version; - hash = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; + hash = "sha256-yD4F4xZpHaID5aXZ5tbCZB24a/+FtyobmAOV5GOJMMU="; }; propagatedBuildInputs = [ From c05e2a7e78c9477d1c4e9131a06fb242c2bb9ae7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Jul 2024 16:19:27 +0200 Subject: [PATCH 468/562] php81Packages.phpspy: add upstream patch to fix version --- pkgs/development/php-packages/phpspy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/php-packages/phpspy/default.nix b/pkgs/development/php-packages/phpspy/default.nix index eb96160ea73c..63cd23efc8f1 100644 --- a/pkgs/development/php-packages/phpspy/default.nix +++ b/pkgs/development/php-packages/phpspy/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, gnugrep, binutils, makeBinaryWrapper, @@ -22,6 +23,13 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://github.com/adsr/phpspy/commit/8854e60ac38cfd2455d4a3d797f283eb3940cb7b.patch"; + hash = "sha256-IMO9GV0Z8PDEAVhLevg5jGh/PHcbNq3f3fMGFaKoLL4="; + }) + ]; + nativeBuildInputs = [ makeBinaryWrapper php.unwrapped From 131f822e17d6a277cd9b4b77e2d2959b064f7e46 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 15:20:53 +0100 Subject: [PATCH 469/562] graalvm-ce: 22.0.0 -> 22.0.1 --- .../graalvm/community-edition/buildGraalvm.nix | 6 +----- .../community-edition/graalvm-ce/hashes.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 34ed06e1de12..83d60202a4fc 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -171,15 +171,11 @@ let $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' - ${# --static is only available in Linux + ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image $extraNativeImageArgs -march=compatibility --static HelloWorld - ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 1ce3b864a6bf..47bd1bc92f8b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "22.0.0"; + "version" = "22.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "01097qag9kjjwh3q11j76bn79x80dm8h5rdd6gzwrsqhn48hx6ns"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-aarch64_bin.tar.gz"; + sha256 = "1kr8ch78570c3z5mcx10an96vdzril7wxq7bdaxx4qvbrhw06l9a"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0mq6vdsfgas8lhz1vdiz8qya37fy7qn0078q30zpa09ila3b9vp5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz"; + sha256 = "0x8za6h3bza5fpdds849v0mjy7yh0hz2r8sgmfcvp966x3lcfkp3"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1l8h9ai7s4km8wx1x43s3barnbq7b6hzfr1mbbmiksng1d2p26v9"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-x64_bin.tar.gz"; + sha256 = "1y1hxfgfmzyx8makzl98phjq4k8r1iidvx25gs8mzm7b7zzjsg2m"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "11ncf4wd5asr3jz21fs0j5w49zxrsdw3j42mpcczjy2z1j813cc7"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-aarch64_bin.tar.gz"; + sha256 = "1h39qw97xcr4ii9kbgm41rczq759ma2vcg5xbypp80w0khsicsmr"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_macos-aarch64_bin.tar.gz"; }; }; } From 3cb8078b3b2b7ac2fb3565f1a5fdbd5a21d58aaf Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 15:27:37 +0100 Subject: [PATCH 470/562] graalvmCEPackages.graalnodejs: 23.1.0 -> 24.0.1 --- .../community-edition/graalnodejs/default.nix | 2 +- .../community-edition/graalnodejs/hashes.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix index fb6d1595bbf3..d98f4b0e380f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix @@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; - product = "nodejs-installable-svm"; + product = "graalnodejs"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix index 3546a11c2fc8..bd17b11ea612 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "24.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "056x616pp0b25wsryzrfrfnjaxr3444fc3hmv8jspl4pjxjrais2"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "01hldmg7wfxkw0sdcnx4hg8aww8f73cdnkallx2ljm53h77n4hcb"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "1si2ifwihszv06sqd25mswibiqbxhxgj6yw829f8zrdhs0sra2nz"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "0x2a9d4kp4s0sm0cj3al8xkixcicagsknfpclfj07vb46p4h09j5"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1ffkdavrs92h3f5yil15v3i7r9aggkpfqd13gl5ipqlrk6pykhr7"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "1k5hpkvhx8wkjps2qlxicif81m2dp75w4yflarppfcvaz4qx5y45"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1g6pql0pdxhxwpjqyfkaq07dar8sx2wipsyrjc7hmz3z7pjxcf5i"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "1npzqmwhjjq1kazd52a2vi7pdwmr22acg8qf6b8r0z3y7psax1s0"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-aarch64.tar.gz"; }; }; } From 2ba084c79bcfe10f84bea07bbf0f0aae02251472 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 15:29:24 +0100 Subject: [PATCH 471/562] graalvmCEPackages.graaljs: 23.1.0 -> 24.0.1 --- .../community-edition/graaljs/default.nix | 2 +- .../community-edition/graaljs/hashes.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix index 0a7f04052bb6..ec662e156721 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix @@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; - product = "js-installable-svm"; + product = "graaljs"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix index 268a9743a025..50fd67362412 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "24.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "09q88nsbz0lrl866x3hqxm3hb5wpn4x5rp6pk69x1v6xzl58wzq2"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "11mz4qrp96iiblc25yssmczjwc44qf5z6q3c40dvmqyzz7rb7dm7"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0zlk0gpxwjkh4wxsc310kl80ipgk5si1lmyx0q2hqsw9lm98n41g"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "0ljmgaw5l617k1z26jlfj7pk87jkrgmai999vjbcvj1z7l26am2g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1y5mc92yync85ywcahvq8x9jlla0rzjd4g7cm6q7p21wvfwp4d5q"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "1h629gzdaay2rr5vgxir4kybarl19rcmvbsgrfri007rkchyxr5g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0ph3c6jgbvm3cliyqlccd2l292a7p0051l3sv7yf3318r6zrrk7m"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "11sjplallyhf0vp6b53rhj5cv0zb6haii4aaan5xahplw9gavv8g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-aarch64.tar.gz"; }; }; } From c0be044fc241fc09d5d84e68e0ba6da4130f4d36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 14:36:28 +0000 Subject: [PATCH 472/562] gomodifytags: 1.16.0 -> 1.17.0 --- pkgs/development/tools/gomodifytags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 2d256bbf7280..c66137a82899 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomodifytags"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "fatih"; repo = "gomodifytags"; rev = "v${version}"; - sha256 = "1yhkn9mdvsn9i5v03c5smz32zlhkylnxhkcbjb7llafxzbhzgfm6"; + sha256 = "sha256-XVjSRW7FzXbGmGT+xH4tNg9PVXvgmhQXTIrYYZ346/M="; }; - vendorHash = "sha256-8efqJfu+gtoFbhdlDZfb8NsXV9hBDI2pvAQNH18VVhU="; + vendorHash = "sha256-0eWrkOcaow+W2Daaw2rzugfS+jqhN6RE2iCdpui9aQg="; meta = { description = "Go tool to modify struct field tags"; From f00ce8992f1991fc20d0504af2aae8ab5bca50d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 05:39:36 +0000 Subject: [PATCH 473/562] python312Packages.google-cloud-dlp: 3.18.0 -> 3.18.1 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 3772f823e92a..336bc4781365 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.18.0"; + version = "3.18.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R0CMx16DmMfc6Tw/YqPthYKyDxJcyODdMxAVrj62L34="; + hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0="; }; nativeBuildInputs = [ setuptools ]; From 8382cec160701eef8f096c0c0d2823312ada4540 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:51:48 +0200 Subject: [PATCH 474/562] python312Packages.google-cloud-dlp: fix changelog --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 336bc4781365..42f7a3e0b28b 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = "https://github.com/googleapis/python-dlp"; - changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dlp-v${version}/packages/google-cloud-dlp/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 5bb752fa62acb7d87521310645c128c158145d8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 02:06:17 +0000 Subject: [PATCH 475/562] python312Packages.google-cloud-redis: 2.15.3 -> 2.15.4 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 5dd7405a8d11..aca483456c1a 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.3"; + version = "2.15.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5qIx5FEHA4z+SY360fba0sp73KOpMTI3ML4Dq3oACo8="; + hash = "sha256-vG8+mL1A5j9Cuwzmz+aYbjmYXWlGCzriDNtQoLbwmoU="; }; nativeBuildInputs = [ setuptools ]; From 1c60e01321071426333dad6f943a79be361b22c7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:53:45 +0200 Subject: [PATCH 476/562] python312Packages.google-cloud-redis: fix changelog --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index aca483456c1a..851697c0dffd 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -44,8 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Memorystore for Redis API client library"; - homepage = "https://github.com/googleapis/python-redis"; - changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-redis-v${version}/packages/google-cloud-redis/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From f323e57a90ac410d9952e755725c93e87de205db Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Jul 2024 14:50:20 +0000 Subject: [PATCH 477/562] xfce.xfburn: 0.7.0 -> 0.7.1 https://gitlab.xfce.org/apps/xfburn/-/compare/xfburn-0.7.0...xfburn-0.7.1 Also enable optional udev and gstreamer support. --- .../xfce/applications/xfburn/default.nix | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index d2ba14d27dff..af652b1ad225 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -1,15 +1,40 @@ -{ lib, mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }: +{ + mkXfceDerivation, + lib, + docbook_xsl, + exo, + gst_all_1, + gtk3, + libburn, + libgudev, + libisofs, + libxfce4ui, + libxslt, +}: mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.7.0"; + version = "0.7.1"; odd-unstable = false; - sha256 = "sha256-/CuV2tqja5fa2H2mmU9BP6tZHoCZZML5d2LL/CG3rno="; + sha256 = "sha256-wKJ9O4V1b2SoqC4dDKKLg7u8IK9TcjVEa4ZxQv3UOOI="; - nativeBuildInputs = [ libxslt docbook_xsl ]; - buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; + nativeBuildInputs = [ + libxslt + docbook_xsl + ]; + + buildInputs = [ + exo + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk3 + libburn + libgudev + libisofs + libxfce4ui + ]; meta = with lib; { description = "Disc burner and project creator for Xfce"; From 7a44a7b081a8af270b1447a546528e63a3ff0874 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 15 Jul 2024 17:12:33 +0200 Subject: [PATCH 478/562] ci: add the security team to the codeowners of the ci/ directory Given its content is used in items already code-owned by the security team it should have the same level of scrutiny. --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 24be3d045d3a..e2bd963249bc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,7 +14,7 @@ # CI /.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/check-nix-format.yml @infinisil -/ci @infinisil +/ci @infinisil @NixOS/Security # Develompent support /.editorconfig @Mic92 @zowoq From 592cb1ee5d89c8f8c1a35b61a3e27d3d32edebad Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:14:22 -0300 Subject: [PATCH 479/562] linode-cli: add fish shell completion --- pkgs/tools/virtualization/linode-cli/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 795eb1e8636e..5c0150384611 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -71,7 +71,10 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash) + for shell in bash fish; do + installShellCompletion --cmd linode-cli \ + --$shell <($out/bin/linode-cli --skip-config completion $shell) + done ''; passthru.updateScript = ./update.sh; From 66572bc17554c1810045c9b05418225c3b89b456 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:20:56 -0300 Subject: [PATCH 480/562] linode-cli: meta add changelog, remove nested with --- pkgs/tools/virtualization/linode-cli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 5c0150384611..55128504fb64 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -79,11 +79,12 @@ buildPythonApplication rec { passthru.updateScript = ./update.sh; - meta = with lib; { - mainProgram = "linode-cli"; + meta = { description = "Linode Command Line Interface"; + changelog = "https://github.com/linode/linode-cli/releases/tag/v${version}"; homepage = "https://github.com/linode/linode-cli"; - license = licenses.bsd3; - maintainers = with maintainers; [ ryantm techknowlogick ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ryantm techknowlogick ]; + mainProgram = "linode-cli"; }; } From c0af897d90aa1fff4b953fc284bd73a3040bdfe1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:22:53 -0300 Subject: [PATCH 481/562] linode-cli: order attrs by phases order --- pkgs/tools/virtualization/linode-cli/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 55128504fb64..ba9826c3ef1a 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -47,6 +47,14 @@ buildPythonApplication rec { --replace "version = get_version()" "version='${version}'," ''; + postConfigure = '' + python3 -m linodecli bake ${spec} --skip-config + cp data-3 linodecli/ + echo "${version}" > baked_version + ''; + + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = [ colorclass pyyaml @@ -58,18 +66,11 @@ buildPythonApplication rec { packaging ]; - postConfigure = '' - python3 -m linodecli bake ${spec} --skip-config - cp data-3 linodecli/ - echo "${version}" > baked_version - ''; - doInstallCheck = true; installCheckPhase = '' $out/bin/linode-cli --skip-config --version | grep ${version} > /dev/null ''; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash fish; do installShellCompletion --cmd linode-cli \ From 2bc864f50e5b5182c3c88cdc3445dd14f188b85d Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Thu, 13 Jun 2024 11:28:11 -0400 Subject: [PATCH 482/562] librandombytes: init at 20240318 Co-authored-by: Abdullah Imad Co-authored-by: Alberto Merino Co-authored-by: Enric Morales Co-authored-by: Jack Leightcap Co-authored-by: Roland Coeurjoly Signed-off-by: Jack Leightcap updated the patch for cross compilin fixed patch Apply suggestions from code review Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- .../environment-variable-tools.patch | 34 ++++++++ pkgs/by-name/li/librandombytes/package.nix | 81 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 pkgs/by-name/li/librandombytes/environment-variable-tools.patch create mode 100644 pkgs/by-name/li/librandombytes/package.nix diff --git a/pkgs/by-name/li/librandombytes/environment-variable-tools.patch b/pkgs/by-name/li/librandombytes/environment-variable-tools.patch new file mode 100644 index 000000000000..e342a74fe4d0 --- /dev/null +++ b/pkgs/by-name/li/librandombytes/environment-variable-tools.patch @@ -0,0 +1,34 @@ +diff --git a/configure b/configure +index 36fcf67..39612f3 100755 +--- a/configure ++++ b/configure +@@ -143,6 +143,16 @@ firstcompiler = None + with open('compilers/default') as f: + for c in f.readlines(): + c = c.strip() ++ if env_cc := os.getenv('CC'): ++ c_as_list= c.split() ++ # check if the compiler we're testing has the name inside the last ++ # part of the CC env var ++ # i.e. gcc == x86_64-linux-unknown-gnu-gcc ++ # or gcc == gcc ++ if c_as_list[0] == env_cc.split("-")[-1]: ++ c_as_list[0] = env_cc ++ c = ' '.join(c_as_list) ++ log('patched command as %s' % c) + cv = compilerversion(c) + if cv == None: + log('skipping default compiler %s' % c) +diff --git a/scripts-build/staticlib b/scripts-build/staticlib +index 7b2fc92..a6bbe41 100755 +--- a/scripts-build/staticlib ++++ b/scripts-build/staticlib +@@ -4,6 +4,6 @@ lib="$1" + shift + + rm -f package/lib/"$lib".a +-ar cr package/lib/"$lib".a "$@" +-ranlib package/lib/"$lib".a || : ++${AR:-ar} cr package/lib/"$lib".a "$@" ++${RANLIB:-ranlib} package/lib/"$lib".a || : + chmod 644 package/lib/"$lib".a diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix new file mode 100644 index 000000000000..1a4ae6885b0d --- /dev/null +++ b/pkgs/by-name/li/librandombytes/package.nix @@ -0,0 +1,81 @@ +{ + stdenv, + lib, + python3, + openssl, + fetchzip, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "librandombytes"; + version = "20240318"; + + src = fetchzip { + url = "https://randombytes.cr.yp.to/librandombytes-${finalAttrs.version}.tar.gz"; + hash = "sha256-LE8iWw7FxckPREyqefgKtslD6CPDsL7VsfHScQ6JmLs="; + }; + + patches = [ ./environment-variable-tools.patch ]; + + postPatch = '' + patchShebangs configure + patchShebangs scripts-build + ''; + + # NOTE: librandombytes uses a custom Python `./configure`: it does not expect standard + # autoconfig --build --host etc. arguments: disable + configurePlatforms = [ ]; + + # NOTE: the librandombytes library has required specific CFLAGS defined: + # https://randombytes.cr.yp.to/librandombytes-20240318/compilers/default.html + # - `-O` (alias `-O1`) safe optimization + # - `-Qunused-arguments` suppress clang warning + # the default "fortify" hardening sets -O2, -D_FORTIFY_SOURCE=2: + # since librandombytes uses -O1, we disable the fortify hardening, and then manually re-enable -D_FORTIFY_SOURCE. + hardeningDisable = [ "fortify" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isClang [ "-Qunused-arguments" ] + ++ [ + "-D_FORTIFY_SOURCE=2" + "-O1" + ] + ); + + nativeBuildInputs = [ python3 ]; + + buildInputs = [ openssl ]; + + meta = { + homepage = "https://randombytes.cr.yp.to/"; + description = "A simple API for applications generating fresh randomness"; + changelog = "https://randombytes.cr.yp.to/download.html"; + license = with lib.licenses; [ + # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html + publicDomain + cc0 + bsd0 + mit + mit0 + ]; + maintainers = with lib.maintainers; [ + kiike + imadnyc + jleightcap + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + "armv7a-linux" + "aarch64-linux" + # Cannot support 32 bit MIPS because options in libcpucycles only supports mips64: https://cpucycles.cr.yp.to/libcpucycles-20240318/cpucycles/options.html + "mips64-linux" + "mips64el-linux" + # powerpc-linux (32 bits) is supported by upstream project but not by nix + "powerpc64-linux" + "powerpc64le-linux" + "riscv32-linux" + "riscv64-linux" + "s390x-linux" + # Upstream package supports sparc, but nix does not + ] ++ lib.platforms.darwin; # Work on MacOS X mentioned: https://randombytes.cr.yp.to/download.html + }; +}) From 694f2edcbf0310cd662e4a36f3fe8f3541be358f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:30:26 -0300 Subject: [PATCH 483/562] python3Packages.linode-metadata: init at 0.3.0 https://github.com/linode/py-metadata/releases/tag/v0.3.0 --- .../linode-metadata/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/linode-metadata/default.nix diff --git a/pkgs/development/python-modules/linode-metadata/default.nix b/pkgs/development/python-modules/linode-metadata/default.nix new file mode 100644 index 000000000000..a7b47d18efdc --- /dev/null +++ b/pkgs/development/python-modules/linode-metadata/default.nix @@ -0,0 +1,44 @@ +{ + buildPythonPackage, + fetchPypi, + httpx, + lib, + linode-cli, + pytest, + pytest-asyncio, + setuptools, +}: + +buildPythonPackage rec { + pname = "linode-metadata"; + version = "0.3.0"; + + src = fetchPypi { + pname = "linode_metadata"; + inherit version; + hash = "sha256-ZFCv9f4hbiBaJuKvzs/BGFoP+mAFwVa8OFF22b22voI="; + }; + + pyproject = true; + + dependencies = [ + httpx + setuptools + ]; + + checkInputs = [ + pytest + pytest-asyncio + ]; + + pythonImportsCheck = [ "linode_metadata" ]; + + meta = { + description = "Python package for interacting with the Linode Metadata Service"; + downloadPage = "https://pypi.org/project/linode-metadata/"; + homepage = "https://github.com/linode/py-metadata"; + changelog = "https://github.com/linode/py-metadata/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = linode-cli.meta.maintainers; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b0da130ca3..9cd250fb2997 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6996,6 +6996,8 @@ self: super: with self; { linode-api = callPackage ../development/python-modules/linode-api { }; + linode-metadata = callPackage ../development/python-modules/linode-metadata { }; + linode = callPackage ../development/python-modules/linode { }; linuxfd = callPackage ../development/python-modules/linuxfd { }; From f7c05d862df52325b24917531e3edd0481ed961a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:35:43 -0300 Subject: [PATCH 484/562] linode-cli: 5.45.0 -> 5.50.0 https://github.com/linode/linode-cli/releases/tag/v5.50.0 --- .../virtualization/linode-cli/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index ba9826c3ef1a..05566b42cec4 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,23 +1,24 @@ -{ lib -, fetchFromGitHub -, fetchurl -, buildPythonApplication +{ buildPythonApplication , colorclass +, fetchPypi +, fetchurl , installShellFiles -, pyyaml -, requests -, setuptools -, terminaltables -, rich +, lib +, linode-metadata , openapi3 , packaging +, pyyaml +, requests +, rich +, setuptools +, terminaltables }: let - hash = "sha256-J0L+FTVzYuAqTDOwpoH12lQr03UNo5dsQpd/iUKR40Q="; + hash = "sha256-IXltDBgabTBDw0y7IXgRGpAWVUyqeJI8EfxkZ5YuQrU="; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.166.0"; - specHash = "sha256-rUwKQt3y/ALZUoW3eJiiIDJYLQpUHO7Abm0h09ra02g="; + specVersion = "4.176.0"; + specHash = "sha256-P1E8Ga5ckrsw/CX0kxFef5fe8/p/pDCLuleX9wR5l48="; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; hash = specHash; @@ -27,14 +28,13 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.45.0"; + version = "5.50.0"; pyproject = true; - src = fetchFromGitHub { - owner = "linode"; - repo = pname; - rev = "v${version}"; - inherit hash; + src = fetchPypi { + pname = "linode_cli"; + inherit version; + hash = "sha256-OCnO7Bf2tDnC4g7kYS0WFlV9plAS25GbzRO6mpDYYxk="; }; patches = [ @@ -57,6 +57,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorclass + linode-metadata pyyaml requests setuptools @@ -83,6 +84,7 @@ buildPythonApplication rec { meta = { description = "Linode Command Line Interface"; changelog = "https://github.com/linode/linode-cli/releases/tag/v${version}"; + downloadPage = "https://pypi.org/project/linode-cli"; homepage = "https://github.com/linode/linode-cli"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ryantm techknowlogick ]; From 050f873c0eea4a5ceb91710f5bf8b13f77491009 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:50:56 -0300 Subject: [PATCH 485/562] linode-cli: nixfmt format --- .../virtualization/linode-cli/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 05566b42cec4..5d28513787e8 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,17 +1,18 @@ -{ buildPythonApplication -, colorclass -, fetchPypi -, fetchurl -, installShellFiles -, lib -, linode-metadata -, openapi3 -, packaging -, pyyaml -, requests -, rich -, setuptools -, terminaltables +{ + buildPythonApplication, + colorclass, + fetchPypi, + fetchurl, + installShellFiles, + lib, + linode-metadata, + openapi3, + packaging, + pyyaml, + requests, + rich, + setuptools, + terminaltables, }: let @@ -37,9 +38,7 @@ buildPythonApplication rec { hash = "sha256-OCnO7Bf2tDnC4g7kYS0WFlV9plAS25GbzRO6mpDYYxk="; }; - patches = [ - ./remove-update-check.patch - ]; + patches = [ ./remove-update-check.patch ]; # remove need for git history prePatch = '' @@ -87,7 +86,10 @@ buildPythonApplication rec { downloadPage = "https://pypi.org/project/linode-cli"; homepage = "https://github.com/linode/linode-cli"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ryantm techknowlogick ]; + maintainers = with lib.maintainers; [ + ryantm + techknowlogick + ]; mainProgram = "linode-cli"; }; } From 1b1801d94add2d3241999c10dd09bc42e400912a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 16:01:36 +0000 Subject: [PATCH 486/562] starboard: 0.15.20 -> 0.15.21 --- pkgs/applications/networking/cluster/starboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index b72de922e985..ea4f3a80adb4 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.20"; + version = "0.15.21"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18="; + hash = "sha256-XSxmF3dDTKVnZI4yt686LA0E3mIVdamGMX5EqIQ2qQE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-6qz0nFqdo/ympxuJDy2gD4kr5G5j0DbhUxl+7ocDdO4="; + vendorHash = "sha256-eDAJyOj3P1dJ0h/Y0O+8JrHw2S+8MPj4NikzrI7eDrk="; nativeBuildInputs = [ installShellFiles ]; From 856651fda8be67aeb8fb843a9ca9a1bcf6c14f41 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 15 Jul 2024 12:10:17 -0400 Subject: [PATCH 487/562] nixos/incus: INCUS_OVMF_PATH -> INCUS_EDK2_PATH --- nixos/modules/virtualisation/incus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 8e26e6c77dd1..8cb42adc0368 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -111,7 +111,7 @@ let environment = lib.mkMerge [ { INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; - INCUS_OVMF_PATH = ovmf; + INCUS_EDK2_PATH = ovmf; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; } From b4dbbdf34e32e0fc49d05439f772a11acfbd2863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:12:00 -0400 Subject: [PATCH 488/562] chawan: set updateScript --- pkgs/by-name/ch/chawan/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 4a52e998fc7c..de47458ff974 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -10,6 +10,7 @@ , perl , pkg-config , zlib +, unstableGitUpdater }: stdenv.mkDerivation { @@ -64,6 +65,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/mancha ${makeWrapperArgs} ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Lightweight and featureful terminal web browser"; homepage = "https://sr.ht/~bptato/chawan/"; From a04d89c8140bf3a5cac9dad487f468b9d01d9d3e Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Tue, 2 Jul 2024 23:47:55 -0400 Subject: [PATCH 489/562] _86Box: Add optional wayland support to 86Box 86Box will run on wayland without these changes but mouse capturing will not work. Adding `extra-cmake-modules` and `wayland` as dependencies solves this problem. This also adds the `enableWayland` flag which defaults to true for linux environments. --- pkgs/applications/emulators/86box/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 0e543fa8d821..00f7290a49ca 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, cmake, + extra-cmake-modules, pkg-config, makeWrapper, freetype, @@ -19,10 +20,13 @@ discord-gamesdk, libpcap, libslirp, + wayland, + wayland-scanner, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, enableVncRenderer ? false, + enableWayland ? stdenv.isLinux, unfreeEnableDiscord ? false, unfreeEnableRoms ? false, }: @@ -43,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper qt5.wrapQtAppsHook - ]; + ] ++ lib.optionals enableWayland [ extra-cmake-modules wayland-scanner ]; buildInputs = [ freetype @@ -58,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { libslirp qt5.qtbase qt5.qttools - ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableVncRenderer libvncserver; + ] ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional enableWayland wayland + ++ lib.optional enableVncRenderer libvncserver; cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" From 0ef7b67d2415f58b0cfa2b373fc775bb1adb0644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 16:13:13 +0000 Subject: [PATCH 490/562] cargo-deb: 2.4.0 -> 2.5.0 --- pkgs/development/tools/rust/cargo-deb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 27c60b403901..8d88d4a8dbbe 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-fJJMbibX/i/l1Qc/V4+loHJ+G/+nnstB0a1dlXkJjk0="; + hash = "sha256-gqzMsCvdH7dJgmBsTDw0ExH6+23KMKxMfm5BpixIwKg="; }; - cargoHash = "sha256-SelvLaI+vG4PzBcxphBpeFM0nRtaQoTHvuS/8P8/Cig="; + cargoHash = "sha256-zHdsiFX2mFle8/w16RWwcx6HVCw39J3du838lGXBZQ0="; nativeBuildInputs = [ makeWrapper From 55a0e8417b4cc020e44ec1d429082c787a7d0e3a Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Tue, 2 Jul 2024 16:14:50 -0600 Subject: [PATCH 491/562] collector: init at 1.0.1 --- pkgs/by-name/co/collector/package.nix | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/co/collector/package.nix diff --git a/pkgs/by-name/co/collector/package.nix b/pkgs/by-name/co/collector/package.nix new file mode 100644 index 000000000000..894fa663a554 --- /dev/null +++ b/pkgs/by-name/co/collector/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + appstream-glib, + desktop-file-utils, + libadwaita, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + gtk4, + python3, + gettext, + cmake, + gobject-introspection, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "collector"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "mijorus"; + repo = "collector"; + rev = "d98a11c65c7de054cb894aeb4b5e963aeb83c0d8"; + hash = "sha256-un+PvLAHfosX9jWExepWDbDKev7D9TAu+XfOFm7xOyA="; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gettext + cmake + desktop-file-utils + appstream-glib + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + gobject-introspection + (python3.withPackages ( + ps: with ps; [ + pillow + requests + pygobject3 + ] + )) + ]; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + description = "Drag multiple files and folders on to Collection window, drop them anywhere!"; + mainProgram = "collector"; + homepage = "https://github.com/mijorus/collector"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ CaptainJawZ ]; + }; +}) From 93a6079c14e89275689a36865b2b910f214c438a Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 12:46:35 -0400 Subject: [PATCH 492/562] spotifyd: only use dbus on linux --- pkgs/by-name/sp/spotifyd/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 83240137a064..54e2b4dc3a02 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -43,7 +43,9 @@ rustPackages.rustPlatform.buildRustPackage rec { ++ lib.optional withJack libjack2 ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio - ++ lib.optional (withMpris || withKeyring) dbus; + # The `dbus_keying` feature works on other platforms, but only requires + # `dbus` on Linux + ++ lib.optional ((withMpris || withKeyring) && stdenv.isLinux) dbus; buildNoDefaultFeatures = true; buildFeatures = From 01fa8e07140df7768b831881c9d7228d03228d0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 17:05:20 +0000 Subject: [PATCH 493/562] partclone: 0.3.31 -> 0.3.32 --- pkgs/tools/backup/partclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 43289247e943..f10e0ac13b78 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.31"; + version = "0.3.32"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-ASOca6HMXlnA78LbHALk9Fi9kiqjQmjp2OPLYpqhbwQ="; + sha256 = "sha256-oYxMtVGmD88eLXCwdJJ6z+6X4Blfm3B4iwbGWwSAJ9c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 7de303b4518766db2ddca9dfcbdc823430fe3869 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Mon, 15 Jul 2024 18:40:46 +0200 Subject: [PATCH 494/562] maintainers/team-list: add autra to geospatial --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e0472b808170..bc154625997e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -362,6 +362,7 @@ with lib.maintainers; geospatial = { members = [ + autra imincik l0b0 nh2 From 55a050b0d714f96dbc3c1e0eb2d16948a9837dcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 17:15:28 +0000 Subject: [PATCH 495/562] bearer: 1.45.0 -> 1.45.1 --- pkgs/development/tools/bearer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 735c7383f720..e8fa96b7ba0c 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.45.0"; + version = "1.45.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-6q9mUv1S44shGr3ScqLNTw1AiFS2sQmAMionsEdfOOw="; + hash = "sha256-EYBX5w17CesqVWfPD5djbO5U96il8VC8crh1fQGhGoQ="; }; - vendorHash = "sha256-q3JnxFSnMePBfwFdrj69uh65UXqeL0+QUvGjzkS2lGs="; + vendorHash = "sha256-+PwkjmelmPEba7T6OJwuDdTr8Umw1GmNBIGDTSkWCeE="; subPackages = [ "cmd/bearer" ]; From 6a47bb2ca49c9c650a3a1845efc9703dfb5f4173 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Mon, 15 Jul 2024 18:16:04 +0100 Subject: [PATCH 496/562] home-assistant-custom-components.frigate: 5.1.0 -> 5.2.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.2.0 --- .../home-assistant/custom-components/frigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/default.nix index 0065c94b6ebc..b32706f3eaa1 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/default.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "presto8"; domain = "frigate"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "blakeblackshear"; repo = "frigate-hass-integration"; rev = "v${version}"; - hash = "sha256-6W9U0Q0wW36RsErvtFQo1sc1AF7js6MMHxgMQcDFexw="; + hash = "sha256-OWpOYNVzowdn0iZfJwhdMrAYeqDpNJvSwHpsJX9fDk4="; }; propagatedBuildInputs = [ From b8c330e598b2009d24ff84671bd09742777c5704 Mon Sep 17 00:00:00 2001 From: tahanonu Date: Mon, 15 Jul 2024 18:12:51 +0100 Subject: [PATCH 497/562] python312Packages.free-proxy: correct src and dependencies --- .../python-modules/free-proxy/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix index 79599e5ccd53..c6d78bedfab6 100644 --- a/pkgs/development/python-modules/free-proxy/default.nix +++ b/pkgs/development/python-modules/free-proxy/default.nix @@ -1,8 +1,9 @@ -{ lib, - fetchPypi, +{ + lib, fetchFromGitHub, buildPythonPackage, setuptools, + pip-chill, lxml, requests, }: @@ -13,15 +14,16 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - owner = "jundymerk"; + owner = "jundymek"; repo = "free-proxy"; - rev = "refs/tags/v${version}"; - hash = "sha256-1hTOMbsL1089/yPZbAIs5OgjtEzCBlFv2hGi+u4hV/k="; + rev = "refs/tags/${version}"; + hash = "sha256-82usyhUzZrdYir8puiAfaF650f0PxYJSXBE75zxYjK8="; }; build-system = [ setuptools ]; dependencies = [ + pip-chill lxml requests ]; From 5215b63e7c3b422b064c7a710247d57621d45ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 17:29:42 +0000 Subject: [PATCH 498/562] python312Packages.stripe: 9.12.0 -> 10.3.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3823eb4ea1b9..6b50ea6aeaf4 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.12.0"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-y8Umq9DwAckgwyO6fEDM497hZH2SDp2+yuNIjzc2dSQ="; + hash = "sha256-VlFfrwy+6C8n2bBmQDmIoQcwH8gHZ1AL6XiaJdZfK64="; }; build-system = [ setuptools ]; From ccf595eed373ca2528a8c2092cd387ec5891fae0 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:38:18 -0400 Subject: [PATCH 499/562] vesktop: add updateScript --- pkgs/by-name/ve/vesktop/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 54cee68c90c8..f1a310c3a833 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -15,6 +15,7 @@ autoPatchelfHook, pnpm_9, nodejs, + nix-update-script, withTTS ? true, withMiddleClickScroll ? false, # Enables the use of vencord from nixpkgs instead of @@ -164,6 +165,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; }; meta = { From 4ea0150b7e9860b9aaea7bc04ca56c442c7d3ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jul 2024 09:41:46 -0700 Subject: [PATCH 500/562] python312Packages.msgraph-core: 1.1.0 -> 1.1.1 Diff: https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/refs/tags/v1.1.0...v1.1.1 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v1.1.1 --- pkgs/development/python-modules/msgraph-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 8bc1b7489301..9b8dad37c766 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; + hash = "sha256-MrZGlp0rvKBNrIOYCWJfnRmD983/OjuQv1DoRVNngKU="; }; build-system = [ setuptools ]; From 2aef9e0b3a7256eef43ab56b66393455feeb110d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jul 2024 10:55:56 -0700 Subject: [PATCH 501/562] python312Packages.expiringdict: modernize --- pkgs/development/python-modules/expiringdict/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index e4904230a497..4b5591d05525 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -6,7 +6,7 @@ dill, mock, pytestCheckHook, - setuptools + setuptools, }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { # the package is not included into the PyPI tarball src = fetchFromGitHub { owner = "mailgun"; - repo = pname; + repo = "expiringdict"; rev = "refs/tags/v${version}"; hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; @@ -48,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "expiringdict" ]; meta = with lib; { + changelog = "https://github.com/mailgun/expiringdict/blob/${src.rev}/CHANGELOG.rst"; description = "Dictionary with auto-expiring values for caching purposes"; homepage = "https://github.com/mailgun/expiringdict"; license = licenses.asl20; From 00cc5a05ecdcd4c51da258a9d3dab8448654baf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jul 2024 11:09:56 -0700 Subject: [PATCH 502/562] python312Packages.kafka-python-ng: init at 2.2.2 --- .../kafka-python-ng/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/kafka-python-ng/default.nix diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix new file mode 100644 index 000000000000..4e3997d5ed1f --- /dev/null +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools-scm, + crc32c, + lz4, + python-snappy, + zstandard, + botocore, + pytest-mock, + pytestCheckHook, + xxhash, +}: + +buildPythonPackage rec { + version = "2.2.2"; + pname = "kafka-python-ng"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wbarnha"; + repo = "kafka-python-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-ELJvcj91MQ2RTjT1dwgnTGSSG5lP6B6/45dFgtNY2Cc="; + }; + + build-system = [ setuptools-scm ]; + + passthru.optional-dependencies = { + crc32c = [ crc32c ]; + lz4 = [ lz4 ]; + snappy = [ python-snappy ]; + zstd = [ zstandard ]; + boto = [ botocore ]; + }; + + pythonImportsCheck = [ "kafka" ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + xxhash + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + meta = { + changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; + description = "Pure Python client for Apache Kafka"; + homepage = "https://github.com/wbarnha/kafka-python-ng"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b0da130ca3..6ca9ca100e7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6446,6 +6446,8 @@ self: super: with self; { kafka-python = callPackage ../development/python-modules/kafka-python { }; + kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { }; + kaggle = callPackage ../development/python-modules/kaggle { }; kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; From 268c167841a8a6573dc2244d5dc6d55ee2e68372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jul 2024 11:15:44 -0700 Subject: [PATCH 503/562] parsedmarc: update dependencies --- pkgs/development/python-modules/parsedmarc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 7dd87d5f6af4..07696140e7b3 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -20,7 +20,7 @@ google-auth-oauthlib, hatchling, imapclient, - kafka-python, + kafka-python-ng, lxml, mailsuite, msgraph-core, @@ -77,7 +77,7 @@ buildPythonPackage rec { google-auth-httplib2 google-auth-oauthlib imapclient - kafka-python + kafka-python-ng lxml mailsuite msgraph-core From 35644e53d7a0b486ea69bc84b98ad20853e64a0a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 9 Jul 2024 10:13:07 -0300 Subject: [PATCH 504/562] qnial: migrate to by-name --- .../qnial/default.nix => by-name/qn/qnial/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/interpreters/qnial/default.nix => by-name/qn/qnial/package.nix} (100%) diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/by-name/qn/qnial/package.nix similarity index 100% rename from pkgs/development/interpreters/qnial/default.nix rename to pkgs/by-name/qn/qnial/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1c0e799088..268f9453682a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12044,8 +12044,6 @@ with pkgs; qlog = qt6Packages.callPackage ../applications/radio/qlog { }; - qnial = callPackage ../development/interpreters/qnial { }; - quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; From 7bbda31fc0575ab51801f14e82a32b353aec40b3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 14:49:03 -0300 Subject: [PATCH 505/562] qnial: 6.3 -> 6.3_1 - use backup from bitbucket/museoa - finalAttrs design pattern - remove unused input makeWrapper - strictDeps - change maintainer --- pkgs/by-name/qn/qnial/package.nix | 49 +++++++++++++++++++------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/qn/qnial/package.nix b/pkgs/by-name/qn/qnial/package.nix index a23f1665e5cc..0ba34b8a6572 100644 --- a/pkgs/by-name/qn/qnial/package.nix +++ b/pkgs/by-name/qn/qnial/package.nix @@ -1,20 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses, libxcrypt }: +{ + lib, + fetchFromBitbucket, + libxcrypt, + ncurses, + pkg-config, + stdenv, + unzip, +}: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qnial"; - version = "6.3"; + version = "6.3_1"; - src = fetchFromGitHub { - sha256 = "0426hb8w0wpkisvmf3danj656j6g7rc6v91gqbgzkcj485qjaliw"; - rev = "cfe8720a4577d6413034faa2878295431bfe39f8"; + src = fetchFromBitbucket { + owner = "museoa"; repo = "qnial"; - owner = "vrthra"; + rev = finalAttrs.version; + hash = "sha256-QhjEq6YKO6OKy7+dlHeTWQvCvrF8zS7o8QfPD8WDXy0="; }; - nativeBuildInputs = [ makeWrapper unzip pkg-config ]; + nativeBuildInputs = [ + pkg-config + unzip + ]; + + buildInputs = [ + ncurses + libxcrypt + ]; + + strictDeps = true; preConfigure = '' - cd build; + cd build ''; installPhase = '' @@ -24,17 +42,12 @@ stdenv.mkDerivation { cp -r niallib $out/lib/ ''; - buildInputs = [ - ncurses - libxcrypt - ]; - meta = { description = "Array language from Nial Systems"; - mainProgram = "nial"; - homepage = "https://github.com/vrthra/qnial"; + homepage = "https://bitbucket.com/museoa/qnial"; license = lib.licenses.artistic1; - maintainers = [ ]; + mainProgram = "nial"; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) From 6ba20fc4228ce1b3e2e9c9f47896fa012918456c Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 15 Jul 2024 12:04:38 -0600 Subject: [PATCH 506/562] opencomposite: fix build --- pkgs/by-name/op/opencomposite/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 40bc6f785839..cc9929d392ba 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -43,11 +43,17 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") - # debug logging macros cause format-security warnings - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") ]; + # NOTE: `cmakeFlags` will get later tokenized by bash and there is no way + # of inserting a flag value with a space in it (inserting `"` or `'` won't help). + # https://discourse.nixos.org/t/cmakeflags-and-spaces-in-option-values/20170/2 + preConfigure = '' + cmakeFlagsArray+=( + "-DCMAKE_CXX_FLAGS=-DGLM_ENABLE_EXPERIMENTAL -Wno-error=format-security" + ) + ''; + installPhase = '' runHook preInstall mkdir -p $out/lib/opencomposite From 185601b9b181a5977179dbd97c45d63f659e9149 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 18:30:50 +0000 Subject: [PATCH 507/562] sonarr: 4.0.5.1710 -> 4.0.7.1863 --- pkgs/by-name/so/sonarr/deps.nix | 705 +++++++++++++++-------------- pkgs/by-name/so/sonarr/package.nix | 4 +- 2 files changed, 355 insertions(+), 354 deletions(-) diff --git a/pkgs/by-name/so/sonarr/deps.nix b/pkgs/by-name/so/sonarr/deps.nix index 661374123252..dbf3a2421aa4 100644 --- a/pkgs/by-name/so/sonarr/deps.nix +++ b/pkgs/by-name/so/sonarr/deps.nix @@ -2,356 +2,357 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "3.0.4-preview.27.ge7cb7c3b40"; sha256 = "00r2mi76x4jj30sw1vh0qb9123766g86mxd6f3hgsbczy5mqaa2j"; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) - (fetchNuGet { pname = "coverlet.core"; version = "3.0.4-preview.27.ge7cb7c3b40"; sha256 = "1gs17rkrpy64fzdybsfyg76xafcp5i9qdarrg2wrgkraxnhl31cw"; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) - (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) - (fetchNuGet { pname = "Diacritical.Net"; version = "1.0.4"; sha256 = "1vw1qx5djgcikkb9z5b280fib45s5fgh0mzvqz7i3ggv7kl2a5mc"; }) - (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.3"; sha256 = "1pkkaabw636wnwxar9vr8pg62zjapk3j5f21fvqq9fwh519fqkda"; }) - (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; sha256 = "0iygbabd73ggzyq1ckbxifrh1kvzwlkr3x32ahamka7pv3982khb"; }) - (fetchNuGet { pname = "Dynamitey"; version = "2.0.9.136"; sha256 = "1wzd4g58bgvlxj2wkx71jgv6yxaikgm2q9b8cvicr2hndr6wl6y1"; }) - (fetchNuGet { pname = "Equ"; version = "2.3.0"; sha256 = "1b4nhs8xxyddbp7vbih7xf0kn86prwq150bw7ri1gsgaac5r3h9c"; }) - (fetchNuGet { pname = "FluentAssertions"; version = "6.10.0"; sha256 = "0agw9snp59hzsdy8plwj6byiy20xd5l3zx5627yn44m4lh8md17q"; }) - (fetchNuGet { pname = "FluentValidation"; version = "9.5.4"; sha256 = "11g4w8y08k7c8infhhrcd6jp4l4m723m19rgzgknmdy1p0lzrll6"; }) - (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; sha256 = "12rpibz66bm4img2v1knjhawp4g94qmb78pfbpbhmg60zpnmjg7x"; }) - (fetchNuGet { pname = "Ical.Net"; version = "4.2.0"; sha256 = "19qcbsfmpzm4iclga4zd8qzb37gggq9vs665viyjc8x77nm2zi9r"; }) - (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; sha256 = "1kyjp5skhsajvmabz438abcvddaz1w8s3d3csybw3znngpj9hlpb"; }) - (fetchNuGet { pname = "Instances"; version = "1.6.1"; sha256 = "1lbb3j7f21yq63xsqbiwlx61blf9f54f8zsp3q50a156gd2kvvl1"; }) - (fetchNuGet { pname = "Lib.Harmony"; version = "2.0.1"; sha256 = "0m9inqv1mx90cr7r57jra2j8qp0yjnvg6032djhiqv03hnhchv4s"; }) - (fetchNuGet { pname = "MailKit"; version = "3.6.0"; sha256 = "1i7fjvi5pp1bi9h4dp82dn7kfp7y6rwc4lwyp1zphyvv3gc54ahh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.21"; sha256 = "1flywd4z2mjllcni6crcp3rm4l1ffhl32likfcgn34d2vicxxjv0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "6.0.21"; sha256 = "0gv8k2dmak4p3n6abcn219d91naw4z4svmd0vrlr8l4pirz1bkm1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Owin"; version = "6.0.21"; sha256 = "15bji9cx9hda8vncvabahgr5037qriyi3bb72m7vj79sad6nbshp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.0"; sha256 = "11bzf84kg54g5vq5w4zshdfl9a1agkph6gmg9lrq68fjf14w66vw"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.Data.SqlClient"; version = "2.1.2"; sha256 = "1l9qvvqdg1jmqg525k0cgfw08j9jyvb9ibh3x1wl1zidkwg1xgbz"; }) - (fetchNuGet { pname = "Microsoft.Data.SqlClient.SNI.runtime"; version = "2.1.1"; sha256 = "0c04sjbhm5lyn2b4faz8zlc338i4lavv1638yz64nw6xxrp2b0zr"; }) - (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; sha256 = "0wg6ilgm0vkhgh8jkvpna7kqiix47zpcgzdvh6c237bi8h0lz7mz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.1"; sha256 = "164i6xmkpl419akn17ag4hng8jq866g39wyxns4wv5glahwb6xai"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.1"; sha256 = "16xpqfzpcjk3mg70g5g2qrkhqf7rppah3q6dasdddbpikw43ni47"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.1"; sha256 = "0faddzvkhjhsn9fp269r4sapjrahiynwlwakhzljfg3k94jfldk1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; sha256 = "0kl5ypidmzllyxb91gwy3z950dc416p1y8wikzbdbp0l7aaaxq2p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.0.1"; sha256 = "0p1xb5vcsbmxdi538736avj7kkafsvjsl98mz5sgs7a048pmq5s0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.1"; sha256 = "11jwzzyryr6i2nwfcrs4rjv4qg0zmm15gaa882xk54ric3zc37ig"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "6.0.2"; sha256 = "0613a766fxr4pzy8a8p731d0ibz7p8m4hxil2cmzl6g755vg40l6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.1"; sha256 = "1l6jhhdxnvvy9bszmkv2q58qsms78d5k7zbkq1lj7djncly71wr7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; sha256 = "0j3g2k8sr99kr73w66yk4ghq469syyxzayq6fjfnjjgj1y7x05fl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; sha256 = "0ck8r63qal88349kkbj1i98fd8z9kcp41s13yyz8cpkygn15wq4g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.1"; sha256 = "1xndfwz6wgqpkjkfkbxgnmg7b691ihyx9x95mkp0sjg5hpfvxdw5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.21.1"; sha256 = "11czikqfn0sx2a1algv2v233h0ndjs8rncfm306qm376w917brs3"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.8.0"; sha256 = "12df8mliwc33gj671a61ivd74hdrlmaffs841bblk4pmgfrscq72"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.8.0"; sha256 = "16jcnkm9mn3pv8mn2wv4vvndarhfhrkx4n395n3kvp03638wyy63"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.8.0"; sha256 = "0z417z28b9raxy8hi0b3l9js5lqrzcxwxcjlwimbichsi0jilcd3"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.8.0"; sha256 = "1gm4df8rb7ppzhydgbz1ib423s9pwi00dh3gxfmp0myz224nflsa"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.8.0"; sha256 = "0mn8j3sqmfa5ksyydnpypwdbbr7dvyahwiyqkp85mbbhcayhi6rl"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; sha256 = "0agmphcspyg4pmpzfrfpbmgqf3wd3kqqvs87xls0i1139pa8ryi9"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "MimeKit"; version = "3.6.0"; sha256 = "0l54df3s0qnj0b06a4z5mldlx4nnfvw8sbfl57ddalz505q3mayg"; }) - (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.1"; sha256 = "0c7srz0vqm0npli2ixg9j6x934l0drrng8brwanqh96s1wwaikr7"; }) - (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.2"; sha256 = "114idyjaa6npi580d61gvr7i5xfcy5xi2yc1pfr9y82pj5kj7x5a"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.1"; sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "5.20.1.34-servarr24"; sha256 = "1dng80xi6qp62zp4p23cigkbykvhkk8g8k2qgzl5ky9kk6hdvb3a"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/9845f7c9-6c8c-4845-b5ee-58375c59e0d8/nuget/v3/flat2/mono.posix.netstandard/5.20.1.34-servarr24/mono.posix.netstandard.5.20.1.34-servarr24.nupkg"; }) - (fetchNuGet { pname = "MonoMod.Common"; version = "20.5.7.1"; sha256 = "1aa61i75n1435az43jzh80ra8mqna4yqq3byjzyaadg8dvcwq1rg"; }) - (fetchNuGet { pname = "MonoTorrent"; version = "2.0.7"; sha256 = "030nh2fvj78fmllbv08f2bzdwfb2nhgbjn5x5hggd7ibg8mmx8ax"; }) - (fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; }) - (fetchNuGet { pname = "NBuilder"; version = "6.1.0"; sha256 = "17qi59fnfk3qpwyc14z2jaigvjl0rjy592927wv3nlh8wq7aajyw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) - (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "6.0.3"; sha256 = "17d1chixs9f3g1gwg74k1ms9y7v7c396jdvycsj54d6a7hkwr5fx"; }) - (fetchNuGet { pname = "NodaTime"; version = "3.0.0"; sha256 = "1rk6jxpy7rngznmci02hi346wr7ibr262m8jn0bf5rdk6y8qds4h"; }) - (fetchNuGet { pname = "Npgsql"; version = "7.0.7"; sha256 = "1rsss91i3q0irafps64bqdhg741cayw4i1r3j3sblgwhxl8czw82"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) - (fetchNuGet { pname = "NunitXml.TestLogger"; version = "3.0.131"; sha256 = "0a1b9v3rl0jxdm0clma5xv73w9kwv33asix6041dv6x7xzyqi2p4"; }) - (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) - (fetchNuGet { pname = "RestSharp"; version = "106.15.0"; sha256 = "1g2gbzaldyriy46rgf5yvnd5b8q7y0blhcwals80j0gv3igs2h7i"; }) - (fetchNuGet { pname = "ReusableTasks"; version = "2.0.0"; sha256 = "0qag69n8kx164minz3h50g6f7cdq15r89vikcd1llbkdwq4qldaa"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "4.0.2"; sha256 = "118k34q5zrzz2k150nq10mp6iplxpvfsyzi9f6fn81ra0v200fsg"; }) - (fetchNuGet { pname = "Servarr.FFMpegCore"; version = "4.7.0-26"; sha256 = "11hlvzd78rq2by05ywbmf5xgcc1f0y53y3aq46hipcvqnaqy0v50"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffmpegcore/4.7.0-26/servarr.ffmpegcore.4.7.0-26.nupkg"; }) - (fetchNuGet { pname = "Servarr.FFprobe"; version = "5.1.4.112"; sha256 = "07cy85gi8n3axpfrj1zgyf037p9yxcll0jd1d8bks6ibjyywilrr"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator"; version = "3.3.2.9"; sha256 = "1lyb4d13c3azj1xgr4cdp2pmwxkzpr9qh9qzc0lf0v5iddpir4dw"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator/3.3.2.9/servarr.fluentmigrator.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Abstractions"; version = "3.3.2.9"; sha256 = "1606h83gdgv2rg32xjzd3nsi037dwdqqc3n0lrn4q3nxlrlcx2lm"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.abstractions/3.3.2.9/servarr.fluentmigrator.abstractions.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Oracle"; version = "3.3.2.9"; sha256 = "14wvmsg881mgigazszyas9sshr8119m40a0gd1bddbq9iwbz5wfj"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.oracle/3.3.2.9/servarr.fluentmigrator.extensions.oracle.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Postgres"; version = "3.3.2.9"; sha256 = "0vqd1jxxn66ydbkrwq9qkykf28i8z74a0ixr03mwzcrgg1h2wh0g"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.postgres/3.3.2.9/servarr.fluentmigrator.extensions.postgres.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlAnywhere"; version = "3.3.2.9"; sha256 = "1mz7j4wara40l1hhmflja2z62nd5i8qcpaxc7xkxaw7wdbd3qslb"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlanywhere/3.3.2.9/servarr.fluentmigrator.extensions.sqlanywhere.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlServer"; version = "3.3.2.9"; sha256 = "04s1wd89zn8k0s7m256sgnzw32lvin6iylba545hjysrkqfl438z"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlserver/3.3.2.9/servarr.fluentmigrator.extensions.sqlserver.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner"; version = "3.3.2.9"; sha256 = "020mv58591cv172dc3sw0r555xf42nwsrra92irvlk796vpxm34j"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner/3.3.2.9/servarr.fluentmigrator.runner.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Core"; version = "3.3.2.9"; sha256 = "19y34dw0qs5y1hp0w5yq5z85wv6ibw8gyim6ghvzg7vbw8hhgg60"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.core/3.3.2.9/servarr.fluentmigrator.runner.core.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Db2"; version = "3.3.2.9"; sha256 = "1ikb0anvh6i88x48k9mscp362crj873v5fxd174zs7rqyw6fs8kj"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.db2/3.3.2.9/servarr.fluentmigrator.runner.db2.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Firebird"; version = "3.3.2.9"; sha256 = "07dvw3y5n39fxrpfqkdn30gncxh8x2j6jvw1vnijay9cxmhn7cxc"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.firebird/3.3.2.9/servarr.fluentmigrator.runner.firebird.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Hana"; version = "3.3.2.9"; sha256 = "10fi2xq1izxqd3mhcg42ahyxl8i0iyhl6hi3zcbnr88x9kdafagc"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.hana/3.3.2.9/servarr.fluentmigrator.runner.hana.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.MySql"; version = "3.3.2.9"; sha256 = "1nggyp6acsz7931gy7iq2pa0z56g9m2rv9ang4969ajr47whd3ii"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.mysql/3.3.2.9/servarr.fluentmigrator.runner.mysql.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Oracle"; version = "3.3.2.9"; sha256 = "0y17z0bv5gcaw19cirgfhf8lj90h748bpc5cniq8hqc62spbyv70"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.oracle/3.3.2.9/servarr.fluentmigrator.runner.oracle.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Postgres"; version = "3.3.2.9"; sha256 = "17j7c2cas53b1x5wi6rvn6yli347qfbp1m9l2jrxrb8dj58n79ii"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.postgres/3.3.2.9/servarr.fluentmigrator.runner.postgres.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Redshift"; version = "3.3.2.9"; sha256 = "1w6055ifmbay1d0dmnkk3nsszn7ihkx8gskrxlh0ysgcrz6qcwlf"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.redshift/3.3.2.9/servarr.fluentmigrator.runner.redshift.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlAnywhere"; version = "3.3.2.9"; sha256 = "1fzfkaa9cbhjy9lrb78h7yakka4j1gfi6hn7kxrlidkw382yv7d9"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlanywhere/3.3.2.9/servarr.fluentmigrator.runner.sqlanywhere.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SQLite"; version = "3.3.2.9"; sha256 = "1903cc4z31b0pcs64zagk7hn6dkgmfyj2di7bdf0i4zl2h365x3m"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlite/3.3.2.9/servarr.fluentmigrator.runner.sqlite.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServer"; version = "3.3.2.9"; sha256 = "1zwmhwniwh46h9r9jr1vjpmh8k94xldg4fgzdlaa22pr7m8iyclq"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServerCe"; version = "3.3.2.9"; sha256 = "07j9nmhyb946mdlpp9i159f4c7mq9w1ar5p8dvskzkzmp26dj7ck"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; sha256 = "0cs6wfx74rwp88m5arci04ldv2s92kpif28ykfm9ig17h9a8gsnc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.4.1"; sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph"; }) - (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.1"; sha256 = "1d6cx49fzycbl2fam8d1j3491sqx6mh7qkb5ddrawr00x74hgzak"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Data.SQLite.Core.Servarr"; version = "1.0.115.5-18"; sha256 = "0dx5n2rp2bbn9c0044skybsv6njybr2h3mh03zqa6nx4s8l2z90z"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.0"; sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.2"; sha256 = "08kgiywg5whhw80xshlrp0q9mkl8hlkgqdsnk1gm6bb898f1l3gs"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.8.0"; sha256 = "1j0cfyg5718rfp6i8c4qmmr8lcx6p4dq1byicnlvmlnr4kx8ks2m"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "6.0.0-preview.5.21301.5"; sha256 = "0clg39zqzdp45r8pp9shlgvnpvsskf608vdz5qjn8k4fbm69cyx0"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.5.0"; sha256 = "1bqqs9w424cw6an5n0rvd1d9522d50z550fn75g2lysl480gkkn0"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; sha256 = "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Caching"; version = "4.7.0"; sha256 = "1bxv0jfxm50z4303znp790bijm7pg6nli0l8fin83scfhkc34h7y"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0-preview.5.21301.5"; sha256 = "131f3z3ikv3n8442chr11nj4x46amq00mb53pb2ds42dabldkdgy"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; sha256 = "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"; }) - (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.1"; sha256 = "15nvnflqfrz2fsclcwgaq8r532x2fbv1ds3rck95l8psb7pgx1v5"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; sha256 = "00yamg3b111blkjvyckxl5nxsxs2n9iccp7z1x0c2j96czgf60pz"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.9"; sha256 = "1fvqlicbn774da3b1zyfbnd7lw350sxq8hr7jcincv1fbz2yyf76"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "3.0.4-preview.27.ge7cb7c3b40"; hash = "sha256-UiiFa/GfLf3gcKb1atAz5gwR0sIA7sA1GFKSbk6sIgM="; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) + (fetchNuGet { pname = "coverlet.core"; version = "3.0.4-preview.27.ge7cb7c3b40"; hash = "sha256-nIVBoe0qz5e5eDmrhlMslznVzXne6eXbd8T4m2c+Qb8="; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; hash = "sha256-Ic3pMHtq5jF94tPi8l5MFDGyLnEZYofcqxbH5yDLHZY="; }) + (fetchNuGet { pname = "Diacritical.Net"; version = "1.0.4"; hash = "sha256-rBYl6Dz7vRHPx/tXAJ8rupAVHUBilZ/WnJE92UrHge8="; }) + (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.3"; hash = "sha256-qk3sUiiQu4TxdkG4Ise8Sn5h3kV5p6w6t9wMw5dSc94="; }) + (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; hash = "sha256-C06B0tj3qFkVVGL0kSflf88As4t9TRaw/++N05Zaz0c="; }) + (fetchNuGet { pname = "Dynamitey"; version = "2.0.9.136"; hash = "sha256-wRvKTW4WisziZmglLOqbUXVv9pPh9MmF7HS/hcoj7fM="; }) + (fetchNuGet { pname = "Equ"; version = "2.3.0"; hash = "sha256-LMGRC1Pq6RdiPnyBEjDP1yA7gesHxrXPXa353pGGlqw="; }) + (fetchNuGet { pname = "FluentAssertions"; version = "6.10.0"; hash = "sha256-+IRWEaSkEmL9Eab0P2hpHQgf/TKS04t80x+mcq1O/Ck="; }) + (fetchNuGet { pname = "FluentValidation"; version = "9.5.4"; hash = "sha256-htL8KbjBt2rn+y+nUIc4lVBypWksQ+hsROxMBDzi5IU="; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; hash = "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="; }) + (fetchNuGet { pname = "Ical.Net"; version = "4.2.0"; hash = "sha256-OcUvqj2nIyZ93MUYvRN+752xPkbtE/Uoi6T+W51eDKc="; }) + (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; hash = "sha256-61KY5H3W/sGX12y0oREPX7W22VJokL9U3VJpOHW50s8="; }) + (fetchNuGet { pname = "Instances"; version = "1.6.1"; hash = "sha256-ge49RXumBAUKHld/5EhxydEVTKc8Lqz7MNgH4Y4ca9E="; }) + (fetchNuGet { pname = "Lib.Harmony"; version = "2.0.1"; hash = "sha256-mmzIoIUDbByhbGIA87aVHlyMpFBZnpJPZiD1Gja2MVU="; }) + (fetchNuGet { pname = "MailKit"; version = "3.6.0"; hash = "sha256-ECpS2Bt7e3h/uJ5Twng2/lw3j20C3UZgiivcW+KW7sQ="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.21"; hash = "sha256-YMveWdyikWEfczNSMSh0LlBS87gsMxMto1RW8Unjnro="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "6.0.21"; hash = "sha256-oc4Vfo6XUJRp3qDVrcknXNmQWgrCsqWMHZdMVZuYaD8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Owin"; version = "6.0.21"; hash = "sha256-F+plTVM6HblPFWetEX3M+AxQ8oNqqc3sRqrB1FmKcpU="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.0"; hash = "sha256-fBvDSXDSIYMzTa8+A+98KqhEXYP6E17wLo+UNwlyf4U="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; hash = "sha256-RBFO0YLp1//Li2a9s1oAhR+C4TMXgD7TTH+V9QDgMS8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; hash = "sha256-7/gsQHWAuFWrcVpVharASTNL+Mvl6Gw+AAw41k0MzXw="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; hash = "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="; }) + (fetchNuGet { pname = "Microsoft.Data.SqlClient"; version = "2.1.2"; hash = "sha256-f70eHp8t/kB56AOumNb2MkkEuHsMzCLKw1WG1/DeONE="; }) + (fetchNuGet { pname = "Microsoft.Data.SqlClient.SNI.runtime"; version = "2.1.1"; hash = "sha256-+YMlbu7dcEvM92iYsLeiJKIxGP3oK0eWsJ6WCpfUBDA="; }) + (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; hash = "sha256-HX3iOXH75I1L7eNihCbMNDDpcotfZpfQUdqdRTGM6FY="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; hash = "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; hash = "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; hash = "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.1"; hash = "sha256-UXWzOFT0lc2Jtt3zNJ4xCEv0LCRPnWCnSoHQO2s3kZg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; hash = "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.1"; hash = "sha256-h0Q7CJ/xrtaaVs3gAdW9+TgMZ8bilQfOq2NKdr/Dt5s="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; hash = "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; hash = "sha256-owzLlamhIWWEoV2oumAxv4G3IlYzYGaDse0GVb8u1LA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.1"; hash = "sha256-YTbqJElzPCfph1Nxyq2PUGV5lSY5GXFdshpKOPdvTTk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; hash = "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; hash = "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; hash = "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; hash = "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; hash = "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; hash = "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.0.1"; hash = "sha256-QBdcLyJAHf10+RUlquXWTs155FZmHDRKbL0uzXZZPVw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; hash = "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.1"; hash = "sha256-L57B/mAxkzK7QEipV0KtHzxMtsxEZ+a4FdFkn/3/XIY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; hash = "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "6.0.2"; hash = "sha256-hgLydinnGforEzR2SCq6568IWhjnIoX8vyR3Z8xRIxg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.1"; hash = "sha256-J/NwPGVWtiNpwHP9M0tDR1eNUcFiz/r1Sn5v2xuE0tA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; hash = "sha256-LQw/najhYDdvtrsogHEQue+U+/+YJcgyBP+3MTJYA40="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; hash = "sha256-kweko71W7/hIAUO3ZYYbNXksVLgj8wrDN028QthMFCs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; hash = "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; hash = "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.1"; hash = "sha256-hbe+3YXlSQ3urCX11D2MIZl1XrWvr+mmnBc/bj53zfY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.21.1"; hash = "sha256-Q+d1QuLmjIoNGNUxm5GWzQI4hthiP6qCEl0D6/CMn4U="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.8.0"; hash = "sha256-4mCms3v1kknXCgRp51SluUFy2o7BqHCMfGMwHmlFrok="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.8.0"; hash = "sha256-w3jP0TAD3D2HLWlY0meGDmbV7N5kc2Er2nfYmuq0TJo="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.8.0"; hash = "sha256-ozEaJYgasrhq5FSyzjv7GdOiZaJjgQiR7yqnhcQ/gXw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.8.0"; hash = "sha256-SlNniRDfV3Cr62/ABkDkN+khyIrhr9c8/PeelZFrpL4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.8.0"; hash = "sha256-NJsIvWJwrVrQndhHDpXf7eS1Gr/+2ua9nkW5ivWQyFY="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; hash = "sha256-XgahgoL+VfAN4NB6qxeAHxvGj9s1Dsl9wLSSPlEU/wE="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; hash = "sha256-LZJLTWU2DOnuBiN/g+S+rwG2/BJtKrjydKnj3ujp98U="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; hash = "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; hash = "sha256-A/LU0UTQ7ee9n1Yww8FGPGELvYTPkjeRWvkhW/KY4J0="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; hash = "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; hash = "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "MimeKit"; version = "3.6.0"; hash = "sha256-z6s6cAHlU9XaKdQtjfh21pJOG63lE2XAAtJioIdrpFA="; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.1"; hash = "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA="; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.2"; hash = "sha256-qvQjZ5FXIJ+yu4F5EXvxzPUST94vmAZQidcapaRvkYQ="; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.1"; hash = "sha256-AG7yzcuXoPFMBtJfWZbOZwx97TMemI16HhP9qHliw/c="; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "5.20.1.34-servarr24"; hash = "sha256-aqzdoJkz+Vnof1hM9NCccE+/5otsiEvuF+ZiEztAz7Y="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/9845f7c9-6c8c-4845-b5ee-58375c59e0d8/nuget/v3/flat2/mono.posix.netstandard/5.20.1.34-servarr24/mono.posix.netstandard.5.20.1.34-servarr24.nupkg"; }) + (fetchNuGet { pname = "MonoMod.Common"; version = "20.5.7.1"; hash = "sha256-LwfM2W7oNaX8l34NjD1RFlekMkDwy0G+KoMEW04MRqk="; }) + (fetchNuGet { pname = "MonoTorrent"; version = "2.0.7"; hash = "sha256-XaFeK3ornvYeLL1YuR60Yjne/hIOgb0orQ4duZ2AFgw="; }) + (fetchNuGet { pname = "Moq"; version = "4.18.4"; hash = "sha256-JOmYlcTJdQOthRxnT0jAD6WG+NVLMmIV2BM9rNhNg3Q="; }) + (fetchNuGet { pname = "NBuilder"; version = "6.1.0"; hash = "sha256-3EulDuYIUjs2PyKJVLzMgMr9opLik8A8v3hMZ10qEZ8="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NLog"; version = "4.7.11"; hash = "sha256-XEl2ISxP2sx5b+av3QVF6LWim4JPyepdnr8zA/H1b28="; }) + (fetchNuGet { pname = "NLog"; version = "4.7.14"; hash = "sha256-dogq2n5I62JnY+qsTnWHsLlhSvDqc5PRSjBvIBztU94="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; hash = "sha256-RGQxi7tcoGLLn1kQbXc3cA3DUetwAwqHeDLJsXWaNNI="; }) + (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "6.0.3"; hash = "sha256-3ZXMJzzKNFKkZn43adJgZx+fdA2TnMdfeMMl3SNkoZ0="; }) + (fetchNuGet { pname = "NodaTime"; version = "3.0.0"; hash = "sha256-kOiGkTez5eIWsBJVYURe8WRuyIhQgMiq/c/m42+XZuY="; }) + (fetchNuGet { pname = "Npgsql"; version = "7.0.7"; hash = "sha256-AvHPEO2QP7r0kCOHSLhXLJDzYMOLGH2dyhHgEUPSWuc="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; hash = "sha256-Zn+sJIF7ieNqu/t2RwJx6WPFb1jl9UuNHidb/Px0v3E="; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; hash = "sha256-ZlpEM9IQlqsRPmYPMN6yCbICfakSoY89y40xtMY3rE8="; }) + (fetchNuGet { pname = "NunitXml.TestLogger"; version = "3.0.131"; hash = "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; hash = "sha256-VPPoVGvEJBHoUR4hU57sdY2pF3P9igLSQSBtPRLRB6c="; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; hash = "sha256-i1R9e4aKZ5U+y96+GOxTknsAtGn7fmeBNSdfzhqe1Jc="; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) + (fetchNuGet { pname = "RestSharp"; version = "106.15.0"; hash = "sha256-8UChXxz7AQmQpoozSBfwB6NVmt2+uJcN8TH7RtVfT7w="; }) + (fetchNuGet { pname = "ReusableTasks"; version = "2.0.0"; hash = "sha256-SjWKCeZtLkpDYzPuhHIJuLHjzAMFjm9jJSb0iWwyT2E="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Sentry"; version = "4.0.2"; hash = "sha256-TzsAxAYqB2SdcSl+r92+nd5obgUBW1DCFP/nXzAZE4U="; }) + (fetchNuGet { pname = "Servarr.FFMpegCore"; version = "4.7.0-26"; hash = "sha256-oGzgsbJ4sxuhIVgNP4oHLjD2enF1cV+AXwJndNrfFIY="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffmpegcore/4.7.0-26/servarr.ffmpegcore.4.7.0-26.nupkg"; }) + (fetchNuGet { pname = "Servarr.FFprobe"; version = "5.1.4.112"; hash = "sha256-OdPIvZcrGj0XaqFJQCnrPt0zgPPvB5nd7WpYFF9Bnh0="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator"; version = "3.3.2.9"; hash = "sha256-vJEcb2uxbOAoYB8niFO+f3Zer7iNkfx6kF8NNkIjy9M="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator/3.3.2.9/servarr.fluentmigrator.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Abstractions"; version = "3.3.2.9"; hash = "sha256-lYrOaKbdDkxspsAOhnHj7QwQtR3tyy7Gy2K/9gaCBpg="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.abstractions/3.3.2.9/servarr.fluentmigrator.abstractions.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Oracle"; version = "3.3.2.9"; hash = "sha256-0vHyF48Jr9ZWaA8oQGoKAWWoddLKf/3Vi68GhJ6um5M="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.oracle/3.3.2.9/servarr.fluentmigrator.extensions.oracle.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Postgres"; version = "3.3.2.9"; hash = "sha256-D0AuYHgvs8/rALlHoMj5KCLhpp84YZ7nat4Y27sMDW8="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.postgres/3.3.2.9/servarr.fluentmigrator.extensions.postgres.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlAnywhere"; version = "3.3.2.9"; hash = "sha256-i2o82mr8cNVnP6yryzCKpVlhvlCSugphoICorDiR59c="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlanywhere/3.3.2.9/servarr.fluentmigrator.extensions.sqlanywhere.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlServer"; version = "3.3.2.9"; hash = "sha256-Hw1CHZ5ZewkLKWpRH42Nm4rBv33aFFGPBhPZn1DjQRM="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlserver/3.3.2.9/servarr.fluentmigrator.extensions.sqlserver.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner"; version = "3.3.2.9"; hash = "sha256-koza7zbpTLpzFEnlrLkVxPVSSgZcD9bECZuFVFDZFQg="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner/3.3.2.9/servarr.fluentmigrator.runner.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Core"; version = "3.3.2.9"; hash = "sha256-wLwHIeJrn/c3fKZG/xBf0Wxe0C/YFw4uDL5oDHgjw6c="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.core/3.3.2.9/servarr.fluentmigrator.runner.core.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Db2"; version = "3.3.2.9"; hash = "sha256-ciLtDPc4H/3JCa27ssdBMjNhxmW6polIRygauK0Ca8Y="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.db2/3.3.2.9/servarr.fluentmigrator.runner.db2.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Firebird"; version = "3.3.2.9"; hash = "sha256-rLNjYe0seSWj3YFvaaToCHZmHxi2Texu7i4NW/zgux0="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.firebird/3.3.2.9/servarr.fluentmigrator.runner.firebird.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Hana"; version = "3.3.2.9"; hash = "sha256-7Cmn2kwdoWwX+yNCQ6GPICLaPVSCPAbraLj/GHAX0YE="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.hana/3.3.2.9/servarr.fluentmigrator.runner.hana.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.MySql"; version = "3.3.2.9"; hash = "sha256-MY4G+SFZqmQSeValnUVNz5QP1BU4Hv/CSOdrpsz179k="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.mysql/3.3.2.9/servarr.fluentmigrator.runner.mysql.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Oracle"; version = "3.3.2.9"; hash = "sha256-4Gy/rhaGYYhwtKywuxA5ECRJkYPu5chS4Iq9shf4J3g="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.oracle/3.3.2.9/servarr.fluentmigrator.runner.oracle.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Postgres"; version = "3.3.2.9"; hash = "sha256-MaZjUZENrdyzFDTVcJfDh4xIvbE7m8hLD2sUrZhgR54="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.postgres/3.3.2.9/servarr.fluentmigrator.runner.postgres.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Redshift"; version = "3.3.2.9"; hash = "sha256-jnKGzc/saQ8g7Xnqh/qE8divtR1z2tpAC16t6mIpwPA="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.redshift/3.3.2.9/servarr.fluentmigrator.runner.redshift.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlAnywhere"; version = "3.3.2.9"; hash = "sha256-qZ3tBRp8tkhzn8dCE90Lkqg5lT8QnZVp8hIulpSa7rs="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlanywhere/3.3.2.9/servarr.fluentmigrator.runner.sqlanywhere.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SQLite"; version = "3.3.2.9"; hash = "sha256-dfRiBhT0kwhcWyc2Ib2rbzZj4ZlPfWI0u2CF8QljA6Q="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlite/3.3.2.9/servarr.fluentmigrator.runner.sqlite.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServer"; version = "3.3.2.9"; hash = "sha256-mDIfUT35CqEUbf858hrtJE0E65U7ZJlygoZAHi2Hlf8="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServerCe"; version = "3.3.2.9"; hash = "sha256-kx3ZjLj1zz/1buiWrAJPuB5GXCohpntpq4ak5WG1SR4="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.4.1"; hash = "sha256-8NZ0tWPqRYf3ovkn4OQapGsHeseEYKg91nqZAU33hrQ="; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; hash = "sha256-h7o4X3XojdRyJWQdUfZetLdqtrQlddMzxhh6j9Zcaec="; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; hash = "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; hash = "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.1"; hash = "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Data.SQLite.Core.Servarr"; version = "1.0.115.5-18"; hash = "sha256-H6QvKNKkW6PwHwDWAUVeXlqz9fJTEwIAS3YtcbOwpTc="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.0"; hash = "sha256-wSJTNjJGcEa0tOrXXHGNVkjPpBPnLLP7ZKpQ9FvZIDM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; hash = "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; hash = "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.2"; hash = "sha256-+g0aHEpoLVNfmFY3/CaFiM6aMLiZQt0B4hDy8riPbyI="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.8.0"; hash = "sha256-VeiJ+iTZ0rqpZdGvgBu5pjOKcq2YMBTNdRmFU553DMg="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "6.0.0-preview.5.21301.5"; hash = "sha256-oHuWTF2OTGQlLr9tBIybWu9r96NQp3tRLuS2j38ajzI="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.5.0"; hash = "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.Caching"; version = "4.7.0"; hash = "sha256-/kAy2ISO6YFsdIiCSK1591QZF0jn2j/AIB+U2p0Eu68="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0-preview.5.21301.5"; hash = "sha256-/rXZ6FJNEN3EuqOsCgCuypBOpA0hQyYIQXbsGccfLow="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; hash = "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; hash = "sha256-xMSJGgn+UGGe9eGNaZ04OsyiFO7fYtDfz7zsya/9AOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; hash = "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; hash = "sha256-p0ROK7zJPz4EmNdjgAz2eX8dOMVHhpvQLTU7JveMceA="; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.1"; hash = "sha256-ZYf+7ln6IlrSZHnoFvZyootRMsLqcUaZduJnh6mz25Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; hash = "sha256-/wLj3mcmScFAD/9cxmKyQnfdbaF9Mr/lpCuEsMarygM="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.9"; hash = "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; hash = "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; hash = "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; hash = "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM="; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; hash = "sha256-NWPne5KQuqUt7WvaRT1KX3kkpWv6EPTHcI6CO/GBNME="; }) ] diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index d6a72b492642..3491ca44c249 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -17,12 +17,12 @@ , prefetch-yarn-deps }: let - version = "4.0.5.1710"; + version = "4.0.7.1863"; src = fetchFromGitHub { owner = "Sonarr"; repo = "Sonarr"; rev = "v${version}"; - hash = "sha256-9mrt5/6v8odPv1rwJoT6laXGlh3blgZAL97tsllj7MY="; + hash = "sha256-wleqBvwglU7RonBa1ZWV3C0wB8cUpBlSU2ENDfi26Yo="; }; in buildDotnetModule { From d8b61cd06ed85c8bbc1b76a37d0708a04bb70912 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 14 Jul 2024 12:02:27 +0200 Subject: [PATCH 508/562] electron_29-bin: 29.4.2 -> 29.4.4 - Changelog: https://github.com/electron/electron/releases/tag/v29.4.4 - Diff: https://github.com/electron/electron/compare/refs/tags/v29.4.2...v29.4.4 - Fixes CVE-2024-6290 - Fixes CVE-2024-6291 - Fixes CVE-2024-6292 - Fixes CVE-2024-6293 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index d5760841b2e2..0707737a555d 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,14 +34,14 @@ }, "29": { "hashes": { - "aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b", - "aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59", - "armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539", - "headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr", - "x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562", - "x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f" + "aarch64-darwin": "07cb1c196db721f2094930e672cede0e55cbb2249d61bf856d98972e4dfb396b", + "aarch64-linux": "2d48177564b32b7a747798b4a10e8d8b65bc66d607be17910016d9edd40050cc", + "armv7l-linux": "d99590901a11e665c5d40cc2b7f11b151d4be47210ee7eea7ff732f807e63058", + "headers": "194vq6lcppf76ly7cz4b1299h8wfw6xvwfgfndqsqm1sg6g1hrmg", + "x86_64-darwin": "6ba1127154c444c1dee32872efb6f183659634a1ccae627fb0142f744938b3aa", + "x86_64-linux": "85ab5686909f131061d4a20f14f5bc2e95abe2aa51babcf90a2d54b60fe759d4" }, - "version": "29.4.2" + "version": "29.4.4" }, "30": { "hashes": { From bff159a6ff2bafd943921de3c8a4a00fe8617c1e Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 14 Jul 2024 12:02:33 +0200 Subject: [PATCH 509/562] electron_30-bin: 30.1.1 -> 30.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v30.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v30.1.1...v30.2.0 - Fixes CVE-2024-5493 - Fixes CVE-2024-5831 - Fixes CVE-2024-5832 - Fixes CVE-2024-6100 - Fixes CVE-2024-6101 - Fixes CVE-2024-6103 - Fixes CVE-2024-6290 - Fixes CVE-2024-6291 - Fixes CVE-2024-6292 - Fixes CVE-2024-6293 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 0707737a555d..4d0f09922d73 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,13 +45,13 @@ }, "30": { "hashes": { - "aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c", - "aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c", - "armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f", - "headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i", - "x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357", - "x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4" + "aarch64-darwin": "4f435480c1316035bfc114dfd75c2da70eeadec3fabe8c9b3e0d8b320bc60e07", + "aarch64-linux": "d347b5f1ed111e54eb25919ddf45cb656d6c4180725c48354d21b47a5f7631c4", + "armv7l-linux": "36fdf7c3e57cb9bc0d1ff886913a39724cea2aaa2b75524e31daa09a66e8f767", + "headers": "1y8nyib0a9k5q01smy55ddkj9sl01rj625afx32h5pf815r5asmf", + "x86_64-darwin": "09d0d625d1f87e200e65c0ad5a4bdd74e7e66c4a198a074d3df272cd0abac277", + "x86_64-linux": "af23e79a2ec173d4f94d78e3fcad38fc40de9c4301dd3e7e314cb4e0b51a9aa3" }, - "version": "30.1.1" + "version": "30.2.0" } } From e6ac493615b712ee267069b949ad8b0584052c3e Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 14 Jul 2024 12:02:44 +0200 Subject: [PATCH 510/562] electron-source.electron_29: 29.4.2 -> 29.4.4 - Changelog: https://github.com/electron/electron/releases/tag/v29.4.4 - Diff: https://github.com/electron/electron/compare/refs/tags/v29.4.2...v29.4.4 - Fixes CVE-2024-6290 - Fixes CVE-2024-6291 - Fixes CVE-2024-6292 - Fixes CVE-2024-6293 --- pkgs/development/tools/electron/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 26349f02fa60..2cd39bc76cec 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=", + "hash": "sha256-nWCGQvQEXcImYaTWv+C3WjseqeSYtPvIRX6maD+BoGk=", "owner": "electron", "repo": "electron", - "rev": "v29.4.2" + "rev": "v29.4.4" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -899,10 +899,10 @@ "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", "modules": "121", "node": "20.9.0", - "version": "29.4.2" + "version": "29.4.4" }, "30": { "chrome": "124.0.6367.243", From c342bba1bce97b3f0e037a70680ef45f2679a417 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 14 Jul 2024 12:02:50 +0200 Subject: [PATCH 511/562] electron-source.electron_30: 30.1.1 -> 30.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v30.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v30.1.1...v30.2.0 - Fixes CVE-2024-5493 - Fixes CVE-2024-5831 - Fixes CVE-2024-5832 - Fixes CVE-2024-6100 - Fixes CVE-2024-6101 - Fixes CVE-2024-6103 - Fixes CVE-2024-6290 - Fixes CVE-2024-6291 - Fixes CVE-2024-6292 - Fixes CVE-2024-6293 --- pkgs/development/tools/electron/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 2cd39bc76cec..a9f0f5e0995e 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -952,10 +952,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=", + "hash": "sha256-6afs+tP0cGpqW8l2R0Zev/QwHCzOfMYfmJp2/Ad9w0w=", "owner": "electron", "repo": "electron", - "rev": "v30.1.1" + "rev": "v30.2.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1181,10 +1181,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=", + "hash": "sha256-48NsBhaiCwnsXEQah/rWPvAmz1LIJUsUKMTkjMQCW0Q=", "owner": "nodejs", "repo": "node", - "rev": "v20.14.0" + "rev": "v20.15.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1816,9 +1816,9 @@ "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", + "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", "modules": "123", - "node": "20.14.0", - "version": "30.1.1" + "node": "20.15.0", + "version": "30.2.0" } } From 8e4a87c54f7a8434c0efdc53ffbd5ce153a54c1d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 21:37:09 +0300 Subject: [PATCH 512/562] kdePackages.kio: cherry-pick fix for drag and drop on Wayland --- pkgs/kde/frameworks/kio/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 98d7a12f00b7..8f3ba7022730 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, qt5compat, qttools, acl, @@ -11,6 +12,13 @@ mkKdeDerivation { patches = [ # Remove hardcoded smbd search path ./0001-Remove-impure-smbd-search-path.patch + + # Backport fix for drag and drop + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/frameworks/kio/-/commit/e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249.patch"; + hash = "sha256-YtklZr4DwV8wNABIAUm969w90hi4iEk5aW7a3n6yQeM="; + }) ]; extraBuildInputs = [qt5compat qttools acl attr]; From 9a2d00c2e0e8866b146d5f9a838b92e33b0741b9 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jul 2024 21:37:20 +0300 Subject: [PATCH 513/562] kdePackages.ark: cherry-pick fix for temp directory cleanup --- pkgs/kde/gear/ark/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/kde/gear/ark/default.nix b/pkgs/kde/gear/ark/default.nix index fb9c3d8e596f..897d0c499a36 100644 --- a/pkgs/kde/gear/ark/default.nix +++ b/pkgs/kde/gear/ark/default.nix @@ -1,11 +1,21 @@ { mkKdeDerivation, + fetchpatch, libarchive, libzip, }: mkKdeDerivation { pname = "ark"; + # Backport fix to clean up temporary folders with Qt 6.7 + # FIXME: remove in next update + patches = [ + (fetchpatch { + url = "https://invent.kde.org/utilities/ark/-/commit/85c5e26f581cf011638a53e62b92e1da8fd55fcd.patch"; + hash = "sha256-ZjVdKgFoGE0Jme8JhGVn7+PODJqdwHQhglrHzsxePf8="; + }) + ]; + extraBuildInputs = [libarchive libzip]; meta.mainProgram = "ark"; } From cb8be2781ecac23ddd1489aeb4ebe52cfe850fd8 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 7 Jul 2024 22:32:32 +0200 Subject: [PATCH 514/562] redmine: 5.1.2 -> 5.1.3 Signed-off-by: Felix Singer --- pkgs/by-name/re/redmine/Gemfile | 2 +- pkgs/by-name/re/redmine/Gemfile.lock | 178 +++++++++++++------------- pkgs/by-name/re/redmine/gemset.nix | 183 +++++++++++++++------------ pkgs/by-name/re/redmine/package.nix | 4 +- pkgs/by-name/re/redmine/update.sh | 14 +- 5 files changed, 209 insertions(+), 172 deletions(-) diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index e29e240c75b7..732a5d669712 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '>= 2.7.0', '< 3.3.0' -gem 'rails', '6.1.7.7' +gem 'rails', '6.1.7.8' gem 'rouge', '~> 4.2.0' gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index c1600850c9a7..fe895ddd26e7 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -1,28 +1,28 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.7) - actionpack (= 6.1.7.7) - activesupport (= 6.1.7.7) + actioncable (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.7) - actionpack (= 6.1.7.7) - activejob (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionmailbox (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (>= 2.7.1) - actionmailer (6.1.7.7) - actionpack (= 6.1.7.7) - actionview (= 6.1.7.7) - activejob (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionmailer (6.1.7.8) + actionpack (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.7) - actionview (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -30,44 +30,44 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.1.7.7) - actionpack (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + actiontext (6.1.7.8) + actionpack (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) nokogiri (>= 1.8.5) - actionview (6.1.7.7) - activesupport (= 6.1.7.7) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.7) - activesupport (= 6.1.7.7) + activejob (6.1.7.8) + activesupport (= 6.1.7.8) globalid (>= 0.3.6) - activemodel (6.1.7.7) - activesupport (= 6.1.7.7) - activerecord (6.1.7.7) - activemodel (= 6.1.7.7) - activesupport (= 6.1.7.7) - activestorage (6.1.7.7) - actionpack (= 6.1.7.7) - activejob (= 6.1.7.7) - activerecord (= 6.1.7.7) - activesupport (= 6.1.7.7) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activestorage (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activesupport (= 6.1.7.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.7) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) base64 (0.2.0) - builder (3.2.4) + builder (3.3.0) capybara (3.40.0) addressable matrix @@ -79,30 +79,31 @@ GEM xpath (~> 3.2) chunky_png (1.4.0) commonmarker (0.23.10) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) crass (1.0.6) - css_parser (1.16.0) + css_parser (1.17.1) addressable csv (3.2.9) date (3.3.4) deckar01-task_list (2.3.2) html-pipeline docile (1.4.0) - erubi (1.12.0) - ffi (1.16.3) + erubi (1.13.0) + ffi (1.17.0) globalid (1.2.1) activesupport (>= 6.1) html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -113,12 +114,12 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) + method_source (1.1.0) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.3) - mocha (2.1.0) + mini_portile2 (2.8.7) + minitest (5.24.1) + mocha (2.4.0) ruby2_keywords (>= 0.0.5) mysql2 (0.5.6) net-imap (0.3.7) @@ -131,36 +132,36 @@ GEM timeout net-smtp (0.3.4) net-protocol - nio4r (2.7.1) + nio4r (2.7.3) nokogiri (1.15.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.24.0) - parser (3.3.0.5) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) racc pg (1.5.6) - public_suffix (5.0.4) + public_suffix (6.0.0) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.7) - actioncable (= 6.1.7.7) - actionmailbox (= 6.1.7.7) - actionmailer (= 6.1.7.7) - actionpack (= 6.1.7.7) - actiontext (= 6.1.7.7) - actionview (= 6.1.7.7) - activejob (= 6.1.7.7) - activemodel (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + rails (6.1.7.8) + actioncable (= 6.1.7.8) + actionmailbox (= 6.1.7.8) + actionmailer (= 6.1.7.8) + actionpack (= 6.1.7.8) + actiontext (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activemodel (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) bundler (>= 1.15.0) - railties (= 6.1.7.7) + railties (= 6.1.7.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) @@ -169,26 +170,27 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.7) - actionpack (= 6.1.7.7) - activesupport (= 6.1.7.7) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbpdf (1.21.3) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) redcarpet (3.6.0) - regexp_parser (2.9.0) + regexp_parser (2.9.2) request_store (1.5.1) rack (>= 1.4) - rexml (3.2.6) + rexml (3.3.1) + strscan roadie (5.2.1) css_parser (~> 1.4) nokogiri (~> 1.15) @@ -212,8 +214,8 @@ GEM rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -225,11 +227,12 @@ GEM ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.1.0) + sanitize (6.1.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - selenium-webdriver (4.18.1) + selenium-webdriver (4.22.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -242,19 +245,20 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) + strscan (3.1.0) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -264,7 +268,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.36) - zeitwerk (2.6.13) + zeitwerk (2.6.16) PLATFORMS ruby @@ -293,7 +297,7 @@ DEPENDENCIES nokogiri (~> 1.15.2) pg (~> 1.5.3) puma - rails (= 6.1.7.7) + rails (= 6.1.7.8) rails-dom-testing rbpdf (~> 1.21.3) redcarpet (~> 3.6.0) @@ -317,7 +321,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.1.4p223 + ruby 3.1.5p252 BUNDLED WITH - 2.4.22 + 2.5.9 diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index 10c5de5ed7e2..720e7d7fa731 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1br4vjv1si1gvhh8p96r95crljqwbx3nlzbkkdqg21xq8f9106kl"; + sha256 = "1gxw5sxfj6i9q68yv0aq8jn0rzfypqbsidvj8pin8i7kpd636f9d"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i21621aiv233pa8fp1pvibwgbzzdddp0bx44qqn16yca6z35zrj"; + sha256 = "02ffqgzvlx4gjmxs474q5xfvl4c5ykdgj0y9whkrm0si6xpzajn0"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irkj00z2mzsvbrpdl8sd08k04hz5lhvy8rfkzhx2sqq5x1n155a"; + sha256 = "0icpi06ibsi9xmcy2p0c33wh8p7rl2j26r6rmbhknp9jw3rlga9s"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15jp9a1mgz8xjm618s8g69d70w19nn2svav4fhz3aarjwfbkvwj7"; + sha256 = "1plks83m7pbvxg8dp7aw8706kv5rxsxgpmcxdzwz57gsqkirvc7w"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hjm6vapqq1f7addwl71qwzn72lnmq686ypnbyhd873hqlnzangf"; + sha256 = "1ki290ng0xkbjhr5sgrd98p4ysvbjdgxv4aqrafabcs0axgfibkx"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkdqf299dx8bgvgpgknf37kcbprqgq0iy8xdipww6pmbbc45bwk"; + sha256 = "16diw7arrvrxlk04c6h46qzyyikl1jf18z5sgixvcqzz8sfqp7g0"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06rp7kks22wrc55vric8yh0kg137jsiwd62jimdiqhh9bp48jbbm"; + sha256 = "06r93sgvbyqlv6sjy97qqlpa671lni4cvb5gd208m6215xk7ds71"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zz32997k2fsyd0fzrh8f79yjr6hv3i4j9wykkxncl02j8dhrkay"; + sha256 = "13562p4p9wra5k07jxi9g1v0l0plkkavr0z5jr1iznf7yizms8nq"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzymgyrvw2k32ldabp2jr0zgp6z9w8smyb946qgvs9zfs4n2qnn"; + sha256 = "0x0nym941dhgh5q5p293y2jk2b4baxmcgs6xkc5vrsqf164jmq9p"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12i033l3m41vr3qs7msy4p88a6pglx9vnsh5nakp0b6abf6mv5mk"; + sha256 = "0i6vr1vng0pdb1dy8g1yvsfi90ji4bw02d06i6jyfvy9jb66amh7"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r2i9b0pm0b1dy8fc7kyls1g7f0bcnyq53v825rykibzdqfqdfgp"; + sha256 = "09krayvf764y868qm0sy0ssmcjx5a7iksnbi7zx284jjggc574ry"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; ast = { groups = ["default" "test"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; capybara = { dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; @@ -208,10 +208,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; crass = { groups = ["default"]; @@ -229,10 +229,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp"; + sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.1"; }; csv = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; ffi = { groups = ["default" "development" "test"]; @@ -300,10 +300,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; globalid = { dependencies = ["activesupport"]; @@ -343,20 +343,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; json = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; language_server-protocol = { groups = ["default" "test"]; @@ -379,6 +379,16 @@ }; version = "3.9.0"; }; + logger = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + type = "gem"; + }; + version = "1.6.0"; + }; loofah = { dependencies = ["crass" "nokogiri"]; groups = ["default"]; @@ -426,10 +436,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; mini_magick = { groups = ["minimagick"]; @@ -464,20 +474,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; type = "gem"; }; - version = "5.22.3"; + version = "5.24.1"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -485,10 +495,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lsll8iba8612dypk718l9kx73m9syiscb2rhciljys1krc5g1zr"; + sha256 = "1bzpqxmk8h9pr0m6knryjd0dgmmyg0bwrksp3rqhrdxpaa3ddr6s"; type = "gem"; }; - version = "2.1.0"; + version = "2.4.0"; }; mysql2 = { groups = ["default"]; @@ -567,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15iwbiij52x6jhdbl0rkcldnhfndmsy0sbnsygkr9vhskfqrp72m"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -588,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; + sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j"; type = "gem"; }; - version = "1.24.0"; + version = "1.25.1"; }; parser = { dependencies = ["ast" "racc"]; @@ -599,10 +609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p"; + sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d"; type = "gem"; }; - version = "3.3.0.5"; + version = "3.3.4.0"; }; pg = { groups = ["default"]; @@ -627,10 +637,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -648,10 +658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rack = { groups = ["default" "test"]; @@ -680,10 +690,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jqp5fggkxbjm4rhsywa7j5rvwkzp6gbaa1mg4k8zxrbfczhxwwl"; + sha256 = "0cj4sr7fw01ycfkqmpz6zr90zyfxl8yw9s6m0df47a71m56hjb21"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; @@ -713,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qxgrd92yq0cckrmzx54glvjdd1xx87xysgvaqd75hn50klp8ip"; + sha256 = "04k6y7balxm5d1sq53rb613lm1bwxmmzavmxg1h9z6dnds2djylb"; type = "gem"; }; - version = "6.1.7.7"; + version = "6.1.7.8"; }; rainbow = { groups = ["default" "test"]; @@ -733,10 +743,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default" "development"]; @@ -754,10 +764,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; @@ -795,10 +805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841"; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; }; request_store = { dependencies = ["rack"]; @@ -812,14 +822,15 @@ version = "1.5.1"; }; rexml = { + dependencies = ["strscan"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.1"; }; roadie = { dependencies = ["css_parser" "nokogiri"]; @@ -901,10 +912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; + sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv"; type = "gem"; }; - version = "1.31.2"; + version = "1.31.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -964,21 +975,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wsw05y0h1ln3x2kvcw26fs9ivryb4xbjrb4hsk2pishkhydkz4j"; + sha256 = "0qczw46f82f8nam87xdzk17frwfwwqq7km6ma0kwc0nadmi4glgq"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; selenium-webdriver = { - dependencies = ["base64" "rexml" "rubyzip" "websocket"]; + dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b"; + sha256 = "0rjxlivsh32xvjq78p1m1sr366aa04wms4hwb2r187ygrnmp0hv4"; type = "gem"; }; - version = "4.18.1"; + version = "4.22.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -1028,10 +1039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; + sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4"; type = "gem"; }; - version = "3.4.2"; + version = "3.5.1"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -1052,6 +1063,16 @@ }; version = "1.6.9"; }; + strscan = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; thor = { groups = ["default"]; platforms = []; @@ -1108,10 +1129,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; + sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp"; type = "gem"; }; - version = "1.2.10"; + version = "1.2.11"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -1171,9 +1192,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.16"; }; } diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index 1140c17ef75c..7dbd0434ba41 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "5.1.2"; + version = "5.1.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-JsDKCpqu4c65g4Jb8SZsmbCFC/ATwXhxP1o7AIABISM="; + hash = "sha256-iiIyD9nJQOZZjzrV+3o5MxlchgaO7plLpvzcIsXOy1k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/redmine/update.sh b/pkgs/by-name/re/redmine/update.sh index 3c4d842735cf..bd8231464264 100755 --- a/pkgs/by-name/re/redmine/update.sh +++ b/pkgs/by-name/re/redmine/update.sh @@ -15,5 +15,17 @@ for file in "gemset.nix" "Gemfile.lock"; do done bundle lock --add-platform ruby -bundle lock --remove-platform x86_64-linux +bundle lock --remove-platform aarch64-linux +bundle lock --remove-platform aarch64-linux-gnu +bundle lock --remove-platform aarch64-linux-musl +bundle lock --remove-platform arm-linux +bundle lock --remove-platform arm-linux-gnu +bundle lock --remove-platform arm-linux-musl +bundle lock --remove-platform arm64-darwin +bundle lock --remove-platform x86-linux +bundle lock --remove-platform x86-linux-gnu +bundle lock --remove-platform x86-linux-musl +bundle lock --remove-platform x86_64-darwin +bundle lock --remove-platform x86_64-linux-gnu +bundle lock --remove-platform x86_64-linux-musl bundix -l From d582f13e5e6f68b6207a5ad8ba3a3ade470fefae Mon Sep 17 00:00:00 2001 From: Aleksana Date: Tue, 16 Jul 2024 03:55:51 +0800 Subject: [PATCH 515/562] treewide: switch to cargoHash (#327127) * nickel: switch to cargoHash * gnvim-unwrapped: switch to cargoHash * surrealdb-migrations: switch to cargoHash * wluma: switch to cargoHash * httm: switch to cargoHash No need (observed) for these packages to have a vendor Cargo.lock. If they for some reason have to use a different Cargo.lock than upstream, they should copy that to the build directory as well, otherwise the build will fail. They don't, so I infer there's no reason to use Cargo.lock. --- .../editors/neovim/gnvim/Cargo.lock | 1264 ----- .../editors/neovim/gnvim/default.nix | 2 +- pkgs/by-name/ni/nickel/Cargo.lock | 3533 ------------- pkgs/by-name/ni/nickel/package.nix | 4 +- .../database/surrealdb-migrations/Cargo.lock | 4647 ----------------- .../database/surrealdb-migrations/default.nix | 4 +- pkgs/tools/filesystems/httm/Cargo.lock | 1461 ------ pkgs/tools/filesystems/httm/default.nix | 4 +- pkgs/tools/wayland/wluma/Cargo.lock | 1611 ------ pkgs/tools/wayland/wluma/default.nix | 4 +- 10 files changed, 5 insertions(+), 12529 deletions(-) delete mode 100644 pkgs/applications/editors/neovim/gnvim/Cargo.lock delete mode 100644 pkgs/by-name/ni/nickel/Cargo.lock delete mode 100644 pkgs/development/tools/database/surrealdb-migrations/Cargo.lock delete mode 100644 pkgs/tools/filesystems/httm/Cargo.lock delete mode 100644 pkgs/tools/wayland/wluma/Cargo.lock diff --git a/pkgs/applications/editors/neovim/gnvim/Cargo.lock b/pkgs/applications/editors/neovim/gnvim/Cargo.lock deleted file mode 100644 index 8b1a0a24364c..000000000000 --- a/pkgs/applications/editors/neovim/gnvim/Cargo.lock +++ /dev/null @@ -1,1264 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "anyhow" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cairo-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cfg-expr" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "field-offset" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "futures" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" - -[[package]] -name = "futures-executor" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" - -[[package]] -name = "futures-macro" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "futures-sink" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" - -[[package]] -name = "futures-task" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" - -[[package]] -name = "futures-util" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gio" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-compat" -version = "0.1.0" -dependencies = [ - "futures", - "gio", -] - -[[package]] -name = "gio-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "log", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-build-tools" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8480c9ba9cc06aa8d5baf446037f8dc237bee127e9b62080c4db7e293d8ea0" - -[[package]] -name = "glib-macros" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e73a9790e243f6d55d8e302426419f6084a1de7a84cd07f7268300408a19de" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gnvim" -version = "0.3.1" -dependencies = [ - "atty", - "cfg-if", - "clap", - "futures", - "gio-compat", - "glib", - "glib-build-tools", - "gtk4", - "libc", - "nvim-rs", - "once_cell", - "pango", - "rmpv", -] - -[[package]] -name = "gobject-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" -dependencies = [ - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "once_cell", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "nvim-rs" -version = "0.1.0" -dependencies = [ - "async-trait", - "futures", - "proc-macro2", - "quote", - "rmp-serde", - "rmpv", - "serde", - "syn 1.0.109", - "tokio", - "tokio-util", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "pango" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rmpv" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754" -dependencies = [ - "num-traits", - "rmp", - "serde", - "serde_bytes", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "tokio" -version = "1.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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-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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index fc39298321e9..e39a43a85863 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-uhObLKoQE+r0/ocWA26MpJsSt9RAzKG1XmZsXat+ohg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock deleted file mode 100644 index 2bc24165ac01..000000000000 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ /dev/null @@ -1,3533 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "assert_cmd" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[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 = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytemuck" -version = "1.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex 0.7.0", - "strsim 0.11.0", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" -dependencies = [ - "clap 4.5.2", -] - -[[package]] -name = "clap_derive" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" -dependencies = [ - "heck", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "codespan" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" -dependencies = [ - "codespan-reporting", - "serde", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "serde", - "termcolor", - "unicode-width", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "comrak" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" -dependencies = [ - "clap 4.5.2", - "entities", - "memchr", - "once_cell", - "regex", - "shell-words", - "slug", - "syntect", - "typed-arena", - "unicode_categories", - "xdg", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "coolor" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" -dependencies = [ - "crossterm", -] - -[[package]] -name = "cpp_demangle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.25", - "criterion-plot", - "itertools 0.10.5", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crossterm" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[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 = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "cxx" -version = "1.0.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9324397d262f63ef77eb795d900c0d682a34a43ac0932bec049ed73055d52f63" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "scratch", - "syn 2.0.52", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "deunicode" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[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 = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[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", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "entities" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[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-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "git-version" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" -dependencies = [ - "git-version-macro", -] - -[[package]] -name = "git-version-macro" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "half" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "inferno" -version = "0.11.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" -dependencies = [ - "ahash", - "indexmap 2.2.5", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml 0.26.0", - "rgb", - "str_stack", -] - -[[package]] -name = "insta" -version = "1.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "regex", - "similar", - "yaml-rust", -] - -[[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 = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax 0.8.2", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid 0.2.4", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "logos" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" -dependencies = [ - "beef", - "fnv", - "proc-macro2 1.0.78", - "quote 1.0.35", - "regex-syntax 0.6.29", - "syn 1.0.109", -] - -[[package]] -name = "lsp-harness" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_cmd", - "env_logger", - "insta", - "log", - "lsp-server", - "lsp-types", - "nickel-lang-utils", - "serde", - "serde_json", - "test-generator", - "toml", -] - -[[package]] -name = "lsp-server" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" -dependencies = [ - "crossbeam-channel", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "lsp-types" -version = "0.95.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "malachite" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ff327de42075f680ba15c5cb3c417687eb7241ce2063a91d0186ce5c5e77ee" -dependencies = [ - "malachite-base", - "malachite-float", - "malachite-nz", - "malachite-q", -] - -[[package]] -name = "malachite-base" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e960ee0e7e1b8eec9229f5b20d6b191762574225144ea638eb961d065c97b55d" -dependencies = [ - "hashbrown 0.14.3", - "itertools 0.11.0", - "libm", - "ryu", -] - -[[package]] -name = "malachite-float" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd21e0e005798917fb37c87ef9b0787e3ad490b378df987b78dfa44669b895fe" -dependencies = [ - "itertools 0.11.0", - "malachite-base", - "malachite-nz", - "malachite-q", - "serde", -] - -[[package]] -name = "malachite-nz" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770aaf1a4d59a82ed3d8644eb66aff7492a6dd7476def275a922d04d77ca8e57" -dependencies = [ - "itertools 0.11.0", - "libm", - "malachite-base", - "serde", -] - -[[package]] -name = "malachite-q" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a9dfca114f6b582595990ccfc287cace633aa95f890ade5b1fc099b7175d3b" -dependencies = [ - "itertools 0.11.0", - "malachite-base", - "malachite-nz", - "serde", -] - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" -dependencies = [ - "ahash", - "metrics-macros", - "portable-atomic", -] - -[[package]] -name = "metrics-macros" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "metrics-util" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" -dependencies = [ - "aho-corasick", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.13.1", - "indexmap 1.9.3", - "metrics", - "num_cpus", - "ordered-float", - "quanta", - "radix_trie", - "sketches-ddsketch", -] - -[[package]] -name = "minimad" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef" -dependencies = [ - "once_cell", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nickel-lang-cli" -version = "1.7.0" -dependencies = [ - "clap 4.5.2", - "clap_complete", - "directories", - "git-version", - "insta", - "metrics", - "metrics-util", - "nickel-lang-core", - "nickel-lang-utils", - "serde", - "tempfile", - "test-generator", -] - -[[package]] -name = "nickel-lang-core" -version = "0.8.0" -dependencies = [ - "ansi_term", - "assert_matches", - "clap 4.5.2", - "codespan", - "codespan-reporting", - "comrak", - "criterion", - "cxx", - "cxx-build", - "indexmap 1.9.3", - "indoc 2.0.4", - "js-sys", - "lalrpop", - "lalrpop-util", - "logos", - "malachite", - "malachite-q", - "md-5", - "metrics", - "nickel-lang-utils", - "once_cell", - "pkg-config", - "pprof", - "pretty", - "pretty_assertions", - "regex", - "rustyline", - "rustyline-derive", - "serde", - "serde-wasm-bindgen", - "serde_json", - "serde_repr", - "serde_yaml", - "sha-1", - "sha2", - "similar", - "simple-counter", - "strip-ansi-escapes", - "strsim 0.10.0", - "termimad", - "test-generator", - "toml", - "topiary-core", - "topiary-queries", - "tree-sitter-nickel", - "typed-arena", - "unicode-segmentation", - "void", - "wasm-bindgen", -] - -[[package]] -name = "nickel-lang-lsp" -version = "1.7.0" -dependencies = [ - "anyhow", - "assert_cmd", - "assert_matches", - "bincode", - "clap 4.5.2", - "codespan", - "codespan-reporting", - "criterion", - "crossbeam", - "csv", - "derive_more", - "env_logger", - "git-version", - "glob", - "insta", - "lalrpop", - "lalrpop-util", - "lazy_static", - "log", - "lsp-harness", - "lsp-server", - "lsp-types", - "nickel-lang-core", - "nickel-lang-utils", - "pretty_assertions", - "regex", - "scopeguard", - "serde", - "serde_json", - "test-generator", - "thiserror", -] - -[[package]] -name = "nickel-lang-utils" -version = "0.1.0" -dependencies = [ - "codespan", - "criterion", - "nickel-lang-core", - "serde", - "toml", -] - -[[package]] -name = "nickel-wasm-repl" -version = "0.8.0" -dependencies = [ - "nickel-lang-core", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec 0.7.4", - "itoa", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "onig" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" -dependencies = [ - "bitflags 1.3.2", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "pad" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.5", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64", - "indexmap 2.2.5", - "line-wrap", - "quick-xml 0.31.0", - "serde", - "time", -] - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "pprof" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" -dependencies = [ - "backtrace", - "cfg-if", - "criterion", - "findshlibs", - "inferno", - "libc", - "log", - "nix", - "once_cell", - "parking_lot", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", -] - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f3aa1e3ca87d3b124db7461265ac176b40c277f37e503eaa29c9c75c037846" -dependencies = [ - "arrayvec 0.5.2", - "log", - "typed-arena", - "unicode-segmentation", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettydiff" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" -dependencies = [ - "ansi_term", - "pad", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyckel" -version = "1.7.0" -dependencies = [ - "codespan-reporting", - "nickel-lang-core", - "pyo3", - "pyo3-build-config", -] - -[[package]] -name = "pyo3" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" -dependencies = [ - "cfg-if", - "indoc 1.0.9", - "libc", - "memoffset", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" -dependencies = [ - "proc-macro2 1.0.78", - "pyo3-macros-backend", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[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.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2 1.0.78", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rayon" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustyline" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "rustyline-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scratch" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" -dependencies = [ - "indexmap 2.2.5", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "similar" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" - -[[package]] -name = "simple-counter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb57743b52ea059937169c0061d70298fe2df1d2c988b44caae79dd979d9b49" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slug" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" -dependencies = [ - "deunicode", - "wasm-bindgen", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "strip-ansi-escapes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" -dependencies = [ - "vte", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "symbolic-common" -version = "10.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" -dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", - "uuid", -] - -[[package]] -name = "symbolic-demangle" -version = "10.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" -dependencies = [ - "cpp_demangle", - "rustc-demangle", - "symbolic-common", -] - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "onig", - "plist", - "regex-syntax 0.8.2", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termimad" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e32883199fc52cda7e431958dee8bc3ec6898afabc152b76959b9e0e74e2202" -dependencies = [ - "coolor", - "crossbeam", - "crossterm", - "minimad", - "thiserror", - "unicode-width", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-generator" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b23be2add79223226e1cb6446cb3e37506a5927089870687a0f1149bb7a073a" -dependencies = [ - "glob", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - -[[package]] -name = "thiserror" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "time" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-test" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.5", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "topiary-core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26541394bdbcd5a039deb917b2096a69c6604f733f0d41f534fc6975987040d" -dependencies = [ - "futures", - "itertools 0.11.0", - "log", - "pretty_assertions", - "prettydiff", - "serde", - "serde_json", - "tokio", - "tokio-test", - "topiary-tree-sitter-facade", - "topiary-web-tree-sitter-sys", -] - -[[package]] -name = "topiary-queries" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89106b9c504a9e3247b8e40f879a73a922f0d516e1051a6ef739b4cf7d54c8d9" - -[[package]] -name = "topiary-tree-sitter-facade" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7c870d9a844bbba0f55be40eaa89624a9f627c155cd22eea70dd808bd71b3d" -dependencies = [ - "js-sys", - "topiary-web-tree-sitter-sys", - "tree-sitter", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "topiary-web-tree-sitter-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9e35caeeb7f07e97b71ee7ea204c89516e7cc490d1c2ae318eca3ff3c08d46" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "tree-sitter" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-nickel" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449daa9ac0e2a18d7243eaf21d7299d6683ce6750ca225ebd557412d22d106cf" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - -[[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 = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" -dependencies = [ - "cfg-if", - "serde", - "serde_json", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" -dependencies = [ - "quote 1.0.35", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" - -[[package]] -name = "web-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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-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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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-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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.52", -] diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index e53a6e4cc6dd..dbc004302e47 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -16,9 +16,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EwiZg0iyF9EQ0Z65Re5WgeV7xgs/wPtTQ9XA0iEMEIQ="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-JwuBjCWETIlBX5xswdznOAmzkL0Rn6cv7pxM6DwAkOs="; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock deleted file mode 100644 index 4ccab5df7b79..000000000000 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ /dev/null @@ -1,4647 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef" -dependencies = [ - "psl-types", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "any_ascii" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" - -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "assert_cmd" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_fs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[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-executor" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-recursion" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-task" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", -] - -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bcrypt" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" -dependencies = [ - "base64 0.22.0", - "blowfish", - "getrandom", - "subtle", - "zeroize", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - -[[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 = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - -[[package]] -name = "borsh" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.58", - "syn_derive", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cc" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" - -[[package]] -name = "cedar-policy" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d91e3b10a0f7f2911774d5e49713c4d25753466f9e11d1cd2ec627f8a2dc857" -dependencies = [ - "cedar-policy-core", - "cedar-policy-validator", - "itertools 0.10.5", - "lalrpop-util", - "ref-cast", - "serde", - "serde_json", - "smol_str", - "thiserror", -] - -[[package]] -name = "cedar-policy-core" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2315591c6b7e18f8038f0a0529f254235fd902b6c217aabc04f2459b0d9995" -dependencies = [ - "either", - "ipnet", - "itertools 0.10.5", - "lalrpop", - "lalrpop-util", - "lazy_static", - "miette", - "regex", - "rustc_lexer", - "serde", - "serde_json", - "serde_with", - "smol_str", - "stacker", - "thiserror", -] - -[[package]] -name = "cedar-policy-validator" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e756e1b2a5da742ed97e65199ad6d0893e9aa4bd6b34be1de9e70bd1e6adc7df" -dependencies = [ - "cedar-policy-core", - "itertools 0.10.5", - "serde", - "serde_json", - "serde_with", - "smol_str", - "stacker", - "thiserror", - "unicode-security", -] - -[[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 = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "chrono-human-duration" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19283df3a144dfdeee6568e42ad7f0939d3c261bcdfe954b1a1098f6f7c1b908" -dependencies = [ - "chrono", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "cli-table" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" -dependencies = [ - "cli-table-derive", - "csv", - "termcolor", - "unicode-width", -] - -[[package]] -name = "cli-table-derive" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[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 = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.58", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "deunicode" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "diffy" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790" -dependencies = [ - "nu-ansi-term", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dir-diff" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" -dependencies = [ - "walkdir", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "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", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "dmp" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaa1135a34d26e5cc5b4927a8935af887d4f30a5653a797c33b9a4222beb6d9" -dependencies = [ - "urlencoding", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "earcutr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01" -dependencies = [ - "itertools 0.11.0", - "num-traits", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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 = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "float_next_after" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-concurrency" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b590a729e1cbaf9ae3ec294143ea034d93cbb1de01c884d04bcd0af8b613d02" -dependencies = [ - "bitvec", - "futures-core", - "pin-project", - "slab", - "smallvec", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[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 = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[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 = "geo" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" -dependencies = [ - "earcutr", - "float_next_after", - "geo-types", - "geographiclib-rs", - "log", - "num-traits", - "robust", - "rstar", - "serde", -] - -[[package]] -name = "geo" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" -dependencies = [ - "earcutr", - "float_next_after", - "geo-types", - "geographiclib-rs", - "log", - "num-traits", - "robust", - "rstar", - "serde", - "spade", -] - -[[package]] -name = "geo-types" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" -dependencies = [ - "approx 0.5.1", - "arbitrary", - "num-traits", - "rstar", - "serde", -] - -[[package]] -name = "geographiclib-rs" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" -dependencies = [ - "libm", -] - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "globwalk" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" -dependencies = [ - "bitflags 2.5.0", - "ignore", - "walkdir", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", - "serde", -] - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin 0.9.8", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[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 = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lexicmp" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7378d131ddf24063b32cbd7e91668d183140c4b3906270635a4d633d1068ea5d" -dependencies = [ - "any_ascii", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "linfa-linalg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e7562b41c8876d3367897067013bb2884cc78e6893f092ecd26b305176ac82" -dependencies = [ - "ndarray", - "num-traits", - "rand", - "thiserror", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "matrixmultiply" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "miette" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" -dependencies = [ - "miette-derive", - "once_cell", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "names" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" -dependencies = [ - "rand", -] - -[[package]] -name = "nanoid" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" -dependencies = [ - "rand", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "approx 0.4.0", - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "ndarray-stats" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5a8477ac96877b5bd1fd67e0c28736c12943aba24eda92b127e036b0c8f400" -dependencies = [ - "indexmap 1.9.3", - "itertools 0.10.5", - "ndarray", - "noisy_float", - "num-integer", - "num-traits", - "rand", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "noisy_float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978fe6e6ebc0bf53de533cd456ca2d9de13de13856eda1518a285d7705a213af" -dependencies = [ - "num-traits", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "object_store" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "humantime", - "itertools 0.11.0", - "parking_lot", - "percent-encoding", - "snafu", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown 0.14.5", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-clean" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.7", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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 = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[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 = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quick_cache" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1380629287ed1247c1e0fcc6d43efdcec508b65382c9ab775cc8f3df7ca07b0" -dependencies = [ - "ahash 0.8.11", - "equivalent", - "hashbrown 0.14.5", - "parking_lot", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", - "serde", -] - -[[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 = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "reblessive" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4149deda5bd21e0f6ccaa2f907cd542541521dead5861bc51bebdf2af4acaf2a" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[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 = "ref-cast" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "revision" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588784c1d9453cfd2ce1b7aff06c903513677cf0e63779a0a3085ee8a44f5b17" -dependencies = [ - "bincode", - "chrono", - "geo 0.26.0", - "regex", - "revision-derive", - "roaring", - "rust_decimal", - "serde", - "thiserror", - "uuid", -] - -[[package]] -name = "revision-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854ff0b6794d4e0aab5e4486870941caefe9f258e63cad2f21b49a6302377c85" -dependencies = [ - "darling", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "rkyv" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmpv" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e540282f11751956c82bc5529a7fb71b871b998fbf9cf06c2419b22e1b4350df" -dependencies = [ - "num-traits", - "rmp", -] - -[[package]] -name = "roaring" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" -dependencies = [ - "bytemuck", - "byteorder", - "serde", -] - -[[package]] -name = "robust" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rstar" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" -dependencies = [ - "heapless", - "num-traits", - "smallvec", -] - -[[package]] -name = "rust-ini" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[package]] -name = "rust-stemmers" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "rust_decimal" -version = "1.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_lexer" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "password-hash", - "pbkdf2", - "salsa20", - "sha2", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - -[[package]] -name = "serde" -version = "1.0.198" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.198" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serial_test" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smol_str" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" -dependencies = [ - "serde", -] - -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "snap" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spade" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" -dependencies = [ - "hashbrown 0.14.5", - "num-traits", - "robust", - "smallvec", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlparser" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" -dependencies = [ - "log", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "storekey" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c42833834a5d23b344f71d87114e0cc9994766a5c42938f4b50e7b2aef85b2" -dependencies = [ - "byteorder", - "memchr", - "serde", - "thiserror", -] - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[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 = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "surrealdb" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8bb7301422b4b0945aef848285073fa95c1e1412a0952dbdc50917104c26d2" -dependencies = [ - "async-channel", - "bincode", - "chrono", - "dmp", - "flume", - "futures", - "futures-concurrency", - "geo 0.27.0", - "indexmap 2.2.6", - "once_cell", - "path-clean", - "pharos", - "reqwest", - "revision", - "ring 0.17.8", - "rust_decimal", - "rustls", - "semver", - "serde", - "serde_json", - "surrealdb-core 1.4.2", - "surrealdb-core 2.0.0-1.5.0", - "thiserror", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tracing", - "trice", - "url", - "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", -] - -[[package]] -name = "surrealdb-core" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2f403dba761e0e3404f90334f8ff1454f1f308e88c84dd5dbcee52866ff30e" -dependencies = [ - "addr", - "any_ascii", - "argon2", - "async-channel", - "async-executor", - "async-recursion", - "base64 0.21.7", - "bcrypt", - "bincode", - "bytes", - "cedar-policy", - "chrono", - "deunicode", - "dmp", - "fst", - "futures", - "fuzzy-matcher", - "geo 0.27.0", - "geo-types", - "hex", - "ipnet", - "lexicmp", - "md-5", - "nanoid", - "nom", - "num_cpus", - "object_store", - "once_cell", - "pbkdf2", - "pharos", - "pin-project-lite", - "quick_cache", - "radix_trie", - "rand", - "regex", - "revision", - "ring 0.17.8", - "roaring", - "rust-stemmers", - "rust_decimal", - "scrypt", - "semver", - "serde", - "serde_json", - "sha1", - "sha2", - "snap", - "storekey", - "surrealdb-derive", - "surrealdb-jsonwebtoken", - "thiserror", - "tokio", - "tracing", - "trice", - "ulid", - "url", - "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", -] - -[[package]] -name = "surrealdb-core" -version = "2.0.0-1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7c90233b21c23c669d462c1305693a4cdd6a5c7424654fbd9564564a6b8bf8" -dependencies = [ - "addr", - "ahash 0.8.11", - "any_ascii", - "argon2", - "async-channel", - "async-executor", - "async-recursion", - "base64 0.21.7", - "bcrypt", - "bincode", - "bytes", - "cedar-policy", - "chrono", - "ciborium", - "dashmap", - "deunicode", - "dmp", - "fst", - "futures", - "fuzzy-matcher", - "geo 0.27.0", - "geo-types", - "hashbrown 0.14.5", - "hex", - "ipnet", - "lexicmp", - "linfa-linalg", - "md-5", - "nanoid", - "ndarray", - "ndarray-stats", - "nom", - "num-traits", - "num_cpus", - "object_store", - "once_cell", - "pbkdf2", - "pharos", - "pin-project-lite", - "quick_cache", - "radix_trie", - "rand", - "reblessive", - "regex", - "reqwest", - "revision", - "ring 0.17.8", - "rmpv", - "roaring", - "rust-stemmers", - "rust_decimal", - "scrypt", - "semver", - "serde", - "serde_json", - "sha1", - "sha2", - "snap", - "storekey", - "surrealdb-derive", - "surrealdb-jsonwebtoken", - "thiserror", - "tokio", - "tracing", - "trice", - "ulid", - "url", - "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", -] - -[[package]] -name = "surrealdb-derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aacdb4c58b9ebef0291310afcd63af0012d85610d361f3785952c61b6f1dddf4" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "surrealdb-jsonwebtoken" -version = "8.3.0-surreal.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" -dependencies = [ - "base64 0.21.7", - "getrandom", - "hmac", - "pem", - "rand", - "ring 0.16.20", - "rsa", - "serde", - "serde_json", - "sha2", - "simple_asn1", -] - -[[package]] -name = "surrealdb-migrations" -version = "1.5.0" -dependencies = [ - "assert_cmd", - "assert_fs", - "chrono", - "chrono-human-duration", - "clap", - "cli-table", - "color-eyre", - "convert_case", - "diffy", - "dir-diff", - "fs_extra", - "include_dir", - "itertools 0.12.1", - "names", - "predicates", - "pretty_assertions", - "regex", - "rust-ini", - "serde", - "serde_json", - "serial_test", - "sqlparser", - "surrealdb", - "tokio", - "tokio-test", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-test" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[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", - "syn 2.0.58", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "trice" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3aaab10ae9fac0b10f392752bf56f0fd20845f39037fec931e8537b105b515a" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ulid" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" -dependencies = [ - "getrandom", - "rand", - "serde", - "web-time", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-security" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9e13753df674873f3c4693b240ae5c03245ddc157dfccf7c26db9329af3a11" -dependencies = [ - "unicode-normalization", - "unicode-script", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "atomic", - "getrandom", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[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", - "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", - "syn 2.0.58", - "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", - "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", - "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", - "syn 2.0.58", - "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 = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wasmtimer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf" -dependencies = [ - "futures", - "js-sys", - "parking_lot", - "pin-utils", - "wasm-bindgen", -] - -[[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 = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[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-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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 22c39698dfed..00d172072f08 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -22,9 +22,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x5WyaVHLVFCHWPqyEuaVSbeIaGXDB0o7h776udcC4DM="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-wANIaEvHtFzAAsly2aqHlYwiKnxHkqH3/0rYs05AkXI="; buildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/filesystems/httm/Cargo.lock b/pkgs/tools/filesystems/httm/Cargo.lock deleted file mode 100644 index 571ac1756d50..000000000000 --- a/pkgs/tools/filesystems/httm/Cargo.lock +++ /dev/null @@ -1,1461 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac", - "digest", - "opaque-debug", -] - -[[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 = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", - "yaml-rust", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.48", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core", - "syn 2.0.48", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "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", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "exacl" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" -dependencies = [ - "bitflags 2.5.0", - "log", - "scopeguard", - "uuid", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fuzzy-muff" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b471332520d987f877cd86f529817c3c537b477199aa856e3b29012a4e37d2" -dependencies = [ - "thread_local", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash 0.3.8", - "autocfg", - "rayon", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.11", - "rayon", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "httm" -version = "0.38.1" -dependencies = [ - "ahash 0.8.11", - "clap 4.5.4", - "crossbeam-channel", - "exacl", - "hashbrown 0.14.3", - "indicatif 0.17.8", - "itertools", - "libc", - "lms", - "lscolors", - "nix 0.28.0", - "nu-ansi-term", - "number_prefix 0.4.0", - "once_cell", - "proc-mounts", - "rayon", - "realpath-ext", - "serde", - "serde_json", - "terminal_size", - "time", - "two_percent", - "which", - "xattr", -] - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.3.0", - "regex", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix 0.4.0", - "portable-atomic", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lms" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164b6100e88b387adf64d289e247bebae8f77810566f58159f119d0be90ed958" -dependencies = [ - "bitflags 1.3.2", - "blake2", - "clap 2.34.0", - "env_logger", - "hashbrown 0.8.2", - "indicatif 0.15.0", - "lazy_static", - "log", - "rayon", - "seahash", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lscolors" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53304fff6ab1e597661eee37e42ea8c47a146fca280af902bb76bff8a896e523" -dependencies = [ - "nu-ansi-term", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nohash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" - -[[package]] -name = "nu-ansi-term" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "partition-identity" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa925f9becb532d758b0014b472c576869910929cf4c3f8054b386f19ab9e21" -dependencies = [ - "thiserror", -] - -[[package]] -name = "portable-atomic" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-mounts" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d652f8435d0ab70bf4f3590a6a851d59604831a458086541b95238cc51ffcf2" -dependencies = [ - "partition-identity", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "realpath-ext" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692f72862a0d532b44a0f4965fb10f17e7659eaedf24d2ce3c989ca778bd092f" -dependencies = [ - "bitflags 1.3.2", - "errno", - "libc", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[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 = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tuikit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e19c6ab038babee3d50c8c12ff8b910bdb2196f62278776422f50390d8e53d8" -dependencies = [ - "bitflags 1.3.2", - "lazy_static", - "log", - "nix 0.24.3", - "term", - "unicode-width", -] - -[[package]] -name = "two_percent" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84167b95c58bc7cdd169699ab51938076616cee3a9c5c7a7292e0498361e868a" -dependencies = [ - "ahash 0.8.11", - "bitflags 2.5.0", - "crossbeam-channel", - "derive_builder", - "fuzzy-muff", - "hashbrown 0.14.3", - "libc", - "log", - "nohash", - "once_cell", - "rayon", - "regex", - "tuikit", - "unicode-width", - "vte", - "which", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vte" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" -dependencies = [ - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "which" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" -dependencies = [ - "either", - "home", - "rustix", - "winsafe", -] - -[[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-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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[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.0", -] - -[[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.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "yaml-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index b2fd6522bc3d..3fb44623460a 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aCWhjMXLNx5/wV1HFDtyUuUfpRAxDZhI/Bk7roqZkJ8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-ZmelNAewyrbiKqlyEwkgxlZToYD53UBZrK0nyqGN3RU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/wayland/wluma/Cargo.lock b/pkgs/tools/wayland/wluma/Cargo.lock deleted file mode 100644 index b49762dd04a0..000000000000 --- a/pkgs/tools/wayland/wluma/Cargo.lock +++ /dev/null @@ -1,1611 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -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 2.7.2", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.57", - "which", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "ddc" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba69f2c53e320fc4abad17cb02bbbf04d1a36f18e9907f347589ec5991b3c6c5" -dependencies = [ - "mccs", -] - -[[package]] -name = "ddc-hi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6747b17c926a2aa34739b30f1a6cc726e3a7baf0e2f69a4c03a95cf5de94de" -dependencies = [ - "anyhow", - "ddc", - "ddc-i2c", - "ddc-macos", - "ddc-winapi", - "edid", - "log", - "mccs", - "mccs-caps", - "mccs-db", - "nvapi", -] - -[[package]] -name = "ddc-i2c" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef18fac9fd5c11d0c7b85a80887b01f7361b49edb2b4627243928b90ce2691b" -dependencies = [ - "ddc", - "i2c", - "i2c-linux", - "resize-slice", -] - -[[package]] -name = "ddc-macos" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d04c521a076cbd37159b4674492304407f3bbc9669b43a90d9ed054a6d2b3cb" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "core-graphics", - "ddc", - "io-kit-sys", - "mach", - "thiserror", -] - -[[package]] -name = "ddc-winapi" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015df0d6d814ea948e012977760324da6d103ec8d67c971c75a6daa3b4fc943f" -dependencies = [ - "ddc", - "widestring", - "winapi", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "edid" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ce75530893d834dcfe3bb67ce0e7dec489484e7cb4423ca31618af4bab24fe" -dependencies = [ - "nom 3.2.1", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "i2c" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c7b7bdd7b3a985fdcf94a0d7d98e7a47fde8b7f22fb55ce1a91cc104a2ce9a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "i2c-linux" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0268a871aaa071221d6c2875ebedcf64710e59b0d87c68c8faf5e98b87dd2a4" -dependencies = [ - "bitflags 1.3.2", - "i2c", - "i2c-linux-sys", - "resize-slice", - "udev", -] - -[[package]] -name = "i2c-linux-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cd060ed0016621d3da4ed3a23b0158084de90d1f3a8e59f3d391aacd3bbcf8" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "libc", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "inotify" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" -dependencies = [ - "bitflags 1.3.2", - "futures-core", - "inotify-sys", - "libc", - "tokio", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "io-kit-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" -dependencies = [ - "core-foundation-sys", - "mach2", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[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 = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[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 = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "mccs" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6090d6b3ded42fed158b660a6b9cdaa1924f3eef6c6598e82a9ca9b70a1988cd" -dependencies = [ - "void", -] - -[[package]] -name = "mccs-caps" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb961d01a3bb07969cfa276be2ab88c31d0fefa77a872696832732d6e9ec094" -dependencies = [ - "mccs", - "nom 3.2.1", -] - -[[package]] -name = "mccs-db" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cdaa8fe19a1a1918becc1b8cbbbdc1058bc71411dff4de0a6ec6b5269f49d38" -dependencies = [ - "mccs", - "nom 3.2.1", - "serde", - "serde_derive", - "serde_yaml 0.7.5", -] - -[[package]] -name = "memchr" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" -dependencies = [ - "memchr 1.0.2", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr 2.7.2", - "minimal-lexical", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nvapi" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c63de8cd8362e2c38d1a48dea6ae68e6293a8d8d22a52180d0f8dcc779b3158" -dependencies = [ - "i2c", - "log", - "nvapi-sys", - "void", -] - -[[package]] -name = "nvapi-sys" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29e9a9393c69ee856bfcf5f76ed1ef32d2c0dd6f58558fd43334278fc1e7ea7" -dependencies = [ - "bitflags 1.3.2", - "winapi", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr 2.7.2", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" -dependencies = [ - "proc-macro2", - "syn 2.0.57", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr 2.7.2", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr 2.7.2", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "resize-slice" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3cb2f74a9891e76958b9e0ccd269a25b466c3ae3bb3efd71db157248308c4a" -dependencies = [ - "uninitialized", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8099d3df28273c99a1728190c7a9f19d444c941044f64adf986bee7ec53051" -dependencies = [ - "dtoa", - "linked-hash-map", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.48.0", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "udev" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47504d1a49b2ea1b133e7ddd1d9f0a83cf03feb9b440c2c470d06db4589cf301" -dependencies = [ - "libc", - "libudev-sys", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "uninitialized" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c1aa4511c38276c548406f0b1f5f8b793f000cfb51e18f278a102abd057e81" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "v4l" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fbfea44a46799d62c55323f3c55d06df722fbe577851d848d328a1041c3403" -dependencies = [ - "bitflags 1.3.2", - "libc", - "v4l-sys", -] - -[[package]] -name = "v4l-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16214e9b9476f0e76d117945c9c18a46a2602643c917a75b718ae2cf5395fa30" -dependencies = [ - "bindgen", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[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", - "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", - "syn 2.0.57", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "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", - "syn 2.0.57", - "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 = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[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-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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr 2.7.2", -] - -[[package]] -name = "wluma" -version = "4.4.0" -dependencies = [ - "ash", - "chrono", - "dbus", - "ddc-hi", - "env_logger", - "inotify", - "itertools", - "lazy_static", - "log", - "mockall", - "serde", - "serde_yaml 0.9.34+deprecated", - "toml", - "v4l", - "wayland-client", - "wayland-protocols", - "xdg", -] - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix index 94201db4a395..d2311dc26312 100644 --- a/pkgs/tools/wayland/wluma/default.nix +++ b/pkgs/tools/wayland/wluma/default.nix @@ -38,9 +38,7 @@ rustPlatform.buildRustPackage rec { 'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma' ''; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-BwduYAYIRxc40nn9kloHv+Dt8jLSZViweSYGL5e45YM="; nativeBuildInputs = [ makeWrapper From 05709d196810a3e01a31d1e0450c64720a318478 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 6 Jul 2024 01:03:33 -0300 Subject: [PATCH 516/562] live555: 2024.05.15 -> 2024.05.30 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 2a49aaa0db4d..232780a52498 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.05.15"; + version = "2024.05.30"; src = fetchurl { urls = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-Mgkf5XiFBEEDTTx+YlV12wE4zpmPPqaUPv9KcEK38D0="; + hash = "sha256-hVCwbY1UwAdfgOle9nQqncZ3/K/C27gkfwODL7mtVk8="; }; patches = [ From 788306fc82c05e46855e72478156ccb85651563c Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 15 Jul 2024 22:45:56 +0200 Subject: [PATCH 517/562] kodiPackages.sendtokodi: remove dependency on youtube_dl The sendtokodi plugin for Kodi can use both yt-dlp and youtube_dl to play back various URLs. Both of these packages have been susceptible to CVE-2024-38519. But while yt-dlp is still maintained and was patched, youtube_dl is unmaintained and thus known-vulnerable. Patch out the dependency on youtube_dl so that sendtokodi will only ever use yt-dlp to resolve URLs. --- .../video/kodi/addons/sendtokodi/default.nix | 13 ++++++++----- ...aged-deps.patch => use-packaged-yt-dlp.patch} | 16 +++++++++------- 2 files changed, 17 insertions(+), 12 deletions(-) rename pkgs/applications/video/kodi/addons/sendtokodi/{use-packaged-deps.patch => use-packaged-yt-dlp.patch} (59%) diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index f6946842ded4..f801be10f35f 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -13,7 +13,10 @@ buildKodiAddon rec { }; patches = [ - ./use-packaged-deps.patch + # Unconditionally depend on packaged yt-dlp. This removes the ability to + # use youtube_dl, which is unmaintained and considered vulnerable (see + # CVE-2024-38519). + ./use-packaged-yt-dlp.patch ]; propagatedBuildInputs = [ @@ -26,14 +29,14 @@ buildKodiAddon rec { ''; passthru = { - # Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via - # the Python path. - pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ]; + # Instead of the vendored libraries, we propagate yt-dlp via the Python + # path. + pythonPath = with kodi.pythonPackages; makePythonPath [ yt-dlp ]; }; meta = with lib; { homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; - description = "Plays various stream sites on Kodi using youtube-dl"; + description = "Plays various stream sites on Kodi using yt-dlp"; license = licenses.mit; maintainers = teams.kodi.members ++ [ maintainers.pks ]; }; diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch b/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch similarity index 59% rename from pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch rename to pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch index abfea58a7ceb..b53e1a434fff 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch +++ b/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch @@ -1,16 +1,18 @@ diff --git a/service.py b/service.py -index 1d7b6e4..9782993 100644 +index 024ad9a..6ef71dd 100644 --- a/service.py +++ b/service.py -@@ -241,9 +241,9 @@ def playlistIndex(url, playlist): +@@ -243,11 +243,8 @@ def playlistIndex(url, playlist): + # Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+) - if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: +-if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: - from lib.youtube_dl import YoutubeDL -+ from youtube_dl import YoutubeDL - else: +-else: - from lib.yt_dlp import YoutubeDL -+ from yt_dlp import YoutubeDL - +- ++from yt_dlp import YoutubeDL ++ # patch broken strptime (see above) patch_strptime() + From 7009c7331e956fc2265b19c59b3239f134285deb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 15 Jul 2024 22:48:58 +0200 Subject: [PATCH 518/562] python311Packages.testcontainers: 4.7.1 -> 4.7.2 Diff: https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.7.1...testcontainers-v4.7.2 Changelog: https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v4.7.2 --- pkgs/development/python-modules/testcontainers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index a4b20a75d15b..0ca740b2c655 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-li9okYMPW6PM03cFQRfHKzr48eOguNXmmHnSCBgDqYo="; + hash = "sha256-cmMuX3tKVGe4F+dQlOqQSTS/e49oWuudOekeL/j0YFw="; }; postPatch = '' From cef5e7801a30fb693d21a1785d6970b1a151d81c Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 15 Jul 2024 23:07:49 +0200 Subject: [PATCH 519/562] kodiPackages.inputstreamhelper: fix compatibility with Python 3.12 The inputstreamhelper Kodi script depends on the "distutils" package, which has been removed with Python 3.12. This has since been fixed upstream, but wasn't yet released. Backport the patch. --- .../video/kodi/addons/inputstreamhelper/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 13b2738fdff9..deca0d57d7c5 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, fetchpatch, addonUpdateScript }: buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; @@ -9,6 +9,13 @@ buildKodiAddon rec { sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; + patches = [ + (fetchpatch { + url = "https://github.com/emilsvennesson/script.module.inputstreamhelper/commit/af6adc16a0bee4921a827946b004ee070406ae37.patch"; + hash = "sha256-901EyVeZUb0EMvxsEza95qFjTOZ7PDYyqHMRawPM5Zs="; + }) + ]; + passthru = { pythonPath = "lib"; updateScript = addonUpdateScript { From 0613e470539d8f913e4783d463957e578fb74300 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 21:11:06 +0000 Subject: [PATCH 520/562] renovate: 37.424.3 -> 37.431.7 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index e15fff10eab7..afa41bcef68a 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -21,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "37.424.3"; + version = "37.431.7"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-OOanxZte0H27U5L1MGrNUxYDWQ7ctAoNVVUukbE7v7s="; + hash = "sha256-aaqsScfi0pXfrxOJ7xjPxtV9m9EUadhivagcAddP8HY="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-tOe0CqRVkN5Uu7S0o9sCV7Tdtkp3JDrupyx0r0AJfs4="; + hash = "sha256-atTs7sYxiioCXO5r6C07UULztquKgWCi+A2iqq+30VQ="; }; env.COREPACK_ENABLE_STRICT = 0; From 6e3fb85a49b74457cb983c8db02e7042b9ffebc7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 10 Jul 2024 08:10:50 +0200 Subject: [PATCH 521/562] aflplusplus: 4.20c: update qemuafl to match 4.20c --- pkgs/tools/security/aflplusplus/qemu.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index f412b8e40499..abf85697c03b 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - rev = "a1321713c7502c152dd7527555e0f8a800d55225"; - sha256 = "sha256-HLlOHqT2vrHjHyu4n83IzVzKv9ErinephLLev1E10nM="; + # rev origin: https://github.com/AFLplusplus/AFLplusplus/commits/stable/qemu_mode/QEMUAFL_VERSION + rev = "40033af00c4c5de172ed4fe60c21b9edbd2c189d"; + sha256 = "sha256-oK0DLJjXDiQuRlbaNOurvw5vlr9HEeOobNywiFTq7xg="; fetchSubmodules = true; }; From 94a133b22ef34b73eaf75f7712146fb5837ddd2f Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 15 Jul 2024 23:45:53 +0200 Subject: [PATCH 522/562] maintainers: add max --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e906187a9152..ec92f8cba451 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12660,6 +12660,13 @@ name = "Matthias Wimmer"; keys = [ { fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; } ]; }; + max = { + email = "max+nixpkgs@privatevoid.net"; + matrix = "@max:privatevoid.net"; + github = "max-privatevoid"; + githubId = 55053574; + name = "Max Headroom"; + }; max-amb = { email = "max_a@e.email"; github = "max-amb"; From b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2 Mon Sep 17 00:00:00 2001 From: Eldofin <90446228+Eldolfin@users.noreply.github.com> Date: Sun, 14 Jul 2024 20:52:37 +0200 Subject: [PATCH 523/562] helix: 24.03 -> 24.07 --- pkgs/applications/editors/helix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index fe2979bc56ba..28c8cfe3dfa0 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "24.03"; + version = "24.07"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc="; + hash = "sha256-R8foMx7YJ01ZS75275xPQ52Ns2EB3OPop10F4nicmoA="; stripRoot = false; }; - cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; + cargoHash = "sha256-Y8zqdS8vl2koXmgFY0hZWWP1ZAO8JgwkoPTYPVpkWsA="; nativeBuildInputs = [ git installShellFiles ]; From 33ce82fab45db0efb65a141d0686918119a4bdc1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 15 Jul 2024 23:32:22 +0200 Subject: [PATCH 524/562] aflplusplus: modernize - Update depreciated `--replace` by `replace-fail` - Replace `$(out)` with placeholder - Change `sha` attributes to `hash` --- pkgs/tools/security/aflplusplus/default.nix | 50 ++++++++++--------- .../security/aflplusplus/libdislocator.nix | 8 +-- .../security/aflplusplus/libtokencap.nix | 6 +-- pkgs/tools/security/aflplusplus/qemu.nix | 8 +-- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 9351a1c8f5c3..09d2d20d0faf 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -24,9 +24,10 @@ let src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; - rev = "v${version}"; - sha256 = "sha256-bS4Zxd2CX8m6zxO/izJi7Cj34260mOaU6GWjEj+xEU8="; + rev = "refs/tags/v${version}"; + hash = "sha256-bS4Zxd2CX8m6zxO/izJi7Cj34260mOaU6GWjEj+xEU8="; }; + enableParallelBuilding = true; # Note: libcgroup isn't needed for building, just for the afl-cgroup @@ -48,22 +49,22 @@ let # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path. # Replace LLVM_BINDIR with a non-existing path to give a hard error when it's used. substituteInPlace src/afl-cc.c \ - --replace "CLANGPP_BIN" '"${clang}/bin/clang++"' \ - --replace "CLANG_BIN" '"${clang}/bin/clang"' \ - --replace '"gcc"' '"${gcc}/bin/gcc"' \ - --replace '"g++"' '"${gcc}/bin/g++"' \ - --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + --replace-fail "CLANGPP_BIN" '"${clang}/bin/clang++"' \ + --replace-fail "CLANG_BIN" '"${clang}/bin/clang"' \ + --replace-fail '"gcc"' '"${gcc}/bin/gcc"' \ + --replace-fail '"g++"' '"${gcc}/bin/g++"' \ + --replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" substituteInPlace src/afl-ld-lto.c \ - --replace 'LLVM_BINDIR' '"/nixpkgs-patched-does-not-exist"' + --replace-fail 'LLVM_BINDIR' '"/nixpkgs-patched-does-not-exist"' # Remove the rest of the line sed -i 's|LLVM_BINDIR = .*|LLVM_BINDIR = |' utils/aflpp_driver/GNUmakefile substituteInPlace utils/aflpp_driver/GNUmakefile \ - --replace 'LLVM_BINDIR = ' 'LLVM_BINDIR = ${clang}/bin/' + --replace-fail 'LLVM_BINDIR = ' 'LLVM_BINDIR = ${clang}/bin/' substituteInPlace GNUmakefile.llvm \ - --replace "\$(LLVM_BINDIR)/clang" "${clang}/bin/clang" + --replace-fail "\$(LLVM_BINDIR)/clang" "${clang}/bin/clang" ''; env.NIX_CFLAGS_COMPILE = toString [ @@ -72,9 +73,10 @@ let ]; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" "USE_BINDIR=0" ]; + buildPhase = '' runHook preBuild @@ -109,15 +111,15 @@ let cp utils/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup chmod +x $out/bin/afl-cgroup substituteInPlace $out/bin/afl-cgroup \ - --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ - --replace "cgexec" "${libcgroup}/bin/cgexec" \ - --replace "cgdelete" "${libcgroup}/bin/cgdelete" + --replace-fail "cgcreate" "${libcgroup}/bin/cgcreate" \ + --replace-fail "cgexec" "${libcgroup}/bin/cgexec" \ + --replace-fail "cgdelete" "${libcgroup}/bin/cgdelete" patchShebangs $out/bin '' + lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ - --replace "qemu_mode/unsigaction" "$out/lib/afl" + --replace-fail "qemu_mode/unsigaction" "$out/lib/afl" chmod +x $out/bin/afl-wine-trace # qemu needs to be fed ELFs, not wrapper scripts, so we have to cheat a bit if we @@ -136,17 +138,17 @@ let # replace references to tools in build directory with references to installed locations substituteInPlace test/test-qemu-mode.sh \ - --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ - --replace '../afl-qemu-trace' '$out/bin/afl-qemu-trace' \ - --replace '../afl-fuzz' '$out/bin/afl-fuzz' \ - --replace '../qemu_mode/unsigaction/unsigaction32.so' '$out/lib/afl/unsigaction32.so' \ - --replace '../qemu_mode/unsigaction/unsigaction64.so' '$out/lib/afl/unsigaction64.so' + --replace-fail '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ + --replace-fail '../afl-qemu-trace' '$out/bin/afl-qemu-trace' \ + --replace-fail '../afl-fuzz' '$out/bin/afl-fuzz' \ + --replace-fail '../qemu_mode/unsigaction/unsigaction32.so' '$out/lib/afl/unsigaction32.so' \ + --replace-fail '../qemu_mode/unsigaction/unsigaction64.so' '$out/lib/afl/unsigaction64.so' substituteInPlace test/test-libextensions.sh \ - --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ - --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' + --replace-fail '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ + --replace-fail '../libtokencap.so' '`$out/bin/get-libtokencap-so`' substituteInPlace test/test-llvm.sh \ - --replace '../afl-cmin.bash' '`$out/bin/afl-cmin.bash`' + --replace-fail '../afl-cmin.bash' '`$out/bin/afl-cmin.bash`' # perl -pi -e 's|(? Date: Mon, 15 Jul 2024 23:54:16 +0200 Subject: [PATCH 525/562] afplusplus: format --- pkgs/tools/security/aflplusplus/default.nix | 144 +++++++++----- .../security/aflplusplus/libdislocator.nix | 6 +- .../security/aflplusplus/libtokencap.nix | 6 +- pkgs/tools/security/aflplusplus/qemu.nix | 182 +++++++++--------- 4 files changed, 193 insertions(+), 145 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 09d2d20d0faf..3f436d650a3f 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,8 +1,22 @@ -{ lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper -, clang, llvm, gcc, which, libcgroup, python3, perl, gmp -, file, wine ? null -, cmocka -, llvmPackages +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitHub, + callPackage, + makeWrapper, + clang, + llvm, + gcc, + which, + libcgroup, + python3, + perl, + gmp, + file, + wine ? null, + cmocka, + llvmPackages, }: # wine fuzzing is only known to work for win32 binaries, and using a mixture of @@ -12,9 +26,13 @@ assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); let aflplusplus-qemu = callPackage ./qemu.nix { }; - qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" - else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" - else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; + qemu-exe-name = + if stdenv.targetPlatform.system == "x86_64-linux" then + "qemu-x86_64" + else if stdenv.targetPlatform.system == "i686-linux" then + "qemu-i386" + else + throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { @@ -32,9 +50,18 @@ let # Note: libcgroup isn't needed for building, just for the afl-cgroup # script. - nativeBuildInputs = [ makeWrapper which clang gcc ]; - buildInputs = [ llvm python3 gmp llvmPackages.bintools ] - ++ lib.optional (wine != null) python3.pkgs.wrapPython; + nativeBuildInputs = [ + makeWrapper + which + clang + gcc + ]; + buildInputs = [ + llvm + python3 + gmp + llvmPackages.bintools + ] ++ lib.optional (wine != null) python3.pkgs.wrapPython; # Flag is already set by package and causes some compiler warnings. # warning: "_FORTIFY_SOURCE" redefined @@ -88,50 +115,56 @@ let runHook postBuild ''; - postInstall = '' - # remove afl-clang(++) which are just symlinks to afl-clang-fast - rm $out/bin/afl-clang $out/bin/afl-clang++ + postInstall = + '' + # remove afl-clang(++) which are just symlinks to afl-clang-fast + rm $out/bin/afl-clang $out/bin/afl-clang++ - # the makefile neglects to install unsigaction - cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ + # the makefile neglects to install unsigaction + cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ - # Install the custom QEMU emulator for binary blob fuzzing. - ln -s ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + # Install the custom QEMU emulator for binary blob fuzzing. + ln -s ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace - # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so - cat > $out/bin/get-afl-qemu-libcompcov-so < $out/bin/get-afl-qemu-libcompcov-so < Date: Mon, 15 Jul 2024 14:12:58 +0200 Subject: [PATCH 526/562] just: 1.30.1 -> 1.31.0 --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 673900a67a1f..809d03ba7d60 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.30.1"; + version = "1.31.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-x7+QK8JnAwXuYvVnLq82CPNXOJfUIQ4ekKLI4ed65Aw="; + hash = "sha256-ljn51K3/reWxUy26XAUXNNRqiFgKMXTA5jX/kuKukqI="; }; - cargoHash = "sha256-J7N+VOn9WUt60FTioblVHvB3XXmLeLM9vVCY44pkYW8="; + cargoHash = "sha256-cIoAYJw+wVwmBXy6ltcc3ImRCiRRv84C1iA/Bdf3tzE="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 8166a4cc8bb029a47fa86ce143e7d42865001e89 Mon Sep 17 00:00:00 2001 From: Reed Riley Date: Mon, 15 Jul 2024 11:20:18 -0700 Subject: [PATCH 527/562] bcachefs-tools: 1.9.2 -> 1.9.3 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index ee753b3f158d..f145834ba7e8 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1GsRBAVAfD0SAM1gk8W+bX7MtxunGKOLtXweL4rrf9Q="; + hash = "sha256-vKRjxehwqbvvgq+EMHoF3KRiPIxay06MpZRjapBFdVU="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - hash = "sha256-rabiNqw4hg0Js8VadxfkhNLIsrKfMuoKa5lFIfSMNPY="; + hash = "sha256-JOfS3vCkqI5wvFWgGkw1PIfmzW9yuP/Zp/x98MPdbUQ="; }; makeFlags = [ From c1c63238b3e8fd179b6f1d373d35d980444a921a Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Tue, 18 Jun 2024 09:56:42 -0400 Subject: [PATCH 528/562] libcpucycles: init at 20240318 Co-authored-by: Abdullah Imad Co-authored-by: Alberto Merino Co-authored-by: Enric Morales Co-authored-by: Jack Leightcap Co-authored-by: Roland Coeurjoly Signed-off-by: Jack Leightcap --- pkgs/by-name/li/libcpucycles/package.nix | 55 ++++++++++++++++++++++ pkgs/by-name/li/librandombytes/package.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/by-name/li/libcpucycles/package.nix diff --git a/pkgs/by-name/li/libcpucycles/package.nix b/pkgs/by-name/li/libcpucycles/package.nix new file mode 100644 index 000000000000..18f7d1a4f002 --- /dev/null +++ b/pkgs/by-name/li/libcpucycles/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchzip, + python3, + librandombytes, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcpucycles"; + version = "20240318"; + + src = fetchzip { + url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz"; + hash = "sha256-Fb73EOHGgEehZJwTCtCG12xwyiqtDXFs9eFDsHBQiDo="; + }; + + postPatch = '' + patchShebangs configure + patchShebangs scripts-build + ''; + + nativeBuildInputs = [ python3 ]; + + inherit (librandombytes) hardeningDisable configurePlatforms env; + + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id "$out/lib/libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" + install_name_tool -change "libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" "$out/bin/cpucycles-info" + ''; + + meta = { + homepage = "https://cpucycles.cr.yp.to/"; + description = "Microlibrary for counting CPU cycles"; + changelog = "https://cpucycles.cr.yp.to/download.html"; + license = with lib.licenses; [ + # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html + publicDomain + cc0 + bsd0 + mit + mit0 + ]; + maintainers = with lib.maintainers; [ + kiike + imadnyc + jleightcap + ]; + # list of architectures it supports, but currentlly untested with nix https://cpucycles.cr.yp.to/libcpucycles-20240318/cpucycles/options.html + platforms = [ + "x86_64-linux" + "aarch64-linux" + ] ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix index 1a4ae6885b0d..fa12ca954bdc 100644 --- a/pkgs/by-name/li/librandombytes/package.nix +++ b/pkgs/by-name/li/librandombytes/package.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs scripts-build ''; + __structuredAttrs = true; + # NOTE: librandombytes uses a custom Python `./configure`: it does not expect standard # autoconfig --build --host etc. arguments: disable configurePlatforms = [ ]; From db10106dbc08ac5ffd4c314a7de08d71159844de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:13:28 -0400 Subject: [PATCH 529/562] chawan: 0-unstable-2024-03-01 -> 0-unstable-2024-07-14 --- .../ch/chawan/mancha-augment-path.diff | 24 ++++++++---------- pkgs/by-name/ch/chawan/package.nix | 25 +++++++++++-------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ch/chawan/mancha-augment-path.diff b/pkgs/by-name/ch/chawan/mancha-augment-path.diff index cbe4f6aed80e..5a1be54fdfa3 100644 --- a/pkgs/by-name/ch/chawan/mancha-augment-path.diff +++ b/pkgs/by-name/ch/chawan/mancha-augment-path.diff @@ -1,15 +1,13 @@ -Add the -m option to man's command line to augment the list of paths -searched by man. The string "OUT" must be substituted with chawan's $out -path after patching. +Add the -m option to man's command line to augment the list of paths searched by man. The required -m option is only available in the mandoc implementation. ---- a/adapter/protocol/man -+++ b/adapter/protocol/man -@@ -75,7 +75,7 @@ EOF +--- a/adapter/protocol/man.nim ++++ b/adapter/protocol/man.nim +@@ -264,7 +264,7 @@ proc myOpen(cmd: string): tuple[ofile, efile: File] = - $section =~ s:([^-\w\200-\377.,])::g; - $man =~ s:([^-\w\200-\377.,])::g; -- open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |"); -+ open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN -m OUT/share/man $section $man 2> /dev/null |"); - } - - $ok = 0; + proc doMan(man, keyword, section: string) = + let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section) + let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " & +- man & sectionOpt & ' ' & quoteShellPosix(keyword) ++ man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword) + let (ofile, efile) = myOpen(cmd) + if ofile == nil: diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index de47458ff974..c2c81ba5cdcc 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -7,34 +7,37 @@ , ncurses , nim , pandoc -, perl , pkg-config , zlib , unstableGitUpdater +, libseccomp +, substituteAll }: stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2024-03-01"; + version = "0-unstable-2024-07-14"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "87ba9a87be15abbe06837f1519cfb76f4bf759f3"; - hash = "sha256-Xs+Mxe5/uoxPMf4FuelpO+bRJ1KdfASVI7rWqtboJZw="; + rev = "0e3d67f31df2c2d53aa0e578439852731e5f5af9"; + hash = "sha256-eVoZisQyaebWO58a0a0KR7fwsL1kTmPX1SayqdnmSuk="; fetchSubmodules = true; }; patches = [ # Include chawan's man pages in mancha's search path - ./mancha-augment-path.diff + (substituteAll { + src = ./mancha-augment-path.diff; + out = placeholder "out"; + }) ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration" ); - buildInputs = [ curlMinimal ncurses perl zlib ]; nativeBuildInputs = [ makeBinaryWrapper nim @@ -42,10 +45,12 @@ stdenv.mkDerivation { pkg-config ]; - postPatch = '' - substituteInPlace adapter/protocol/man \ - --replace-fail "OUT" $out - ''; + buildInputs = [ + curlMinimal + libseccomp + ncurses + zlib + ]; buildFlags = [ "all" "manpage" ]; installFlags = [ From 3568cc41f1e382427a263ca04a897b2154fe5450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 02:43:56 +0000 Subject: [PATCH 530/562] python312Packages.chacha20poly1305-reuseable: 0.12.1 -> 0.12.2 --- .../python-modules/chacha20poly1305-reuseable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 2916b8e7d779..6f306f46211b 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -18,7 +18,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.12.1"; + version = "0.12.2"; in buildPythonPackage { @@ -30,8 +30,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - hash = "sha256-jgbtDpl2hXmfzmsiIIG6+B3QoekuAjBJGMxQJPX4ynA="; + rev = "refs/tags/v${version}"; + hash = "sha256-RESSkMWkmlmYarLOI8pX5mwgcr8xAigbp1mrAQP/QNU="; }; nativeBuildInputs = [ From 3eb974fbbe6e7e2649e145b3f42dfe5151cb095b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 02:48:58 +0000 Subject: [PATCH 531/562] polylith: 0.2.19 -> 0.2.20 --- pkgs/development/tools/misc/polylith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index a9fecc09a204..6486bb10ca70 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.19"; + version = "0.2.20"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-tJV3kkB7dydnrJ0Es7DoOtCS+TwJG3SMONB2dsyHxx4="; + sha256 = "sha256-c/EFacN8isuxghnxaMn/uqDK1r7w1qn/suV8xbnmvOo="; }; dontUnpack = true; From 0c936986c211c54f1a757cde28fd25d3fb872945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:04:54 +0000 Subject: [PATCH 532/562] maa-cli: 0.4.7 -> 0.4.8 --- pkgs/by-name/ma/maa-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 254e10da2303..e1bfed03e0eb 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-FR0sUHAxxW49c/lnZteJGzgfvTskWNyc8gmQvghtrB8="; + hash = "sha256-qsyMLYAcniYz3gHw2N0itewmEaeCfXHCNwKUq6zUwX0="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { "core_installer" ]; - cargoHash = "sha256-iy9myT3bVW1TXCZx3ddiiDoDXx5BWqeQnSsJ97bc4IA="; + cargoHash = "sha256-cmsr4XEccerQMo1ksBzJvA/xdx9sAJlyum+YCpFATOw="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 From eba41fa905c433b653198cdc6d31452668892d8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:10:42 +0000 Subject: [PATCH 533/562] ignite-cli: 28.4.0 -> 28.5.0 --- pkgs/by-name/ig/ignite-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 998d9a0062a0..cbbc82593b80 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.4.0"; + version = "28.5.0"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-FxTOtowoGXJvGt+qnVOogOnxAurFPe9ihQpBhxhwEkI="; + hash = "sha256-s8RKlqIL1AjsqO+sOrWnAfHCpP1G7BFxnr5aHVe7Np4="; }; - vendorHash = "sha256-ZqyZTvJ7IeEbQ/jRjaEiWT8xNnZdiaY3qJKeQtaHzXc="; + vendorHash = "sha256-NEjva9KDPz7rykqcKcTOwSKBR3n4oFSYARX/BQzhgqY="; nativeBuildInputs = [ makeWrapper ]; From 7534840b68b840762a496c3a0f343a380c7b736f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:28:57 +0000 Subject: [PATCH 534/562] python312Packages.model-checker: 0.4.9 -> 0.4.12 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index e8472d3233e5..f06f4ed471a6 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.4.9"; + version = "0.4.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-BUkbCllM2qN5yKTvte2iwnmBXQAzu2N8LTGRfvOTKUQ="; + hash = "sha256-bgVtOpWx5jytVxSz/WKLqLm+hVKbwIy+Fy5nEj/Nwt4="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From d92dd651b4ad5aae9f34962bb311c711bd32b865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:29:35 +0000 Subject: [PATCH 535/562] python312Packages.manifestoo-core: 1.6 -> 1.7 --- pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index b3bdfbf34fab..35b713babb5f 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.6"; + version = "1.7"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-gOWu01Z1lxhMJELyxvU5A5AskVEqCoLV/auydM5/QCE="; + hash = "sha256-CLYySNkMysd81ZBA2yfHGSvBuuf8vEvVXkzVsTeEoNM="; }; nativeBuildInputs = [ hatch-vcs ]; From cb2d357291f6f446dfa4f9c8b48f0ca593dec0fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:29:49 +0000 Subject: [PATCH 536/562] patch2pr: 0.25.0 -> 0.26.1 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 0795adf94f5f..a563034ee0e3 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-mS7Yz1RPeA/pms3gGQ1oEjtzH9miIOWlf6YrrIoJk94="; + hash = "sha256-7mN5tp0QUlITCPeotMU61FUl0xmr78RMxUsIlq+F3DE="; }; - vendorHash = "sha256-XJC4rJI+adqiyFfiuyTbrAoWDiTThz7vjDZQrchDEiA="; + vendorHash = "sha256-YRhB0L1kIPZahS0K94vKr2iexhXkwl3GaNsk16WiLAU="; ldflags = [ "-X main.version=${version}" From 5c12546986e51c380cb01b35864c0f2a85f61864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:48:16 +0000 Subject: [PATCH 537/562] zed: 1.16.0 -> 1.17.0 --- pkgs/development/tools/zed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index f408780d1dea..8adf786836c9 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xjE/9Sl4lpgUg1+giUw/14E3MehhFqJI5cYXaw/qVPE="; + sha256 = "sha256-bafX3i6jEMqYB4YCpIX4z4SgQbJjryGmZ6pvqtVrk3A="; }; vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; From 4ecc64bb2356a096f88447effa54ad657599d41e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:56:08 +0000 Subject: [PATCH 538/562] python312Packages.govee-ble: 0.31.3 -> 0.33.1 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index c9a97a114c95..fbfe6fe508e6 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.31.3"; + version = "0.33.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-Gb9k2MieRKSJeKpmltL9HYA7pYKTSTWLGDgo52mY6xA="; + hash = "sha256-nGTf8QjnoEQCSya2mPlUB+cDD3ewGYiihIV2S6HRr9o="; }; postPatch = '' From 01056a3121b63b934a142a661c0826842a51e191 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 04:04:32 +0000 Subject: [PATCH 539/562] pinentry-rofi: 2.1.1 -> 2.2.0 --- pkgs/tools/security/pinentry-rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/tools/security/pinentry-rofi/default.nix index 6d623f581658..f59381cec6ed 100644 --- a/pkgs/tools/security/pinentry-rofi/default.nix +++ b/pkgs/tools/security/pinentry-rofi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pinentry-rofi"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; - sha256 = "sha256-e7dpMivZrTHmRuAzBzDVRoUgvBt6NpZ43FRQtX2omHA="; + sha256 = "sha256-E904PLYuIvlew2WHVEwU2bXp6Tc6+lTSVB/m9b9v+z8="; }; nativeBuildInputs = [ From d91cb30da5c11b030b80a9cc3125a42f3866e9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 04:21:47 +0000 Subject: [PATCH 540/562] redocly: 1.17.0 -> 1.18.0 --- pkgs/by-name/re/redocly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 71df968a3d79..77cabb05fa1f 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-6aPNgqem3nG+rPJmxMyjqYPm5mE+93h/uXKCuiUeLxI="; + hash = "sha256-Wcnq6hOgZb/HjTL1vb70d69LwFqRsBrgWHKyjYnauEg="; }; - npmDepsHash = "sha256-J+nlY+FKZqwhj4JyuyReW/UoAMX/eouuOAZ2WCzW2VA="; + npmDepsHash = "sha256-mHwabPif4B1kzqA5Y9WBEr17c3tg0IsBGcRcWnQqGD0="; npmBuildScript = "prepare"; From 896db9a56db3df8d825bed8da4e7c00ad8db1ddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 04:40:16 +0000 Subject: [PATCH 541/562] bitwarden-cli: 2024.6.1 -> 2024.7.0 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index b1879dce4797..6e43db4962fe 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -11,18 +11,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.6.1"; + version = "2024.7.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI="; + hash = "sha256-FH7++E+kc86lksHjTbVFU0mP0ZB2xb6ZCojdyNm1iWU="; }; nodejs = nodejs_20; - npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI="; + npmDepsHash = "sha256-F2iqTWgK+5ts2wd5NLsuyMZp1FnsbJmSjT3lJzV9PUo="; nativeBuildInputs = [ python311 From 6af0e1855f2360472604b88b319eeb26da4c8bf7 Mon Sep 17 00:00:00 2001 From: Honnip Date: Tue, 16 Jul 2024 13:52:50 +0900 Subject: [PATCH 542/562] libreoffice: add Korean language pack --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b48bd3347ead..b6dd98d4cae1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -98,7 +98,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , qtbase ? null From 3ba72e28340373ef25ad20c8c75bdfbc3202612f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 15 Jul 2024 21:51:36 -0700 Subject: [PATCH 543/562] nixos/amazon-image: avoid top-level with statements in maintainers script --- nixos/maintainers/scripts/ec2/amazon-image.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 8b6a9bc52b12..1b3724bfc170 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption optionalString types versionAtLeast; + inherit (lib.options) literalExpression; cfg = config.amazonImage; amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; @@ -15,7 +15,7 @@ in { # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes config.boot.kernelParams = let timeout = - if pkgs.lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.15" + if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255"; in [ "nvme_core.io_timeout=${timeout}" ]; @@ -156,5 +156,5 @@ in { }; in if config.ec2.zfs.enable then zfsBuilder else extBuilder; - meta.maintainers = with maintainers; [ arianvp ]; + meta.maintainers = with lib.maintainers; [ arianvp ]; } From 2e17c4a4daba78edd5dc027eea2eeb74f9da6f6b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 15 Jul 2024 21:46:25 -0700 Subject: [PATCH 544/562] nixos/amazon-image: avoid top-level with statements --- nixos/modules/virtualisation/amazon-image.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 77730178422c..f6d8848816d4 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -6,9 +6,8 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkDefault mkIf; cfg = config.ec2; in @@ -107,5 +106,5 @@ in # (e.g. it depends on GTK). services.udisks2.enable = false; }; - meta.maintainers = with maintainers; [ arianvp ]; + meta.maintainers = with lib.maintainers; [ arianvp ]; } From d8a85c7d96d06c2adaa9510485915687f5b71f13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 05:20:38 +0000 Subject: [PATCH 545/562] kubescape: 3.0.13 -> 3.0.14 --- pkgs/tools/security/kubescape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 3d03be031a8c..a64ade845944 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.13"; + version = "3.0.14"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-s0BaPIGMP8PbVv14e0U+tWKUFUVohAndaI5pLoMdALM="; + hash = "sha256-vTbNnQwHU1ALjNrZHE7nNw53DIe4lEifYOqkIeZohVE="; fetchSubmodules = true; }; From 6be09ce2922f12205601ea79037d1f75ff9c37f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 05:20:42 +0000 Subject: [PATCH 546/562] grype: 0.79.2 -> 0.79.3 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index c31195ff2331..fcbba6ae0e20 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.2"; + version = "0.79.3"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-8GO5vMUl6b1qjQ9+FdieLkSvkMQuJBwrfhJJies/37U="; + hash = "sha256-EAolb8r4n0r9SC7eh4wogHIM3iYgf9lKRFHryD4hhGc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-nws+/haDtyVC80f3S0wM7zI8ZB7c7KalqV96mp2D4C8="; + vendorHash = "sha256-/SbEc2YEXwBqR8PPnPj8Q3lDGMp/Kpib8E4lUzFGGV8="; nativeBuildInputs = [ installShellFiles ]; From be420db169e476c1e85dc9278974099d857bd2f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 07:00:03 +0000 Subject: [PATCH 547/562] rabbit: 1.0.5 -> 2.0.0 --- pkgs/by-name/ra/rabbit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix index 1ec1e092c1f1..2ee17d7818a6 100644 --- a/pkgs/by-name/ra/rabbit/package.nix +++ b/pkgs/by-name/ra/rabbit/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "rabbit"; - version = "1.0.5"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "natarajan-chidambaram"; repo = "RABBIT"; rev = "refs/tags/${version}"; - hash = "sha256-ykvI5qW4toNYKAnrk3ADwat1gAUazbDGGKZEZAvKngQ="; + hash = "sha256-cAWLVB7KpLsfXcxAbSXkE3O6N0V1mw3z9UdMeH0IkpI="; }; pythonRelaxDeps = true; From a68cb202a25c0320d11bdbe7aeeebe6d9c870141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 07:02:10 +0000 Subject: [PATCH 548/562] dnsproxy: 0.71.2 -> 0.72.0 --- pkgs/tools/networking/dnsproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 08624565dcd0..d86df692a192 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.71.2"; + version = "0.72.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-fsJWyb3YFmTeLf1qbO42RTldiEv3MeXyrySywGmIg5A="; + hash = "sha256-lhMHGB+/p4+pXZrLwf+NwyNF5TbMhNrJW0tCjRV+U9Q="; }; - vendorHash = "sha256-oINdRXLtfoCOpZ+n4HAkPtXyKen4m9VaDz1ggiEzehc="; + vendorHash = "sha256-vGIw0Hj0l8SI6zYnTknzc7Lb5volW37yE/KnWZHydQE="; ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ]; From 206d68e865a65419570a95d6ffa7a3287bf339c3 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Tue, 9 Jul 2024 08:57:29 +0000 Subject: [PATCH 549/562] wcurl: init at 2024.07.10 --- pkgs/by-name/wc/wcurl/package.nix | 65 +++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/wc/wcurl/package.nix diff --git a/pkgs/by-name/wc/wcurl/package.nix b/pkgs/by-name/wc/wcurl/package.nix new file mode 100644 index 000000000000..381279883d0c --- /dev/null +++ b/pkgs/by-name/wc/wcurl/package.nix @@ -0,0 +1,65 @@ +{ + stdenvNoCC, + lib, + curl, + fetchFromGitLab, + installShellFiles, + nix-update-script, + shunit2, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "wcurl"; + version = "2024.07.10"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "wcurl"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-FYkG74uoXFNYT7tszDcdCPQCEG3ePOFBUgIUYpsAzb8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ installShellFiles ]; + + nativeCheckInputs = [ shunit2 ]; + + doCheck = true; + + dontBuild = true; + + postPatch = '' + substituteInPlace wcurl \ + --replace-fail '"curl "' '"${curl}/bin/curl "' + ''; + + checkPhase = '' + runHook preCheck + + tests/tests.sh + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + install -D wcurl -t $out/bin + installManPage wcurl.1 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://salsa.debian.org/debian/wcurl"; + description = "Simple wrapper around curl to easily download files"; + mainProgram = "wcurl"; + license = lib.licenses.curl; + maintainers = with lib.maintainers; [ deejayem ]; + platforms = lib.platforms.all; + }; +}) From 598bc1e6d498e08bbd103bba5c517d771d3be439 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 08:13:52 +0000 Subject: [PATCH 550/562] python312Packages.apkinspector: 1.2.4 -> 1.3.0 --- pkgs/development/python-modules/apkinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 95bffbe4854b..3481b3e3c1c3 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.2.4"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; rev = "refs/tags/v${version}"; - hash = "sha256-WVqaRWOLo8/Xav+AtaxE3EKR9lZe+Z+ep/K88FGbASg="; + hash = "sha256-frcggMsDpPfIqL0J7FNOht+aXeg79xnZryZZwI4wWGw="; }; build-system = [ poetry-core ]; From 8564cb1517f118e1e90b8bc9ba052678f1aa4603 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 15 Jul 2024 16:27:03 +0200 Subject: [PATCH 551/562] coqPackages.multinomials switched back to coq_makefile --- pkgs/development/coq-modules/multinomials/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 89297a6fd0ea..6b61d9545f88 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -41,7 +41,7 @@ "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = lib.versions.range "1.5.3" "2.2.0"; preConfigure = '' patchShebangs configure || true From 85fbe210ba99b7f1ce34ec0e2c4afa84200365e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 08:49:06 +0000 Subject: [PATCH 552/562] vdrPlugins.softhddevice: 2.3.4 -> 2.3.5 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 43953398ae11..633a4b208e23 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-pwA0LBQZ0jYXgBHhboAhyPM/kM7sboGw0O+3OIg5Nz4="; + sha256 = "sha256-i/lxR/iSarmhJvqjcu8+HscTYoVExwCcweSNo206BYU="; rev = "v${version}"; }; From 5f134632ffe92112d6e9870049c1553fd3032bca Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 16 Jul 2024 16:59:22 +0800 Subject: [PATCH 553/562] scope-tui: 0-unstable-2024-03-16 -> 0.3.0-unstable-2024-05-06 --- pkgs/by-name/sc/scope-tui/Cargo.lock | 962 -------------------------- pkgs/by-name/sc/scope-tui/package.nix | 41 +- 2 files changed, 21 insertions(+), 982 deletions(-) delete mode 100644 pkgs/by-name/sc/scope-tui/Cargo.lock diff --git a/pkgs/by-name/sc/scope-tui/Cargo.lock b/pkgs/by-name/sc/scope-tui/Cargo.lock deleted file mode 100644 index 1af1397638df..000000000000 --- a/pkgs/by-name/sc/scope-tui/Cargo.lock +++ /dev/null @@ -1,962 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "ryu", - "static_assertions", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.4.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[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", - "winapi", -] - -[[package]] -name = "libpulse-simple-binding" -version = "2.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd6b68f33f6a251265e6ed1212dc3107caad7c5c6fdcd847b2e65ef58c308d" -dependencies = [ - "libpulse-binding", - "libpulse-simple-sys", - "libpulse-sys", -] - -[[package]] -name = "libpulse-simple-sys" -version = "1.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6613b4199d8b9f0edcfb623e020cb17bbd0bee8dd21f3c7cc938de561c4152" -dependencies = [ - "libpulse-sys", - "pkg-config", -] - -[[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", - "pkg-config", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", -] - -[[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", - "syn 1.0.109", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "primal-check" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" -dependencies = [ - "num-integer", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "ratatui" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" -dependencies = [ - "bitflags 2.4.2", - "cassowary", - "compact_str", - "crossterm", - "indoc", - "itertools", - "lru", - "paste", - "stability", - "strum", - "time", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfft" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" -dependencies = [ - "num-complex", - "num-integer", - "num-traits", - "primal-check", - "strength_reduce", - "transpose", - "version_check", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scope-tui" -version = "0.3.0" -dependencies = [ - "clap", - "crossterm", - "derive_more", - "libpulse-binding", - "libpulse-simple-binding", - "ratatui", - "rustfft", - "thiserror", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "stability" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.52", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "time" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -dependencies = [ - "deranged", - "libc", - "num-conv", - "num_threads", - "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 = "transpose" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" -dependencies = [ - "num-integer", - "strength_reduce", -] - -[[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-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[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-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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix index 2cd6569a4bcb..27e9001ba9f9 100644 --- a/pkgs/by-name/sc/scope-tui/package.nix +++ b/pkgs/by-name/sc/scope-tui/package.nix @@ -1,38 +1,39 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libpulseaudio +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libpulseaudio, + alsa-lib, + withPulseaudio ? true, }: rustPlatform.buildRustPackage { pname = "scope-tui"; - version = "0-unstable-2024-03-16"; + version = "0.3.0-unstable-2024-05-06"; src = fetchFromGitHub { owner = "alemidev"; repo = "scope-tui"; - rev = "299efd70129eb945f8ce63ff853decb41ef5e7ef"; - hash = "sha256-ELcNSjie/AGrPFT06VXR5mNxiBPwYGVzeC8I9ybN8Bc="; + rev = "c2fe70a69cfc15c4de6ea3f2a51580ec57a5c9e1"; + hash = "sha256-6UPIZ2UB5wb0IkigaOXdQ/0ux9vHUGC4w5WnrjEd1bg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-9e5FOf7X+54591SjikeAq/5gsnqjUOEtVKpr6vWAHMI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpulseaudio ]; + buildInputs = [ alsa-lib ] ++ lib.optionals withPulseaudio [ libpulseaudio ]; - meta = with lib; { + buildFeatures = lib.optionals withPulseaudio [ "pulseaudio" ]; + + doCheck = false; # no tests + + meta = { description = "Simple oscilloscope/vectorscope/spectroscope for your terminal"; homepage = "https://github.com/alemidev/scope-tui"; - license = licenses.mit; - maintainers = with maintainers; [ iynaix ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "scope-tui"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 8093ed7a5171d8f916398d40fda30e353cc04120 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 16 Jul 2024 17:00:40 +0800 Subject: [PATCH 554/562] scope-tui: add aleksana to maintainers --- pkgs/by-name/sc/scope-tui/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix index 27e9001ba9f9..8b99e3d7c7bb 100644 --- a/pkgs/by-name/sc/scope-tui/package.nix +++ b/pkgs/by-name/sc/scope-tui/package.nix @@ -32,7 +32,10 @@ rustPlatform.buildRustPackage { description = "Simple oscilloscope/vectorscope/spectroscope for your terminal"; homepage = "https://github.com/alemidev/scope-tui"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iynaix ]; + maintainers = with lib.maintainers; [ + iynaix + aleksana + ]; mainProgram = "scope-tui"; platforms = lib.platforms.linux; }; From feb20da98fe546ab5342e0d7720da8fcda53daab Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Feb 2024 23:43:59 +0100 Subject: [PATCH 555/562] or-tools: 9.4 -> 9.7 --- .../science/math/or-tools/default.nix | 64 ++++++++++++------- .../or-tools/fix-stringview-compile.patch | 36 ----------- .../science/math/or-tools/offline.patch | 16 +++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch create mode 100644 pkgs/development/libraries/science/math/or-tools/offline.patch diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index acb0ece75463..cb4670204d11 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -6,7 +6,7 @@ , eigen , ensureNewerSourcesForZipFilesHook , fetchFromGitHub -, fetchpatch +, substituteAll , glpk , lib , pkg-config @@ -19,53 +19,57 @@ , zlib }: +let + pybind11_protobuf = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_protobuf"; + rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac"; + hash = "sha256-f6pzRWextH+7lm1xzyhx98wCIWH3lbhn59gSCcjsBVw="; + }; +in stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.4"; + version = "9.7"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "sha256-joWonJGuxlgHhXLznRhC1MDltQulXzpo4Do9dec1bLY="; + hash = "sha256-eHukf6TbY2dx7iEf8WfwfWsjDEubPtRO02ju0kHtASo="; }; + patches = [ - # Disable test that requires external input: https://github.com/google/or-tools/issues/3429 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch"; - hash = "sha256-iWE+atp308q7pC1L1FD6sK8LvWchZ3ofxvXssguozbM="; + (substituteAll { + src = ./offline.patch; + pybind11_protobuf = "../../pybind11_protobuf"; }) - # Fix test that broke in parallel builds: https://github.com/google/or-tools/issues/3461 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch"; - hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc="; - }) - # Backport fix in cmake test configuration where pip installs newer version from PyPi over local build, - # breaking checkPhase: https://github.com/google/or-tools/issues/3260 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch"; - hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM="; - }) - # Don't use non-existent member of string_view. Partial patch from commit - # https://github.com/google/or-tools/commit/c5a2fa1eb673bf652cb9ad4f5049d054b8166e17.patch - ./fix-stringview-compile.patch ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. postPatch = '' echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + + cp -R ${pybind11_protobuf} pybind11_protobuf + chmod -R u+w pybind11_protobuf ''; cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DBUILD_PYTHON=ON" "-DBUILD_pybind11=OFF" + "-DBUILD_pybind11_protobuf=ON" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + + strictDeps = true; + nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook @@ -78,14 +82,18 @@ stdenv.mkDerivation rec { ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf + mypy ]); buildInputs = [ + abseil-cpp bzip2 cbc eigen glpk python.pkgs.absl-py python.pkgs.pybind11 + python.pkgs.pytest + python.pkgs.scipy python.pkgs.setuptools python.pkgs.wheel re2 @@ -103,7 +111,19 @@ stdenv.mkDerivation rec { python.pkgs.virtualenv ]; - doCheck = true; + env.NIX_CFLAGS_COMPILE = toString [ + # fatal error: 'python/google/protobuf/proto_api.h' file not found + "-I${protobuf.src}" + # fatal error: 'pybind11_protobuf/native_proto_caster.h' file not found + "-I${pybind11_protobuf}" + ]; + + # some tests fail on linux and hang on darwin + doCheck = false; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; # This extra configure step prevents the installer from littering # $out/bin with sample programs that only really function as tests, diff --git a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch deleted file mode 100644 index 760ab80a38e4..000000000000 --- a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc -index 58286306e5..bd26c019ab 100644 ---- a/ortools/lp_data/lp_parser.cc -+++ b/ortools/lp_data/lp_parser.cc -@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) { - - bool LPParser::ParseConstraint(StringPiece constraint) { - const StatusOr parsed_constraint_or_status = -- ::operations_research::glop::ParseConstraint(constraint.as_string()); -+ ::operations_research::glop::ParseConstraint(constraint); - if (!parsed_constraint_or_status.ok()) return false; - const ParsedConstraint& parsed_constraint = - parsed_constraint_or_status.value(); -@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) { - - } // namespace - --StatusOr ParseConstraint(absl::string_view constraint_view) { -+StatusOr ParseConstraint(absl::string_view constraint) { - ParsedConstraint parsed_constraint; - // Get the name, if present. -- StringPiece constraint{constraint_view}; - StringPiece constraint_copy{constraint}; - std::string consumed_name; - Fractional consumed_coeff; -@@ -413,8 +412,8 @@ StatusOr ParseConstraint(absl::string_view constraint_view) { - right_bound = consumed_coeff; - if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != - TokenType::END) { -- return absl::InvalidArgumentError(absl::StrCat( -- "End of input was expected, found: ", constraint.as_string())); -+ return absl::InvalidArgumentError( -+ absl::StrCat("End of input was expected, found: ", constraint)); - } - } - diff --git a/pkgs/development/libraries/science/math/or-tools/offline.patch b/pkgs/development/libraries/science/math/or-tools/offline.patch new file mode 100644 index 000000000000..1a2a4dbe3631 --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/offline.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt +index af3a28c113..ba92c3c55e 100644 +--- a/cmake/dependencies/CMakeLists.txt ++++ b/cmake/dependencies/CMakeLists.txt +@@ -177,9 +177,8 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf) + list(APPEND CMAKE_MESSAGE_INDENT " ") + FetchContent_Declare( + pybind11_protobuf +- GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git" +- GIT_TAG "main" +- PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" ++ SOURCE_DIR @pybind11_protobuf@ ++ PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" + ) + FetchContent_MakeAvailable(pybind11_protobuf) + list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca72068589a..989476f13a7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37751,10 +37751,10 @@ with pkgs; inherit (darwin) DarwinTools; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; - protobuf = protobuf_21; + protobuf = protobuf_23; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp.override { + abseil-cpp = abseil-cpp_202301.override { static = true; cxxStandard = "20"; }; From c0a9d48d1a0cc4b546d5f3cfe843e565276c46f6 Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Tue, 16 Jul 2024 11:01:49 +0200 Subject: [PATCH 556/562] refactor: move mcfly to by-name --- .../misc/mcfly/default.nix => by-name/mc/mcfly/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/mcfly/default.nix => by-name/mc/mcfly/package.nix} (100%) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/by-name/mc/mcfly/package.nix similarity index 100% rename from pkgs/tools/misc/mcfly/default.nix rename to pkgs/by-name/mc/mcfly/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f03593ee5a..b09aa3ba46c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9704,8 +9704,6 @@ with pkgs; mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { }; - m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini; From d4e9d5a11348f8c4a7eeec5121dc4445a1abbfc2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 16 Jul 2024 05:13:07 -0400 Subject: [PATCH 557/562] keet: 1.2.1 -> 2.2.0 (#308337) Co-authored-by: Sandro --- .../instant-messengers/keet/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix index c49442e38370..c708d46d3a2e 100644 --- a/pkgs/applications/networking/instant-messengers/keet/default.nix +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -1,23 +1,30 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, fetchzip }: let pname = "keet"; - version = "1.2.1"; + version = "2.2.0"; - src = fetchurl { - url = "https://keet.io/downloads/${version}/Keet.AppImage"; - sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + src = fetchzip { + url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz"; + hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc="; }; - appimageContents = appimageTools.extract { inherit pname version src; }; + appimageContents = appimageTools.extract { + inherit pname version; + src = "${src}/Keet.AppImage"; + }; in appimageTools.wrapType2 { - inherit src pname version; + inherit pname version; + + src = "${src}/Keet.AppImage"; + + extraPkgs = pkgs: with pkgs; [ + gtk4 + ]; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + install -m 444 -D ${appimageContents}/Keet.desktop -t $out/share/applications + cp -r ${appimageContents}/*.png $out/share ''; meta = with lib; { From c7bb9bf6b0119f9ed5c3f14f54950fd560199cab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 09:29:16 +0000 Subject: [PATCH 558/562] python312Packages.beancount-black: 1.0.2 -> 1.0.4 --- pkgs/development/python-modules/beancount-black/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index 4196997a0c95..c229ec89cea2 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "1.0.2"; + version = "1.0.4"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beancount-black"; - rev = version; - hash = "sha256-SoAic9UYKE9lhMpl44VosJmmjKJjDrKOyMeUO931Ztg="; + rev = "refs/tags/${version}"; + hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE="; }; buildInputs = [ poetry-core ]; From e3dc4b2bcbf675219f4bd9ab528debc8b35e347f Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 16 Jul 2024 17:37:19 +0800 Subject: [PATCH 559/562] lan-mouse: switch to cargoHash --- pkgs/by-name/la/lan-mouse/Cargo.lock | 2669 ------------------------- pkgs/by-name/la/lan-mouse/package.nix | 4 +- 2 files changed, 1 insertion(+), 2672 deletions(-) delete mode 100644 pkgs/by-name/la/lan-mouse/Cargo.lock diff --git a/pkgs/by-name/la/lan-mouse/Cargo.lock b/pkgs/by-name/la/lan-mouse/Cargo.lock deleted file mode 100644 index bb7273f6b730..000000000000 --- a/pkgs/by-name/la/lan-mouse/Cargo.lock +++ /dev/null @@ -1,2669 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "arraydeque" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - -[[package]] -name = "ashpd" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus", -] - -[[package]] -name = "async-broadcast" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" -dependencies = [ - "async-channel", - "async-io", - "async-lock 3.3.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 5.2.0", - "futures-lite", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" - -[[package]] -name = "async-trait" -version = "0.1.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[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.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel", - "async-lock 3.3.0", - "async-task", - "fastrand", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cairo-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" -dependencies = [ - "bitflags 2.5.0", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-expr" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[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 = "clap" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[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 = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "enumflags2" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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 = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" -dependencies = [ - "event-listener 5.2.0", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[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 = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[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-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gio" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys 0.52.0", -] - -[[package]] -name = "glib" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" -dependencies = [ - "bitflags 2.5.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-build-tools" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108f374fff60efd14b0d70d8916e7213aed18d7dd071ba3e9334ed2dac1dc86a" -dependencies = [ - "gio", -] - -[[package]] -name = "glib-macros" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" -dependencies = [ - "heck 0.5.0", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "glib-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hickory-proto" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "hostname" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if", - "libc", - "windows 0.52.0", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "keycode" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07873c3182aec8a0eb1a5a4e7b197d42e9d167ba78497a6ee932a82d94673ed" -dependencies = [ - "arraydeque", - "arrayvec", - "bitflags 1.3.2", - "keycode_macro", -] - -[[package]] -name = "keycode_macro" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e521ea802f5b3c7194e169d75cab431b0ff08d022f2b6047b08754b4988b89df" -dependencies = [ - "anyhow", - "heck 0.3.3", - "proc-macro2", - "quote", -] - -[[package]] -name = "lan-mouse" -version = "0.8.0" -dependencies = [ - "anyhow", - "ashpd", - "async-channel", - "async-trait", - "clap", - "core-graphics", - "env_logger", - "futures", - "futures-core", - "glib-build-tools", - "gtk4", - "hickory-resolver", - "hostname 0.4.0", - "keycode", - "libadwaita", - "libc", - "log", - "memmap", - "num_enum", - "once_cell", - "reis", - "serde", - "serde_json", - "slab", - "tempfile", - "tokio", - "toml", - "wayland-client", - "wayland-protocols", - "wayland-protocols-misc", - "wayland-protocols-wlr", - "windows 0.54.0", - "x11", -] - -[[package]] -name = "libadwaita" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[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 = "pango" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand", - "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 = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[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-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[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 = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -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_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reis" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635de3608f72e8d067f8972f9401619ac7a3f34a0a17340fa0e3f9db57e067a3" -dependencies = [ - "futures", - "rustix", - "tokio", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname 0.3.1", - "quick-error", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -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 = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.9", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.5", -] - -[[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", - "syn 2.0.53", -] - -[[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", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.5.0", - "rustix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-misc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[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-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[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.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-result" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" -dependencies = [ - "windows-targets 0.52.4", -] - -[[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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "zbus" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" -dependencies = [ - "async-broadcast", - "async-process", - "async-recursion", - "async-trait", - "derivative", - "enumflags2", - "event-listener 5.2.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "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.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index 583953e829b5..8e4218dc3f99 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -38,9 +38,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-rmiirWNS5Eldq0NyOyYielTPDdKbhtRqRS7RnGZ7H3g="; meta = { description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network"; From c8dfaee895788edbb9cbb0a09e340cb485ccb038 Mon Sep 17 00:00:00 2001 From: Jack Leightcap <30168080+jleightcap@users.noreply.github.com> Date: Tue, 16 Jul 2024 06:27:18 -0400 Subject: [PATCH 560/562] lib25519: init at 20240321 (#319618) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * init: lib25519 at 20240321 Signed-off-by: Jack Leightcap * Add installCheckPhase to lib25519 * Set platforms for lib25519, libcpucycles and librandombytes * Fixed patch for libcpucycles * lib25519: remove openssl unneeded variable * lib25519: patch scripts to pull toolchain from environment variables * librandombytes: add regression test script * lib25519: checkpoint for successful cross-compile * testing without binfmt * compilation for arm64 without cross compiling * compilation for x86 that creates a x86 binary * lib25519: replace compiler command to fix cross- and native compiling * librandombytes, lib25519: cleanup * crosstest.sh: drop --------- Signed-off-by: Jack Leightcap Co-authored-by: Roland Coeurjoly Co-authored-by: imad.nyc Co-authored-by: Enric Morales Co-authored-by: Alberto Merino Risueño Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- .../lib25519/environment-variable-tools.patch | 48 ++++++++++++ pkgs/by-name/li/lib25519/package.nix | 75 +++++++++++++++++++ .../environment-variable-tools.patch | 59 +++++++++++++++ pkgs/by-name/li/libcpucycles/package.nix | 8 +- pkgs/by-name/li/librandombytes/package.nix | 5 ++ 5 files changed, 190 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/li/lib25519/environment-variable-tools.patch create mode 100644 pkgs/by-name/li/lib25519/package.nix create mode 100644 pkgs/by-name/li/libcpucycles/environment-variable-tools.patch diff --git a/pkgs/by-name/li/lib25519/environment-variable-tools.patch b/pkgs/by-name/li/lib25519/environment-variable-tools.patch new file mode 100644 index 000000000000..121055201b01 --- /dev/null +++ b/pkgs/by-name/li/lib25519/environment-variable-tools.patch @@ -0,0 +1,48 @@ +diff --git a/configure b/configure +index 04042b2..30d1ea9 100755 +--- a/configure ++++ b/configure +@@ -210,6 +210,17 @@ for arch in sorted(os.listdir('compilers')): + with open('compilers/%s' % arch) as f: + for c in f.readlines(): + c = c.strip() ++ if env_cc := os.getenv('CC'): ++ c_as_list= c.split() ++ # check if the compiler we're testing has the name inside the last ++ # part of the CC env var ++ # i.e. gcc == x86_64-linux-unknown-gnu-gcc ++ # or gcc == gcc ++ if c_as_list[0] == env_cc.split("-")[-1]: ++ c_as_list[0] = env_cc ++ c = ' '.join(c_as_list) ++ log('patched command as %s' % c) ++ + cv = compilerversion(c) + if cv == None: + log('skipping %s compiler %s' % (arch,c)) +diff --git a/scripts-build/checknamespace b/scripts-build/checknamespace +index ae11bed..bd9cb85 100755 +--- a/scripts-build/checknamespace ++++ b/scripts-build/checknamespace +@@ -36,7 +36,7 @@ def doit(d): + obj2U = {} + + try: +- p = subprocess.Popen(['nm','-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True) ++ p = subprocess.Popen([os.getenv('NM', 'nm'),'-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True) + out,err = p.communicate() + except Exception as e: + warn('nm failure: %s' % e) +diff --git a/scripts-build/staticlib b/scripts-build/staticlib +index 7683233..0445bc3 100755 +--- a/scripts-build/staticlib ++++ b/scripts-build/staticlib +@@ -3,6 +3,6 @@ + lib="$1" + + rm -f package/lib/"$lib".a +-ar cr package/lib/"$lib".a ofiles/*.o +-ranlib package/lib/"$lib".a || : ++${AR:-ar} cr package/lib/"$lib".a ofiles/*.o ++${RANLIB:-ranlib} package/lib/"$lib".a || : + chmod 644 package/lib/"$lib".a diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix new file mode 100644 index 000000000000..90d377948f93 --- /dev/null +++ b/pkgs/by-name/li/lib25519/package.nix @@ -0,0 +1,75 @@ +{ + stdenv, + lib, + python3, + fetchzip, + librandombytes, + libcpucycles, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "lib25519"; + version = "20240321"; + + src = fetchzip { + url = "https://lib25519.cr.yp.to/lib25519-${finalAttrs.version}.tar.gz"; + hash = "sha256-R10Q803vCjIZCS4Z/uErsx547RaXfAELGQm9NuNhw+I="; + }; + + patches = [ ./environment-variable-tools.patch ]; + + postPatch = '' + patchShebangs configure + patchShebangs scripts-build + ''; + + # NOTE: lib25519 uses a custom Python `./configure`: it does not expect standard + # autoconfig --build --host etc. arguments: disable + # Pass the hostPlatform string + configurePhase = '' + runHook preConfigure + ./configure --host=${stdenv.buildPlatform.system} --prefix=$out + runHook postConfigure + ''; + + nativeBuildInputs = [ python3 ]; + buildInputs = [ + librandombytes + libcpucycles + ]; + + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id "$out/lib/lib25519.1.dylib" "$out/lib/lib25519.1.dylib" + for f in $out/bin/*; do + install_name_tool -change "lib25519.1.dylib" "$out/lib/lib25519.1.dylib" "$f" + done + ''; + + # failure: crypto_pow does not handle p=q overlap + doInstallCheck = !stdenv.isDarwin; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/lib25519-test + runHook postInstallCheck + ''; + + meta = { + homepage = "https://randombytes.cr.yp.to/"; + description = "A simple API for applications generating fresh randomness"; + changelog = "https://randombytes.cr.yp.to/download.html"; + license = with lib.licenses; [ + # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html + publicDomain + cc0 + bsd0 + mit + mit0 + ]; + maintainers = with lib.maintainers; [ + kiike + imadnyc + jleightcap + ]; + # This supports whatever platforms libcpucycles supports + inherit (libcpucycles.meta) platforms; + }; +}) diff --git a/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch b/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch new file mode 100644 index 000000000000..b194e68c06b7 --- /dev/null +++ b/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch @@ -0,0 +1,59 @@ +diff --git a/configure b/configure +index 87d5c14..5e2a1a4 100755 +--- a/configure ++++ b/configure +@@ -112,21 +112,26 @@ def compilerversion(c): + except: + pass + +-firstcompiler = None +- +-with open('compilers/default') as f: +- for c in f.readlines(): +- c = c.strip() +- cv = compilerversion(c) +- if cv == None: +- print('skipping default compiler %s' % c) +- continue +- print('using default compiler %s' % c) +- firstcompiler = c +- break +- +-if firstcompiler is None: +- raise ValueError('did not find a working compiler') ++if c := os.getenv("CC"): ++ firstcompiler = c ++ print('using default compiler %s' % c) ++else: ++ firstcompiler = None ++ ++ with open('compilers/default') as f: ++ for c in f.readlines(): ++ c = c.strip() ++ cv = compilerversion(c) ++ if cv == None: ++ print('skipping default compiler %s' % c) ++ continue ++ print('using default compiler %s' % c) ++ firstcompiler = c ++ break ++ ++ if firstcompiler is None: ++ raise ValueError('did not find a working compiler') ++ + + with open('build/%s/scripts/compiledefault' % host,'w') as f: + f.write('#!/bin/sh\n') +diff --git a/scripts-build/staticlib b/scripts-build/staticlib +index bb23658..111ab13 100755 +--- a/scripts-build/staticlib ++++ b/scripts-build/staticlib +@@ -1,6 +1,6 @@ + #!/bin/sh + + rm -f package/lib/libcpucycles.a +-ar cr package/lib/libcpucycles.a "$@" +-ranlib package/lib/libcpucycles.a || : ++${AR:-ar} cr package/lib/libcpucycles.a "$@" ++${RANLIB:-ranlib} package/lib/libcpucycles.a || : + chmod 644 package/lib/libcpucycles.a diff --git a/pkgs/by-name/li/libcpucycles/package.nix b/pkgs/by-name/li/libcpucycles/package.nix index 18f7d1a4f002..4e88903de66d 100644 --- a/pkgs/by-name/li/libcpucycles/package.nix +++ b/pkgs/by-name/li/libcpucycles/package.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Fb73EOHGgEehZJwTCtCG12xwyiqtDXFs9eFDsHBQiDo="; }; + patches = [ ./environment-variable-tools.patch ]; + postPatch = '' patchShebangs configure patchShebangs scripts-build @@ -46,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: { imadnyc jleightcap ]; - # list of architectures it supports, but currentlly untested with nix https://cpucycles.cr.yp.to/libcpucycles-20240318/cpucycles/options.html - platforms = [ - "x86_64-linux" - "aarch64-linux" - ] ++ lib.platforms.darwin; + inherit (librandombytes.meta) platforms; }; }) diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix index fa12ca954bdc..f36a94018e75 100644 --- a/pkgs/by-name/li/librandombytes/package.nix +++ b/pkgs/by-name/li/librandombytes/package.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ]; + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id "$out/lib/librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" + install_name_tool -change "librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" "$out/bin/randombytes-info" + ''; + meta = { homepage = "https://randombytes.cr.yp.to/"; description = "A simple API for applications generating fresh randomness"; From 0ac0801e101a3bf66cc9c730c850c0f3d290208b Mon Sep 17 00:00:00 2001 From: Arthur <150680976+arthsmn@users.noreply.github.com> Date: Tue, 16 Jul 2024 08:42:37 -0300 Subject: [PATCH 561/562] picocrypt-cli: init at 2.04 (#326360) Co-authored-by: Sandro --- pkgs/by-name/pi/picocrypt-cli/package.nix | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/pi/picocrypt-cli/package.nix diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix new file mode 100644 index 000000000000..71c885fe7f29 --- /dev/null +++ b/pkgs/by-name/pi/picocrypt-cli/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "picocrypt-cli"; + version = "2.04"; + + src = fetchFromGitHub { + owner = "Picocrypt"; + repo = "CLI"; + rev = version; + hash = "sha256-LWU/u+5AJgBS9IAA3fq5jQLlst+kpEqtRZvjkBSMG2E="; + }; + + sourceRoot = "${src.name}/picocrypt"; + vendorHash = "sha256-5bdiXy/c4FYu544lyL/ac3KF/1zWIPG/bmrpdZa9YV8="; + + ldflags = [ + "-s" + "-w" + ]; + + CGO_ENABLED = 1; + + meta = { + description = "Command-line interface for Picocrypt"; + homepage = "https://github.com/Picocrypt/CLI"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "picocrypt"; + }; +} From 7a0d1c51783f02fe874ee990d438469573c2e689 Mon Sep 17 00:00:00 2001 From: Arthur <150680976+arthsmn@users.noreply.github.com> Date: Tue, 16 Jul 2024 08:43:40 -0300 Subject: [PATCH 562/562] kryptor: init at 4.1.0 (#326334) Co-authored-by: Sandro --- pkgs/by-name/kr/kryptor/deps.nix | 9 ++++++++ pkgs/by-name/kr/kryptor/package.nix | 33 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/kr/kryptor/deps.nix create mode 100644 pkgs/by-name/kr/kryptor/package.nix diff --git a/pkgs/by-name/kr/kryptor/deps.nix b/pkgs/by-name/kr/kryptor/deps.nix new file mode 100644 index 000000000000..190f7bea309d --- /dev/null +++ b/pkgs/by-name/kr/kryptor/deps.nix @@ -0,0 +1,9 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Geralt"; version = "3.0.1"; hash = "sha256-jNiRhjqY4juSR68zHfkW+IKnnq2qXlXi3hXZrPyRlps="; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.19"; hash = "sha256-EXeaeLf3kpeFw5ecr/D/hZbOdSH+t518pV6HwOxc8ec="; }) + (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; hash = "sha256-lPAL8r1/y6WmWpgKqYHzIa3iEz1+Soqkud4XnbpN/N4="; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.6"; hash = "sha256-Red8XiAF5Td7yt7jSOgUSlgzSUV5F1Be1yv+WEzNjmo="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.6"; hash = "sha256-6OQ+R8PUmZO6FjW4AmLdVFrwpzUQ/o8m8bZ2pYuISJg="; }) + (fetchNuGet { pname = "Monocypher"; version = "0.3.0"; hash = "sha256-InbhO6d2wZ96Zl69b+KIUVM6XRU1X1op6e15afx6hps="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) +] diff --git a/pkgs/by-name/kr/kryptor/package.nix b/pkgs/by-name/kr/kryptor/package.nix new file mode 100644 index 000000000000..15029ab22e0c --- /dev/null +++ b/pkgs/by-name/kr/kryptor/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildDotnetModule +, fetchFromGitHub +}: + +buildDotnetModule rec { + pname = "kryptor"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "samuel-lucas6"; + repo = "Kryptor"; + rev = "v${version}"; + hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8="; + }; + + projectFile = "src/Kryptor.sln"; + nugetDeps = ./deps.nix; + + executables = ["kryptor"]; + + dotnetFlags = ["-p:IncludeNativeLibrariesForSelfExtract=true"]; + + meta = { + changelog = "https://github.com/samuel-lucas6/Kryptor/releases/tag/v${version}"; + description = "Simple, modern, and secure encryption and signing tool that aims to be a better version of age and Minisign"; + homepage = "https://github.com/samuel-lucas6/Kryptor"; + license = lib.licenses.gpl3Only; + mainProgram = "kryptor"; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}