From bdade1b81eb00a74beade2add657c5258a0f65a9 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 26 May 2024 08:43:21 +0000 Subject: [PATCH 01/68] passt: support cross compilation --- pkgs/by-name/pa/passt/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 8db2c9a981e4..dd0161aee07a 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -1,6 +1,8 @@ { lib , stdenv +, buildPackages , fetchurl +, getconf , gitUpdater , testers }: @@ -14,6 +16,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UK3Klpo3cp4EH42W16qh5WbZlCxb+ETQtWbpgatL/Dc="; }; + postPatch = '' + substituteInPlace Makefile --replace-fail \ + 'PAGE_SIZE=$(shell getconf PAGE_SIZE)' \ + "PAGE_SIZE=$(${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe getconf} PAGE_SIZE)" + ''; + makeFlags = [ "prefix=${placeholder "out"}" "VERSION=${finalAttrs.version}" From 58176c67da14c249601baa905a4791e4347e15d6 Mon Sep 17 00:00:00 2001 From: Markus Nyman Date: Wed, 7 Aug 2024 13:13:10 +0300 Subject: [PATCH 02/68] maintainers: add marnym --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a02b6f0be78f..ebbbb3c249ba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12595,6 +12595,12 @@ githubId = 1709273; name = "Robin Hack"; }; + marnym = { + email = "markus@nyman.dev"; + github = "marnym"; + githubId = 56825922; + name = "Markus Nyman"; + }; marsupialgutz = { email = "mars@possums.xyz"; github = "pupbrained"; From 2668d660b6ce897f5322686a12ad2b7e8b3ac5c9 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 27 Sep 2024 11:05:57 +0200 Subject: [PATCH 03/68] neovimUtils: make installing queries in treesitter grammars optional --- .../neovim/to-nvim-treesitter-grammar.sh | 36 ++++++ pkgs/applications/editors/neovim/utils.nix | 70 ++++++----- .../vim/plugins/nvim-treesitter/overrides.nix | 111 +++++++++++++++--- 3 files changed, 171 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh diff --git a/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh b/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh new file mode 100644 index 000000000000..24e8428ef483 --- /dev/null +++ b/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh @@ -0,0 +1,36 @@ +echo "Sourcing to-nvim-treesitter-grammar.sh" + +toNvimTreesitterGrammar() { + echo "Executing toNvimTreesitterGrammar" + + mkdir -p "$out/parser" + ln -s "$origGrammar/parser" "$out/parser/$grammarName.so" + + if [ "$installQueries" != 1 ]; then + echo "Installing queries is disabled: installQueries=$installQueries" + return + fi + + echo "Installing queries for $grammarName" + + mkdir -p "$out/queries/$grammarName" + if [ -d "$origGrammar/queries/$grammarName" ]; then + echo "Moving queries from neovim queries dir" + for file in "$origGrammar/queries/$grammarName/"*; do + ln -s "$file" "$out/queries/$grammarName/$(basename "$file")" + done + else + if [ -d "$origGrammar/queries" ]; then + echo "Moving queries from standard queries dir" + + for file in "$origGrammar/queries/"*; do + ln -s "$file" "$out/queries/$grammarName/$(basename "$file")" + done + else + echo "Missing queries for $grammarName" + fi + fi +} + +echo "Using toNvimTreesitterGrammar" +preDistPhases+=" toNvimTreesitterGrammar" diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 9f0aa86de48c..255a943d2fdb 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -1,6 +1,9 @@ { lib +, stdenv +, makeSetupHook , callPackage , vimUtils +, vimPlugins , nodejs , neovim-unwrapped , bundlerEnv @@ -8,7 +11,6 @@ , lua , python3Packages , wrapNeovimUnstable -, runCommand }: let inherit (vimUtils) toVimPlugin; @@ -215,35 +217,49 @@ let (lib.removePrefix "tree-sitter-") (lib.replaceStrings [ "-" ] [ "_" ]) ]; + + nvimGrammars = lib.mapAttrsToList (name: value: value.origGrammar) vimPlugins.nvim-treesitter.grammarPlugins; + isNvimGrammar = x: builtins.elem x nvimGrammars; + + toNvimTreesitterGrammar = callPackage ({ }: + makeSetupHook { + name = "to-nvim-treesitter-grammar"; + } ./to-nvim-treesitter-grammar.sh) {}; in - toVimPlugin (runCommand "treesitter-grammar-${name}" - { - meta = { - platforms = lib.platforms.all; - } // grammar.meta; - } - '' - mkdir -p "$out/parser" - ln -s "${grammar}/parser" "$out/parser/${name}.so" + (toVimPlugin (stdenv.mkDerivation { + name = "treesitter-grammar-${name}"; - mkdir -p "$out/queries/${name}" - if [ -d "${grammar}/queries/${name}" ]; then - echo "moving queries from neovim queries dir" - for file in "${grammar}/queries/${name}"*; do - ln -s "$file" "$out/queries/${name}/$(basename "$file")" - done - else - if [ -d "${grammar}/queries" ]; then - echo "moving queries from standard queries dir" - for file in "${grammar}/queries/"*; do - ln -s "$file" "$out/queries/${name}/$(basename "$file")" - done - else - echo "missing queries for ${name}" - fi - fi - ''); + origGrammar = grammar; + grammarName = name; + + # Queries for nvim-treesitter's (not just tree-sitter's) officially + # supported languages are bundled with nvim-treesitter + # Queries from repositories for such languages are incompatible + # with nvim's implementation of treesitter. + # + # We try our best effort to only include queries for niche languages + # (there are grammars for them in nixpkgs, but they're in + # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*` + # only includes officially supported languages) + # + # To use grammar for a niche language, users usually do: + # packages.all.start = with final.vimPlugins; [ + # (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG) + # ] + # + # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839 + installQueries = !isNvimGrammar grammar; + + dontUnpack = true; + __structuredAttrs = true; + + nativeBuildInputs = [ toNvimTreesitterGrammar ]; + + meta = { + platforms = lib.platforms.all; + } // grammar.meta; + })); /* Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 137d364e5472..066b42da411a 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, tree-sitter, neovim, neovimUtils, runCommand }: +{ lib, callPackage, tree-sitter, neovim, neovimUtils, runCommand, vimPlugins, tree-sitter-grammars }: self: super: @@ -61,29 +61,102 @@ in grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations; - tests.check-queries = - let - nvimWithAllGrammars = neovim.override { - configure.packages.all.start = [ withAllGrammars ]; - }; - in - runCommand "nvim-treesitter-check-queries" - { - nativeBuildInputs = [ nvimWithAllGrammars ]; - CI = true; - } + tests = { + check-queries = + let + nvimWithAllGrammars = neovim.override { + configure.packages.all.start = [ withAllGrammars ]; + }; + in + runCommand "nvim-treesitter-check-queries" + { + nativeBuildInputs = [ nvimWithAllGrammars ]; + CI = true; + } + '' + touch $out + export HOME=$(mktemp -d) + ln -s ${withAllGrammars}/CONTRIBUTING.md . + + nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log + + if grep -q Warning log; then + echo "Error: warnings were emitted by the check" + exit 1 + fi + ''; + + tree-sitter-queries-are-present-for-custom-grammars = + let + pluginsToCheck = + builtins.map + (grammar: grammarToPlugin grammar) + # true is here because there is `recurseForDerivations = true` + (lib.remove true + (lib.attrValues tree-sitter-grammars) + ); + in + runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" + { CI = true; } + '' + function check_grammar { + EXPECTED_FILES="$2/parser/$1.so `ls $2/queries/$1/*.scm`" + + echo + echo expected files for $1: + echo $EXPECTED_FILES + + # the derivation has only symlinks, and `find` doesn't count them as files + # so we cannot use `-type f` + for file in `find $2 -not -type d`; do + echo checking $file + # see https://stackoverflow.com/a/8063284 + if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then + echo $file is unexpected, exiting + exit 1 + fi + done + } + + ${lib.concatLines + (lib.forEach + pluginsToCheck + (g: "check_grammar \"${g.grammarName}\" \"${g}\"") + ) + } + touch $out + ''; + + no-queries-for-official-grammars = + let + pluginsToCheck = + # true is here because there is `recurseForDerivations = true` + (lib.remove true + (lib.attrValues vimPlugins.nvim-treesitter-parsers) + ); + in + runCommand "nvim-treesitter-test-no-queries-for-official-grammars" + { CI = true; } '' touch $out - export HOME=$(mktemp -d) - ln -s ${withAllGrammars}/CONTRIBUTING.md . - nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log + function check_grammar { + echo checking $1... + if [ -d $2/queries ]; then + echo Queries dir exists in $1 + echo This is unexpected, see https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839 + exit 1 + fi + } - if grep -q Warning log; then - echo "Error: warnings were emitted by the check" - exit 1 - fi + ${lib.concatLines + (lib.forEach + pluginsToCheck + (g: "check_grammar \"${g.grammarName}\" \"${g}\"") + ) + } ''; + }; }; meta = with lib; (super.nvim-treesitter.meta or { }) // { From 8cc8689d873177e8b45b4f41150ca1baf6092437 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 3 Oct 2024 11:12:11 +0200 Subject: [PATCH 04/68] Revert "vimPlugins.nvim-treesitter: add workaround for #332580" This reverts commit 98ca865c9dce24c4eba0c163448a9b171453da1c. --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 066b42da411a..2d36e411f6c9 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,17 +4,9 @@ self: super: let inherit (neovimUtils) grammarToPlugin; - - initialGeneratedGrammars = callPackage ./generated.nix { + generatedGrammars = callPackage ./generated.nix { inherit (tree-sitter) buildGrammar; }; - grammarOverrides = final: prev: { - nix = prev.nix.overrideAttrs { - # workaround for https://github.com/NixOS/nixpkgs/issues/332580 - prePatch = "rm queries/highlights.scm"; - }; - }; - generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars)); generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; From dd98f9d88f83f4d049db95e295150f8eb72a9599 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Thu, 17 Oct 2024 10:06:04 +1300 Subject: [PATCH 05/68] stac-validator: init at 3.4.0 Co-authored-by: Ivan Mincik --- pkgs/by-name/st/stac-validator/package.nix | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/st/stac-validator/package.nix diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix new file mode 100644 index 000000000000..5cba3cb49d0c --- /dev/null +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonPackage rec { + pname = "stac-validator"; + version = "3.4.0"; + pyproject = true; + disabled = python3Packages.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "stac-utils"; + repo = "stac-validator"; + rev = "refs/tags/v${version}"; + hash = "sha256-e3v8WvVbZcxN91w+YNUmSILZ1nZ9Vy1UbEpCQkTMQpQ="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + click + jsonschema + requests + ]; + + pythonImportsCheck = [ "stac_validator" ]; + + meta = { + description = "Validator for the SpatioTemporal Asset Catalog (STAC) specification"; + homepage = "https://github.com/stac-utils/stac-validator"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members; + }; +} From df73f7de42be5cdc3e90bc035a5e7ab88d06c63e Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 31 Oct 2024 04:48:08 +0300 Subject: [PATCH 06/68] pghero: 3.5.0 -> 3.6.1 --- pkgs/by-name/pg/pghero/Gemfile.lock | 194 ++++++++++++------------- pkgs/by-name/pg/pghero/gemset.nix | 217 +++++++++++++--------------- pkgs/by-name/pg/pghero/package.nix | 4 +- 3 files changed, 201 insertions(+), 214 deletions(-) diff --git a/pkgs/by-name/pg/pghero/Gemfile.lock b/pkgs/by-name/pg/pghero/Gemfile.lock index df92af192636..652d10fc1f1d 100644 --- a/pkgs/by-name/pg/pghero/Gemfile.lock +++ b/pkgs/by-name/pg/pghero/Gemfile.lock @@ -1,99 +1,99 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.3) - actionpack (= 7.0.8.3) - activesupport (= 7.0.8.3) + actioncable (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.3) - actionpack (= 7.0.8.3) - activejob (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionmailbox (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.3) - actionpack (= 7.0.8.3) - actionview (= 7.0.8.3) - activejob (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionmailer (7.0.8.6) + actionpack (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.3) - actionview (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionpack (7.0.8.6) + actionview (= 7.0.8.6) + activesupport (= 7.0.8.6) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.3) - actionpack (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + actiontext (7.0.8.6) + actionpack (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.3) - activesupport (= 7.0.8.3) + actionview (7.0.8.6) + activesupport (= 7.0.8.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.3) - activesupport (= 7.0.8.3) + activejob (7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.3.6) - activemodel (7.0.8.3) - activesupport (= 7.0.8.3) - activerecord (7.0.8.3) - activemodel (= 7.0.8.3) - activesupport (= 7.0.8.3) + activemodel (7.0.8.6) + activesupport (= 7.0.8.6) + activerecord (7.0.8.6) + activemodel (= 7.0.8.6) + activesupport (= 7.0.8.6) activerecord-nulldb-adapter (1.0.1) activerecord (>= 5.2.0, < 7.2) - activestorage (7.0.8.3) - actionpack (= 7.0.8.3) - activejob (= 7.0.8.3) - activerecord (= 7.0.8.3) - activesupport (= 7.0.8.3) + activestorage (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activesupport (= 7.0.8.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.3) + activesupport (7.0.8.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.935.0) - aws-sdk-cloudwatch (1.91.0) - aws-sdk-core (~> 3, >= 3.193.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.196.1) + aws-partitions (1.999.0) + aws-sdk-cloudwatch (1.104.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-core (3.211.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) azure_mgmt_monitor (0.19.0) ms_rest_azure (~> 0.12.0) base64 (0.2.0) bigdecimal (3.1.8) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) crass (1.0.6) date (3.3.4) declarative (0.0.20) domain_name (0.6.20240107) - erubi (1.12.0) - faraday (1.10.3) + erubi (1.13.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -114,44 +114,44 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) globalid (1.2.1) activesupport (>= 6.1) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - google-apis-monitoring_v3 (0.62.0) + google-apis-monitoring_v3 (0.71.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-env (2.1.1) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) - google-protobuf (4.27.0) + google-protobuf (4.28.3) bigdecimal rake (>= 13) - googleauth (1.11.0) + googleauth (1.11.2) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) jmespath (1.6.2) - jwt (2.8.1) + jwt (2.9.3) base64 - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -162,8 +162,8 @@ GEM marcel (1.0.4) method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.6) - minitest (5.23.1) + mini_portile2 (2.8.7) + minitest (5.25.1) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -175,7 +175,8 @@ GEM ms_rest (~> 0.7.6) multi_json (1.15.0) multipart-post (2.4.1) - net-imap (0.4.11) + mutex_m (0.2.0) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -184,42 +185,42 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) - nokogiri (1.16.5) + nio4r (2.7.4) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) os (1.1.4) - pg (1.5.6) + pg (1.5.9) pg_query (5.1.0) google-protobuf (>= 3.22.3) - pghero (3.5.0) - activerecord (>= 6) - propshaft (0.9.0) + pghero (3.6.1) + activerecord (>= 6.1) + propshaft (1.1.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack railties (>= 7.0.0) - public_suffix (5.0.5) - puma (6.4.2) + public_suffix (6.0.1) + puma (6.4.3) nio4r (~> 2.0) - racc (1.8.0) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.3) - actioncable (= 7.0.8.3) - actionmailbox (= 7.0.8.3) - actionmailer (= 7.0.8.3) - actionpack (= 7.0.8.3) - actiontext (= 7.0.8.3) - actionview (= 7.0.8.3) - activejob (= 7.0.8.3) - activemodel (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + rails (7.0.8.6) + actioncable (= 7.0.8.6) + actionmailbox (= 7.0.8.6) + actionmailer (= 7.0.8.6) + actionpack (= 7.0.8.6) + actiontext (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activemodel (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) bundler (>= 1.15.0) - railties (= 7.0.8.3) + railties (= 7.0.8.6) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -227,9 +228,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.3) - actionpack (= 7.0.8.3) - activesupport (= 7.0.8.3) + railties (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -240,16 +241,13 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.8) - strscan (>= 3.0.9) ruby2_keywords (0.0.5) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - strscan (3.1.0) - thor (1.3.1) + thor (1.3.2) timeliness (0.3.10) timeout (0.4.1) trailblazer-option (0.1.2) @@ -259,7 +257,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.15) + zeitwerk (2.7.1) PLATFORMS ruby @@ -277,4 +275,4 @@ DEPENDENCIES rails (~> 7.0.0) BUNDLED WITH - 2.5.9 + 2.5.16 diff --git a/pkgs/by-name/pg/pghero/gemset.nix b/pkgs/by-name/pg/pghero/gemset.nix index 1988239ea432..55958edada27 100644 --- a/pkgs/by-name/pg/pghero/gemset.nix +++ b/pkgs/by-name/pg/pghero/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d5g5h9r2a026fg3b75ffkfd5xkc7djild9hf7gb3v78ri20mdxy"; + sha256 = "0ms0196bp8gzlghfj32q2qdzszb7hsgg96v3isrv5ysd87w0z2zl"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1drdgk8795mm2wlb9g50jixd2q79vr9fkrxvqcanbmqa16y2v7k7"; + sha256 = "0mw8casnlqgj3vwqv7qk3d4q3bjszlpmbs9ldpc9gz1qdvafx7cg"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1klwlyfnnznwpcphg6z2n8z9508szr33xk7x3hv4ycdqcirgnfr5"; + sha256 = "07gpm15k5c0y84q99zipnhcdgq93bwralyjpj252prvqwfjmiw73"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11c5pm65m46wlqd25glmwpkji1jn1v2n918jmklxp4w9rr43dzi6"; + sha256 = "19ywl4jp77b51c01hsyzwia093fnj73pw1ipgyj4pk3h2b9faj5n"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxycm7wpxyf05hqd1bgy98jdyi0wynlwzs7p3km8gwpdmgfw1ad"; + sha256 = "1j8b29764nbiqz6d7ra42j2i6wf070lbms1fhpq3cl9azbgijb16"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p0w1rl3f5k7m39j9gnyw5wqz6ym18bhcacisqq4zng2k6jf4893"; + sha256 = "0girx71db1aq5b70ln3qq03z9d7xjdyp297v1a8rdal7k89y859c"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njgqssvh3gzk0hhr04y0f783i7b44draadhjv2jsd56ssx5h8qa"; + sha256 = "0gbc0wx9xal5bj0pbz8ygkr75wj4cm5i69hpwknf023psgixaybw"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y8w73rdd7x1m1gwswjhpqfbjr95hh7hcnkjqk1wz8x9gjk9njb6"; + sha256 = "1f6szahjsb4pr2xvlvk4kghk9291xh9c14s8cqwy6wwpm1vcglim"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03pqj57md528dgwwplr234hq628allla71i1pxys2inbpp7s7vn8"; + sha256 = "14qs1jc9hwnsm4dzvnai8b36bcq1d7rcqgjxy0dc6wza670lqapf"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pkb6ssxl8b9w8pczd562qw0n78fvgjc3xb5yjpfips33a7zqd9j"; + sha256 = "1nnvqnmc7mdhw2w55j4vnx4zmmdmmwmaf6ax2mbj9j5a48fw19vf"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ybapgiiysxgcjyzifn34ksbwjdjzslbvbcd7v83wiry1qmiyg93"; + sha256 = "0gj20cysajda05z3r7pl1g9y84nzsqak5dvk9nrz13jpy6297dj1"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; 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"; }; aws-eventstream = { groups = ["default"]; @@ -157,10 +157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10yhixzr5ndxswgis8z23cqas98m6idd2zprg7ms4sg2iixnh6sz"; + sha256 = "1f2y7ycq7i3y7p5klsi3gk3p5r5p1vkq6w7dq4zk9grq2hw9f7cv"; type = "gem"; }; - version = "1.935.0"; + version = "1.999.0"; }; aws-sdk-cloudwatch = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iw1754r8rizshv04rj9fsm56ipnipfqxb349mx4cy195bq5k72n"; + sha256 = "04fw6v3qbbgdv63l7kmc29p30bjdancg0kfrxbqcmidryj00qi2c"; type = "gem"; }; - version = "1.91.0"; + version = "1.104.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -179,10 +179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f44kp3g9g8v60f7xw769r734b7w6n774jj2njn42444ip3zwsz3"; + sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk"; type = "gem"; }; - version = "3.196.1"; + version = "3.211.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -190,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "1fq3lbvkgm1vk5wa8l7vdnq3vjnlmsnyf4bbd0jq3qadyd9hf54a"; type = "gem"; }; - version = "1.8.0"; + version = "1.10.1"; }; azure_mgmt_monitor = { dependencies = ["ms_rest_azure"]; @@ -231,20 +231,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; crass = { groups = ["default"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -302,10 +302,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -431,15 +431,15 @@ version = "1.2.1"; }; google-apis-core = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "mutex_m" "representable" "retriable"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r56f3h85979q960fvc8iskc6cd0adpqbclqhqzzpcf6d28fx5cw"; + sha256 = "06m775rzhpdz9kalml04sysy5swgfh97jaglsgrv5x8sg4i42j4i"; type = "gem"; }; - version = "0.15.0"; + version = "0.15.1"; }; google-apis-monitoring_v3 = { dependencies = ["google-apis-core"]; @@ -447,10 +447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqd07zpy99m9x69y23j0pyd17y2bvlx2hxd5jcbi5z4hsgnmb59"; + sha256 = "1qzks40qfdxlgy0w72y75rlji9g225v6shf78k6q4p74f7w2ns0s"; type = "gem"; }; - version = "0.62.0"; + version = "0.71.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -458,10 +458,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; }; google-protobuf = { dependencies = ["bigdecimal" "rake"]; @@ -469,10 +469,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13fqdhs2asr2vaqhbmh504zf2khacilqyfwi8qrilwn4md3r6rsy"; + sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; type = "gem"; }; - version = "4.27.0"; + version = "4.28.3"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -480,10 +480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15knmk2fcyqxdpppc3wb5lc6xapbx5hax4lma0iclc2p55aa2kkl"; + sha256 = "07kk8h5f9q62qf1mk7rycgv6m09rd0k8baffdpb3vsksxnpaqsvy"; type = "gem"; }; - version = "1.11.0"; + version = "1.11.2"; }; http-cookie = { dependencies = ["domain_name"]; @@ -491,10 +491,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.7"; }; httpclient = { groups = ["default"]; @@ -512,10 +512,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; }; jmespath = { groups = ["default"]; @@ -533,10 +533,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.3"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -544,10 +544,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; + sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h"; type = "gem"; }; - version = "2.22.0"; + version = "2.23.1"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -595,20 +595,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.23.1"; + version = "5.25.1"; }; ms_rest = { dependencies = ["concurrent-ruby" "faraday" "timeliness"]; @@ -652,16 +652,26 @@ }; version = "2.4.1"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; net-imap = { dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y0pzapcasfjayk4nydy04hnx11xmsv8jl8myizxhbpkdmrl10dc"; + sha256 = "182ap7y5ysmr1xqy23ygssz3as1wcy3r5qcdm1whd1n1yfc1aa5q"; type = "gem"; }; - version = "0.4.11"; + version = "0.5.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -701,10 +711,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -712,10 +722,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lla2macphrlbzkirk0nwwwhcijrfymyfjjw1als0kwqd0n1cdpc"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.5"; + version = "1.16.7"; }; os = { groups = ["default"]; @@ -732,10 +742,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; + sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.9"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -754,10 +764,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0shy6p0bc2z5l1mj6wqc6kxvp0ka3g0i1lhdgl0miqvk6qw9sibv"; + sha256 = "1m4wlwx37n1jsrdzxf824pz7j0p72i1al7ndmy6q5m3r77ngdm76"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.1"; }; propshaft = { dependencies = ["actionpack" "activesupport" "rack" "railties"]; @@ -765,20 +775,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14b06ilc0cadr0jz5aih56yxgnd0j36qp9a4x16py55id1ijw7gy"; + sha256 = "0sqg0xf46xd47zdpm8d12kfnwl0y5jb2hj10imzb3bk6mwgkd2fk"; type = "gem"; }; - version = "0.9.0"; + version = "1.1.0"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.5"; + version = "6.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -786,30 +796,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.9"; + version = "2.2.10"; }; rack-test = { dependencies = ["rack"]; @@ -828,10 +838,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1inqd2jjl9rd1yl85rn2wbbsln9i5x029hr5abgnwm8z5vc437fg"; + sha256 = "1s42lyl19h74xlqkb6ffl67h688q0slp1lhnd05g09a46z7wapri"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; @@ -861,10 +871,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxki005rl1315mp78csayvfdx5zxjvwv8xmcfyjksgq27cimk5r"; + sha256 = "1fcn0ix814074gqicc0k1178f7ahmysiv3pfq8g00phdwj0p3w0g"; type = "gem"; }; - version = "7.0.8.3"; + version = "7.0.8.6"; }; rake = { groups = ["default"]; @@ -897,17 +907,6 @@ }; version = "3.1.2"; }; - rexml = { - dependencies = ["strscan"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; - type = "gem"; - }; - version = "3.2.8"; - }; ruby2_keywords = { groups = ["default"]; platforms = []; @@ -929,25 +928,15 @@ }; version = "0.19.0"; }; - strscan = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; timeliness = { groups = ["default"]; @@ -1026,9 +1015,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr2731z8f6cj23jxh67cdnpkrnnfwbrxj1hfhshls4mp8i8drmj"; + sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89"; type = "gem"; }; - version = "2.6.15"; + version = "2.7.1"; }; } diff --git a/pkgs/by-name/pg/pghero/package.nix b/pkgs/by-name/pg/pghero/package.nix index 34c9d9466da5..545e8b36816e 100644 --- a/pkgs/by-name/pg/pghero/package.nix +++ b/pkgs/by-name/pg/pghero/package.nix @@ -24,13 +24,13 @@ let in { pname = "pghero"; - version = "3.5.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "pghero"; repo = "pghero"; rev = "v${finalAttrs.version}"; - hash = "sha256-6JShYn3QfxPdAVcrJ7/kxzxa4dBEzSkUiLguIH+VCRQ="; + hash = "sha256-kABdQRwV5Y/jB9P8kYVmwmntOK0CF/JJYmaINNv26fA="; }; strictDeps = true; From af521fac004ff958995d9b854839ba3516507623 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 30 Oct 2024 20:44:59 -0700 Subject: [PATCH 07/68] vault: 1.18.0 -> 1.18.1 Diff: https://github.com/hashicorp/vault/compare/v1.18.0...v1.18.1 Changelog: https://github.com/hashicorp/vault/blob/v1.18.1/CHANGELOG.md --- pkgs/by-name/va/vault/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index cdb465e980a9..5e58a6bb1a23 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-5CqA2dZZdV1IiGSGwCA2eQIhp3lrsDIJt4rDK1vdvmE="; + hash = "sha256-NXDxWEy7LqGTvMQn7U/80f3aJYA/UYQfk1BqhYRR9IY="; }; - vendorHash = "sha256-2txRuunh6x+iDKRpljGpSX6Q8q11a84CPVm6d299NNY="; + vendorHash = "sha256-T0dJmFAgFq7Z/C0YUkoIeIt4FjfX5d8++4R0hR1qOCE="; proxyVendor = true; From 9e3959fbe5dfd40e872c1c15baee6371073289e8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 30 Oct 2024 20:53:55 -0700 Subject: [PATCH 08/68] vault-bin: 1.18.0 -> 1.18.1 --- pkgs/by-name/va/vault-bin/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index c6622a32c884..b852097eee14 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.18.0"; + version = "1.18.1"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-fyVkSZ20tUcBv9/iT1h3o/2KkoCJ5op7DBoMc0US7SM="; - aarch64-linux = "sha256-Vsc0ra+OzrDBwmKke0ef4kfy5CWu5m34gC7u0BDL7uo="; - i686-linux = "sha256-3uAkBPOoMbdfS5EfII03JbVl1ekfRXm4yv1rL5A7x7c="; - x86_64-darwin = "sha256-fydYqDEihbGuZ9I1quJSJk+lJxnSkqF+t1mOP8EA2Ok="; - aarch64-darwin = "sha256-yJmNM9eQydbRdY6+JK28hhzXJ9Hj3CcwUJkhS60aCyA="; + x86_64-linux = "sha256-YzWFrJ4Rxu5M+5DkRKyH/bLx8B6XvTa8ZS3fnZonZvQ="; + aarch64-linux = "sha256-KMRPQKOxakE8wuLU+YlUv5XHHUiVoX8QIRjShyqoIug="; + i686-linux = "sha256-s6+rIDcnYuFU5RfwLDEXhKNe9Kww0FTJLYWpSezcluc="; + x86_64-darwin = "sha256-FAskgYylmf2sYbrRMn7uQDnVNJQDi2uVnwwDcIXPcJE="; + aarch64-darwin = "sha256-tIWWVsxar7Gyphkc0PILSbKHrNIQ6aBz1ebFdtFX6NA="; }; in fetchzip { From b83ad8ea1e52f482e0bab4e4215a775ab9004a54 Mon Sep 17 00:00:00 2001 From: Markus Nyman Date: Wed, 7 Aug 2024 12:34:58 +0300 Subject: [PATCH 09/68] fyi: init at 1.0.4 --- pkgs/by-name/fy/fyi/package.nix | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/fy/fyi/package.nix diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix new file mode 100644 index 000000000000..cf6cc59ddc40 --- /dev/null +++ b/pkgs/by-name/fy/fyi/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchFromGitea, + pkg-config, + meson, + ninja, + dbus, + scdoc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fyi"; + version = "1.0.4"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fyi"; + rev = finalAttrs.version; + hash = "sha256-UGkShHziREQTkQUlbFXT1144BiBApFVbCvu5A1DuoMI="; + }; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + scdoc + ]; + + buildInputs = [ dbus ]; + + meta = { + changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}"; + description = "Command line utility to create desktop notifications"; + homepage = "https://codeberg.org/dnkl/fyi"; + license = [ lib.licenses.mit ]; + mainProgram = "fyi"; + maintainers = with lib.maintainers; [ marnym ]; + platforms = lib.platforms.linux; + }; +}) From f0c1ff9fde44a54ba0fdfcf88dd49d420425725c Mon Sep 17 00:00:00 2001 From: melon <101197249+BlaiZephyr@users.noreply.github.com> Date: Sun, 10 Nov 2024 13:29:29 +0000 Subject: [PATCH 10/68] update to 18.7 - remove unused fetchpatch --- pkgs/games/ddnet/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 88397cb55259..b6d276c64a3f 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cargo , cmake , ninja @@ -36,19 +35,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.6"; + version = "18.7"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-thAB7QtR23j39ORK1YT2Idp4J7GffbNV7snbLAnYzMI="; + hash = "sha256-mOXD7lEggFus+TBZ5042QALu4PhHRBntnChQFnHu6Dw="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-/kCsAZP9cwUQFcNnk5/eYMzw80Bh4JnwPXd299p1JEU="; + hash = "sha256-zug7MzxqGhlmm6ZeRo+3ldwmFEn5cVCb+nvRzomFrnc="; }; nativeBuildInputs = [ From 423eaf863daee985c873f411c943be8f6e35af88 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 4 Nov 2024 23:19:11 +0100 Subject: [PATCH 11/68] dyndnsc: 0.6.1 -> 0.6.1-unstable-2024-02-25 --- pkgs/by-name/dy/dyndnsc/package.nix | 42 +++++++++++------------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/dy/dyndnsc/package.nix b/pkgs/by-name/dy/dyndnsc/package.nix index a4c84ee7e76a..262817426bd5 100644 --- a/pkgs/by-name/dy/dyndnsc/package.nix +++ b/pkgs/by-name/dy/dyndnsc/package.nix @@ -1,18 +1,19 @@ { lib, - stdenv, python3Packages, - fetchPypi, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "dyndnsc"; - version = "0.6.1"; + version = "0.6.1-unstable-2024-02-25"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-EweNKe6i+aTKAfBWdsMwnq1eNB2rBH4NUcRvI9S3+7Q="; + src = fetchFromGitHub { + owner = "infothrill"; + repo = "python-dyndnsc"; + rev = "75f82ce64a91b9fd25cd362d295095be4dab72b5"; + hash = "sha256-2SWtYQ3TaFbuHxABBUeXSqgfCA/T8lCAB+9mAIyjySU="; }; postPatch = '' @@ -20,11 +21,8 @@ python3Packages.buildPythonApplication rec { --replace-fail '"pytest-runner"' "" ''; - pythonRelaxDeps = [ "bottle" ]; - build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ daemonocle dnspython @@ -32,31 +30,21 @@ python3Packages.buildPythonApplication rec { netifaces requests setuptools + responses ]; nativeCheckInputs = with python3Packages; [ - bottle pytest-console-scripts pytestCheckHook ]; - disabledTests = - [ - # dnswanip connects to an external server to discover the - # machine's IP address. - "dnswanip" - # AssertionError - "test_null_dummy" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # The tests that spawn a server using Bottle cannot be run on - # macOS or Windows as the default multiprocessing start method - # on those platforms is 'spawn', which requires the code to be - # run to be picklable, which this code isn't. - # Additionaly, other start methods are unsafe and prone to failure - # on macOS; see https://bugs.python.org/issue33725. - "BottleServer" - ]; + disabledTests = [ + # dnswanip connects to an external server to discover the + # machine's IP address. + "dnswanip" + # AssertionError + "test_null_dummy" + ]; # Allow tests that bind or connect to localhost on macOS. __darwinAllowLocalNetworking = true; From 24553b60f11999e90fcb325ef12fedff5480ed03 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 Nov 2024 14:02:05 +0100 Subject: [PATCH 12/68] python312Packages.sentence-transformers: 3.2.1 -> 3.3.0 Diff: https://github.com/UKPLab/sentence-transformers/compare/refs/tags/v3.2.1...v3.3.0 Changelog: https://github.com/UKPLab/sentence-transformers/releases/tag/3.3.0 --- .../python-modules/sentence-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 895b71d8cabe..1268b5d12dfb 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-5N5yObR3+3eV65ojFJFhzDbqtjNi/U2IhHlAaKttcVI="; + hash = "sha256-nF1E0w1OApajeo1bNNPufVC86KQRY0oTSI3pgKnOWrQ="; }; build-system = [ setuptools ]; From 384f1966962642a6fb88fdc4ca981f69e8aafebb Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 11 Nov 2024 09:50:51 -0400 Subject: [PATCH 13/68] godot_4-mono: fix build on aarch64 --- pkgs/by-name/go/godot_4/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 64267cd63218..d48b0b0a6d09 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -56,6 +56,8 @@ let suffix = if withMono then "-mono" else ""; + arch = stdenv.hostPlatform.linuxArch; + attrs = rec { pname = "godot4${suffix}"; version = "4.3-stable"; @@ -149,9 +151,9 @@ let postBuild = lib.optionalString withMono '' echo "Generating Glue" if [[ ${withPrecision} == *double* ]]; then - bin/godot.${withPlatform}.${withTarget}.${withPrecision}.x86_64.mono --headless --generate-mono-glue modules/mono/glue + bin/godot.${withPlatform}.${withTarget}.${withPrecision}.${arch}.mono --headless --generate-mono-glue modules/mono/glue else - bin/godot.${withPlatform}.${withTarget}.x86_64.mono --headless --generate-mono-glue modules/mono/glue + bin/godot.${withPlatform}.${withTarget}.${arch}.mono --headless --generate-mono-glue modules/mono/glue fi echo "Building C#/.NET Assemblies" python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision} From a519334e6920d6e7e9d456d523bfca651c653975 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 11 Nov 2024 12:24:44 -0500 Subject: [PATCH 14/68] libkrunfw: 4.4.2 -> 4.5.1 Diff: https://github.com/containers/libkrunfw/compare/refs/tags/v4.4.2...v4.5.1 --- pkgs/by-name/li/libkrunfw/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix index 6369dd56f490..10245ed920c5 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.4.2"; + version = "4.5.1"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-o1bFz3INtJRm9gdm2b9+sHW6r+l/RNCZr62ucI73N9w="; + hash = "sha256-GFfBiGMOyBwMKjpD1kj3vRpvjR0ydji3QNDyoOQoQsw="; }; kernelSrc = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-6.6.52.tar.xz"; - hash = "sha256-FZGrNIOZ1KpTEhFYUlBWppyM8P4OkJNbAJXppY43tLg="; + url = "mirror://kernel/linux/kernel/v6.x/linux-6.6.59.tar.xz"; + hash = "sha256-I2FoCNjAjxKBX/iY9O20wROXorKEPQKe5iRS0hgzp20="; }; postPatch = '' From d8a684b28cd29e6bc4422c4cecebab743c350f73 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 11 Nov 2024 12:27:30 -0500 Subject: [PATCH 15/68] libkrun: 1.9.5 -> 1.9.6 Diff: https://github.com/containers/libkrun/compare/refs/tags/v1.9.5...v1.9.6 --- pkgs/by-name/li/libkrun/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 0da33d028e1c..7ca3769b56b3 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fVL49g71eyfYyeXI4B1qRNM90fBKjHeq0I4poz1pdME="; + hash = "sha256-bseyOHgteLEUz93gL5G2zR0ssijMd86zmlvm02a7FSY="; }; outputs = [ "out" "dev" ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; - hash = "sha256-MW4/iB2NsCj0s9Q/h/PoCIIaDfZ/iqw+FGrsJmVR0lw="; + hash = "sha256-OerD2SEJquv7bHEZw4jdxmrQn8SuIUJiYPu9E1u439o="; }; nativeBuildInputs = [ From 835a135705ac69cb2182ecefaf02f673edef12a0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 11 Nov 2024 23:14:32 +0100 Subject: [PATCH 16/68] python312Packages.nitrokey: 0.2.2 -> 0.2.3 https://github.com/Nitrokey/nitrokey-sdk-py/releases/tag/v0.2.3 --- pkgs/development/python-modules/nitrokey/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index b39d6d344061..b6426fe8b1ec 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -13,17 +13,16 @@ semver, crcmod, hidapi, - ecdsa, }: buildPythonPackage rec { pname = "nitrokey"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tG6+diyrauJEzpPG33+S5o1ik3n44/443szR7vXH4gE="; + hash = "sha256-8Ig2LI7waU/IbUwApyFI2TwtarT5bYolgeq14SgmbEo="; }; disabled = pythonOlder "3.9"; @@ -38,7 +37,6 @@ buildPythonPackage rec { crcmod cryptography hidapi - ecdsa protobuf5 pyserial ]; From 5393569fe72a6ac67355e38c0afc5b4cd2f944d8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 11 Nov 2024 21:48:17 -0400 Subject: [PATCH 17/68] godot_4: add version test --- pkgs/by-name/go/godot_4/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index d48b0b0a6d09..a01943badade 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -26,6 +26,7 @@ scons, speechd-minimal, stdenv, + testers, udev, vulkan-loader, wayland, @@ -58,7 +59,7 @@ let arch = stdenv.hostPlatform.linuxArch; - attrs = rec { + attrs = finalAttrs: rec { pname = "godot4${suffix}"; version = "4.3-stable"; commitHash = "77dcf97d82cbfe4e4615475fa52ca03da645dbd8"; @@ -223,6 +224,13 @@ let runHook postInstall ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = lib.replaceStrings [ "-" ] [ "." ] version; + }; + }; + meta = { changelog = "https://github.com/godotengine/godot/releases/tag/${version}"; description = "Free and Open Source 2D and 3D game engine"; @@ -242,7 +250,6 @@ let in stdenv.mkDerivation ( - finalAttrs: if withMono then dotnetCorePackages.addNuGetDeps { nugetDeps = ./deps.nix; @@ -252,7 +259,7 @@ stdenv.mkDerivation ( old.buildInputs ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk_8.targetPackages)); }; - } attrs finalAttrs + } attrs else attrs ) From 30fbe2995ba0c67d64f4e34667da887c9c37914c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 11 Nov 2024 21:52:14 -0400 Subject: [PATCH 18/68] godot_4: require big-parallel --- pkgs/by-name/go/godot_4/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index a01943badade..0255b75d72b2 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -231,6 +231,11 @@ let }; }; + requiredSystemFeatures = [ + # fixes: No space left on device + "big-parallel" + ]; + meta = { changelog = "https://github.com/godotengine/godot/releases/tag/${version}"; description = "Free and Open Source 2D and 3D game engine"; From 8e48501956f28d7df670f8f578c734cfc3bdf506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Tue, 12 Nov 2024 14:09:55 +0100 Subject: [PATCH 19/68] python3Packages.pyrad: 2.4-2023-06-13 -> 2.4-2024-07-24 Update pyrad to latest commit (4 month old) as they cleaned up pyproject to remove support for old python version and remove problematic dependencies (netaddr 0.8) --- .../python-modules/pyrad/default.nix | 35 +++---------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 9e2cb672d95a..fc4f14046019 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -2,49 +2,24 @@ buildPythonPackage, fetchFromGitHub, lib, - poetry-core, - netaddr, - six, unittestCheckHook, - fetchPypi, + poetry-core, }: -let - netaddr_0_8_0 = netaddr.overridePythonAttrs (oldAttrs: rec { - version = "0.8.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-1sxXx6B7HZ0ukXqos2rozmHDW6P80bg8oxxaDuK1okM="; - }; - }); -in buildPythonPackage rec { pname = "pyrad"; - version = "2.4-unstable-2023-06-13"; - format = "pyproject"; + version = "2.4-unstable-2024-07-24"; + pyproject = true; src = fetchFromGitHub { owner = "pyradius"; repo = pname; - rev = "dd34c5a29b46d83b0bea841e85fd72b79f315b87"; - hash = "sha256-U4VVGkDDyN4J/tRDaDGSr2TSA4JmqIoQj5qn9qBAvQU="; + rev = "f42a57cb0e80de42949810057d36df7c4a6b5146"; + hash = "sha256-5SPVeBL1oMZ/XXgKch2Hbk6BRU24HlVl4oXZ2agF1h8="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ - netaddr_0_8_0 - six - ]; - - preCheck = '' - substituteInPlace tests/testServer.py \ - --replace-warn "def testBind(self):" "def dontTestBind(self):" \ - --replace-warn "def testBindv6(self):" "def dontTestBindv6(self):" \ - ''; - nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "pyrad" ]; From 14a09fe48f5bf7d633a79ee6cd2999a9d309825b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 12 Nov 2024 14:51:58 +0100 Subject: [PATCH 20/68] screen-message: 0.28 -> 0.29 --- pkgs/by-name/sc/screen-message/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/screen-message/package.nix b/pkgs/by-name/sc/screen-message/package.nix index c049c3841ea6..c8ad7e050a96 100644 --- a/pkgs/by-name/sc/screen-message/package.nix +++ b/pkgs/by-name/sc/screen-message/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "screen-message"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "nomeata"; repo = "screen-message"; rev = version; - hash = "sha256-KHJL1N72Hc1B1m0olxoZxBHIpq/d/T3m2VdS5XC9+tk="; + hash = "sha256-fwKle+aXZuiNo5ksrigj7BGLv2fUILN2GluHHZ6co6s="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 18135de79a9630f01c1df91865e3fd06ff954cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 17 Aug 2024 00:09:24 +0200 Subject: [PATCH 21/68] nixos/firefox: dedupe identically nativeMessageHosts packages --- nixos/modules/programs/firefox.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index ed874cad74e4..8229affb1ad9 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -313,7 +313,9 @@ in old.extraPrefsFiles or [ ] ++ cfg.autoConfigFiles ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ]; - nativeMessagingHosts = old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages; + nativeMessagingHosts = lib.unique ( + old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages + ); cfg = (old.cfg or { }) // cfg.wrapperConfig; })) ]; From 8487e692fd7afba356fe8d5a55a4b60d98612906 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 13 Nov 2024 01:16:30 +0800 Subject: [PATCH 22/68] lib/licenses: add bsd3Lbnl --- lib/licenses.nix | 5 +++++ .../plugins/ventura-psychrometric-panel/default.nix | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9affe6a2d63c..eb0de0509ac3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -213,6 +213,11 @@ lib.mapAttrs mkLicense ({ fullName = "BSD 3-Clause Clear License"; }; + bsd3Lbnl = { + spdxId = "BSD-3-Clause-LBNL"; + fullName = "Lawrence Berkeley National Labs BSD variant license"; + }; + bsdOriginal = { spdxId = "BSD-4-Clause"; fullName = ''BSD 4-clause "Original" or "Old" License''; diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index 0b500e632039..28cdd3f09446 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -6,12 +6,7 @@ grafanaPlugin rec { zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; meta = with lib; { description = "Grafana plugin to display air conditions on a psychrometric chart."; - license = licenses.bsd3 // { - spdxId = "BSD-3-Clause-LBNL"; - url = "https://spdx.org/licenses/BSD-3-Clause-LBNL.html"; - fullName = "Lawrence Berkeley National Labs BSD variant license"; - shortName = "lbnl-bsd3"; - }; + license = licenses.bsd3Lbnl; maintainers = with maintainers; [ nagisa ]; platforms = platforms.unix; }; From 1bd2aeb9d95dcce25b8f23d9cdb62a5af9f3b9dc Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 13 Nov 2024 01:17:38 +0800 Subject: [PATCH 23/68] python312Packages.pybind11-stubgen: init at 2.5.1 --- .../pybind11-stubgen/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pybind11-stubgen/default.nix diff --git a/pkgs/development/python-modules/pybind11-stubgen/default.nix b/pkgs/development/python-modules/pybind11-stubgen/default.nix new file mode 100644 index 000000000000..09af1cb1b301 --- /dev/null +++ b/pkgs/development/python-modules/pybind11-stubgen/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pybind11-stubgen"; + version = "2.5.1"; + pyproject = true; + + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "sizmailov"; + repo = "pybind11-stubgen"; + rev = "refs/tags/v${version}"; + hash = "sha256-PJiiRSQ92vP5LKWCgBuowkuDdTmC22xyuax2wsH0wOM="; + }; + + # For testing purposes, the upstream source uses a shell script to build the pybind11 + # project and compares the generated stub file with a preset one. + # This process requires network access and takes considerable time to complete. + # Therefore, I disabled the check phase. + doCheck = false; + + pythonImportsCheck = [ "pybind11_stubgen" ]; + + meta = { + changelog = "https://github.com/sizmailov/pybind11-stubgen/releases/tag/v${version}"; + description = "Generates stubs for python modules"; + homepage = "https://github.com/sizmailov/pybind11-stubgen"; + license = lib.licenses.bsd3Lbnl; + maintainers = with lib.maintainers; [ qbisi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b39c8f8c6b85..d785decd9b5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11144,6 +11144,8 @@ self: super: with self; { pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { }; + pybindgen = callPackage ../development/python-modules/pybindgen { }; pyblackbird = callPackage ../development/python-modules/pyblackbird { }; From 948647235213723675dc1d427e5c4cfc65214683 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 12 Nov 2024 21:02:10 +0100 Subject: [PATCH 24/68] nixosTests.postgresql: run tests with JIT as well This was intended for quite some time already, but ever since enableJIT was changed to be the source of truth of JIT-iness for the PostgreSQL module, this hasn't worked for the tests anymore. --- nixos/tests/postgresql/anonymizer.nix | 1 + nixos/tests/postgresql/pgjwt.nix | 1 + nixos/tests/postgresql/pgvecto-rs.nix | 7 ++++--- nixos/tests/postgresql/postgresql-tls-client-cert.nix | 1 + nixos/tests/postgresql/postgresql-wal-receiver.nix | 1 + nixos/tests/postgresql/postgresql.nix | 4 +++- nixos/tests/postgresql/timescaledb.nix | 1 + nixos/tests/postgresql/tsja.nix | 1 + nixos/tests/postgresql/wal2json.nix | 1 + 9 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index 3a5f69086eaa..44d79c2213a6 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -19,6 +19,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = ps: [ ps.anonymizer ]; settings.shared_preload_libraries = [ "anon" ]; }; diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 81e5dac41ada..87622d54fcac 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -23,6 +23,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = ps: with ps; [ pgjwt diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix index 9d8389eecf99..702c55c38dac 100644 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -24,9 +24,9 @@ let ''; makeTestFor = - postgresqlPackage: + package: makeTest { - name = "pgvecto-rs-${postgresqlPackage.name}"; + name = "pgvecto-rs-${package.name}"; meta = with lib.maintainers; { maintainers = [ diogotcorreia ]; }; @@ -35,8 +35,9 @@ let { ... }: { services.postgresql = { + inherit package; enable = true; - package = postgresqlPackage; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = ps: with ps; [ pgvecto-rs diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index d7cddb625256..0dcdaf98eaf7 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -50,6 +50,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; enableTCPIP = true; ensureUsers = [ { diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index 5c1551c5f2fd..579a56153386 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -31,6 +31,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; settings = { max_replication_slots = 10; max_wal_senders = 10; diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 509a14411de9..55f61cc97227 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -40,8 +40,9 @@ let { ... }: { services.postgresql = { - inherit (package) ; + inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; }; services.postgresqlBackup = { @@ -158,6 +159,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; ensureUsers = [ { name = "all-clauses"; diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix index b29d59c744f0..8586a0db1bbd 100644 --- a/nixos/tests/postgresql/timescaledb.nix +++ b/nixos/tests/postgresql/timescaledb.nix @@ -53,6 +53,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = ps: with ps; [ timescaledb diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix index 7c976da21b68..26d83f052a66 100644 --- a/nixos/tests/postgresql/tsja.nix +++ b/nixos/tests/postgresql/tsja.nix @@ -20,6 +20,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = ps: with ps; [ tsja diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 551254a68ebd..aca3d5aa8954 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -16,6 +16,7 @@ let services.postgresql = { inherit package; enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; extraPlugins = with package.pkgs; [ wal2json ]; settings = { wal_level = "logical"; From 23b7dc80662fdf2ca5471beb2eac412c3176b1e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 19:23:01 +0100 Subject: [PATCH 25/68] picard: set localedir without relying on bash eval To be able to remove the bash-eval behavior for setupPyGlobalFlags, we change $out to use placeholder "out" instead. Confirmed that the locales are still loaded from the correct path as demonstrated in #284050. --- pkgs/by-name/pi/picard/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index e43e39e5a47d..e39f26d4a84e 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -62,7 +62,7 @@ pythonPackages.buildPythonApplication rec { pyyaml ]; - setupPyGlobalFlags = [ "build" "--disable-autoupdate" "--localedir=$out/share/locale" ]; + setupPyGlobalFlags = [ "build" "--disable-autoupdate" "--localedir=${placeholder "out"}/share/locale" ]; preCheck = '' export HOME=$(mktemp -d) From 95a3185bf895269a37fc630797f60788c8d81c4c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 21:14:56 +0100 Subject: [PATCH 26/68] fichub-cli: disable only test the easy way There is only one test and this was disabled via some nasty bash eval hacks in pytestFlagsArray. Let's just use... doCheck = false instead? --- pkgs/by-name/fi/fichub-cli/package.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/fi/fichub-cli/package.nix b/pkgs/by-name/fi/fichub-cli/package.nix index 3d62d7b2a304..f694a9b99307 100644 --- a/pkgs/by-name/fi/fichub-cli/package.nix +++ b/pkgs/by-name/fi/fichub-cli/package.nix @@ -35,21 +35,8 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - # The package tries to create a file under the home directory on import - preCheck = '' - export HOME=$(mktemp -d) - ''; - - pytestFlagsArray = [ - # pytest exits with a code of 5 if no tests are selected. - # handle this specific case as not an error - "|| ([ $? = 5 ] || exit $?)" - ]; - - disabledTestPaths = [ - # Loading tests tries to download something from pypi.org - "tests/test_cli.py" - ]; + # Loading tests tries to download something from pypi.org + doCheck = false; meta = { description = "CLI for the fichub.net API"; From f363956c3c64f7e8450b99835d9d677ff655f41b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 21:56:25 +0100 Subject: [PATCH 27/68] python3Packages.macaddress: remove useless $src from pytestFlagsArray We'd like to avoid bash eval in pytestFlagsArray, because we want to get rid of support for it. This case works just fine without. --- pkgs/development/python-modules/macaddress/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/macaddress/default.nix b/pkgs/development/python-modules/macaddress/default.nix index 97d07f45d1c8..137561253049 100644 --- a/pkgs/development/python-modules/macaddress/default.nix +++ b/pkgs/development/python-modules/macaddress/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { reprshed ]; - pytestFlagsArray = [ "$src/test.py" ]; + pytestFlagsArray = [ "test.py" ]; meta = with lib; { homepage = "https://github.com/mentalisttraceur/python-macaddress"; From 676b249c5563964a5a5a8a247214b2f31d26523f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 22:19:09 +0100 Subject: [PATCH 28/68] python3Packages.iso4217: avoid mis-using $pname It makes no sense to depend those folders on pname - they are part of the source code, not our convention, after all. Also this avoids using bash eval behavior in pytestFlagsArray. --- pkgs/development/python-modules/iso4217/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 56945d3ed07a..b9dd6d2f9f7b 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -40,15 +40,15 @@ buildPythonPackage rec { # The table is already downloaded export ISO4217_DOWNLOAD=0 # Copy the table file to satifiy the build process - cp -r ${table} $pname/table.xml + cp -r ${table} iso4217/table.xml ''; postInstall = '' # Copy the table file - cp -r ${table} $out/${python.sitePackages}/$pname/table.xml + cp -r ${table} $out/${python.sitePackages}/iso4217/table.xml ''; - pytestFlagsArray = [ "$pname/test.py" ]; + pytestFlagsArray = [ "iso4217/test.py" ]; pythonImportsCheck = [ "iso4217" ]; From 5eeb03141c423999ad500fedc25cbf579765627e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 31 Oct 2024 17:06:01 +0100 Subject: [PATCH 29/68] python3Packages.certbot-dns-inwx: fix broken pytestImportsCheck This surely was intended to be an imports check, judging by the content of the list. Setting pytestCheckHook like that surely makes no sense. --- pkgs/development/python-modules/certbot-dns-inwx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 08c83c264bca..81b20f23ff79 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # Doesn't have any tests doCheck = false; - pytestCheckHook = [ "certbot_dns_inwx" ]; + pytestImportsCheck = [ "certbot_dns_inwx" ]; meta = with lib; { description = "INWX DNS Authenticator plugin for Certbot"; From cfd186f0978147e6c71c50e907c794d103ed0370 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 31 Oct 2024 17:05:07 +0100 Subject: [PATCH 30/68] python3Packages: remove left-over "--numprocesses" Those are provided by pytest-xdist's setup hook automatically anyway. --- pkgs/by-name/co/conan/package.nix | 5 ----- pkgs/by-name/ro/routersploit/package.nix | 2 -- pkgs/development/python-modules/qcodes/default.nix | 2 -- 3 files changed, 9 deletions(-) diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 386e59d985b0..67fb019af535 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -65,11 +65,6 @@ python3.pkgs.buildPythonApplication rec { "conan" ]; - pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" - ]; - disabledTests = [ # Tests require network access "TestFTP" diff --git a/pkgs/by-name/ro/routersploit/package.nix b/pkgs/by-name/ro/routersploit/package.nix index 3f656e8e4578..14de115541af 100644 --- a/pkgs/by-name/ro/routersploit/package.nix +++ b/pkgs/by-name/ro/routersploit/package.nix @@ -39,8 +39,6 @@ python3.pkgs.buildPythonApplication rec { ]; pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" # Run the same tests as upstream does in the first round "tests/core/" "tests/test_exploit_scenarios.py" diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 01ae8380228c..a1c5206f4af2 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -148,8 +148,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "-v" - "-n" - "$NIX_BUILD_CORES" # Follow upstream with settings "-m 'not serial'" "--hypothesis-profile ci" From c23f21beadaccc1f76b8810b381abfe2a99c23f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 22:01:04 +0100 Subject: [PATCH 31/68] python3Packages.dtw-python: set pytestFlagsArray in preCheck hook This flag relies on bash eval of pytestFlagsArray, which we'd like to get rid of. By moving the evaluation of $src into the preCheck hook, we achieve the same. --- pkgs/development/python-modules/dtw-python/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix index 7021d576bab4..627d16b0e062 100644 --- a/pkgs/development/python-modules/dtw-python/default.nix +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -39,10 +39,12 @@ buildPythonPackage rec { ]; # We need to run tests on real built package: https://github.com/NixOS/nixpkgs/issues/255262 - preCheck = "cd $out"; - nativeCheckInputs = [ pytestCheckHook ]; # tests/ are not included to output package, so we have to set path explicitly - pytestFlagsArray = [ "$src/tests" ]; + preCheck = '' + appendToVar pytestFlagsArray "$src/tests" + cd $out + ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dtw" ]; From 0032be6d426e8646f5986b4ffb6a1878648339a0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 1 Nov 2024 19:13:55 +0100 Subject: [PATCH 32/68] python3Packages.bottleneck: avoid bash eval in pytestFlagsArray We can just cd to $out to let the tests run from that folder automatically. Additionally we get better test output, because the /nix/store component is missing from file names. --- pkgs/development/python-modules/bottleneck/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 18aa852cd73b..f89ea81255e4 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "$out/${python.sitePackages}" ]; + preCheck = "pushd $out"; + postCheck = "popd"; disabledTests = [ "test_make_c_files" ]; From 5ea3790cbe8254f2a432d48a0ff1dcda1e466560 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 1 Nov 2024 21:16:58 +0100 Subject: [PATCH 33/68] python3Packages.vapoursynth: remove useless $src from unittestFlagsArray Avoids the use of bash eval in unittestFlagsArray, which we want to remove. --- pkgs/development/python-modules/vapoursynth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix index 1fb1d4be03ef..8e50bba69a4d 100644 --- a/pkgs/development/python-modules/vapoursynth/default.nix +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { unittestFlagsArray = [ "-s" - "$src/test" + "test" "-p" "'*test.py'" ]; From f9969cbf471f07dde16fd22adcd98ee3b0a499a2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 12 Nov 2024 21:09:07 +0100 Subject: [PATCH 34/68] python3Packages.conan: disable unstable test This test failed repeatedly on aarch64-linux, so far. --- pkgs/by-name/co/conan/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 67fb019af535..ebd96f12693c 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -68,6 +68,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access "TestFTP" + # Unstable test + "test_shared_windows_find_libraries" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Rejects paths containing nix "test_conditional_os" From 9991b9b9840267bd3d104b8f5f9d0da9a6fede7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:13:04 +0100 Subject: [PATCH 35/68] python312Packages.tencentcloud-sdk-python: 3.0.1263 -> 3.0.1264 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1263...3.0.1264 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1264/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index f048b525f679..1f6738692200 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1263"; + version = "3.0.1264"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-B61d8zyrOixqAy9sk4yiipB0xO3eHP5Pi8HfUVs/LeI="; + hash = "sha256-o7HLfcwPE4Fl+0+A5lGb1K1sBJ9Cm01cFrkZL6w0QJE="; }; build-system = [ setuptools ]; From 92fc06ebb0cccdbabee24d1258af015a3015efd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:14:25 +0100 Subject: [PATCH 36/68] cnspec: 11.29.0 -> 11.30.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.29.0...v11.30.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.30.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index bc7a23f0cbe0..8e5a0cff74a9 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.29.0"; + version = "11.30.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-a8ihlnJ8fggJpr54GGlNLgWwM6veW5xz4ah5WkFHHh0="; + hash = "sha256-1d04jYnVrbtxVYOJiUYZzNCwJJXZ2O1Bendxj692Sc8="; }; proxyVendor = true; - vendorHash = "sha256-snnEqg41Vi82uoFzJzYg8/P45lp0Y4w1NQ0rG0CD+T0="; + vendorHash = "sha256-Sd3uN+rny3J0Z/SIMKR0HEsq21B5ZqcjxrUgqS95FaU="; subPackages = [ "apps/cnspec" ]; From acc529b0547382fae827136ee7cbd8a75c3afc5a Mon Sep 17 00:00:00 2001 From: diamond-deluxe <112557036+diamond-deluxe@users.noreply.github.com> Date: Sun, 10 Nov 2024 21:46:31 +0000 Subject: [PATCH 37/68] yafc-ce: 2.1.0 -> 2.3.1 Release: https://github.com/shpaass/yafc-ce/releases/tag/2.3.1 --- pkgs/by-name/ya/yafc-ce/deps.nix | 598 ++-------------------------- pkgs/by-name/ya/yafc-ce/package.nix | 4 +- 2 files changed, 41 insertions(+), 561 deletions(-) diff --git a/pkgs/by-name/ya/yafc-ce/deps.nix b/pkgs/by-name/ya/yafc-ce/deps.nix index 529913f5a3be..01ca69791030 100644 --- a/pkgs/by-name/ya/yafc-ce/deps.nix +++ b/pkgs/by-name/ya/yafc-ce/deps.nix @@ -5,33 +5,33 @@ [ (fetchNuGet { pname = "Google.OrTools"; - version = "9.10.4067"; - hash = "sha256-3iWcH1uKVOxrD6bL27TMVVNj5JX1fjdZ89d3Ddy8Fg0="; + version = "9.11.4210"; + hash = "sha256-5mXPEJiry7s5JKfy+o+8Crq7KZIOJnKu4BjXFYEf2nw="; }) (fetchNuGet { pname = "Google.OrTools.runtime.linux-arm64"; - version = "9.10.4067"; - hash = "sha256-6OE7+DFbLUqBKmw1t2wli//Y+EAy6o67jFtW2lhS0Hw="; + version = "9.11.4210"; + hash = "sha256-Odd81OYE7nkpMCoeONzIP3KHYxYdXdvFcyh7qlhCXYg="; }) (fetchNuGet { pname = "Google.OrTools.runtime.linux-x64"; - version = "9.10.4067"; - hash = "sha256-vd5XqXkOlO8nik5od56x4tncUVJmqamU0CC2DVbEEvY="; + version = "9.11.4210"; + hash = "sha256-1Eq9oKZFU/NqRlEHleVBELiCAKaRlYLxRybYy4s+4RQ="; }) (fetchNuGet { pname = "Google.OrTools.runtime.osx-arm64"; - version = "9.10.4067"; - hash = "sha256-2eJVMi51PVat/CrQiW5BailiJQsvKk+ivpAu46S4lHE="; + version = "9.11.4210"; + hash = "sha256-JoCCnE+ju8/b3Y82yCI3o8ZoEWV7DBns9/6ZJtpnEHY="; }) (fetchNuGet { pname = "Google.OrTools.runtime.osx-x64"; - version = "9.10.4067"; - hash = "sha256-3o0Feg/t70gUmH5lAZzt+dClJkjzuz1e2Q/m8kjAhUo="; + version = "9.11.4210"; + hash = "sha256-yobJIJTTu716ciGgtESLtGjqsteWqE4LtbmAloCBfb4="; }) (fetchNuGet { pname = "Google.OrTools.runtime.win-x64"; - version = "9.10.4067"; - hash = "sha256-7uLHbUEHu9BsC14FXikiApnruLZnMavyFPD+jSAU3XY="; + version = "9.11.4210"; + hash = "sha256-v7InhZCf9jktUsXSvVwsc7REv4kPAfCvH8m3RiBBULs="; }) (fetchNuGet { pname = "Google.Protobuf"; @@ -50,13 +50,13 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.4.0"; - hash = "sha256-YDALPHtbD+zMN+Llm0aKSG1rp5adKZl7R14h8vdLlZ4="; + version = "17.11.1"; + hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.4.0"; - hash = "sha256-jXKJwOZBy4NJtWwPRjw5wLmNGJD6Wr+YYCokIOIXONA="; + version = "17.11.1"; + hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; @@ -78,35 +78,15 @@ version = "8.0.10"; hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="; }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; - }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.4.0"; - hash = "sha256-SyCFW5vyzm4/YSKogIhmYYUvWdS2pPRur17JMxMOiDY="; + version = "17.11.1"; + hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.4.0"; - hash = "sha256-xPsmpE7pSfZonzvtMaJtVMCeszBqUPGzTWWSYpt65sY="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "1.6.1"; - hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; + version = "17.11.1"; + hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Newtonsoft.Json"; @@ -118,216 +98,6 @@ version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "5.11.0"; - hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; - }) - (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 = "SDL2-CS.NetCore"; version = "2.0.8"; @@ -338,6 +108,11 @@ version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) + (fetchNuGet { + pname = "Serilog"; + version = "4.1.0"; + hash = "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="; + }) (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; @@ -353,310 +128,15 @@ version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) - (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.3.0"; - hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; - }) - (fetchNuGet { - pname = "System.Collections.Concurrent"; - version = "4.3.0"; - hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; - }) - (fetchNuGet { - pname = "System.Console"; - version = "4.3.0"; - hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; - }) - (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.Tools"; - version = "4.3.0"; - hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tracing"; - version = "4.3.0"; - hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; - }) - (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.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.3.0"; - hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; - }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; - }) - (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.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.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.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 = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) - (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.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.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.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.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.Text.Encoding"; - version = "4.3.0"; - hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; - }) - (fetchNuGet { - pname = "System.Text.RegularExpressions"; - version = "4.3.0"; - hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; - }) - (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.3.0"; - hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; - }) - (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.3.0"; - hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; - }) - (fetchNuGet { - pname = "System.Xml.XDocument"; - version = "4.3.0"; - hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; - }) (fetchNuGet { pname = "xunit"; - version = "2.4.2"; - hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0="; + version = "2.9.2"; + hash = "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo="; }) (fetchNuGet { pname = "xunit.abstractions"; @@ -665,32 +145,32 @@ }) (fetchNuGet { pname = "xunit.analyzers"; - version = "1.0.0"; - hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw="; + version = "1.16.0"; + hash = "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU="; }) (fetchNuGet { pname = "xunit.assert"; - version = "2.4.2"; - hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU="; + version = "2.9.2"; + hash = "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="; }) (fetchNuGet { pname = "xunit.core"; - version = "2.4.2"; - hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc="; + version = "2.9.2"; + hash = "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8="; }) (fetchNuGet { pname = "xunit.extensibility.core"; - version = "2.4.2"; - hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; + version = "2.9.2"; + hash = "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; - version = "2.4.2"; - hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; + version = "2.9.2"; + hash = "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80="; }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.5"; - hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk="; + version = "2.8.2"; + hash = "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60="; }) ] diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index 7a76a6ceccb3..785b84a99d7f 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-dh+lnilwQSrbZNcRGpEXybsNYxkihZUp5t8co06ZXYE="; + hash = "sha256-t/st/s0zJRNP1Cbjo4aw02jKvuHkMh3jGmiMziMrez8="; }; projectFile = [ "Yafc/Yafc.csproj" ]; From dd80162819bbe94df2e42ee65d7adb23a9540649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 21:03:02 +0000 Subject: [PATCH 38/68] centrifugo: 5.4.5 -> 5.4.7 --- pkgs/by-name/ce/centrifugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index c195ead5764c..b2076c49175a 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.5"; + version = "5.4.7"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-kbSHNtujHlT9l9VV9fVlVnTMOQSKdXSwMP/x0EGTNZo="; + hash = "sha256-hAZT2jqDy0oppKxuLWg6UQxiCySLkPE0eLmqavaRN9I="; }; - vendorHash = "sha256-gfz2jRGx8egAKCFaQOZfh7cthcXS9t8ugB0zF+tiYh0="; + vendorHash = "sha256-Xz8s3R2nOouEyH56y04X15nYtMRwL8toP/8WL0saYwQ="; ldflags = [ "-s" From ff9145a528b59065217a4aceb86902d4630caf3c Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:27:07 +0200 Subject: [PATCH 39/68] soundsource: 5.7.1 -> 5.7.3 --- pkgs/by-name/so/soundsource/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index c76d0c0999d6..567ca85864e8 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.7.1"; + version = "5.7.3"; src = fetchurl { - url = "https://web.archive.org/web/20240924103013/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - sha256 = "sha256-02+Jb+3GSirypBISjdFg89Dp3LtkgPKho8OCVS+GGcQ="; + url = "https://web.archive.org/web/20241112212337/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "sha256-Eup7oiq8vVn2MqxJxE/Z2LtDMdluczHusRJ9uoW3X84="; }; dontUnpack = true; From 55008535a81e6c70da8f6c21e32f88ac28127a74 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:28:56 +0000 Subject: [PATCH 40/68] raycast: 1.85.0 -> 1.85.2 --- pkgs/by-name/ra/raycast/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index d0a726e2a406..46b680bb845d 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.85.0"; + version = "1.85.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-wx9Ps/7O4y21D7lK3UlL23Cbvl8lRDZ375lOHq67w0I="; + hash = "sha256-pmzoRZ0EMEA0kU37skGuEDu6ggBuUdFYCLRpZty5kgs="; }; dontPatch = true; From cc397b29a3d9ad559b17dbbfb2d84daf67e5913b Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 12 Nov 2024 22:48:33 +0100 Subject: [PATCH 41/68] nodejs_18: 18.20.4 -> 18.20.5 --- .../web/nodejs/v18-openssl-3.0.14.patch | 24 ---- pkgs/development/web/nodejs/v18.nix | 103 +----------------- 2 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v18-openssl-3.0.14.patch diff --git a/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch b/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch deleted file mode 100644 index b63fb8ad1303..000000000000 --- a/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js -index 522dd34ad2..3f0ee2a0f9 100644 ---- a/test/parallel/test-tls-alpn-server-client.js -+++ b/test/parallel/test-tls-alpn-server-client.js -@@ -195,7 +195,8 @@ function TestALPNCallback() { - - // Callback picks 2nd preference => undefined => ALPN rejected: - assert.strictEqual(results[1].server, undefined); -- assert.strictEqual(results[1].client.error.code, 'ECONNRESET'); -+ const allowedErrors = ['ECONNRESET', 'ERR_SSL_TLSV1_ALERT_NO_APPLICATION_PROTOCOL']; -+ assert.ok(allowedErrors.includes(results[1].client.error.code), `'${results[1].client.error.code}' was not one of ${allowedErrors}.`); - - TestBadALPNCallback(); - }); -@@ -218,7 +219,8 @@ function TestBadALPNCallback() { - runTest(clientsOptions, serverOptions, function(results) { - // Callback returns 'http/5' => doesn't match client ALPN => error & reset - assert.strictEqual(results[0].server, undefined); -- assert.strictEqual(results[0].client.error.code, 'ECONNRESET'); -+ const allowedErrors = ['ECONNRESET', 'ERR_SSL_TLSV1_ALERT_NO_APPLICATION_PROTOCOL']; -+ assert.ok(allowedErrors.includes(results[0].client.error.code), `'${results[0].client.error.code}' was not one of ${allowedErrors}.`); - - TestALPNOptionsCallback(); - }); diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 556e163e3ae9..6099d100675a 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -23,8 +23,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.20.4"; - sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio="; + version = "18.20.5"; + sha256 = "76037b9bad0ab9396349282dbfcec1b872ff7bd8c8d698853bebd982940858bf"; patches = [ ./configure-emulator-node18.patch ./configure-armv6-vfpv2.patch @@ -34,7 +34,6 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./trap-handler-backport.patch ./use-correct-env-in-tests.patch - ./v18-openssl-3.0.14.patch (fetchpatch2 { url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; @@ -48,103 +47,5 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; }) - - # Patches for OpenSSL 3.2 - # Patches already in 20.13.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/9f939f5af7d11299796999af3cbfa4845b505c78.patch?full_index=1"; - hash = "sha256-vZJMTI8KR+RoCl4r9dfNdNMKssk4osLS61A/F7gdeWQ="; - }) - # Patches already in 20.16.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/5909cf3b047f708de6a1373232bfcc899fa97a1d.patch?full_index=1"; - hash = "sha256-JidSO/73fjxTcGBiMHC7x10muYtv04inXNVJebFmcgo="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/ce531af0c27acf29dd05ab2fac19b4af88f8780d.patch?full_index=1"; - hash = "sha256-2WD4lVCtfji0AXlIHq4tiQ2TWKVMPjYZjbaVxd3HEFw="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/3e7129e5d60d4f017ad06c006dec7f95d986095c.patch?full_index=1"; - hash = "sha256-2SRoUMswY25GamJ6APVAzDwqopSCpVPKAEIIqyaAmBA="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/da0f19208786cd7c57fec733e4ba24d0454f556a.patch?full_index=1"; - hash = "sha256-AyQe2eHIx0O2jUgMCqWnzLhW8XduPaU4ZmhFA3UQI+Q="; - }) - # Patches already in 20.17.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/53ac448022b7cdfcc09296da88d9a1b59921f6bf.patch?full_index=1"; - hash = "sha256-JcEbluU9k20Q3W915D1O6wWgX5R/UKjxqsuDemjMoTc="; - }) - # Patches already in 22.7.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/bd42e4c6a73f61f7ee47e4426d86708fd80c6c4f.patch?full_index=1"; - hash = "sha256-bsCLVwK5t8dD+wHd1FlFJ1wpCGtNGcwoOfq4fG5MHfo="; - includes = ["test/parallel/test-tls-set-sigalgs.js"]; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/e0634f58aba6a1634fe03107d5be849fd008cc02.patch?full_index=1"; - hash = "sha256-Jh7f4JPS1H2Rpj1nEOW53E66Z+GDNEFXl0jALrvyYXQ="; - }) - # Patches already in 22.8.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/e9cd4766e39d96693320be9ce0a1044c450e8675.patch?full_index=1"; - hash = "sha256-RXRLRznz16B8MrfVrpIHgyqLV2edpJk2p717QBttyK4="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/2bfc9e467cb05578efa4d3db497f368fb144e5fc.patch?full_index=1"; - hash = "sha256-TyHSd+O0T/bFR7YZuxm4HumrMljnJu2a8RRLRvz6KNM="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/01f751b529d126529f1d2019f0dcb13b8e54b787.patch?full_index=1"; - hash = "sha256-m3IaWL7U8fQMnmP2Xch4M8Qn1AJU8Ao9GCqMPcDnqCk="; - }) - # Patches already in 22.9.0 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1"; - hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1"; - hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1"; - hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1"; - hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/18101d83a158b877ac765936aba973c664130ea2.patch?full_index=1"; - hash = "sha256-vpHDj5+340bjYLo7gTWFu7iS4vVveBZAMypQ2eLoQzM="; - }) - # Patches not yet released - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; - hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; - hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; - hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; - hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; - hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; - hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; - }) ] ++ gypPatches; } From df5cb0089937235c1def800a41dbdef13e399f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Cl=C3=A9roux?= <73357644+gcleroux@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:10:22 -0500 Subject: [PATCH 42/68] bazecor: 1.5.3 -> 1.5.4 https://github.com/Dygmalab/Bazecor/releases/tag/v1.5.4 --- pkgs/by-name/ba/bazecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 8465b19b4b1f..d71334f03bbc 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.3"; + version = "1.5.4"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-96BHIOt9vA9sLpR8+XRKi8+h953VWMyAeE04A+4GR2Q="; + hash = "sha256-gu3XPl4gKL+k9hX9OVJYGvG3R81c5lZauRJdUFrqtqk="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 From ea8765869083e4b80ad05019310b154e2e942cf7 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 11 Nov 2024 21:42:54 +0100 Subject: [PATCH 43/68] nodejs_23: 23.1.0 -> 23.2.0 --- pkgs/development/web/nodejs/v23.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 2039e9385c4f..a34e53375e69 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -14,8 +14,8 @@ let in buildNodejs { inherit enableNpm; - version = "23.1.0"; - sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423"; + version = "23.2.0"; + sha256 = "3cf7a8a36682775693691f1de901bb5973ad3c0ae2aa87b1add9de515e7b2fc7"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -26,6 +26,11 @@ buildNodejs { ./bin-sh-node-run-v22.patch # Those reverts are due to a mismatch with the libuv version used upstream + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/84fe809535b0954bbfed8658d3ede8a2f0e030db.patch?full_index=1"; + hash = "sha256-C1xG2K9Ejofqkl/vKWLBz3vE0mIPBjCdfA5GX2wlS0I="; + revert = true; + }) (fetchpatch2 { url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1"; hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q="; From d7356ad0568f69056f11d2f7cb6dc9e20c519586 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 10:42:56 +0200 Subject: [PATCH 44/68] todoman: 4.4.0 -> 4.5.0 See https://github.com/pimutils/todoman/blob/v4.5.0/CHANGELOG.rst#L7-L18 for the changelog. Removes pytz dependency. --- pkgs/by-name/to/todoman/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix index 75adb0425cc9..f79a54245f8c 100644 --- a/pkgs/by-name/to/todoman/package.nix +++ b/pkgs/by-name/to/todoman/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "todoman"; rev = "refs/tags/v${version}"; - hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; + hash = "sha256-sk5LgFNo5Dc+oHCLu464Q1g0bk1QGsA7xMtMiits/8c="; }; nativeBuildInputs = [ @@ -34,9 +34,7 @@ python3.pkgs.buildPythonApplication rec { humanize icalendar parsedatetime - python-dateutil pyxdg - pytz tabulate urwid ]; @@ -44,8 +42,9 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ freezegun hypothesis - pytestCheckHook pytest-cov-stub + pytestCheckHook + pytz ]; postInstall = '' From 57e033c7d1eb9d39f914814aa23f57296f610ce1 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 17:25:10 +0200 Subject: [PATCH 45/68] sphinx-click: init at 6.0.0 --- .../python-modules/sphinx-click/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-click/default.nix diff --git a/pkgs/development/python-modules/sphinx-click/default.nix b/pkgs/development/python-modules/sphinx-click/default.nix new file mode 100644 index 000000000000..81ac35a5131c --- /dev/null +++ b/pkgs/development/python-modules/sphinx-click/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + sphinxHook, + # Build system + pbr, + setuptools, + # Dependencies + click, + docutils, + sphinx, + # Checks + pytestCheckHook, + defusedxml, +}: + +buildPythonPackage rec { + pname = "sphinx-click"; + version = "6.0.0"; + pyproject = true; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + sphinxHook + ]; + + dependencies = [ + click + docutils + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + defusedxml + ]; + + pythonImportsCheck = [ + "sphinx_click" + ]; + + src = fetchPypi { + inherit version; + pname = "sphinx_click"; + hash = "sha256-9dZkMh3AxmIv8Bnx4chOWM4M7P3etRDgBM9gwqOrRls="; + }; + + meta = { + description = "Sphinx extension that automatically documents click applications"; + homepage = "https://github.com/click-contrib/sphinx-click"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c0fe5e270bd..49664f84e234 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14909,6 +14909,8 @@ self: super: with self; { sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; + sphinx-click = callPackage ../development/python-modules/sphinx-click { }; + sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { }; sphinx-comments = callPackage ../development/python-modules/sphinx-comments { }; From 525c38a835c1635a60eefcad7a720647aeaa07f6 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 17:25:32 +0200 Subject: [PATCH 46/68] todoman: add sphinxHook --- pkgs/by-name/to/todoman/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix index f79a54245f8c..8faf54d4222d 100644 --- a/pkgs/by-name/to/todoman/package.nix +++ b/pkgs/by-name/to/todoman/package.nix @@ -4,6 +4,7 @@ jq, lib, python3, + sphinxHook, }: python3.pkgs.buildPythonApplication rec { @@ -20,6 +21,9 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles + sphinxHook + python3.pkgs.sphinx-click + python3.pkgs.sphinx-rtd-theme ]; build-system = with python3.pkgs; [ From 58e38adf0cfd53517564628350717577bb36adcc Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 12 Nov 2024 22:32:00 +0000 Subject: [PATCH 47/68] ugrep: 7.0.2 -> 7.0.3 Changes: https://github.com/Genivia/ugrep/releases/tag/v7.0.3 --- pkgs/by-name/ug/ugrep/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix index ef38bbda1a51..63514447bf7f 100644 --- a/pkgs/by-name/ug/ugrep/package.nix +++ b/pkgs/by-name/ug/ugrep/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-3kqarrbg7VB0fUQSjqZCVBmr4Mc09NMr+03A5qhe54Y="; + hash = "sha256-C/Nb5wxZtMzYBJmqOj8UwCU5yrQIrHCHsstuIiKMMq0="; }; buildInputs = [ From f071ea7fc9c4292f107956ec3d4deaf1813b5393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 22:36:59 +0000 Subject: [PATCH 48/68] _9pfs: 0.3 -> 0.4 --- pkgs/by-name/_9/_9pfs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix index c13d3d3cfc42..1fb775ec90ce 100644 --- a/pkgs/by-name/_9/_9pfs/package.nix +++ b/pkgs/by-name/_9/_9pfs/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "9pfs"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "ftrvxmtrx"; repo = "9pfs"; rev = version; - sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; + sha256 = "sha256-nlJ4Zh13T78r0Dn3Ky/XLhipeMbMFbn0qGCJnUCBd3Y="; }; postPatch = '' From 1b3154e6667b9f37f654764893b2f8614d01cbab Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Tue, 12 Nov 2024 17:31:52 -0500 Subject: [PATCH 49/68] ipscan: no longer broken closes #355412 --- pkgs/by-name/ip/ipscan/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix index be0ecf0b1d04..f4b10cbd806b 100644 --- a/pkgs/by-name/ip/ipscan/package.nix +++ b/pkgs/by-name/ip/ipscan/package.nix @@ -53,7 +53,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza totoroot ]; - # Very similar issue to hdfview, see: https://github.com/NixOS/nixpkgs/issues/340048 - broken = true; }; } From 33cf0cd04ac1e8bd37ac6b4974538cc0874af523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 23:06:45 +0000 Subject: [PATCH 50/68] terraform-providers.cloudamqp: 1.32.0 -> 1.32.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e7616f511744..fd26b32f7bf6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -234,11 +234,11 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-0lqVHIq37CebSVDR5Ni4kFyXeZZ+tOqpj8gN4h7OaA0=", + "hash": "sha256-jPiOgAQxQ6HIKJ/L5rh82fyd4rwrPOPgrQN3UMWBQF0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.32.0", + "rev": "v1.32.1", "spdx": "MPL-2.0", "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" }, From 1e1dcc53f94fd2df20c0a9f58e7a3a179160fd53 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 12 Nov 2024 19:53:22 -0500 Subject: [PATCH 51/68] Revert "python3Packages.highdicom: 0.22.0 -> 0.23.0" This reverts commit d00e8031112fbfc281ca06936eaeecc1913d57ed. --- pkgs/development/python-modules/highdicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 7f1d6d1eb243..646ba22abda5 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -22,7 +22,7 @@ let in buildPythonPackage rec { pname = "highdicom"; - version = "0.23.0"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "MGHComputationalPathology"; repo = "highdicom"; rev = "refs/tags/v${version}"; - hash = "sha256-WXNmkaAdbjyPdNtjV6vpxUWGtdPLvrMr5t/5aMKGSLc="; + hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw="; }; propagatedBuildInputs = [ From 9ce28cbd7ed6bffa6df8c783c91453d575a0797a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 12 Nov 2024 19:12:52 -0600 Subject: [PATCH 52/68] autoraise: fix darwin Private frameworks need to be injected through a new hook. This requires configuration for the hook to be activated. --- pkgs/by-name/au/autoraise/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/au/autoraise/package.nix b/pkgs/by-name/au/autoraise/package.nix index 4a1b0623cb3b..9f0f1a19aa86 100644 --- a/pkgs/by-name/au/autoraise/package.nix +++ b/pkgs/by-name/au/autoraise/package.nix @@ -2,9 +2,8 @@ lib, stdenv, fetchFromGitHub, - darwin, + apple-sdk, }: - stdenv.mkDerivation rec { pname = "autoraise"; version = "5.3"; @@ -16,13 +15,10 @@ stdenv.mkDerivation rec { hash = "sha256-OsvmNHpQ46+cWkR4Nz/9oIgSFSWLfCwZnAnRKRiNm5E="; }; - buildInputs = with darwin.apple_sdk.frameworks; [ - AppKit - SkyLight + buildInputs = [ + apple-sdk.privateFrameworksHook ]; - dontConfigure = true; - buildPhase = '' runHook preBuild $CXX -std=c++03 -fobjc-arc -D"NS_FORMAT_ARGUMENT(A)=" -D"SKYLIGHT_AVAILABLE=1" -o AutoRaise AutoRaise.mm -framework AppKit -framework SkyLight From 3766c3b08a8aecfeaa87eb2717edbc4b1cd2ef81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Sun, 10 Nov 2024 00:38:15 +0000 Subject: [PATCH 53/68] zx: 8.2.0 -> 8.2.1 Diff: https://github.com/google/zx/compare/8.2.0...8.2.1 Changelog: https://github.com/google/zx/releases/tag/8.2.1 Temporarily pinning the commit which modifies package.json, as that affects the version reported by the CLI (causing `versionCheckHook` to fail). 0f2be5b053b7649fca84c92cd04310b94e297413~ == refs/tags/8.2.1 See: - https://github.com/google/zx/issues/938 - https://github.com/google/zx/pull/939 --- pkgs/by-name/zx/zx/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index edb53c145578..c8b829463720 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "google"; repo = "zx"; - rev = version; - hash = "sha256-tu5arRnbIVEVkmLBrutW8rNIHN3joA87AYyO+Smmcug="; + rev = "0f2be5b053b7649fca84c92cd04310b94e297413"; + hash = "sha256-4shiST6KMWc89AkAv8A5MQJGDWuwyRwOwKHuAVUcbbg="; }; - npmDepsHash = "sha256-TEVEa0hvSRFp1ju1Ajer4u7mdf4y/N3ged8wuXzyy8A="; + npmDepsHash = "sha256-IYx0g3Fxi4/iuljo8mDlQtTGHhJilDPXYHC2xe6P5fs="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 851ec0dc6a2cf595fccc9e0950ea563ca49dfa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Wed, 13 Nov 2024 01:56:41 +0000 Subject: [PATCH 54/68] zx: 8.2.1 -> 8.2.2 Diff: https://github.com/google/zx/compare/8.2.1...8.2.2 Changelog: https://github.com/google/zx/releases/tag/8.2.2 --- pkgs/by-name/zx/zx/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index c8b829463720..9a17530733f5 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "google"; repo = "zx"; - rev = "0f2be5b053b7649fca84c92cd04310b94e297413"; - hash = "sha256-4shiST6KMWc89AkAv8A5MQJGDWuwyRwOwKHuAVUcbbg="; + rev = version; + hash = "sha256-7VJ29oB5/518KNafdhELekUGCXW8+KunLnOmn1WpGEc="; }; - npmDepsHash = "sha256-IYx0g3Fxi4/iuljo8mDlQtTGHhJilDPXYHC2xe6P5fs="; + npmDepsHash = "sha256-SDHorWbiN4x7m+2GcT15M4d4SU3jpbVU0iILnINv3UE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From bc3593677c5644f75e4e1a0df9c70ff8de6402de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 03:15:12 +0000 Subject: [PATCH 55/68] fastly: 10.15.0 -> 10.16.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 739b431d99f8..ed499cddd0e6 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.15.0"; + version = "10.16.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-zKF9ef28lZns2WWZ7BjLSP7Z5N5+wIaztLmgfzA05+c="; + hash = "sha256-CDqv0umkG7VVhP6M3uuxIhifgHA4UDWtCUJZsXCLGfc="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-PoP4dMhNj+pHPSNmX24W/qipUJJeL88mjx1sqtcF40M="; + vendorHash = "sha256-rh4UXvJh7lBSCXPt6qo65gJOZwa65J7tcBjwPXDxeeQ="; nativeBuildInputs = [ installShellFiles From 9bc7167c19ee699701211f9254ada528bbe14025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 03:21:22 +0000 Subject: [PATCH 56/68] kubectl-node-shell: 1.10.1 -> 1.10.2 --- pkgs/by-name/ku/kubectl-node-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-node-shell/package.nix b/pkgs/by-name/ku/kubectl-node-shell/package.nix index 06c64497747a..7813b832fd9a 100644 --- a/pkgs/by-name/ku/kubectl-node-shell/package.nix +++ b/pkgs/by-name/ku/kubectl-node-shell/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - hash = "sha256-QG1YQH2qd4TBkH42z9htni4llL13sEoBXlih4yc8r4w="; + hash = "sha256-lB1q+zvgXpjVfxjmYa404hHj0kNPLrzRr1wj8AEM6dQ="; }; strictDeps = true; From 66caffaeaa2465c521a807d516d7f5b364501af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 04:39:08 +0000 Subject: [PATCH 57/68] python312Packages.precis-i18n: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/precis-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 7067bd61213e..32e2b0dfb79a 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "byllyfish"; repo = "precis_i18n"; rev = "refs/tags/v${version}"; - hash = "sha256-0Z8JbakShuB8FFGl3NS8VFpHAQgr2P900HVxUafAmyU="; + hash = "sha256-rtg3u8lnnmQFPsNC52LNVoEVu6CeHzAWvOjWBlzLKC4="; }; pythonImportsCheck = [ "precis_i18n" ]; From 2f097593e7c43fa4bd92b8abb20a0bb5e965671c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 05:42:56 +0000 Subject: [PATCH 58/68] python312Packages.sqlfmt: 0.23.2 -> 0.23.3 --- pkgs/development/python-modules/sqlfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 37f23ca89ee7..6b35dbcfc44f 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sqlfmt"; - version = "0.23.2"; + version = "0.23.3"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "sqlfmt"; rev = "refs/tags/v${version}"; - hash = "sha256-g2ycfpsBFMh16pYVzCmde0mhQhhvAhH25i3LJTcG7Ac="; + hash = "sha256-kbluj29P1HwTaCYv1Myslak9s8FFm2e/eHdGgi3H4i0="; }; build-system = [ From 3ed52796243d558fbcc14b4d929596307262f25b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 05:52:14 +0000 Subject: [PATCH 59/68] python312Packages.geoalchemy2: 0.15.2 -> 0.16.0 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index bd3cd71bfa47..1c347cb3a7c6 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.15.2"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-c5PvkQdfKajQha2nAtqYq7aHCgP/n41ekE04Rl2Pnr0="; + hash = "sha256-LjfCPSpKwcyjmGReTC4M58890ow3hbxlwl1f7iC9i6Y="; }; build-system = [ From 509edbf1b5c0f7ebe42c2e6be2418c253d4cecae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 05:57:06 +0000 Subject: [PATCH 60/68] python312Packages.meross-iot: 0.4.7.3 -> 0.4.7.5 --- pkgs/development/python-modules/meross-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 2359d5fc340b..c704714e9a45 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.7.3"; + version = "0.4.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-Ne9m6umPmX3uXAyY9/Ucvi/rPdHrGJgD5IrZ+BBQweI="; + hash = "sha256-CEBZVbUkRMWw95imL1k3q7Z3Nkyzwleh5C/s0XxfhfQ="; }; build-system = [ setuptools ]; From 708febeaf6249b0f4f73bb4552fc20a9a9b0dd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 07:57:00 +0100 Subject: [PATCH 61/68] lua-language-server: 3.12.0 -> 3.13.0 --- pkgs/by-name/lu/lua-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 9fe5e27c89c5..0849339389ef 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU="; + hash = "sha256-V8iqMmf9uVwWvFqEYPlc7WhPnPmKMlJuhve81kf3yQg="; fetchSubmodules = true; }; From 481ac026baed39bc9ddf20423378e1adf8a1c441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 07:08:33 +0000 Subject: [PATCH 62/68] python312Packages.db-dtypes: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/db-dtypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index c082433f9f3c..15dad3f13588 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY="; + hash = "sha256-InotzUk1lEuTD1tAojpEGfFyjrCDoGaa8JMDUdRd+Hw="; }; build-system = [ setuptools ]; From ccc1d7f5c7807310a143b4bfb27a18a37de8d566 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 08:34:53 +0000 Subject: [PATCH 63/68] twitch-tui: 2.6.16 -> 2.6.17 --- .../networking/instant-messengers/twitch-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 8d3b36071874..6c703855039d 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.16"; + version = "2.6.17"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QWIy+gAW42tJhmNIj6UThVedIrfAFdlatD71BoKZC4s="; + hash = "sha256-QwFCabksDG+G7nfQPtxshd4n71Dj/uKOGRRutnZxECM="; }; - cargoHash = "sha256-eR21I7xWUyImF30p4M+NwMrxRemrECLcGh8U6wKnp7E="; + cargoHash = "sha256-EEZZaTIDrVcygfXg7/cLOnrVeDfpP88Q16RQ+Bl7eUI="; nativeBuildInputs = [ pkg-config From 3678a98d9316c5621b0904c78953936173310a29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 08:47:58 +0000 Subject: [PATCH 64/68] rke: 1.6.2 -> 1.7.0 --- pkgs/by-name/rk/rke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 6dc805296764..1cd9c415cfe0 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c="; + hash = "sha256-TbcjyUB0ni/n24vySZEUd0gFiWHr4FAdYhRB7BFPpCY="; }; - vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM="; + vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM="; subPackages = [ "." ]; From 9f44eeafb596783d659f27af75d2ca8d97bb8e5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 09:06:57 +0000 Subject: [PATCH 65/68] kubescape: 3.0.18 -> 3.0.19 --- pkgs/by-name/ku/kubescape/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index 4cd86b660d73..cdb3468b0235 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.18"; + version = "3.0.19"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-4HBKvykeFFYg+/86ophmpIWELX8zkbvYEYgmISD3bbY="; + hash = "sha256-kEbCBXefnQO2gJ3kCxP1wLVmQl73E5mXGBza/iR4ioM="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-QcCCY7BdDhZeLSOIYNnAet7uvcGlju4qb/j/GYwu2vE="; + vendorHash = "sha256-sywkDpqEHozqcmUOQuxYpM1YJfJKInpEcrysp8eB9Bw="; subPackages = [ "." ]; From 1661444658c8ced48406c1d21df65c22bfb3f68f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 09:54:03 +0000 Subject: [PATCH 66/68] tev: 1.28 -> 1.29 --- pkgs/by-name/te/tev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index a0c663ca9cff..3f682ccbb6ee 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-bgum8UIv0hTcIacjQsL7nc/2AbhjW5Zhq+LFkIWmDu8="; + hash = "sha256-ke1T5nOrDoJilpfshAIAFWw/640Gm5OaxZ+ZakCevTs="; }; nativeBuildInputs = [ cmake wrapGAppsHook3 ]; From 155168226cb666d242306e13d7dbdaa8a76d20e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 10:36:10 +0000 Subject: [PATCH 67/68] shattered-pixel-dungeon: 2.5.3 -> 2.5.4 --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 9edc11876baf..8b57fcb25352 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-Y23w3Pdq5Lsn4gywHhhfL2o9gVQlw/6mbRrjlHNfJjA="; + hash = "sha256-I8DO0HwMfuIwgraX8Q8Ns4ynQMV0aFsAoXCG7EbltPs="; }; depsPath = ./deps.json; From 2fd7958f0b7f95af1452bed6317a9fdf8dfd7d54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Nov 2024 03:14:07 +1000 Subject: [PATCH 68/68] home-assistant-custom-lovelace-modules.mushroom: 4.1.0 -> 4.1.1 (#355676) https://github.com/piitaya/lovelace-mushroom/releases/tag/v4.1.1 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index f74cf52bdf66..65e56d0746f3 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-Mk1SkDUevaRugxZmMM73xEdiZXdB78rZ+FF/TeaxL8I="; + hash = "sha256-d38FyJ3pQ6L0AY2j6aTB8CRxJt8LDgT1A9ZpMoQgbXo="; }; - npmDepsHash = "sha256-Gzs660w9KG7/m4oB/TjEwSNogRPpnaaHsmQgmqHgfyU="; + npmDepsHash = "sha256-9i7pJh1dmhKobGFcLvZlc0JfaygwVuBvm6ttphl7SWg="; installPhase = '' runHook preInstall