From d7cf2201b6f8dd2716d6bb1a67c20f88f92ea1bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 18:59:21 +0000 Subject: [PATCH 01/31] sublime-merge-dev: 2100 -> 2101 --- .../version-management/sublime-merge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index d272645ee506..eac6a917895c 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2100"; + buildVersion = "2101"; dev = true; - aarch64sha256 = "BL0hk/8hf660I1HUQMQwvZxB6TpXpygQxOYtuDGfrYw="; - x64sha256 = "NePJt2WttsbqJsduGX6UsOzAce2xW4Mc8Nq9We+ZCSM="; + aarch64sha256 = "/56SBJ9ehoBCLTWYo8hGpn6/uqKxsSfcSzcJDd3uUMc="; + x64sha256 = "AIH0VtEetiHdip0PIx1U1mcFlFz1gk0VCRDq4C5/wNM="; } { }; } From 2bac9814ef201225c9c5d2a8e891680ab577b8f7 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Fri, 4 Oct 2024 06:43:21 +0200 Subject: [PATCH 02/31] gitlab: 17.2.5 -> 17.2.8 17.2.8: Fixes CVE-2024-4278 Fixes CVE-2024-4099 Fixes CVE-2024-8974 17.2.7: Fixes CVE-2024-45409 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 4 ++-- .../version-management/gitlab/rubyEnv/Gemfile.lock | 12 ++++++------ .../version-management/gitlab/rubyEnv/gemset.nix | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8b73993462c7..9b4b7f2ae019 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.5", - "repo_hash": "0l3s3k3v306ihn47lkj49b8vlly7v11clciwpf7ly4c5mwvwjlx6", + "version": "17.2.8", + "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.5-ee", + "rev": "v17.2.8-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.5", - "GITLAB_PAGES_VERSION": "17.2.5", + "GITALY_SERVER_VERSION": "17.2.8", + "GITLAB_PAGES_VERSION": "17.2.8", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.5" + "GITLAB_WORKHORSE_VERSION": "17.2.8" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 68acfdcf5343..3fe22d7050f0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.5"; + version = "17.2.8"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-R6GmIBU7rzLBsegcXPjc9Dxp9qe3tP6unqOsnyiozgw="; + hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index bbf6c9292206..202944412ca3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.9.0"; + version = "4.10.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-kBM5ICESRUwHlM9FeJEFQFTM2E2zIF6axOGOHNmloKo="; + hash = "sha256-9OiuA0TqRfnZKfAeLbIcPUw5qH6twWKqt0IP8roaWNg="; }; - vendorHash = "sha256-nePIExsIWJgBDUrkkVBzc0qsYdfxR7GL1VhdWcVJnLg="; + vendorHash = "sha256-Bzhg5coOrs3JO6Qslr9csUIrnCMJiG89Fio8ziJjH9k="; postPatch = '' # Disable flaky inmemory storage driver test diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 30dd1ff03d37..e30dcebfd697 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.5"; + version = "17.2.8"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-5qksHuY7EzCoCMBxF4souvUz8xFstfzOZT3CF5YsV7M="; + hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 5948a05158b5..ef6709b94540 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.5"; + version = "17.2.8"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 9152b022d52e..2bb3d4092ed8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -76,7 +76,7 @@ gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCate gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -85,7 +85,7 @@ gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c62ad405603a..681d70b50896 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1207,9 +1207,9 @@ GEM omniauth-oauth2-generic (0.2.8) omniauth-oauth2 (~> 1.0) rake - omniauth-saml (2.1.0) - omniauth (~> 2.0) - ruby-saml (~> 1.12) + omniauth-saml (2.2.1) + omniauth (~> 2.1) + ruby-saml (~> 1.17) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) omniauth_openid_connect (0.6.1) @@ -1627,7 +1627,7 @@ GEM ruby-openai (3.7.0) httparty (>= 0.18.1) ruby-progressbar (1.11.0) - ruby-saml (1.15.0) + ruby-saml (1.17.0) nokogiri (>= 1.13.10) rexml ruby-statistics (3.0.0) @@ -2136,7 +2136,7 @@ DEPENDENCIES omniauth-google-oauth2 (~> 1.1) omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5)! - omniauth-saml (~> 2.1.0) + omniauth-saml (~> 2.2.1) omniauth-shibboleth-redux (~> 2.0) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) @@ -2218,7 +2218,7 @@ DEPENDENCIES ruby-magic (~> 0.6) ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) - ruby-saml (~> 1.15.0) + ruby-saml (~> 1.17.0) rubyzip (~> 2.3.2) rugged (~> 1.6) sanitize (~> 6.0.2) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f24b73179060..741336ca7211 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -4428,10 +4428,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; + sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; omniauth-shibboleth-redux = { dependencies = ["omniauth"]; @@ -6029,10 +6029,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; + sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; ruby-statistics = { groups = ["default" "test"]; From 81f3c68b9259540e2f8feae044ad28fbffde4ab7 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Fri, 4 Oct 2024 22:10:08 +0200 Subject: [PATCH 03/31] rustic: 0.8.1 -> 0.9.1 --- .../doc/manual/release-notes/rl-2411.section.md | 2 ++ pkgs/by-name/ru/rustic/package.nix | 16 +++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 13f02e6b26c8..af926f1cfc14 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -520,6 +520,8 @@ - Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details. +- The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0). + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 14f1c30ace13..07d8ddd6da76 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -11,26 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-SOXuQIdebzMHyO/r+0bvhZvdc09pNPiCXgYfzMoZUZo="; + hash = "sha256-hkkylXJOhPOC4p+MOuYCzfcmCoHmm+/8afsaPFwD1/s="; }; - cargoHash = "sha256-5tXaq/FPC3T+f1p4RtihQGgwAptcO58mOKQhiOpjacc="; - - # At the time of writing, upstream defaults to "self-update", "tui", and "webdav". - # "self-update" is a self-updater, which we don't want in nixpkgs. - # With each update we should therefore ensure that we mimic the default features - # as closely as possible. - buildNoDefaultFeatures = true; - buildFeatures = [ - "tui" - "webdav" - ]; + cargoHash = "sha256-Rh96vPLAxz8KCIk9y9TFB2fP0JngnM9LSsClWfgYUG0="; nativeBuildInputs = [ installShellFiles ]; From 76bd7b41c80200f6bb2ed735dbd869cf907c3d44 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Fri, 4 Oct 2024 23:42:13 +0200 Subject: [PATCH 04/31] linux_xanmod: 6.6.52 -> 6.6.54 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5b6f24ae3183..ba1a79eb5e04 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,8 +7,8 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.52"; - hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4="; + version = "6.6.54"; + hash = "sha256-i6Rm0Qasgxpw9XcK938IJ+qZ+V2z82zpuly2Au2J18Q="; }; main = { version = "6.10.11"; From 154b16f3929a2601dfd632e0e30cf97f77084713 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Fri, 4 Oct 2024 23:46:03 +0200 Subject: [PATCH 05/31] linux_xanmod_latest: 6.10.11 -> 6.11.2 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index ba1a79eb5e04..394a22bd8df5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -11,8 +11,8 @@ let hash = "sha256-i6Rm0Qasgxpw9XcK938IJ+qZ+V2z82zpuly2Au2J18Q="; }; main = { - version = "6.10.11"; - hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8="; + version = "6.11.2"; + hash = "sha256-4BXPZs8lp/O/JGWFIO/J1HyOjByaqWQ9O6/jx76TIDs="; }; }; From 22e0ae0e34e6500e17d5c1f591737ba36d697728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Oct 2024 13:24:04 +0000 Subject: [PATCH 06/31] ngtcp2-gnutls: 1.7.0 -> 1.8.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 31f69e82198f..74401482119c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-7DesCT8swwk9E1ckYrj3mGsdx37HrJxd+svKpJRrhoI="; + hash = "sha256-qBDpNyBxcW/OPnrbmL+NmKWIF69p1OoZFqlP6mwPi9U="; }; outputs = [ "out" "dev" ]; From 0023b4dcab63acd11813c6a732361cd5d3314f6c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 6 Oct 2024 15:50:20 +0000 Subject: [PATCH 07/31] python3Packages.prosemirror: init at 0.5.0 --- .../python-modules/prosemirror/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/prosemirror/default.nix diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix new file mode 100644 index 000000000000..2457d8b60cf2 --- /dev/null +++ b/pkgs/development/python-modules/prosemirror/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + setuptools-scm, + pytestCheckHook, + fetchPypi, + lxml, + cssselect, +}: + +buildPythonPackage rec { + pname = "prosemirror"; + version = "0.5.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + lxml + cssselect + ]; + + pythonImportsCheck = [ "prosemirror" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python implementation of core ProseMirror modules for collaborative editing"; + homepage = "https://pypi.org/project/prosemirror"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b7ed5e1154f..92d8635aa922 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10110,6 +10110,8 @@ self: super: with self; { propka = callPackage ../development/python-modules/propka { }; + prosemirror = callPackage ../development/python-modules/prosemirror { }; + proxsuite = toPythonModule (pkgs.proxsuite.override { pythonSupport = true; python3Packages = self; }); proxsuite-nlp = toPythonModule (pkgs.proxsuite-nlp.override { pythonSupport = true; python3Packages = self; }); From 099e6bb02d3e1ca2e4feced50568766bf094531a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 7 Oct 2024 13:36:51 +0200 Subject: [PATCH 08/31] bazarr: migrate to fetchzip --- pkgs/servers/bazarr/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index f8b364548248..3e8cac490961 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unar, ffmpeg, nixosTests }: +{ stdenv, lib, fetchzip, makeWrapper, python3, unar, ffmpeg, nixosTests }: let runtimeProgDeps = [ @@ -10,14 +10,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; version = "1.4.4"; - sourceRoot = "."; - - src = fetchurl { + src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-YVg9pHk7KB4FjtmsFV4INSIKdLFiHHN8FHxeVDz2SlU="; + hash = "sha256-FZKGHC7CLzIzOXH77iHwSb9+Mw1z+kiz+1rLO6XU/94="; + stripRoot = false; }; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ (python3.withPackages (ps: [ From 5d2b0d4ad96b1a36cc70e0139215b62cb3b9e900 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 7 Oct 2024 13:49:25 +0200 Subject: [PATCH 09/31] k3s: set meta.position to respective version file Formerly, meta.position used the default, i.e. getting the position of `meta.description`, which resulted in all k3s versions setting `meta.position` to the generic builder script (pkgs/applications/networking/cluster/k3s/builder.nix). This had the effect that `nixpkgs-update` couldn't find the derivation files and automatic updates failed for all k3s versions. This commit explicitly sets `meta.position` to the position of the `k3sVersion` attribute, which points to the version file of the respective version (e.g. pkgs/applications/networking/cluster/k3s/1_31/versions.nix). This solves problems during automatic updates and provides version-specific information in `meta.position`. --- pkgs/applications/networking/cluster/k3s/builder.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 8d66882a8a97..abf25306acab 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -23,7 +23,7 @@ lib: # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion, updateScript ? null, -}: +}@attrs: # builder.nix contains a "builder" expression that, given k3s version and hash # variables, creates a package for that version. @@ -325,6 +325,7 @@ in buildGoModule rec { pname = "k3s"; version = k3sVersion; + pos = builtins.unsafeGetAttrPos "k3sVersion" attrs; tags = [ "libsqlite3" From c092c852a3cbfd9d74945157222174ba848af128 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 14:50:32 +0200 Subject: [PATCH 10/31] python312Packages.uiprotect: 6.1.0 -> 6.3.1 Diff: https://github.com/uilibs/uiprotect/compare/refs/tags/v6.1.0...v6.3.1 Changelog: https://github.com/uilibs/uiprotect/blob/refs/tags/v6.3.1/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index ee01a24bebcc..45cf6ce2e967 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -18,6 +18,7 @@ packaging, pillow, platformdirs, + propcache, pydantic, pyjwt, rich, @@ -38,7 +39,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.1.0"; + version = "6.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-SWEWh1c5GcMrjJlcLtXScRNoem2ACGt3nFC4+ARMIIw="; + hash = "sha256-42rxRD3mXgMLz3mADF0ksDLpw2di5MyVL7+6iW41nI8="; }; build-system = [ poetry-core ]; @@ -68,6 +69,7 @@ buildPythonPackage rec { packaging pillow platformdirs + propcache pydantic pyjwt rich From e30447fbd317fd507e859ca915f8805949c074dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 13:56:12 +0000 Subject: [PATCH 11/31] git-credential-manager: 2.5.1 -> 2.6.0 --- .../git-credential-manager/default.nix | 4 +- .../git-credential-manager/deps.nix | 121 ++++-------------- 2 files changed, 29 insertions(+), 96 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index c9df6aff549a..1cef974df577 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk="; + hash = "sha256-8hjMtfPY/7cNH8WdHyG4kT2W+wGWteHbin1HgTBGiNQ="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index b22825173ddb..a09ad3f4d1e1 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,107 +2,40 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.11"; hash = "sha256-eP8mwZx8kBOOXqy+rBzdhkNiI3g5u5CyYFXoNHWcMFg="; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.11"; hash = "sha256-PPs+D+dJ0OTay8gzDcucjWjfQWiizTHAluquzsFicZ4="; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.11"; hash = "sha256-OHh3hyB7EWZE2nPK7U6z+4MEbYPAdbW4G74poWUSDcc="; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.11"; hash = "sha256-y1BlGzCP03Waq9bVzKGVFr2L/1/rdpBeyHuHbB0kTbk="; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.65.0"; hash = "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.65.0"; hash = "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) - (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.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) - (fetchNuGet { pname = "System.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.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; hash = "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) ] From 14bddce7b04b8fc89258f379ce86a30ad8b09e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Oct 2024 17:15:40 +0200 Subject: [PATCH 12/31] setup-envtest: 0.18.2 -> 0.19.0 --- pkgs/by-name/se/setup-envtest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/setup-envtest/package.nix b/pkgs/by-name/se/setup-envtest/package.nix index 2fe80013d8ef..a43b97b6a400 100644 --- a/pkgs/by-name/se/setup-envtest/package.nix +++ b/pkgs/by-name/se/setup-envtest/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "setup-envtest"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "controller-runtime"; rev = "v${version}"; - hash = "sha256-fQgWwndxzBIi3zsNMYvFDXjetnaQF0NNK+qW8j4Wn/M="; + hash = "sha256-9AqZMiA+OIJD+inmeUc/lq57kV7L85jk1I4ywiSKirg="; } + "/tools/setup-envtest"; - vendorHash = "sha256-Xr5b/CRz/DMmoc4bvrEyAZcNufLIZOY5OGQ6yw4/W9k="; + vendorHash = "sha256-sn3HiKTpQzjrFTOVOGFJwoNpxU+XWgkWD2EOcPilePY="; ldflags = [ "-s" "-w" ]; From 1568a8b5335be56b4f773eafdb1b55598ed7cd43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 16:19:57 +0000 Subject: [PATCH 13/31] python312Packages.aioairzone-cloud: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 06964c3c9cb9..f2e7c88af82d 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw="; + hash = "sha256-a1UsRmDCieCMblH2SpNujDj98GjqDcMN6+TRAWkkV3I="; }; build-system = [ setuptools ]; From b99e3f3af478fcf1328381a3de95065f3acc2c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 17:56:57 +0000 Subject: [PATCH 14/31] python312Packages.mitogen: 0.3.11 -> 0.3.12 --- pkgs/development/python-modules/mitogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 49d7b7d215a3..a43796cba35e 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.11"; + version = "0.3.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-zOTuvc25J2Q9swSntFzjmVCkN13CnYFgnsPc5/rkvVI="; + hash = "sha256-OlZzE4Nc9VBrv5oCZ4LUFdj1a+9rc7YbHDYSbHwALY8="; }; build-system = [ setuptools ]; From a1df7301756654b4f151942332fde99bc3f48309 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 20:09:30 +0200 Subject: [PATCH 15/31] python312Packages.adafruit-platformdetect: 3.74.0 -> 3.75.0 Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.75.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 5f433ee5bfc3..f457e46b88d8 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.74.0"; + version = "3.75.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-rVmtqpVjQgovAsVCu3+hgglga9LJPGT8zzlhySmpba8="; + hash = "sha256-5Awvnzw0tgZhRXVshTOuzerdORJ+5QCH3PDB7pbjCB0="; }; build-system = [ setuptools-scm ]; From 332dc894d044661e8372909dac0a3615180e3e76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 19:12:37 +0000 Subject: [PATCH 16/31] regal: 0.27.0 -> 0.28.0 --- pkgs/by-name/re/regal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 19bf4bbb4b4f..e4d3c262889a 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "regal"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-IGf7iIL2q3w7qIJ0oxDILxcNjexuEr4bsYK+v24Ae+c="; + hash = "sha256-bQKVebpDqmwTAbocL10WrvA4HeVjDaGcbX090cX7HPw="; }; - vendorHash = "sha256-Yl8ZFEiAJRAetc3e2ZdrbTdYhx/Ek9nr3mMQ0H7+aGM="; + vendorHash = "sha256-EaOMIfkaYPXmsqw/Oi3caKjarR5ijwcoK+EXwGfSUqE="; ldflags = [ "-s" "-w" From 813369f502d1b005345825861b0fe45b514ed6db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 20:05:38 +0000 Subject: [PATCH 17/31] flyctl: 0.3.10 -> 0.3.15 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 95b5e7551393..8faa35852e34 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.10"; + version = "0.3.15"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-xg26di6ceko6QUVciy1BLNC7hMEf4I1HRHmRCrdd4vc="; + hash = "sha256-RM9R3o1NJYrw21SYx5whdR9kbopdOXUj3Uw5dVmo6Kk="; }; - vendorHash = "sha256-N/evH8AiTHzO2fXJM3j4vIfSvAuiCc2IWpVcuRU7zlY="; + vendorHash = "sha256-0KVjg4gt0WOJgVaeugSGzJJE/MvKSPZP6MXCYIw0cxQ="; subPackages = [ "." ]; From feb50c139d27b6151295a135c56516e28197755c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Oct 2024 22:30:58 +0200 Subject: [PATCH 18/31] python312Packages.webdataset: fix disabledTestPaths on darwin + clean --- .../python-modules/webdataset/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index f0a4497c6944..07c43828b2ab 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -2,18 +2,23 @@ lib, stdenv, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies braceexpand, + numpy, + pyyaml, + + # tests imageio, lmdb, msgpack, - numpy, pytestCheckHook, - pyyaml, - setuptools, torch, torchvision, - wheel, - fetchFromGitHub, }: buildPythonPackage rec { pname = "webdataset"; @@ -29,7 +34,6 @@ buildPythonPackage rec { build-system = [ setuptools - wheel ]; dependencies = [ @@ -39,12 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook imageio + lmdb + msgpack + pytestCheckHook torch torchvision - msgpack - lmdb ]; pythonImportsCheck = [ "webdataset" ]; @@ -86,10 +90,10 @@ buildPythonPackage rec { disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: Date: Mon, 7 Oct 2024 21:25:21 +0200 Subject: [PATCH 19/31] python312Packages.transformers: 4.45.1 -> 4.45.2 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.45.1...v4.45.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.45.2 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 91253909d565..49cc0f8c5090 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.45.1"; + version = "4.45.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-5fGEnw4YllQdZV/0vDGXYsCyTw0rtPRD/V7UWoBBZjQ="; + hash = "sha256-5Ric+pEbBf6HswsPb8cdVLdqTRgicFjzcrk0oO2PtC0="; }; build-system = [ setuptools ]; From 453cd7b9d3a001722b749b5b11e59381048e4ca9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Oct 2024 22:42:04 +0200 Subject: [PATCH 20/31] python312Packages.argostranslate: mark as broken on x86_64-darwin --- .../python-modules/argostranslate/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 69e3bf1cc0f8..f3121e90dd5b 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, @@ -54,10 +55,12 @@ buildPythonPackage rec { "argostranslate.translate" ]; - meta = with lib; { + meta = { description = "Open-source offline translation library written in Python"; homepage = "https://www.argosopentech.com"; - license = licenses.mit; - maintainers = with maintainers; [ misuzu ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ misuzu ]; + # Segfaults at import + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } From 7c5da9d3385330ac8ef5337fc26eb7260b7d84a4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Oct 2024 17:46:33 +0200 Subject: [PATCH 21/31] python312Packages.awkward-cpp: 38 -> 39 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.6.8...v2.6.9 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.6.9 --- pkgs/development/python-modules/awkward-cpp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index f503f2ad0af5..bebc46bbd89f 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "38"; + version = "39"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-l0SVah14fD0hXqE8WqG2EQnIk/Ad0e/i2mj1jt6K0Vs="; + hash = "sha256-YdoAEZnqIJRITijKB0WR0uxmDxF+mperieYNpAUnI4U="; }; build-system = [ @@ -36,7 +36,6 @@ buildPythonPackage rec { meta = { description = "CPU kernels and compiled extensions for Awkward Array"; homepage = "https://github.com/scikit-hep/awkward"; - changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; From 723310fabe1469067a6e9676c40420955ca2d310 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Oct 2024 17:46:39 +0200 Subject: [PATCH 22/31] python312Packages.awkward: 2.6.8 -> 2.6.9 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.6.8...v2.6.9 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.6.9 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index aefec7c8f326..086bd6a47035 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.8"; + version = "2.6.9"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-2VhG4Elv1neBEfogfhjwlPltQK64wjaLUMhDg7xB/Ow="; + hash = "sha256-kYDihmfzMH5LPXSgXpC64qMPqxIX59VzflhP0gWu92Y="; }; build-system = [ From 88da3f01d7100469b532b9bb002934851521240b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Oct 2024 18:11:12 +0200 Subject: [PATCH 23/31] python312Packages.uproot: 5.4.0 -> 5.4.1 Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.4.0...v5.4.1 Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.4.1 --- pkgs/development/python-modules/uproot/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e0e666d7ffa7..4242814caafe 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -26,16 +25,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-iCyGG4y7cnJqHEaqpzFc/LjWiLZw3HArU5hDtEyLgFo="; + hash = "sha256-MWqkEbw6hdNaXrRLWoxUcppT+X9a+DmEhho9GpG29XM="; }; build-system = [ From 712e82ace7aaf07e4c70ac6f34808f77ca0d5a29 Mon Sep 17 00:00:00 2001 From: redyf Date: Mon, 7 Oct 2024 18:01:00 -0300 Subject: [PATCH 24/31] typos: 1.25.0 -> 1.26.0 https://github.com/crate-ci/typos/releases/tag/v1.26.0 --- pkgs/by-name/ty/typos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index b9bcf6e0aad4..69daacd13866 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-0JInvnQRINItUyAqnDBT0uRlF7zKRA4S/IyqxqmHnvQ="; + hash = "sha256-yfQSGmLWXyOI5slB8AMcVTfQQKUXY3mBaeDPya4KtKo="; }; - cargoHash = "sha256-44JBZu08PDkyeBMscchNp6N9aF99b5lZWDhp4K42xsY="; + cargoHash = "sha256-WuYAE2msctMf+7C1h5pNGyjrEInnT6PxfZ94bZhzB5w="; meta = with lib; { description = "Source code spell checker"; From 76479c203937e8b589ca485989ef4e9a9a669d2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 23:43:30 +0000 Subject: [PATCH 25/31] just: 1.35.0 -> 1.36.0 --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 169829952641..b39954953c26 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.35.0"; + version = "1.36.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/5UzieioBzltFhzUoPOm6B4QKHFEquXCKo/2SPHkp2M="; + hash = "sha256-4p4otR0W/v0DoWwwcNq/UEDa1V8vlZMpdk33B/9A4Bo="; }; - cargoHash = "sha256-X3noVDRnnrR6xuOBfoH4JPdcPLOBHbGQb6opNvzK/TE="; + cargoHash = "sha256-y6wBFjBOeymbXUIeflQ35FxQRMPlDvB0Zeo2bQeZjJ0="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; From d2821b4043de507f03a157c4b3c1fdeaeeca5d0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Oct 2024 00:40:01 +0000 Subject: [PATCH 26/31] direnv: 2.34.0 -> 2.35.0 --- pkgs/by-name/di/direnv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix index c89d0f19650a..6ff13328ebbf 100644 --- a/pkgs/by-name/di/direnv/package.nix +++ b/pkgs/by-name/di/direnv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - hash = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw="; + hash = "sha256-C4FkBS+2MZGGlpWb7ng4Aa9IvqEuY716M5h2W3b8N1E="; }; - vendorHash = "sha256-FfKvLPv+jUT5s2qQ7QlzBMArI+acj7nhpE8FGMPpp5E="; + vendorHash = "sha256-O2NZgWn00uKLstYPIj9LwyF4kmitJ1FXltazv8RrmZg="; # we have no bash at the moment for windows BASH_PATH = From 67397417918306cff47b7e2e73330578e66cde0f Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Mon, 7 Oct 2024 20:50:15 +0800 Subject: [PATCH 27/31] octosuite: 3.1.0 -> 3.1.1 https://github.com/bellingcat/octosuite/compare/3.1.0...3.1.1 --- pkgs/tools/security/octosuite/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/octosuite/default.nix b/pkgs/tools/security/octosuite/default.nix index af4dd9c39740..46a4d44027f4 100644 --- a/pkgs/tools/security/octosuite/default.nix +++ b/pkgs/tools/security/octosuite/default.nix @@ -5,23 +5,28 @@ python3.pkgs.buildPythonApplication rec { pname = "octosuite"; - version = "3.1.0"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; src = fetchFromGitHub { owner = "bellingcat"; repo = "octosuite"; rev = "refs/tags/${version}"; - hash = "sha256-C73txVtyWTcIrJSApBy4uIKDcuUq0HZrGM6dqDVLkKY="; + hash = "sha256-bgTAGIJbxOa8q8lMsWa8dHwNZ/jXiWGQOp921sd2Vdo="; }; postPatch = '' # pyreadline3 is Windows-only - substituteInPlace setup.py \ - --replace ', "pyreadline3"' "" + substituteInPlace pyproject.toml \ + --replace-fail '"pyreadline3",' "" ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3.pkgs; [ psutil requests rich From c5bffdc928bb0b38f324e01592cf9f368f9ac56b Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 8 Oct 2024 12:37:18 +1100 Subject: [PATCH 28/31] nixos-anywhere: update owner to `nix-community` --- pkgs/by-name/ni/nixos-anywhere/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index bc449ce11245..ee41d4ff3e59 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; version = "1.4.0"; src = fetchFromGitHub { - owner = "numtide"; + owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE="; @@ -43,14 +43,14 @@ stdenv.mkDerivation (finalAttrs: { install -D -m 0755 src/get-facts.sh $out/bin/get-facts.sh # We prefer the system's openssh over our own, since it might come with features not present in ours: - # https://github.com/numtide/nixos-anywhere/issues/62 + # https://github.com/nix-community/nixos-anywhere/issues/62 wrapProgram $out/bin/nixos-anywhere \ --prefix PATH : ${lib.makeBinPath runtimeDeps} --suffix PATH : ${lib.makeBinPath [ openssh ]} ''; meta = with lib; { description = "Install nixos everywhere via ssh"; - homepage = "https://github.com/numtide/nixos-anywhere"; + homepage = "https://github.com/nix-community/nixos-anywhere"; mainProgram = "nixos-anywhere"; license = licenses.mit; platforms = platforms.all; From 10bad16926229e398cd00aa0d34e058f1ac5c3ff Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 8 Oct 2024 12:41:55 +1100 Subject: [PATCH 29/31] macos-builder: readd Nix CLI for debugging See https://github.com/NixOS/nixpkgs/pull/268574#discussion_r1788966194 --- nixos/modules/profiles/macos-builder.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index bf8414e1e108..62674a331d6f 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -105,13 +105,7 @@ in # The linux builder is a lightweight VM for remote building; not evaluation. nix.channel.enable = false; - # remote builder uses `nix-daemon` (ssh-ng:) or `nix-store --serve` (ssh:) - # --force: do not complain when missing - # TODO: install a store-only nix - # https://github.com/NixOS/rfcs/blob/master/rfcs/0134-nix-store-layer.md#detailed-design - environment.extraSetup = '' - rm --force $out/bin/{nix-instantiate,nix-build,nix-shell,nix-prefetch*,nix} - ''; + # Deployment is by image. # TODO system.switch.enable = false;? system.disableInstallerTools = true; From 6ee42c75e31452881deb1e0db4be4e3a17795747 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Oct 2024 10:31:29 +0200 Subject: [PATCH 30/31] vscode-extensions.github.copilot-chat: 0.21.2024090602 -> 0.22.2024100702 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c697b132534f..9c96f070d7e1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2054,8 +2054,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.21.2024090602"; # latest compatible with vscode ^1.93 - hash = "sha256-9wl/orFbf1OFwGnF1uLfyOOtO2v5k2H1aUMBtngXDfs="; + version = "0.22.2024100702"; # latest compatible with vscode ^1.94 + hash = "sha256-n/ecEnxz3LiTx9MuHO8AMIWBJPNNxQb6vghlG/hPMUY="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; From 24d3c4495a4049ebe8050bcfe6ee5b49d4e4280d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Oct 2024 10:34:14 +0200 Subject: [PATCH 31/31] vscode-extensions.github.copilot: 1.234.1133 -> 1.236.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9c96f070d7e1..0fe793f669cb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2037,8 +2037,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.234.1133"; # compatible with vscode ^1.93.1 - hash = "sha256-kRQIB4ozN8f+JPG2U6tA/u0r3/J05kYfMuksaJrumZM="; + version = "1.236.0"; # compatible with vscode ^1.94 + hash = "sha256-ozJwByuSjROWSxfrapcyxDkI7xgcjqf/IKtUfEC+MGk="; }; meta = {