From 21e2356bf48deb7004ab3ce1c79ae66d5d5d4b93 Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Tue, 1 Jul 2025 11:46:57 -0400 Subject: [PATCH 01/96] python312Packages.find-libpython: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/find-libpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix index 6a8ea5cd85a1..645029023d1f 100644 --- a/pkgs/development/python-modules/find-libpython/default.nix +++ b/pkgs/development/python-modules/find-libpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "find-libpython"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ktbarrett"; repo = "find_libpython"; tag = "v${version}"; - hash = "sha256-rYVGE9P5Xtm32kMoiqaZVMgnDbX3JBnI1uV80aNNOfw="; + hash = "sha256-6VRUkRACtZt8n2VT5MwxZ51/ep+Lt/jmEGyfI1zseJw="; }; nativeBuildInputs = [ From b4d71aa5a6964d3e306de2b026e31e73f28be712 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Sun, 29 Jun 2025 21:22:01 -0400 Subject: [PATCH 02/96] squashfsTools: update hash to latest changes on 4.6.1 tag While bootstrapping NixOS from source, I found that this package no longer builds without the cache. Update the hash to make nixpkgs more reproducible from source --- pkgs/by-name/sq/squashfsTools/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sq/squashfsTools/package.nix b/pkgs/by-name/sq/squashfsTools/package.nix index 8629b8f53943..ba1503968142 100644 --- a/pkgs/by-name/sq/squashfsTools/package.nix +++ b/pkgs/by-name/sq/squashfsTools/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "plougher"; repo = "squashfs-tools"; rev = version; - hash = "sha256-C/awQpp1Q/0adx3YVNTq6ruEAzcjL5G7SkOCgpvAA50="; + hash = "sha256-fJ+Ijg0cj92abGe80+1swVeZamarVpnPYM7+izcPJ+k="; }; patches = [ From a9d6d3b4ccb33628aa3d0cbd46729ff0fd0a2efc Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 8 Jul 2025 19:45:03 +0200 Subject: [PATCH 03/96] swayimg: 4.3 -> 4.5 --- pkgs/by-name/sw/swayimg/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 86a885de541d..28458e6e3720 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -23,6 +23,7 @@ libavif, libsixel, libraw, + libdrm, openexr, bash-completion, testers, @@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "4.3"; + version = "4.5"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-0MiIJVX1GKyvoGw1+DGVE1gJq/6sJiA79L16YF4USiQ="; + hash = "sha256-Dne9Oj8dd/Skrvr7aCKwwdjw5Ocz+1LUTNwdDGLvQYY="; }; strictDeps = true; @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libavif libsixel libraw + libdrm openexr ]; From f0888cd57ed457e48c903ff069ac3a76aa48843f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Jul 2025 17:41:34 +0000 Subject: [PATCH 04/96] python3Packages.pathvalidate: 3.2.3 -> 3.3.1 --- pkgs/development/python-modules/pathvalidate/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix index 0927f880fd46..d94596c9d7b8 100644 --- a/pkgs/development/python-modules/pathvalidate/default.nix +++ b/pkgs/development/python-modules/pathvalidate/default.nix @@ -2,20 +2,17 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools-scm, }: buildPythonPackage rec { pname = "pathvalidate"; - version = "3.2.3"; + version = "3.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-WbW5J44wOC1tITSXYjBD6+Y/EOKQVb5EGanATHIXOcs="; + hash = "sha256-sYwHISv+rWJDRbuOHWFBzc8Vo5c2mU6guUA1rSsboXc="; }; build-system = [ setuptools-scm ]; From 6778773934c4e42cfb3027bb72e36275ad2faaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jul 2025 15:21:08 -0700 Subject: [PATCH 05/96] paperless-ngx: unpin pathvalidate --- pkgs/by-name/pa/paperless-ngx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 84e93dc8cb72..3fe7d328a2d7 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -150,6 +150,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-allauth" + "pathvalidate" "redis" ]; From d276fd09d8959486cb3c2bd2b23d28f13c1c63b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Jul 2025 01:18:26 +0200 Subject: [PATCH 06/96] python313Packages.osxphotos: add missing tzdata dependency, mark broken due to in tree missing utitools --- pkgs/development/python-modules/osxphotos/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index eece6a6c86b3..05c4962bf059 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -25,6 +25,7 @@ tenacity, textx, toml, + tzdata, wrapt, wurlitzer, xdg-base-dirs, @@ -67,6 +68,7 @@ buildPythonPackage rec { tenacity textx toml + tzdata wrapt wurlitzer xdg-base-dirs @@ -108,6 +110,7 @@ buildPythonPackage rec { changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - broken = stdenv.hostPlatform.isDarwin; + # missing utitools dependency + broken = true && stdenv.hostPlatform.isDarwin; }; } From 5b516ba8f4fd8d8e7e1c499ba36a7b6de57a0420 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 30 Jul 2025 13:32:40 +0200 Subject: [PATCH 07/96] superfile: fix build --- pkgs/by-name/su/superfile/package.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index f6e0400a997f..3490920389d9 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -1,9 +1,11 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, nix-update-script, writableTmpDirAsHomeHook, + exiftool, }: let version = "1.3.2"; @@ -27,10 +29,19 @@ buildGoModule { "-w" ]; + nativeBuildInputs = [ exiftool ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; - # Upstream notes that this could be flakey, and it consistently fails for me. - checkFlags = [ "-skip=^TestReturnDirElement/Sort_by_Date$" ]; + # Upstream notes that this could be flaky, and it consistently fails for me. + checkFlags = [ + "-skip=^TestReturnDirElement/Sort_by_Date$" + ] + ++ lib.optionals stdenv.isDarwin [ + # Only failing on nix darwin. I suspect this is due to the way + # darwin handles file permissions. + "-skip=^TestCompressSelectedFiles" + ]; passthru.updateScript = nix-update-script { }; From a167470f76eb475c3a2326ffb91612fb152bc8b8 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 30 Jul 2025 13:35:29 +0200 Subject: [PATCH 08/96] superfile: 1.3.2 -> 1.3.3 --- pkgs/by-name/su/superfile/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 3490920389d9..24c64a9ac658 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -8,7 +8,7 @@ exiftool, }: let - version = "1.3.2"; + version = "1.3.3"; tag = "v${version}"; in buildGoModule { @@ -19,7 +19,7 @@ buildGoModule { owner = "yorukot"; repo = "superfile"; inherit tag; - hash = "sha256-IzdaOJcwi7+8d8QpTLPJwEhffEz4h0Rdv7APOMcnTHw="; + hash = "sha256-A1SWsBcPtGNbSReslp5L3Gg4hy3lDSccqGxFpLfVPrk="; }; vendorHash = "sha256-sqt0BzJW1nu6gYAhscrXlTAbwIoUY7JAOuzsenHpKEI="; From adf7675c8a6572b42d729ef6e9fb82cb808b7135 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 5 Aug 2025 10:35:14 -0400 Subject: [PATCH 09/96] kanji-stroke-order-font: 4.004 -> 4.005 --- .../ka/kanji-stroke-order-font/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix index 8c731353c2b0..842fc3ebb944 100644 --- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix +++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix @@ -6,17 +6,15 @@ let font = "kanji-stroke-order"; - version = "4.004"; in stdenv.mkDerivation { pname = "${font}-font"; - inherit version; + version = "4.005"; src = fetchzip { # https://github.com/NixOS/nixpkgs/issues/60157 - url = "https://drive.google.com/uc?export=download&id=1snpD-IQmT6fGGQjEePHdDzE2aiwuKrz4#${font}.zip"; - hash = "sha256-wQpurDS6APnpNMbMHofwW/UKeBF8FXeiCVx4wAOeRoE="; - stripRoot = false; + url = "https://drive.google.com/uc?export=download&id=1DKZEYA3PJ8ulLnjYDP5bxzJ3SWi59ghr#${font}.zip"; + hash = "sha256-6mw72eoRIGzG2IoVnPo1G0i2Z2Ot8Q/WjaJ8tNDQbMk="; }; installPhase = '' @@ -29,15 +27,15 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; - homepage = "https://www.nihilist.org.uk/"; + homepage = "https://www.kanji.uk/"; - license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ ptrhlm stephen-huan ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } From e69ab3147aa27824f66e8993d0fb6bd26eca1575 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 03:25:39 +0000 Subject: [PATCH 10/96] python3Packages.cartopy: 0.24.1 -> 0.25.0 --- pkgs/development/python-modules/cartopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index fc842ff4fd4c..8df52e398f07 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.24.1"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0="; + hash = "sha256-VfGjkOXz8HWyIcfZH7ECWK2XjbeGx5MOugbrRdKHU/4="; }; build-system = [ setuptools-scm ]; From e33181bc6273abdcc4ec67cb6161401823f49b57 Mon Sep 17 00:00:00 2001 From: Max Wipfli Date: Thu, 7 Aug 2025 10:11:58 +0200 Subject: [PATCH 11/96] pypy{27,310,311}: make CFFI builds find libsqlite3 --- .../interpreters/python/pypy/default.nix | 16 ++++++++- .../python/pypy/sqlite_paths.patch | 36 ++++++++++++++++--- .../python/pypy/sqlite_paths_2_7.patch | 22 ++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/interpreters/python/pypy/sqlite_paths_2_7.patch diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 93dadcfce437..7779b3fbba8f 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -140,8 +140,22 @@ stdenv.mkDerivation rec { tcl_libprefix = tcl.libPrefix; }) - (replaceVars ./sqlite_paths.patch { + # Python ctypes.util uses three different strategies to find a library (on Linux): + # 1. /sbin/ldconfig + # 2. cc -Wl,-t -l"$libname"; objdump -p + # 3. ld -t (where it attaches the values in $LD_LIBRARY_PATH as -L arguments) + # The first is disabled in Nix (and wouldn't work in the build sandbox or on NixOS anyway), and + # the third was only introduced in Python 3.6 (see bugs.python.org/issue9998), so is not + # available when buliding PyPy (which is built using Python/PyPy 2.7). + # The second requires SONAME to be set for the dynamic library for the second part not to fail. + # As libsqlite3 stopped shipping with SONAME after the switch to autosetup (>= 3.50 in Nixpkgs; + # see https://www.sqlite.org/src/forumpost/5a3b44f510df8ded). This makes the Python CFFI module + # unable to find the SQLite library. + # To circumvent these issues, we hardcode the path during build. + # For more information, see https://github.com/NixOS/nixpkgs/issues/419942. + (replaceVars (if isPy3k then ./sqlite_paths.patch else ./sqlite_paths_2_7.patch) { inherit (sqlite) out dev; + libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/interpreters/python/pypy/sqlite_paths.patch b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch index 42de7efb3ea3..73af8942acf2 100644 --- a/pkgs/development/interpreters/python/pypy/sqlite_paths.patch +++ b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch @@ -1,7 +1,35 @@ -diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py ---- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400 -+++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400 -@@ -301,6 +301,8 @@ +diff --git a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py +index 2a4e573..92ab786 100644 +--- a/lib_pypy/_sqlite3_build.py ++++ b/lib_pypy/_sqlite3_build.py +@@ -352,7 +352,7 @@ def _has_load_extension(): + typedef ... sqlite3; + int sqlite3_enable_load_extension(sqlite3 *db, int onoff); + """) +- libname = 'sqlite3' ++ libname = '@libsqlite@' + if sys.platform == 'win32': + import os + _libname = os.path.join(os.path.dirname(sys.executable), libname) +@@ -369,7 +369,7 @@ def _has_backup(): + typedef ... sqlite3_backup; + sqlite3_backup* sqlite3_backup_init(sqlite3 *, const char* , sqlite3 *, const char*); + """) +- libname = 'sqlite3' ++ libname = '@libsqlite@' + if sys.platform == 'win32': + import os + _libname = os.path.join(os.path.dirname(sys.executable), libname) +@@ -383,7 +383,7 @@ def _get_version(): + unverified_ffi.cdef(""" + int sqlite3_libversion_number(void); + """) +- libname = 'sqlite3' ++ libname = '@libsqlite@' + if sys.platform == 'win32': + import os + _libname = os.path.join(os.path.dirname(sys.executable), libname) +@@ -554,6 +554,8 @@ if sys.platform.startswith('freebsd'): else: extra_args = dict( libraries=libraries, diff --git a/pkgs/development/interpreters/python/pypy/sqlite_paths_2_7.patch b/pkgs/development/interpreters/python/pypy/sqlite_paths_2_7.patch new file mode 100644 index 000000000000..2226bac5e3d8 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/sqlite_paths_2_7.patch @@ -0,0 +1,22 @@ +diff --git a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py +index fb03aee..b3b5f39 100644 +--- a/lib_pypy/_sqlite3_build.py ++++ b/lib_pypy/_sqlite3_build.py +@@ -234,7 +234,7 @@ def _has_load_extension(): + typedef ... sqlite3; + int sqlite3_enable_load_extension(sqlite3 *db, int onoff); + """) +- libname = 'sqlite3' ++ libname = '@libsqlite@' + if sys.platform == 'win32': + import os + _libname = os.path.join(os.path.dirname(sys.executable), libname) +@@ -257,6 +257,8 @@ if sys.platform.startswith('freebsd'): + else: + extra_args = dict( + libraries=libraries, ++ include_dirs=['@dev@/include'], ++ library_dirs=['@out@/lib'] + ) + + _ffi.set_source("_sqlite3_cffi", "#include ", **extra_args) From e31f105463f586b97bfd716438ab4a48fa999b9d Mon Sep 17 00:00:00 2001 From: Jaakko Paju <36770267+JPaju@users.noreply.github.com> Date: Thu, 7 Aug 2025 14:53:39 +0300 Subject: [PATCH 12/96] simple-completion-language-server: 0-unstable-2025-01-31 -> 0-unstable-2025-07-29 --- .../si/simple-completion-language-server/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix index d3f8a795395c..763d3b4689e9 100644 --- a/pkgs/by-name/si/simple-completion-language-server/package.nix +++ b/pkgs/by-name/si/simple-completion-language-server/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage { pname = "simple-completion-language-server"; - version = "0-unstable-2025-01-31"; + version = "0-unstable-2025-07-29"; src = fetchFromGitHub { owner = "estin"; repo = "simple-completion-language-server"; - rev = "f6ab8e8374d046e5c6ff36cc9804dfc708b56c02"; - hash = "sha256-ot2h85cn2ID7GAOSJvIeKcC3uUYzS3TWQ4Ql6MzPG50="; + rev = "cc57b08ebc68805266beacb512a453e16f86bf17"; + hash = "sha256-TiVzgwsP1KZxTxW71eQyp1bkDnyTaMJdBYmkdvl1RX0="; }; - cargoHash = "sha256-L0Xa+B5hMkVKdOD0YAyGErbgAY68CHzzeP0CLew0BMs="; + cargoHash = "sha256-M+kjdT9X69kdZcBHC2ChR7WGgxtcUaU8woE2bqhu8IM="; buildFeatures = lib.optional withCitation [ "citation" ]; From 5fd354ed409d7022b0457d0e8e35eb68ac70a217 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Thu, 7 Aug 2025 21:19:16 -0400 Subject: [PATCH 13/96] cypress: 14.5.3 -> 14.5.4 --- pkgs/by-name/cy/cypress/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index c6a06f607b98..2e5b3f765932 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -19,19 +19,19 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - hash = "sha256-3zuKJ99/AJ2bG2MWs6J4YPznNeW+Cf5vkdM+wpfFZb0="; + hash = "sha256-oCTpVD7W1NHWD0nJBrgtmWZZozbcJeAfr7mn/JjqdcM="; }; aarch64-linux = { platform = "linux-arm64"; - hash = "sha256-73MtXLJLPUdrYKpdna4869f9JjDYhjlCkjKrv9qw5yk="; + hash = "sha256-MIUVhWkfKN5056jhHN31h4dBcTHJI0iX+I2RbkNI80I="; }; aarch64-darwin = { platform = "darwin-arm64"; - hash = "sha256-c8acBIdTVInl6C+BCegu91jTfc5Ug1hG7yXAvDnyuuQ="; + hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4="; }; x86_64-darwin = { platform = "darwin-x64"; - hash = "sha256-7pGw2AP2T4PtYhQdWzdP0oKzDCPiJqnkR70cj8382Y4="; + hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q="; }; }; inherit (stdenv.hostPlatform) system; @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "cypress"; - version = "14.5.3"; + version = "14.5.4"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; From 8e9c105b1b90b23625e6c81d93d28b398802ae69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 12:44:21 +0000 Subject: [PATCH 14/96] guile-websocket: 0.2.0 -> 0.2.1 --- pkgs/by-name/gu/guile-websocket/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/guile-websocket/package.nix b/pkgs/by-name/gu/guile-websocket/package.nix index 9c2a8ec5a38e..14a04a1845f6 100644 --- a/pkgs/by-name/gu/guile-websocket/package.nix +++ b/pkgs/by-name/gu/guile-websocket/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-websocket"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "https://files.dthompson.us/releases/guile-websocket/guile-websocket-${finalAttrs.version}.tar.gz"; - hash = "sha256-7jxj+I5WpqtGu99zrzl92eIZUThy69A4CsLzXnp4dpA="; + hash = "sha256-MurFAPXYjp1oq9gNCIH2e8xLmVsMUH0OdCpTVxhffVU="; }; strictDeps = true; From 93a64793df33b1b6a0d6a876ac1c1692b6f44133 Mon Sep 17 00:00:00 2001 From: Mats Date: Fri, 15 Aug 2025 18:03:07 +0200 Subject: [PATCH 15/96] curl-impersonate-chrome: 0.8.0 -> 1.2.0 --- .../cu/curl-impersonate/chrome/default.nix | 65 ++++++++++--------- .../cu/curl-impersonate/chrome/deps.nix | 22 +++++-- .../chrome/disable-building-docs.patch | 20 ------ .../cu/curl-impersonate/chrome/update.sh | 38 +++++++++-- 4 files changed, 80 insertions(+), 65 deletions(-) delete mode 100644 pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix index efdd2c69fba3..e5d699a68dd1 100644 --- a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix +++ b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix @@ -13,6 +13,7 @@ python3, ninja, perl, + pkg-config, autoconf, automake, libtool, @@ -24,7 +25,7 @@ }: stdenv.mkDerivation rec { pname = "curl-impersonate-chrome"; - version = "0.8.0"; + version = "1.2.0"; outputs = [ "out" @@ -32,14 +33,12 @@ stdenv.mkDerivation rec { ]; src = fetchFromGitHub { - owner = "yifeikong"; + owner = "lexiforest"; repo = "curl-impersonate"; rev = "v${version}"; - hash = "sha256-m6zeQUL+yBh3ixS+crbJWHX5TLa61A/3oqMz5UVELso="; + hash = "sha256-tAQdTRGAOD2rpLZvoLQ2YL0wrohXEcmChMZBvYjsMhE="; }; - patches = [ ./disable-building-docs.patch ]; - # Disable blanket -Werror to fix build on `gcc-13` related to minor # warnings on `boringssl`. env.NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -62,6 +61,7 @@ stdenv.mkDerivation rec { python3.pythonOnBuildForHost.pkgs.gyp ninja perl + pkg-config autoconf automake libtool @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { "--with-ca-path=${cacert}/etc/ssl/certs" ]; - buildFlags = [ "chrome-build" ]; - checkTarget = "chrome-checkbuild"; - installTargets = [ "chrome-install" ]; + buildFlags = [ "build" ]; + checkTarget = "checkbuild"; + installTargets = [ "install" ]; doCheck = true; @@ -117,6 +117,11 @@ stdenv.mkDerivation rec { popd ''; + postPatch = '' + substituteInPlace Makefile.in \ + --replace-fail "-lc++" "-lstdc++" + ''; + preConfigure = '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go @@ -129,7 +134,7 @@ stdenv.mkDerivation rec { postInstall = '' # Remove vestigial *-config script - rm $out/bin/curl-impersonate-chrome-config + rm $out/bin/curl-impersonate-config # Patch all shebangs of installed scripts patchShebangs $out/bin @@ -138,23 +143,13 @@ stdenv.mkDerivation rec { make -C curl-*/include install '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # Build and install completions for each curl binary + # Patch completion names + substituteInPlace curl-*/scripts/Makefile \ + --replace-fail "_curl" "_curl-impersonate" \ + --replace-fail "curl.fish" "curl-impersonate.fish" - # Patch in correct binary name and alias it to all scripts - perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell zsh >$TMPDIR/curl-impersonate-chrome.zsh - substituteInPlace $TMPDIR/curl-impersonate-chrome.zsh \ - --replace-fail \ - '#compdef curl' \ - "#compdef curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-chrome')" - - perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell fish >$TMPDIR/curl-impersonate-chrome.fish - substituteInPlace $TMPDIR/curl-impersonate-chrome.fish \ - --replace-fail \ - '--command curl' \ - "--command curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' --command %f')" - - # Install zsh and fish completions - installShellCompletion $TMPDIR/curl-impersonate-chrome.{zsh,fish} + # Install completions + make -C curl-*/scripts install ''; preFixup = @@ -163,10 +158,10 @@ stdenv.mkDerivation rec { in '' # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure - if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then + if grep -F nssckbi $out/lib/libcurl-impersonate${libext} &>/dev/null; then ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext} ${lib.optionalString stdenv.hostPlatform.isElf '' - patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext} + patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate${libext} ''} fi ''; @@ -178,12 +173,18 @@ stdenv.mkDerivation rec { updateScript = ./update.sh; + # Find the correct boringssl source file + boringssl-source = builtins.head ( + lib.mapAttrsToList (_: file: file) ( + lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps + ) + ); boringssl-go-modules = (buildGoModule { - inherit (passthru.deps."boringssl.zip") name; + inherit (passthru.boringssl-source) name; - src = passthru.deps."boringssl.zip"; - vendorHash = "sha256-oKlwh+Oup3lVgqgq42vY3iLg62VboF9N565yK2W0XxI="; + src = passthru.boringssl-source; + vendorHash = "sha256-HepiJhj7OsV7iQHlM2yi5BITyAM04QqWRX28Rj7sRKk="; nativeBuildInputs = [ unzip ]; @@ -193,13 +194,13 @@ stdenv.mkDerivation rec { meta = { description = "Special build of curl that can impersonate Chrome & Firefox"; - homepage = "https://github.com/yifeikong/curl-impersonate"; + homepage = "https://github.com/lexiforest/curl-impersonate"; license = with lib.licenses; [ curl mit ]; maintainers = with lib.maintainers; [ ggg ]; platforms = lib.platforms.unix; - mainProgram = "curl-impersonate-chrome"; + mainProgram = "curl-impersonate"; }; } diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/deps.nix b/pkgs/by-name/cu/curl-impersonate/chrome/deps.nix index 24669769556a..3cf8d218c719 100644 --- a/pkgs/by-name/cu/curl-impersonate/chrome/deps.nix +++ b/pkgs/by-name/cu/curl-impersonate/chrome/deps.nix @@ -2,9 +2,9 @@ { fetchurl }: { - "curl-8_7_1.tar.gz" = fetchurl { - url = "https://github.com/curl/curl/archive/curl-8_7_1.tar.gz"; - hash = "sha256-DkbIVvUXYCw0e7X+W3MXT47nmLyH8alyNclXYfdfzCg="; + "curl-8_15_0.tar.gz" = fetchurl { + url = "https://github.com/curl/curl/archive/curl-8_15_0.tar.gz"; + hash = "sha256-KTfK3eAHqjpSoXwhrJFT6gVHAPN5JtHZZgK/B+iIyEc="; }; "brotli-1.1.0.tar.gz" = fetchurl { @@ -12,13 +12,23 @@ hash = "sha256-5yCmyilCi4A/StFlNxdx9TmPq6OX7fZ3iDehhZnqE/8="; }; - "boringssl.zip" = fetchurl { - url = "https://github.com/google/boringssl/archive/d24a38200fef19150eef00cad35b138936c08767.zip"; - hash = "sha256-tzAAwL70VAyUEOZZ86ql+RgXsw4DZhkvW5l0d1eVVHU="; + "boringssl-673e61fc215b178a90c0e67858bbf162c8158993.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/673e61fc215b178a90c0e67858bbf162c8158993.zip"; + hash = "sha256-7bfWHo3j95EHAXJyPuQfvFUPtVCAzbGHu0oF5g4FmiI="; }; "nghttp2-1.63.0.tar.bz2" = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2"; hash = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU="; }; + + "ngtcp2-1.11.0.tar.bz2" = fetchurl { + url = "https://github.com/ngtcp2/ngtcp2/releases/download/v1.11.0/ngtcp2-1.11.0.tar.bz2"; + hash = "sha256-122s6G/Docj84codTLsf3pu6k81fKGEdVbypukPjF7w="; + }; + + "nghttp3-1.9.0.tar.bz2" = fetchurl { + url = "https://github.com/ngtcp2/nghttp3/releases/download/v1.9.0/nghttp3-1.9.0.tar.bz2"; + hash = "sha256-TTCmjxfnKhOStghdr6qfxzLaHX0m7sVUuyFnCDMvzxo="; + }; } diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch b/pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch deleted file mode 100644 index ba7a8990ec1a..000000000000 --- a/pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 5366ca35b3d20ef962ccf54399cc44f523d803be Mon Sep 17 00:00:00 2001 -From: GGG -Date: Mon, 5 Aug 2024 04:19:29 -0300 -Subject: [PATCH] Disable building docs ---- - Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.in b/Makefile.in -index 41d7324..b1f5ec6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -249,6 +249,7 @@ $(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.gz $(CURL_VERSION)/. - # (for cross compilation), then pass it on to curl. - { \ - config_flags="--prefix=@prefix@"; \ -+ config_flags="$$config_flags --disable-manual"; \ - config_flags="$$config_flags --with-nghttp2=$(nghttp2_install_dir)"; \ - config_flags="$$config_flags --with-brotli=$(brotli_install_dir)"; \ - config_flags="$$config_flags --with-openssl=$(boringssl_install_dir)"; \ diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh index afda6e3fbf53..31f8349eb702 100755 --- a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh +++ b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh @@ -33,11 +33,25 @@ findpath() { } getvar() { - echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace + echo "$2" | grep -F "$1 " | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace +} + +evalvar() { + local out="$(getvar "$1" "$2")" + + # Replace $(VAR) within variables with other variables + while [[ "$out" =~ (\$\(([A-Za-z_][A-Za-z0-9_]*)\)) ]]; do + local match="${BASH_REMATCH[1]}" + local var="${BASH_REMATCH[2]}" + local value="$(getvar "$var" "$2")" + out="${out//$match/$value}" + done + + echo $out } attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate-chrome}" -version="$(curl -sSL "https://api.github.com/repos/yifeikong/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" +version="$(curl -sSL "https://api.github.com/repos/lexiforest/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" pkgpath="$(findpath "$attr")" @@ -48,7 +62,7 @@ if [ "$updated" -eq 0 ]; then exit 0 fi -vars="$(curl -sSL "https://github.com/yifeikong/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" +vars="$(curl -sSL "https://github.com/lexiforest/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" # TODO: Fix hash for curl. cat >"$(dirname "$pkgpath")"/deps.nix <"$(dirname "$pkgpath")"/deps.nix < Date: Fri, 15 Aug 2025 18:09:26 +0200 Subject: [PATCH 16/96] mediamtx: 1.13.1 -> 1.14.0 --- pkgs/by-name/me/mediamtx/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index a343c46b1aef..6da08caba363 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,37 +8,39 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.6/dist/hls.min.js"; - hash = "sha256-/h3dYaJYJLB1VfHXjr2sqjCqZ+c+ngKhEYgmZAgsRlE="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.9/dist/hls.min.js"; + hash = "sha256-GObcOPuwxxMg0WOtl5BahSg9A3ds1IcCP+DPGZ8c27I="; }; in buildGoModule (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-tTyrwGePtRj+2TRO1uVp2qxwyLF7ZyXzNLuQqDVlMf8="; + hash = "sha256-I1oKzovSv6hf2/lr2E5pRSqHV/pVoskNwn+gHRz8yv8="; }; - vendorHash = "sha256-6QJVnARlN3ySLE59LTtOaUfKe88zKJPjnjhSNH6OnwY="; + vendorHash = "sha256-5wSdbg7EAdvCUfIKxuX1aGihzHcwFM6Fiu/3eU1dMEY="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js echo "v${finalAttrs.version}" > internal/core/VERSION # disable binary-only rpi camera support - substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \ + substituteInPlace internal/staticsources/rpicamera/camera_other.go \ --replace-fail '!linux || (!arm && !arm64)' 'linux || !linux' - substituteInPlace internal/staticsources/rpicamera/{camera,params_serialize,pipe}.go \ + substituteInPlace internal/staticsources/rpicamera/{params_serialize,pipe}.go \ --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux' - substituteInPlace internal/staticsources/rpicamera/camera_32.go \ + substituteInPlace internal/staticsources/rpicamera/camera_arm32_.go \ --replace-fail 'linux && arm' 'linux && !linux' - substituteInPlace internal/staticsources/rpicamera/camera_64.go \ + substituteInPlace internal/staticsources/rpicamera/camera_arm64_.go \ --replace-fail 'linux && arm64' 'linux && !linux' + substituteInPlace internal/staticsources/rpicamera/camera_arm_.go \ + --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux' ''; subPackages = [ "." ]; From a46c3bdaafc1e19dad5366b07c6194e996894827 Mon Sep 17 00:00:00 2001 From: Mats Date: Fri, 15 Aug 2025 18:04:39 +0200 Subject: [PATCH 17/96] python3Packages.curl-cffi: link to correct curl-impersonate lib --- pkgs/development/python-modules/curl-cffi/use-system-libs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch index 1d044873e461..3dcec2e14c7c 100644 --- a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch +++ b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch @@ -17,7 +17,7 @@ index b705a0d..9bfcaab 100644 - libraries=get_curl_libraries(), - extra_objects=get_curl_archives(), - library_dirs=[arch["libdir"]], -+ libraries=["curl-impersonate-chrome"], ++ libraries=["curl-impersonate"], source_extension=".c", include_dirs=[ str(root_dir / "include"), From e77bbd9e80e557e5334b55246dc8f6d960144ec5 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 16 Aug 2025 10:29:38 +0200 Subject: [PATCH 18/96] nixos/nzbget: fix github repository link It's long been living at nzbgetcom/nzbget, not nzbget/nzbget. Signed-off-by: Christoph Heiss --- nixos/modules/services/misc/nzbget.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index 3891486311f1..6ca1d88e51de 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -72,7 +72,7 @@ in default = { }; description = '' NZBGet configuration, passed via command line using switch -o. Refer to - + for details on supported values. ''; example = { From 7034ff73ed254862c5b7cb509ca2fa8602013284 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 14 Aug 2025 22:06:30 +0200 Subject: [PATCH 19/96] signal-desktop: 7.64.0 -> 7.66.0 Signed-off-by: Marcin Serwin --- pkgs/by-name/si/signal-desktop/package.nix | 10 +- pkgs/by-name/si/signal-desktop/ringrtc.nix | 6 +- .../si/signal-desktop/signal-sqlcipher.nix | 4 +- .../signal-desktop/webrtc-fix-gcc-build.patch | 39 ++++++ .../si/signal-desktop/webrtc-sources.json | 130 ++++++++++-------- pkgs/by-name/si/signal-desktop/webrtc.nix | 7 +- 6 files changed, 124 insertions(+), 72 deletions(-) create mode 100644 pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 8f1b51c813c6..a78be6416e64 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.64.0"; + version = "7.66.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-jBSL9g7+lgyG4luKP84MaWfS+dniBzp3lRimgKtWrI8="; + hash = "sha256-8IhY7m9beyfbs8Pnm8PeSW7vL+aBIgcN8HVmstgKFe8="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -122,15 +122,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-xAmIfTv270g6FoNPCauPBT2H3XTgK6MOjIIwRk0U9PY=" + "sha256-XO+lbCndOupUncod2b6w7BdesGX84GgQQ3SYlX1yp0Q=" else - "sha256-Wmqu+tkoT13PEQ6QA2KczLtgbxgCWwZ6pNuE1klWLCk="; + "sha256-+pq4jGJzy0bg9rkN6jKyuiGiad2BP28mIy+/SgbyNWc="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1753917014; + SOURCE_DATE_EPOCH = 1755119611; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 8d79bfd96e28..f7a6bcb33347 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.54.1"; + version = "2.56.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-T8oI04DOnTHFs7xlJ1wJbK64zqgJ2dM4Plz+C26DWEg="; + hash = "sha256-KEwN6x24hXmK9lqU2M9/5qbBk7zDxeTRbB0vJ1K9d3U="; }; - cargoHash = "sha256-KTPZ/1rDqxYxgUfgVTnNg7nLNxwCWGXDf+uJAhmpB3g="; + cargoHash = "sha256-ghuF1wxAf5psZoWNYOCAubGo0KDwJlqcBXgUbPMD9ac="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 5c4e316c4300..99a8b79b90a1 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "node-sqlcipher"; - version = "2.1.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "signalapp"; repo = "node-sqlcipher"; tag = "v${finalAttrs.version}"; - hash = "sha256-JYdc3H8PhDLkJH5ApfReq0e7HgKoJaK01JGuzoqftyc="; + hash = "sha256-vrY2cu8yfwMX7O6h2GgLhdvQvYOgl916E2z1Pf77ZI0="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch new file mode 100644 index 000000000000..701edc9c5d22 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch @@ -0,0 +1,39 @@ +diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h +index f774b3d..c7242d9 100644 +--- a/p2p/base/port_interface.h ++++ b/p2p/base/port_interface.h +@@ -55,7 +55,7 @@ class PortInterface { + virtual ~PortInterface(); + + virtual IceCandidateType Type() const = 0; +- virtual const Network* Network() const = 0; ++ virtual const ::webrtc::Network* Network() const = 0; + + // Methods to set/get ICE role and tiebreaker values. + virtual void SetIceRole(IceRole role) = 0; +diff --git a/pc/codec_vendor.h b/pc/codec_vendor.h +index 1472225..251afbd 100644 +--- a/pc/codec_vendor.h ++++ b/pc/codec_vendor.h +@@ -119,7 +119,7 @@ class CodecVendor { + class CodecLookupHelper { + public: + virtual ~CodecLookupHelper() = default; +- virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0; ++ virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0; + // Look up the codec vendor to use, depending on context. + // This call may get additional arguments in the future, to aid + // in selection of the correct context. +diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h +index ab914f3..3ff6f6f 100644 +--- a/pc/jsep_transport.h ++++ b/pc/jsep_transport.h +@@ -214,7 +214,7 @@ class JsepTransport { + return rtp_dtls_transport_; + } + +- scoped_refptr SctpTransport() const { return sctp_transport_; } ++ scoped_refptr<::webrtc::SctpTransport> SctpTransport() const { return sctp_transport_; } + + // TODO(bugs.webrtc.org/9719): Delete method, update callers to use + // SctpTransport() instead. diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 56eaf7261468..05a4da47fa00 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,82 +1,82 @@ { "src": { "args": { - "hash": "sha256-ErUR9Xg69X5PEPoDw65BU2Tcpo7+JC2Pc+pYIxEGzNA=", + "hash": "sha256-3hgBFFu2m+s9qzqNgbJSAmHH4ouHaQCL9nz2sFMy7hc=", "owner": "signalapp", "repo": "webrtc", - "tag": "7103e" + "tag": "7204a" }, "fetcher": "fetchFromGitHub" }, "src/base": { "args": { - "hash": "sha256-Jm+OJlnJJUrTtsAMWEB+DM7eLZyIMJa5jQysVsyHwfk=", - "rev": "1d80e43078965dbe6ded5521fbffb128f59124a6", + "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=", + "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390", "url": "https://chromium.googlesource.com/chromium/src/base" }, "fetcher": "fetchFromGitiles" }, "src/build": { "args": { - "hash": "sha256-4iM0mh+1AL1maBjle+GOmfr4AMadQpcNDQg0X5tVD5U=", - "rev": "52d62707eaec02b88722a99e335315d166ceda77", + "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=", + "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb", "url": "https://chromium.googlesource.com/chromium/src/build" }, "fetcher": "fetchFromGitiles" }, "src/buildtools": { "args": { - "hash": "sha256-Nbaoin+aMtJJaC4mDTYFB7q3RbmzSuEUDDZN3tAXoSI=", - "rev": "6f359296daa889aa726f3d05046b9f37be241169", + "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=", + "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "fetcher": "fetchFromGitiles" }, "src/ringrtc/opus/src": { "args": { - "hash": "sha256-Vztq+Z388Welj2cfChumimfEXtVn4zCcrGBedZFoTmM=", + "hash": "sha256-63JClPZ+Me6thFp6iPf++jV2K1hF0KR1n6Bly+ocNq8=", "owner": "xiph", "repo": "opus", - "rev": "0e30966b198ad28943799eaf5b3b08100b6f70c3" + "rev": "55513e81d8f606bd75d0ff773d2144e5f2a732f5" }, "fetcher": "fetchFromGitHub" }, "src/testing": { "args": { - "hash": "sha256-CZOMatu2JSB3fztVz8DvW87KtglBqq0hUYm3IM3pZwY=", - "rev": "f46b86c7f1fc7a7f52e61c11dbd0573a48cf7a6a", + "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=", + "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647", "url": "https://chromium.googlesource.com/chromium/src/testing" }, "fetcher": "fetchFromGitiles" }, "src/third_party": { "args": { - "hash": "sha256-BbFD3QSoHMHsy4d+Quz01Nta7nArhe8or9zsARmlc/U=", - "rev": "10064104c1f11074312018c3a9c4b66f25584bdd", + "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=", + "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2", "url": "https://chromium.googlesource.com/chromium/src/third_party" }, "fetcher": "fetchFromGitiles" }, "src/third_party/boringssl/src": { "args": { - "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=", - "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", + "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=", + "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403", "url": "https://boringssl.googlesource.com/boringssl.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/breakpad/breakpad": { "args": { - "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=", - "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", + "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=", + "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/catapult": { "args": { - "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=", - "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", + "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=", + "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d", "url": "https://chromium.googlesource.com/catapult.git" }, "fetcher": "fetchFromGitiles" @@ -105,6 +105,14 @@ }, "fetcher": "fetchFromGitiles" }, + "src/third_party/compiler-rt/src": { + "args": { + "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=", + "rev": "57196dd146582915c955f6d388e31aea93220c51", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/crc32c/src": { "args": { "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", @@ -123,16 +131,16 @@ }, "src/third_party/depot_tools": { "args": { - "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=", - "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=", + "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/ffmpeg": { "args": { - "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=", - "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", + "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=", + "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "fetcher": "fetchFromGitiles" @@ -147,24 +155,24 @@ }, "src/third_party/fontconfig/src": { "args": { - "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", - "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=", + "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba", "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/freetype/src": { "args": { - "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=", - "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", + "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=", + "rev": "e07e56c7f106b600262ab653d696b7b57f320127", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fuzztest/src": { "args": { - "hash": "sha256-1pzRK+iorGhnLWWpuWdRjBCh0whKoDgEUhTTs2NlPZU=", - "rev": "3c7bc855a4938c5d0d1d07303aa0697c88d33e6c", + "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=", + "rev": "f03aafb7516050ea73f617bf969f03eac641aefc", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "fetcher": "fetchFromGitiles" @@ -179,16 +187,16 @@ }, "src/third_party/googletest/src": { "args": { - "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=", - "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", + "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=", + "rev": "09ffd0015395354774c059a17d9f5bee36177ff9", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/grpc/src": { "args": { - "hash": "sha256-0ljptpIh4wirWZ+utJyiy4g4dhPRB8pIvjcvoqeycu0=", - "rev": "d8ce421830bd993885038934abdc74e1e56e3213", + "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=", + "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28", "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, "fetcher": "fetchFromGitiles" @@ -203,16 +211,16 @@ }, "src/third_party/harfbuzz-ng/src": { "args": { - "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=", - "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", + "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=", + "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/icu": { "args": { - "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=", - "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b", + "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=", + "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "fetcher": "fetchFromGitiles" @@ -243,24 +251,24 @@ }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=", - "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", + "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=", + "rev": "2cca4aba034f99842c2e6cdc173f83801d289764", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++/src": { "args": { - "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=", - "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", + "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=", + "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++abi/src": { "args": { - "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=", - "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", + "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=", + "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "fetcher": "fetchFromGitiles" @@ -283,32 +291,32 @@ }, "src/third_party/libunwind/src": { "args": { - "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=", - "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", + "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=", + "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=", - "rev": "027bbee30a0103b99d86327b48d29567fed11688", + "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=", + "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libyuv": { "args": { - "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=", - "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", + "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=", + "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/llvm-libc/src": { "args": { - "hash": "sha256-sV1wqk8BC7cl7HPgAd+kmxOWpBuWT6kTX91IXIoSYts=", - "rev": "188329a7f2118a957efbb3e6219c255e7dba997c", + "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=", + "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" }, "fetcher": "fetchFromGitiles" @@ -323,8 +331,8 @@ }, "src/third_party/nasm": { "args": { - "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=", - "rev": "767a169c8811b090df222a458b25dfa137fc637e", + "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=", + "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca", "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" }, "fetcher": "fetchFromGitiles" @@ -339,16 +347,16 @@ }, "src/third_party/perfetto": { "args": { - "hash": "sha256-peD4Vnar1Uf8S/JYPpHH8dJZCDIpzpE4EYDfTqVyG8U=", - "rev": "40b529923598b739b2892a536a7692eedbed5685", - "url": "https://android.googlesource.com/platform/external/perfetto.git" + "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=", + "rev": "dd35b295cd359ba094404218414955f961a0d6ae", + "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/protobuf-javascript/src": { "args": { - "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=", - "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8", + "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=", + "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53", "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" }, "fetcher": "fetchFromGitiles" @@ -363,8 +371,8 @@ }, "src/tools": { "args": { - "hash": "sha256-Vmhd5kfPaOyPJaDSg67V64FSgi4maEVjXE4PMnxnIFw=", - "rev": "3460fbcdee33353d37800dad5caa6bba327ad8c8", + "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=", + "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be", "url": "https://chromium.googlesource.com/chromium/src/tools" }, "fetcher": "fetchFromGitiles" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 26c387438f6b..51cdca0cfde5 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: { pulseaudio ]; + patches = [ + ./webrtc-fix-gcc-build.patch + ]; + postPatch = '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' @@ -59,8 +63,9 @@ stdenv.mkDerivation (finalAttrs: { "use_sysroot=false" "is_clang=false" "treat_warnings_as_errors=false" + "use_llvm_libatomic=false" - # https://github.com/signalapp/ringrtc/blob/main/bin/build-electron + # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop "rtc_build_examples=false" "rtc_build_tools=false" "rtc_use_x11=false" From b5e429932d250b8cc5f11cc8c0322977bdd4de8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 17:24:31 +0000 Subject: [PATCH 20/96] getmail6: 6.19.08 -> 6.19.09 --- pkgs/by-name/ge/getmail6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index e785cfa6ed46..66352e4f89aa 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.08"; + version = "6.19.09"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-GUO6zozdh5u3dpFVQUYK/2PlurzXSEswgtdcpiPmhV8="; + hash = "sha256-GQK8zDA7uXYw449/gWzLLUguE/uEqsyFJ3qt5RoqEus="; }; build-system = with python3.pkgs; [ From a95c3ed5933b60f6c187d65a1c7108903574ebb7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 16 Aug 2025 20:33:41 +0200 Subject: [PATCH 21/96] factorio-experimental: 2.0.60 -> 2.0.64 --- pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index cb59bb061465..d4a185011831 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,14 +3,14 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.60.tar.xz" + "factorio_linux_2.0.64.tar.xz" ], - "name": "factorio_alpha_x64-2.0.60.tar.xz", + "name": "factorio_alpha_x64-2.0.64.tar.xz", "needsAuth": true, - "sha256": "d022ee9a9b7376077687232c16a3c809e847dab00e02915ec146fb4b548dd24f", + "sha256": "2c9ac3fa4a0c8433960edb8ba74b832e7e883c41ea73dda69b1608d4e967e826", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.60/alpha/linux64", - "version": "2.0.60" + "url": "https://factorio.com/get-download/2.0.64/alpha/linux64", + "version": "2.0.64" }, "stable": { "candidateHashFilenames": [ @@ -51,14 +51,14 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.60.tar.xz" + "factorio-space-age_linux_2.0.64.tar.xz" ], - "name": "factorio_expansion_x64-2.0.60.tar.xz", + "name": "factorio_expansion_x64-2.0.64.tar.xz", "needsAuth": true, - "sha256": "56a933745f2cf3144bc984031229cb7b8a16eace523fa9288e8eca915e4d8186", + "sha256": "e86f813290d636da9a0715f6700d7b3a60998714146417442688599551529683", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.60/expansion/linux64", - "version": "2.0.60" + "url": "https://factorio.com/get-download/2.0.64/expansion/linux64", + "version": "2.0.64" }, "stable": { "candidateHashFilenames": [ @@ -75,15 +75,15 @@ "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.60.tar.xz", - "factorio_headless_x64_2.0.60.tar.xz" + "factorio-headless_linux_2.0.64.tar.xz", + "factorio_headless_x64_2.0.64.tar.xz" ], - "name": "factorio_headless_x64-2.0.60.tar.xz", + "name": "factorio_headless_x64-2.0.64.tar.xz", "needsAuth": false, - "sha256": "69b5be1a867fd99524f9914dfee900a1ac386cf4e74c4a63768c05dc4d2b2b0b", + "sha256": "729480a81fc3b3bd105bd0c92e108ee1caaac7840cc168cb32b0f9db8759a28a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.60/headless/linux64", - "version": "2.0.60" + "url": "https://factorio.com/get-download/2.0.64/headless/linux64", + "version": "2.0.64" }, "stable": { "candidateHashFilenames": [ From 56a109b9a598e3e4955b4e969d3967affd25710b Mon Sep 17 00:00:00 2001 From: importantblimp <20533356+importantblimp@users.noreply.github.com> Date: Sun, 17 Aug 2025 08:55:21 +1200 Subject: [PATCH 22/96] nixos/pocket-id: fix local Postgres DB Unix socket connection (#434321) --- nixos/modules/services/security/pocket-id.nix | 1 + nixos/tests/pocket-id.nix | 53 ++++++++++++++++--- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix index c74707629b9e..728756c0d77e 100644 --- a/nixos/modules/services/security/pocket-id.nix +++ b/nixos/modules/services/security/pocket-id.nix @@ -196,6 +196,7 @@ in ReadWritePaths = [ cfg.dataDir ]; RemoveIPC = true; RestrictAddressFamilies = [ + "AF_UNIX" "AF_INET" "AF_INET6" ]; diff --git a/nixos/tests/pocket-id.nix b/nixos/tests/pocket-id.nix index c00ed1f497a6..7f2a4a8255f8 100644 --- a/nixos/tests/pocket-id.nix +++ b/nixos/tests/pocket-id.nix @@ -8,7 +8,7 @@ ]; nodes = { - machine = + machineSqlite = { ... }: { services.pocket-id = { @@ -18,23 +18,62 @@ }; }; }; + + machinePostgres = + { config, ... }: + let + username = config.services.pocket-id.user; + in + { + services.pocket-id = { + enable = true; + settings = { + PORT = 10001; + DB_PROVIDER = "postgres"; + DB_CONNECTION_STRING = "host=/run/postgresql user=${username} database=${username}"; + }; + }; + + services.postgresql = { + enable = true; + ensureUsers = [ + { + name = "${username}"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ "${username}" ]; + }; + }; }; testScript = { nodes, ... }: let - inherit (nodes.machine.services.pocket-id) settings; + settingsSqlite = nodes.machineSqlite.services.pocket-id.settings; + settingsPostgres = nodes.machinePostgres.services.pocket-id.settings; inherit (builtins) toString; in '' - machine.wait_for_unit("pocket-id.service") - machine.wait_for_open_port(${toString settings.PORT}) + machineSqlite.wait_for_unit("pocket-id.service") + machineSqlite.wait_for_open_port(${toString settingsSqlite.PORT}) - backend_status = machine.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settings.PORT}/api/users/me") + backend_status = machineSqlite.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settingsSqlite.PORT}/api/users/me") assert backend_status == "401" - machine.succeed("grep 'You are not signed in' /tmp/backend-output") + machineSqlite.succeed("grep 'You are not signed in' /tmp/backend-output") - frontend_status = machine.succeed("curl -L -o /tmp/frontend-output -w '%{http_code}' http://localhost:${toString settings.PORT}") + frontend_status = machineSqlite.succeed("curl -L -o /tmp/frontend-output -w '%{http_code}' http://localhost:${toString settingsSqlite.PORT}") + assert frontend_status == "200" + + + machinePostgres.wait_for_unit("pocket-id.service") + machinePostgres.wait_for_open_port(${toString settingsPostgres.PORT}) + + backend_status = machinePostgres.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settingsPostgres.PORT}/api/users/me") + assert backend_status == "401" + machinePostgres.succeed("grep 'You are not signed in' /tmp/backend-output") + + frontend_status = machinePostgres.succeed("curl -L -o /tmp/frontend-output -w '%{http_code}' http://localhost:${toString settingsPostgres.PORT}") assert frontend_status == "200" ''; } From e2d3c91bb4ec997f6e13f043a9b9867b6531d107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 06:05:55 +0000 Subject: [PATCH 23/96] beeper: 4.1.64 -> 4.1.111 --- pkgs/by-name/be/beeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index a6c59f085224..cb6cd7a143f6 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.1.64"; + version = "4.1.111"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-8Gd7qSp0/anYLrLCUfq15OacVsKwFVWQxaVvN9xsXkY="; + hash = "sha256-0cr6syveIHIIy8+FyE23U8iidMYJXkN8CqhhbH0oNt0="; }; appimageContents = appimageTools.extract { inherit pname version src; From c617a46322f2e441bd8bcc28028724fb70420c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 12:08:02 +0000 Subject: [PATCH 24/96] jd-diff-patch: 2.2.5 -> 2.3.0 --- pkgs/by-name/jd/jd-diff-patch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix index 6a04560238a0..efba04a99fef 100644 --- a/pkgs/by-name/jd/jd-diff-patch/package.nix +++ b/pkgs/by-name/jd/jd-diff-patch/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "jd-diff-patch"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${finalAttrs.version}"; - hash = "sha256-E11Hd2uvF5LrgrWpR8OzXqEjoUrBkBHDDuuCujznfbE="; + hash = "sha256-eaNP7cSJ0IxfHLmPaNAw5MQzD41AiOIjVbAjQkU8uec="; }; sourceRoot = "${finalAttrs.src.name}/v2"; @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { "pack" ]; - vendorHash = "sha256-Ol+9YwtJ5P6au1aW2ss9mrU9l5G3iBviX5q1qC0K+vc="; + vendorHash = "sha256-RerzCZL2soPNtl1hHWjdeNQNQ4VMlGYz3HNn4rTJSmU="; meta = { description = "Commandline utility and Go library for diffing and patching JSON values"; From f6b62e03ed4e485506b194fd1ca4d572072c90ab Mon Sep 17 00:00:00 2001 From: Max Wipfli Date: Sun, 17 Aug 2025 15:01:00 +0200 Subject: [PATCH 25/96] fbpanel: correctly apply -Wno-error --- pkgs/by-name/fb/fbpanel/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fbpanel/package.nix b/pkgs/by-name/fb/fbpanel/package.nix index bf62ae6d41da..2572ff5a00c1 100644 --- a/pkgs/by-name/fb/fbpanel/package.nix +++ b/pkgs/by-name/fb/fbpanel/package.nix @@ -49,8 +49,10 @@ stdenv.mkDerivation { ''; makeFlags = [ "V=1" ]; - NIX_CFLAGS_COMPILE = [ + + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" + "-Wno-error=incompatible-pointer-types" # not implied by -Wno-error "-I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ]; From 20d8a653d0a826994e59c9bddede2b7d58598b1c Mon Sep 17 00:00:00 2001 From: Max Wipfli Date: Sun, 17 Aug 2025 15:06:28 +0200 Subject: [PATCH 26/96] python3Packages.pyflakes: disable failing test for PyPy3 test_misencodedFileUTF16 fails with PyPy3 as it outputs a different error message than CPython. --- pkgs/development/python-modules/pyflakes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 3620594cfb76..821ce3d55f77 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { disabledTests = lib.optionals isPyPy [ # https://github.com/PyCQA/pyflakes/issues/779 "test_eofSyntaxError" + "test_misencodedFileUTF16" "test_misencodedFileUTF8" "test_multilineSyntaxError" ]; From 52b0a7f2b4e4f8e214517f1ebd51d4b06f775169 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 17 Aug 2025 22:07:10 +0300 Subject: [PATCH 27/96] flutter.buildFlutterApplication: Fix `Exec format error` This does NOT fix the cross compilation of flutter applications, it only fixes one issue which should allow for better error messages --- .../flutter/build-support/build-flutter-application.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix index 3b8c1941dfc6..1cbec9d5ebec 100644 --- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix +++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix @@ -9,8 +9,7 @@ glib, flutter, pkg-config, - jq, - yq, + buildPackages, }: # absolutely no mac support for now @@ -112,9 +111,9 @@ let extraPackageConfigSetup = '' # https://github.com/flutter/flutter/blob/3.13.8/packages/flutter_tools/lib/src/dart/pub.dart#L755 - if [ "$('${yq}/bin/yq' '.flutter.generate // false' pubspec.yaml)" = "true" ]; then + if [ "$('${lib.getExe buildPackages.yq}' '.flutter.generate // false' pubspec.yaml)" = "true" ]; then export TEMP_PACKAGES=$(mktemp) - '${jq}/bin/jq' '.packages |= . + [{ + '${lib.getExe buildPackages.jq}' '.packages |= . + [{ name: "flutter_gen", rootUri: "flutter_gen", languageVersion: "2.12", From e69df062f63b314cafd25b9a135cb37f9f740871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 19:29:58 +0000 Subject: [PATCH 28/96] rzls: 10.0.0-preview.25403.1 -> 10.0.0-preview.25411.5 --- pkgs/by-name/rz/rzls/deps.json | 78 ++++++++++++++++---------------- pkgs/by-name/rz/rzls/package.nix | 6 +-- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/rz/rzls/deps.json b/pkgs/by-name/rz/rzls/deps.json index 45aa56bbc3e0..372caef41733 100644 --- a/pkgs/by-name/rz/rzls/deps.json +++ b/pkgs/by-name/rz/rzls/deps.json @@ -67,9 +67,9 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "5.0.0-2.25375.9", - "hash": "sha256-pW+vy3BBsHa2VW1cFNxzeQTZfL7FqA/V9kw/Q8Kh5rQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25375.9/microsoft.codeanalysis.analyzers.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-BTfux6b560oPleV/AkF262NGcA6ODfNpuUjQrTENCP0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25380.11/microsoft.codeanalysis.analyzers.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", @@ -79,27 +79,27 @@ }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "5.0.0-2.25375.9", - "hash": "sha256-BxkLaHnP1Bgr+TVbF6sOa6B5iMd65+/TJAk6sNDteg8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25375.9/microsoft.codeanalysis.common.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-TJCSoPNZkL8ZeaMbM3gxk02Kgw6SOn8sfiLcvhseQNc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25380.11/microsoft.codeanalysis.common.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "5.0.0-2.25375.9", - "hash": "sha256-pzgzbcSY+c6w/EdfxPa0xe7z6XH0+QyP6EstmuvZJZg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25375.9/microsoft.codeanalysis.csharp.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-BOz8ZUYWjrrN0pL2tQPtVgK4xCrSRgl691+xPhV+Xi0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Features", - "version": "5.0.0-2.25375.9", - "hash": "sha256-yfNpDXZeJTpwb9xDov3pBzeb/98xN3o1gSmnk+wn8d4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25375.9/microsoft.codeanalysis.csharp.features.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-4lvcDmiNtG/diRxzppu+NlW9DFN8CtMtt3vXU290Ky8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.features.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "5.0.0-2.25375.9", - "hash": "sha256-kqiVlZFzX1ShsauJCt3SbEh5j+LMAmpuWazixYNqmCY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25375.9/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-cPsgAyt7k7T1DSgH2Cm/je431GQgVO/4pt+Z7rhQ3Zk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Elfie", @@ -109,21 +109,21 @@ }, { "pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features", - "version": "5.0.0-2.25375.9", - "hash": "sha256-dNYVUNB0eDnxA6hJ1E3Txr66LhOWNnuaBmNeUplFopM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25375.9/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-v9VPJ6Q7WN6ymh2EdvEHciBuZpJZOpYEkDamVxv7pW4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25380.11/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Features", - "version": "5.0.0-2.25375.9", - "hash": "sha256-EMBMnbM1u393nlrcnNInWsmk9Rw3E+7efFYM04wtWfA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25375.9/microsoft.codeanalysis.features.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-np7X7tCTIGZRKtBHvM8ToG8/vjCsmEsedLJTVy/QZes=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25380.11/microsoft.codeanalysis.features.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol", - "version": "5.0.0-2.25375.9", - "hash": "sha256-J9rB3T5FYcterYy6NbPUIdKWRdc/lITmYGn8rNf41y0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25375.9/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-o7B62H5VNz/pA5+IM3i5zUIYDsa2UEzWlkOMDrUtj/4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25380.11/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers", @@ -133,27 +133,27 @@ }, { "pname": "Microsoft.CodeAnalysis.Remote.Workspaces", - "version": "5.0.0-2.25375.9", - "hash": "sha256-jHW3kt40M+ujDxO5yv7BMAbb+7ixEMgisI8k+eZ3338=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25375.9/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-z6+Bv8EQmqX9oEb1VgS+k0qj8FYDxRuXkTeuSrKGfTM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "5.0.0-2.25375.9", - "hash": "sha256-ICAVqHxZtp/tXvEmUqA0P8h9di26OLKD9dxQwsCGQqA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25375.9/microsoft.codeanalysis.scripting.common.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-NtfvByHwKt9PISAoHUAy/x1oBwg3hqGcm2gJ+SXcPOc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25380.11/microsoft.codeanalysis.scripting.common.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "5.0.0-2.25375.9", - "hash": "sha256-iD/QaUg8B5H5K986SVa+7OW//wJO/UM85ecOpKaqHcE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25375.9/microsoft.codeanalysis.workspaces.common.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-ybwUauakjco08QhfKzj1n9zai/N2LwBzsZ+mx3ZA9rg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25380.11/microsoft.codeanalysis.workspaces.common.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CommonLanguageServerProtocol.Framework", - "version": "5.0.0-2.25375.9", - "hash": "sha256-kzQhpq33UQyEI2qjCQSqOKnPBkry3925Sg2WEwUx7bU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25375.9/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-QyWWR0EvtMs9oF5elCLYhypzUeAZBy1vzKCqVrLPinc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25380.11/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.CSharp", @@ -205,9 +205,9 @@ }, { "pname": "Microsoft.Net.Compilers.Toolset", - "version": "5.0.0-2.25375.9", - "hash": "sha256-6frF5uW5ybZkcvfVc1MqemvjmMqoj7yYnD2zmUfqaWE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25375.9/microsoft.net.compilers.toolset.5.0.0-2.25375.9.nupkg" + "version": "5.0.0-2.25380.11", + "hash": "sha256-IDw4PtfjbHvXVat7tNiQo3i4AhKYERkHuK4UZ2k0qrA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25380.11/microsoft.net.compilers.toolset.5.0.0-2.25380.11.nupkg" }, { "pname": "Microsoft.NET.StringTools", diff --git a/pkgs/by-name/rz/rzls/package.nix b/pkgs/by-name/rz/rzls/package.nix index 47f7315808f9..dbcb01be172a 100644 --- a/pkgs/by-name/rz/rzls/package.nix +++ b/pkgs/by-name/rz/rzls/package.nix @@ -25,11 +25,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "dotnet"; repo = "razor"; - rev = "ce522dd7670dc8e5885b8d078ff5be2877ee33ed"; - hash = "sha256-FabK93NBoabQPuUr+yaXOxd2acrN3OMqeeCIT6nvAtw="; + rev = "9ab78c78721106dcf827e397ff71b07114577712"; + hash = "sha256-ank/7cg5qubP9oAbj14WZtJ81nNKDh6g8FRVbkdUQAQ="; }; - version = "10.0.0-preview.25403.1"; + version = "10.0.0-preview.25411.5"; projectFile = "src/Razor/src/rzls/rzls.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 24ecea845ff32d8fb6802d81c78122ed1a2cbdf5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 17 Aug 2025 22:33:16 +0300 Subject: [PATCH 29/96] perl: Fix applying all the patches on cross Applying the patches was broken in a2e1f82167a613134a7e24d461595f3a8b90d402 because a `patches` attr was added after `//` which overrode the `patches` before the `//` --- pkgs/development/interpreters/perl/interpreter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 58f66bc811dd..42ac17c9fda2 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -87,6 +87,9 @@ stdenv.mkDerivation ( ./cpp-precomp.patch ./sw_vers.patch ] + # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option + # https://github.com/arsv/perl-cross/pull/159 + ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; @@ -324,11 +327,8 @@ stdenv.mkDerivation ( rev = crossVersion; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; - patches = [ - # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option - # https://github.com/arsv/perl-cross/pull/159 - ./cross-fdopendir.patch - ]; + + # Patches are above!!! depsBuildBuild = [ buildPackages.stdenv.cc From 6642ea4b0926c428220c940ad010a87f7851a288 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 31 Jul 2025 15:08:03 +0200 Subject: [PATCH 30/96] roslyn-ls: 5.0.0-1.25319.11 -> 5.0.0-2.25371.17 Co-authored-by: Tristan Knight --- pkgs/by-name/ro/roslyn-ls/deps.json | 726 ++++++------------ pkgs/by-name/ro/roslyn-ls/package.nix | 12 +- .../ro/roslyn-ls/runtimedownload.patch | 15 + 3 files changed, 262 insertions(+), 491 deletions(-) create mode 100644 pkgs/by-name/ro/roslyn-ls/runtimedownload.patch diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 57b817b72d15..c8b31d32d7d5 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -17,30 +17,78 @@ "hash": "sha256-zPLgLNO4cCrtN9BR9x6X+W0MNkQ71nADIopOC1VBhAQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/9.1.0.7988/icsharpcode.decompiler.9.1.0.7988.nupkg" }, - { - "pname": "MessagePack", - "version": "2.5.192", - "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.192/messagepack.2.5.192.nupkg" - }, { "pname": "MessagePack", "version": "2.5.198", "hash": "sha256-La9QIOel2n2yZaOPaRi04Q/7YudWQ4SiDxgpacFivgI=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.198/messagepack.2.5.198.nupkg" }, - { - "pname": "MessagePack.Annotations", - "version": "2.5.192", - "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.192/messagepack.annotations.2.5.192.nupkg" - }, { "pname": "MessagePack.Annotations", "version": "2.5.198", "hash": "sha256-WnXjX2pGroKn+KukCgPeUUZAkz2S6CdMrCc9P2VcBDQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.198/messagepack.annotations.2.5.198.nupkg" }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.17", + "hash": "sha256-NNGXfUV5RVt1VqLI99NlHoBkt2Vv/Hg3TAHzm8nGM8M=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.17/microsoft.aspnetcore.app.ref.8.0.17.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "9.0.6", + "hash": "sha256-5lyWeyUruj1azKGhUa09h7CrKQFKG/eeKFER2X4RxO8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/9.0.6/microsoft.aspnetcore.app.ref.9.0.6.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.17", + "hash": "sha256-Eunz3nZF5r8a9nqwdeorQPgqd5G+Z4ddofMeAk6VmnA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.17/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "9.0.6", + "hash": "sha256-OYGCWHvZCYDdgJK2IL0pePsOOTgq6y0rQt5gDJedv2s=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/9.0.6/microsoft.aspnetcore.app.runtime.linux-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.17", + "hash": "sha256-SWdah72tC5i2CQL4mRUYfHC0Kh8+C2jiskIIeC74smY=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.17/microsoft.aspnetcore.app.runtime.linux-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "9.0.6", + "hash": "sha256-q0dK5La8B+fxo2Qtz9TA+KFTDW3/6+Y1XtsGF3H9TJY=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/9.0.6/microsoft.aspnetcore.app.runtime.linux-x64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "8.0.17", + "hash": "sha256-y55EGfQ2FzrY2X5+Ne5N3dqi5WNHkFTGVW1hEMrh6OI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.17/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "9.0.6", + "hash": "sha256-xZrp6yT2GYYazdzwXJ+54/j0jbrso94/bgBGeSgEA+I=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/9.0.6/microsoft.aspnetcore.app.runtime.osx-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "8.0.17", + "hash": "sha256-uRCCNPevPemvKIuUxy/VtQlgskChbiAauMWVK/xhoc0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.17/microsoft.aspnetcore.app.runtime.osx-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "9.0.6", + "hash": "sha256-0L5HMCXRf7qkj0yuAGlt3ZWrXVAKzEfnRzi+cX+heEQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/9.0.6/microsoft.aspnetcore.app.runtime.osx-x64.9.0.6.nupkg" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.0", @@ -61,9 +109,9 @@ }, { "pname": "Microsoft.Build.Framework", - "version": "17.15.0-preview-25279-04", - "hash": "sha256-S11gfunqGtjFeBBOfCL412ArdGC8H0P9WskZvCLdfGY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.15.0-preview-25279-04/microsoft.build.framework.17.15.0-preview-25279-04.nupkg" + "version": "17.15.0-preview-25353-11", + "hash": "sha256-Zh78ZPYCj0B5j+lrIBAX0KAZAUWA6ItZ78tYvMDi2oI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.15.0-preview-25353-11/microsoft.build.framework.17.15.0-preview-25353-11.nupkg" }, { "pname": "Microsoft.Build.Framework", @@ -91,9 +139,9 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.11.0", - "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg" + "version": "5.0.0-1.25277.114", + "hash": "sha256-PGgx30sBP6CGFofUPNiD8bEPDdKajynSatWAqh9jbxM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-1.25277.114/microsoft.codeanalysis.analyzers.5.0.0-1.25277.114.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", @@ -103,15 +151,9 @@ }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.0.1", - "hash": "sha256-SU1WPMlg2245w9BFhS3GHtEEbus+tVAYaemHCW3Ysis=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.1/microsoft.codeanalysis.common.4.0.1.nupkg" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.1.0", - "hash": "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg" + "version": "4.12.0", + "hash": "sha256-mm/OKG3zPLAeTVGZtuLxSG+jpQDOchn1oyHqBBJW2Ho=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.12.0/microsoft.codeanalysis.common.4.12.0.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Elfie", @@ -151,15 +193,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25271.1", - "hash": "sha256-Kk4iy7AcCfJ4BOcAEyRuFQ+pFF1zjL+1c+UaU/SKRv4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25271.1/microsoft.dotnet.arcade.sdk.9.0.0-beta.25271.1.nupkg" + "version": "10.0.0-beta.25367.5", + "hash": "sha256-BXE25tCcZgri9yxfIx8S5mEC8F5hYx7rvibc5Q/SNeY=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.25367.5/microsoft.dotnet.arcade.sdk.10.0.0-beta.25367.5.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25271.1", - "hash": "sha256-Pt1JWrowN7AgRijTpkk0OMi/DGGJxN9Dd+eobMev/Do=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25271.1/microsoft.dotnet.xlifftasks.9.0.0-beta.25271.1.nupkg" + "version": "10.0.0-beta.25367.5", + "hash": "sha256-S3amNkCq0gbp9FCYWMxKIwrMNDhyX7AbGLSqH1O5sPk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.25367.5/microsoft.dotnet.xlifftasks.10.0.0-beta.25367.5.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -251,18 +293,120 @@ "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg" }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.17", + "hash": "sha256-pzOqFCd+UrIXmWGDfds5GxkI+Asjx30yFtLIuHFu/h4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.17/microsoft.netcore.app.host.linux-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "9.0.6", + "hash": "sha256-c03NdUDlM2oM0MBOTLsYhRfS64teVXfue3SNSza2gJI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/9.0.6/microsoft.netcore.app.host.linux-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.17", + "hash": "sha256-AGnEGHcO2hfvChG3xEGOTA6dX4MiYPB7FoBkmWz3dc8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.17/microsoft.netcore.app.host.linux-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "9.0.6", + "hash": "sha256-OQwudVyZi+SeLpiNzxpkxVjNZSs0kq4GG10zF3TERS8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/9.0.6/microsoft.netcore.app.host.linux-x64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "8.0.17", + "hash": "sha256-fpMzkOWaA3OFNtHsqOk9s9xKVrcrqOyKHxE7jk8hebg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.17/microsoft.netcore.app.host.osx-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "9.0.6", + "hash": "sha256-mkLxg2k2NH64SPJ87pgKdYMYXQa7nGbSVf/yfNX3s+g=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/9.0.6/microsoft.netcore.app.host.osx-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "8.0.17", + "hash": "sha256-Hrn01x+S+gnGEEHhr6mN6bPyqVAhp5u3CqgWwQbh4To=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.17/microsoft.netcore.app.host.osx-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "9.0.6", + "hash": "sha256-NRrb7WQPpZqarH7OTsBZWroNrBCS6sMdiGm2wlqqXNw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/9.0.6/microsoft.netcore.app.host.osx-x64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.17", + "hash": "sha256-tKawpjkMjV0ysNIWWrgHTiLxncZJDRNiDkQBwl255l4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.17/microsoft.netcore.app.ref.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "9.0.6", + "hash": "sha256-pSDW5VBIA11bwuZv8klq4+P+X6jFwZqu9JR1M1aUT9k=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/9.0.6/microsoft.netcore.app.ref.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.17", + "hash": "sha256-FutphE4bEjd8s6ZqpFXrD1zuCDkNCJ7Vnl0pBm86HBA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.17/microsoft.netcore.app.runtime.linux-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "9.0.6", + "hash": "sha256-+SEo4lrzGnLk1+jJQeJeYS7PJxDID/N1WH6snfsRGAI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/9.0.6/microsoft.netcore.app.runtime.linux-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.17", + "hash": "sha256-6YVEXiJ3b2gZAYri8iSRBdi/J+0DEl7FcwBX6h1Unkg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.17/microsoft.netcore.app.runtime.linux-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "9.0.6", + "hash": "sha256-Y3VzFepVQghnvo6LWoeGnBAaWygy/eLJ8oLlnmRHjps=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/9.0.6/microsoft.netcore.app.runtime.linux-x64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "8.0.17", + "hash": "sha256-J3dfDial8GHyKQMFuBNFtOMD/mOK58vjrK2ZtrYObZg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.17/microsoft.netcore.app.runtime.osx-arm64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "9.0.6", + "hash": "sha256-ZxAcTppjSDMaMaRXKX8C4BNg3d1Hy6xVt4AuPpPTxwI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/9.0.6/microsoft.netcore.app.runtime.osx-arm64.9.0.6.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "8.0.17", + "hash": "sha256-WnkJyhSBHMw/VtLHWy0AFwzzkbIC1YQugFuj3Adg+Ks=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.17/microsoft.netcore.app.runtime.osx-x64.8.0.17.nupkg" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "9.0.6", + "hash": "sha256-3wCLKoYt6LeJwV14M1DkZspmjxTUdqsiRSJ96y3qMvk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/9.0.6/microsoft.netcore.app.runtime.osx-x64.9.0.6.nupkg" + }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg" - }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.3", @@ -277,9 +421,9 @@ }, { "pname": "Microsoft.ServiceHub.Analyzers", - "version": "4.9.7-beta", - "hash": "sha256-1Yod+XFyjmuEbvFxAA8BZAutnQ3xmh8MhoD7/Nknw00=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.7-beta/microsoft.servicehub.analyzers.4.9.7-beta.nupkg" + "version": "4.9.11-beta", + "hash": "sha256-v4vgNHVeTwxnETMNVxtBzQrnacVF0GyKs/PQSDcAJ1c=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.11-beta/microsoft.servicehub.analyzers.4.9.11-beta.nupkg" }, { "pname": "Microsoft.ServiceHub.Client", @@ -289,9 +433,9 @@ }, { "pname": "Microsoft.ServiceHub.Framework", - "version": "4.9.7-beta", - "hash": "sha256-ZybCv3Zk3E5Y3mzlCvV0fLM+UjvvNOzyiOH3QQ75LKg=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.7-beta/microsoft.servicehub.framework.4.9.7-beta.nupkg" + "version": "4.9.11-beta", + "hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg" }, { "pname": "Microsoft.ServiceHub.Resources", @@ -301,27 +445,27 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.5.0", - "hash": "sha256-M8Ct2u3RaTxWip0XBLPtL2xeGsYz1rjKgfsV++nZDPg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.5.0/microsoft.testplatform.objectmodel.17.5.0.nupkg" + "version": "17.13.0", + "hash": "sha256-+dmv0r97ZxSAcx6PfOWBaaTcy9m00tIGeOPjtVQnZVU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.13.0/microsoft.testplatform.objectmodel.17.13.0.nupkg" }, { "pname": "Microsoft.TestPlatform.TranslationLayer", - "version": "17.5.0", - "hash": "sha256-rVgeXl/F8jqXJhQcrm2tV6jvsYHA6UF+5crLVr4GZBA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.5.0/microsoft.testplatform.translationlayer.17.5.0.nupkg" + "version": "17.13.0", + "hash": "sha256-2D2hEhJLgGCFuLJbWTwu2wQAB+H5FWuug5cGfLax3NE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.13.0/microsoft.testplatform.translationlayer.17.13.0.nupkg" }, { "pname": "Microsoft.VisualStudio.Composition", - "version": "17.13.44", - "hash": "sha256-UBl62SMU9chbuWcJUBPYc6LsQvPk7NimTrNP9j0cE5E=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.13.44/microsoft.visualstudio.composition.17.13.44.nupkg" + "version": "17.13.50", + "hash": "sha256-1o5CEOSOGqWaBBzUEQWKCVIE1VYWIvJD7zh2+XHhC1Q=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.13.50/microsoft.visualstudio.composition.17.13.50.nupkg" }, { "pname": "Microsoft.VisualStudio.Composition.Analyzers", - "version": "17.13.44", - "hash": "sha256-3GlqWRl4uS0BABt3rrf/XnY70wE2h9OsNaBoxKOEsaI=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.13.44/microsoft.visualstudio.composition.analyzers.17.13.44.nupkg" + "version": "17.13.50", + "hash": "sha256-0fxXjTykGG8NU8BExsk0qwQQ5chDwmRVKFFVG+yWs2Y=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.13.50/microsoft.visualstudio.composition.analyzers.17.13.50.nupkg" }, { "pname": "Microsoft.VisualStudio.RemoteControl", @@ -337,21 +481,21 @@ }, { "pname": "Microsoft.VisualStudio.Telemetry", - "version": "17.14.18", - "hash": "sha256-WUxacqD+0elQIrseb5EEbt3HKwbiKuaZrGOdiF9H7XA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.18/microsoft.visualstudio.telemetry.17.14.18.nupkg" + "version": "18.0.22", + "hash": "sha256-0Y5PFohljinGeJGVSJqYSUGUq49SRpW29/W/ucKklXQ=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/18.0.22/microsoft.visualstudio.telemetry.18.0.22.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading", - "version": "17.15.3-alpha", - "hash": "sha256-5j0d1djMxc32QoFDnfkgdO0euZssG+EiXvfsi65OzAU=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.3-alpha/microsoft.visualstudio.threading.17.15.3-alpha.nupkg" + "version": "17.15.20-alpha", + "hash": "sha256-/0oB9YozrbcEoew5Tvh0OEE/b3iFHWmO1nzsmS2iDRA=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.20-alpha/microsoft.visualstudio.threading.17.15.20-alpha.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.15.3-alpha", - "hash": "sha256-3uaodC/cRWCtLYEE1uDOsVhyhYwpG54OCAj6piX/K6Y=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.15.3-alpha/microsoft.visualstudio.threading.analyzers.17.15.3-alpha.nupkg" + "version": "17.15.20-alpha", + "hash": "sha256-0Jw6ZAvu7YyM5TgCTTpEeTzcWh1nAIeWvzT6Hj32uSs=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.15.20-alpha/microsoft.visualstudio.threading.analyzers.17.15.20-alpha.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading.Only", @@ -361,9 +505,15 @@ }, { "pname": "Microsoft.VisualStudio.Threading.Only", - "version": "17.15.3-alpha", - "hash": "sha256-eY5+yKUgFsS1u1x8cbqJ1rXn1xp/GeskFb4/NAAyZjw=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.3-alpha/microsoft.visualstudio.threading.only.17.15.3-alpha.nupkg" + "version": "17.14.15", + "hash": "sha256-o15PJKoIqyfgP2jqybgkydc8bKVZUpCCcrPR05rO7k4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.14.15/microsoft.visualstudio.threading.only.17.14.15.nupkg" + }, + { + "pname": "Microsoft.VisualStudio.Threading.Only", + "version": "17.15.20-alpha", + "hash": "sha256-cBFSercx77Jqw4Z8Af5lu57a2xUmudETNywGN43JR8U=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.20-alpha/microsoft.visualstudio.threading.only.17.15.20-alpha.nupkg" }, { "pname": "Microsoft.VisualStudio.Utilities.Internal", @@ -377,12 +527,6 @@ "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg" - }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", @@ -431,12 +575,6 @@ "hash": "sha256-nS0Km+T6sRdIQLzwqjluHoV3MQe2dxwYhCrnKuURoSs=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.112/nuget.dependencyresolver.core.6.8.0-rc.112.nupkg" }, - { - "pname": "NuGet.Frameworks", - "version": "5.11.0", - "hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg" - }, { "pname": "NuGet.Frameworks", "version": "6.8.0-rc.112", @@ -485,198 +623,6 @@ "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg" - }, { "pname": "SQLitePCLRaw.bundle_green", "version": "2.1.0", @@ -709,15 +655,15 @@ }, { "pname": "StreamJsonRpc", - "version": "2.23.8-alpha", - "hash": "sha256-ORpUMIIVHeGdIFra8Vm2BnQLGUx7jBRwBEEfybFipRY=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.8-alpha/streamjsonrpc.2.23.8-alpha.nupkg" + "version": "2.23.39-alpha", + "hash": "sha256-3gQz0m7BhU6dTj6cDgaY/TFIn0Tl0+CAJl6SXRr4Oxg=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.39-alpha/streamjsonrpc.2.23.39-alpha.nupkg" }, { "pname": "System.Buffers", - "version": "4.6.0", - "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.0/system.buffers.4.6.0.nupkg" + "version": "4.6.1", + "hash": "sha256-sARR6R0Bb77Aka0eNh86cBXh2R1AR/fkinRFWypnPXk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.1/system.buffers.4.6.1.nupkg" }, { "pname": "System.CodeDom", @@ -725,12 +671,6 @@ "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/8.0.0/system.codedom.8.0.0.nupkg" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg" - }, { "pname": "System.Collections.Immutable", "version": "8.0.0", @@ -761,12 +701,6 @@ "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/9.0.0/system.composition.9.0.0.nupkg" }, - { - "pname": "System.Composition.AttributedModel", - "version": "8.0.0", - "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/8.0.0/system.composition.attributedmodel.8.0.0.nupkg" - }, { "pname": "System.Composition.AttributedModel", "version": "9.0.0", @@ -809,12 +743,6 @@ "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg" }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "9.0.0", @@ -833,72 +761,18 @@ "hash": "sha256-t+l5WgfxivrZhWKjr0rpqtCcNXyRgytsGgWf/BIv5PU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg" }, - { - "pname": "System.Diagnostics.Process", - "version": "4.3.0", - "hash": "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg" - }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.3.0", - "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg" - }, - { - "pname": "System.Formats.Asn1", - "version": "8.0.0", - "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.0/system.formats.asn1.8.0.0.nupkg" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg" - }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg" - }, { "pname": "System.IO.Pipelines", "version": "9.0.0", "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/9.0.0/system.io.pipelines.9.0.0.nupkg" }, - { - "pname": "System.IO.Pipes", - "version": "4.3.0", - "hash": "sha256-2QA4FIwDB7mT4Hs8bj0oDJcCzr4ycsw+tSzF+58J+/k=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes/4.3.0/system.io.pipes.4.3.0.nupkg" - }, { "pname": "System.Management", "version": "7.0.0", @@ -907,45 +781,15 @@ }, { "pname": "System.Memory", - "version": "4.6.0", - "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.0/system.memory.4.6.0.nupkg" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg" + "version": "4.6.3", + "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.3/system.memory.4.6.3.nupkg" }, { "pname": "System.Numerics.Vectors", - "version": "4.6.0", - "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.0/system.numerics.vectors.4.6.0.nupkg" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg" + "version": "4.6.1", + "hash": "sha256-K8UAqG3LAvIDLW2Hf54tbp5KeQgOVyObQZhnnUAx8sc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.1/system.numerics.vectors.4.6.1.nupkg" }, { "pname": "System.Reflection.Emit", @@ -977,47 +821,11 @@ "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.1.0", - "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.0/system.runtime.compilerservices.unsafe.6.1.0.nupkg" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg" + "version": "6.1.2", + "hash": "sha256-X2p/U680Zfkr622oc+vg5JYgbDEzE7mLre5DVaayWTc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.2/system.runtime.compilerservices.unsafe.6.1.2.nupkg" }, { "pname": "System.Security.AccessControl", @@ -1037,41 +845,17 @@ "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg" }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg" }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg" - }, { "pname": "System.Text.Encoding.CodePages", - "version": "7.0.0", - "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg" + "version": "8.0.0", + "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/8.0.0/system.text.encoding.codepages.8.0.0.nupkg" }, { "pname": "System.Text.Encodings.Web", @@ -1085,29 +869,11 @@ "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/9.0.0/system.text.json.9.0.0.nupkg" }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg" - }, { "pname": "System.Threading.Channels", - "version": "7.0.0", - "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg" - }, - { - "pname": "System.Threading.Overlapped", - "version": "4.3.0", - "hash": "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg" + "version": "8.0.0", + "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/8.0.0/system.threading.channels.8.0.0.nupkg" }, { "pname": "System.Threading.Tasks.Dataflow", @@ -1121,18 +887,6 @@ "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.6.0/system.threading.tasks.extensions.4.6.0.nupkg" }, - { - "pname": "System.Threading.Thread", - "version": "4.3.0", - "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg" - }, { "pname": "System.ValueTuple", "version": "4.5.0", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 0aa4179ae2d3..6f7c37ee7b66 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -12,7 +12,7 @@ let pname = "roslyn-ls"; dotnet-sdk = with dotnetCorePackages; - sdk_9_0 + sdk_10_0 // { inherit (combinePackages [ @@ -24,7 +24,7 @@ let ; }; # need sdk on runtime as well - dotnet-runtime = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.sdk_10_0; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; project = "Microsoft.CodeAnalysis.LanguageServer"; @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.84.19"; + vsVersion = "2.87.26"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-K2gR/SqGe22S1yShBE3/yhLRKQQPcwmpYlP9R2+wbVI="; + hash = "sha256-5XDE2fwBga1hhXgaNG46vruljnKulLR7yIT5BLjJBGA="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.0.0-1.25319.11"; + version = "5.0.0-2.25371.17"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; @@ -57,6 +57,8 @@ buildDotnetModule rec { # until made configurable/and or different location # https://github.com/dotnet/roslyn/issues/76892 ./cachedirectory.patch + # Force download of apphost + ./runtimedownload.patch ]; postPatch = '' diff --git a/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch b/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch new file mode 100644 index 000000000000..a1fee909c1f0 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch @@ -0,0 +1,15 @@ +diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj +index c32f01a6695..b98bab44c4e 100644 +--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj ++++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj +@@ -54,8 +54,8 @@ + win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64 + + +- false +- false ++ true ++ true + + + true From 3cfc17517ac5a9dd3f8b03af16bb30e1f8078207 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 00:21:32 +0000 Subject: [PATCH 31/96] debian-devscripts: 2.25.17 -> 2.25.18 --- pkgs/by-name/de/debian-devscripts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 1d7fe8078d25..c0ccf7b46a6c 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.17"; + version = "2.25.18"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-l5FVMg5PEpook9eKdaAnOUlFg7SAas3QC4xF1Spvyf0="; + hash = "sha256-POmUwNYKfdWda80T44S6x2Dg2TpezMirXuiI95Z077Q="; }; patches = [ From 371eef69fe2afce2175b8bd8a44e1daad99cefa2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 18 Aug 2025 03:06:32 +0300 Subject: [PATCH 32/96] {twitter-color-emoji,noto-fonts-color-emoji}: Enable `strictDeps`, Fix cross twitter-color-emoji is already copying some attrs from noto-fonts-color-emoji so let's copy the deps too to fix cross. Cleanup the `buildPackages.python3.pkgs` by using `python3Packages` which is spliced. --- .../no/noto-fonts-color-emoji/package.nix | 5 +++- .../tw/twitter-color-emoji/package.nix | 23 +++---------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix index ef2a82f0a959..e572ef3e060f 100644 --- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, buildPackages, + python3Packages, pkg-config, cairo, imagemagick, @@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4="; }; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc pkg-config @@ -35,7 +38,7 @@ stdenvNoCC.mkDerivation rec { nototools pngquant which - buildPackages.python3.pkgs.fonttools + python3Packages.fonttools ]; postPatch = '' diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix index ae999224b791..6e49a942bf07 100644 --- a/pkgs/by-name/tw/twitter-color-emoji/package.nix +++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix @@ -3,16 +3,8 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, - cairo, - imagemagick, - nototools, - pkg-config, - pngquant, - python3, - which, - zopfli, noto-fonts-color-emoji, }: @@ -27,7 +19,7 @@ let hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; }; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "twitter-color-emoji"; inherit version; @@ -43,16 +35,7 @@ stdenv.mkDerivation rec { mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name} ''; - nativeBuildInputs = [ - cairo - python3.pkgs.fonttools - imagemagick - nototools - pkg-config - pngquant - which - zopfli - ]; + inherit (noto-fonts-color-emoji) strictDeps depsBuildBuild nativeBuildInputs; postPatch = let From 2a859bfb6bbd6ea48fc782caf03c231c6033a774 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 18:44:33 -0700 Subject: [PATCH 33/96] python3Packages.pysesame: init at 1.0.2 --- .../python-modules/pysesame2/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pysesame2/default.nix diff --git a/pkgs/development/python-modules/pysesame2/default.nix b/pkgs/development/python-modules/pysesame2/default.nix new file mode 100644 index 000000000000..e98b9063cbc1 --- /dev/null +++ b/pkgs/development/python-modules/pysesame2/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "pysesame2"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-djKvmmYePdpcMt9bKkQyKsKAT5hhXMPJwC0EkfY8vWU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + pythonImportsCheck = [ "pysesame2" ]; + + # No tests in repository + doCheck = false; + + meta = { + description = "Python API for Sesame Smartlock made by CANDY HOUSE"; + homepage = "https://github.com/yagami-cerberus/pysesame2"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897ed22dd676..c59958ad6c73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13958,6 +13958,8 @@ self: super: with self; { pyseries = callPackage ../development/python-modules/pyseries { }; + pysesame2 = callPackage ../development/python-modules/pysesame2 { }; + pyseventeentrack = callPackage ../development/python-modules/pyseventeentrack { }; pysftp = callPackage ../development/python-modules/pysftp { }; From 2b6d89614a5368b82eeb591c615dc0249fede904 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 18:45:54 -0700 Subject: [PATCH 34/96] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f6ec28d256e9..8acf4d286d3c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5304,7 +5304,8 @@ ]; "sesame" = ps: with ps; [ - ]; # missing inputs: pysesame2 + pysesame2 + ]; "seven_segments" = ps: with ps; [ pillow From 03d9644c3a003e2d83b9c2b71e77b99044b48599 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 19:07:27 -0700 Subject: [PATCH 35/96] python3Packages.medcom-ble: init at 0.1.1 --- .../python-modules/medcom-ble/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/medcom-ble/default.nix diff --git a/pkgs/development/python-modules/medcom-ble/default.nix b/pkgs/development/python-modules/medcom-ble/default.nix new file mode 100644 index 000000000000..12462859840c --- /dev/null +++ b/pkgs/development/python-modules/medcom-ble/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + bleak, + bleak-retry-connector, +}: + +buildPythonPackage rec { + pname = "medcom-ble"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + pname = "medcom_ble"; + inherit version; + hash = "sha256-PQ0ZOFLGVllz/Jxw2CN6D5Ypza5/Ck3dtk3DuB+eHiA="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + # Package has no tests + doCheck = false; + + pythonImportsCheck = [ + "medcom_ble" + ]; + + meta = { + description = "Library to communicate with Medcom BLE radiation monitors"; + homepage = "https://github.com/elafargue/medcom-ble"; + changelog = "https://github.com/elafargue/medcom-ble/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897ed22dd676..3fbfea337b11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9080,6 +9080,8 @@ self: super: with self; { medallion = callPackage ../development/python-modules/medallion { }; + medcom-ble = callPackage ../development/python-modules/medcom-ble { }; + mediafile = callPackage ../development/python-modules/mediafile { }; mediafire-dl = callPackage ../development/python-modules/mediafire-dl { }; From 966d09842cb9d499921eb8f445cbfc20a664ffb7 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 19:08:11 -0700 Subject: [PATCH 36/96] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f6ec28d256e9..5518ff3d067f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3488,12 +3488,13 @@ hassil home-assistant-intents ifaddr + medcom-ble mutagen pymicro-vad pyserial pyspeex-noise zeroconf - ]; # missing inputs: medcom-ble + ]; "media_extractor" = ps: with ps; @@ -7365,6 +7366,7 @@ "mcp_server" "mealie" "meater" + "medcom_ble" "media_extractor" "media_player" "media_source" From da3913b61b59c4440e9e34beb983eb49d4abf397 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 17 Aug 2025 22:10:43 -0400 Subject: [PATCH 37/96] python3Packages.tikteck: init at 0.4 Signed-off-by: Ethan Carter Edwards --- .../python-modules/tikteck/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/tikteck/default.nix diff --git a/pkgs/development/python-modules/tikteck/default.nix b/pkgs/development/python-modules/tikteck/default.nix new file mode 100644 index 000000000000..fdc1aeadd4fe --- /dev/null +++ b/pkgs/development/python-modules/tikteck/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + bluepy, + pycryptodome, +}: + +buildPythonPackage rec { + pname = "tikteck"; + version = "0.4"; + pyproject = true; + + # github doesn't have any tags unfortunately + src = fetchPypi { + pname = "tikteck"; + inherit version; + hash = "sha256-KEbGT2RXLFMQ49gltOYcbE+ebJ1kiXzhT0DIeVXsSJM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + bluepy + pycryptodome + ]; + + pythonImportsCheck = [ "tikteck" ]; + + # no upstream tests exist + doCheck = false; + + meta = { + description = "Control Tikteck Bluetooth LED bulbs"; + homepage = "https://github.com/mjg59/python-tikteck"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897ed22dd676..632eea37ec37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18126,6 +18126,8 @@ self: super: with self; { tika-client = callPackage ../development/python-modules/tika-client { }; + tikteck = callPackage ../development/python-modules/tikteck { }; + tiktoken = callPackage ../development/python-modules/tiktoken { }; tikzplotlib = callPackage ../development/python-modules/tikzplotlib { }; From 07fc13a9a75bd82f2899445b8848d846e99a21c1 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 17 Aug 2025 22:17:15 -0400 Subject: [PATCH 38/96] home-assistant: update component packages Signed-off-by: Ethan Carter Edwards --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f6ec28d256e9..e60668db7cb0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -6030,7 +6030,8 @@ ]; "tikteck" = ps: with ps; [ - ]; # missing inputs: tikteck + tikteck + ]; "tile" = ps: with ps; [ pytile From d32278bffa25fe906680fd026bd79da943039e7d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 20:00:01 -0700 Subject: [PATCH 39/96] python3Packages.concord232: init at 0.15 --- .../python-modules/concord232/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/concord232/default.nix diff --git a/pkgs/development/python-modules/concord232/default.nix b/pkgs/development/python-modules/concord232/default.nix new file mode 100644 index 000000000000..33265242b0e7 --- /dev/null +++ b/pkgs/development/python-modules/concord232/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + stevedore, + prettytable, + pyserial, + flask, +}: + +buildPythonPackage rec { + pname = "concord232"; + version = "0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JasonCarter80"; + repo = "concord232"; + tag = "v${version}"; + hash = "sha256-qMHFOKuNuk4Z/FDNRqh1nsnA5vCW+9YXGK6d7Td5O5s="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + stevedore + prettytable + pyserial + flask + ]; + + # Package has no tests + doCheck = false; + + meta = { + description = "GE Concord 4 RS232 Serial Interface Library and Server"; + homepage = "https://github.com/JasonCarter80/concord232"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897ed22dd676..120a967dd508 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2867,6 +2867,8 @@ self: super: with self; { compressed-tensors = callPackage ../development/python-modules/compressed-tensors { }; + concord232 = callPackage ../development/python-modules/concord232 { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; conda = callPackage ../development/python-modules/conda { }; From 0bfc5a6658bd8cea2c29a0042bf98687d14c31e7 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 20:00:54 -0700 Subject: [PATCH 40/96] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f6ec28d256e9..bc6d48a50622 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -973,7 +973,8 @@ ]; "concord232" = ps: with ps; [ - ]; # missing inputs: concord232 + concord232 + ]; "coned" = ps: with ps; [ ]; From fd389fa352de35457e87da0f8dbba48ce90ccaa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 03:43:01 +0000 Subject: [PATCH 41/96] python3Packages.nitransforms: 25.0.0 -> 25.0.1 --- pkgs/development/python-modules/nitransforms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 4a43c19b92eb..7381dc0e797b 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "25.0.0"; + version = "25.0.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-bGyrFyB8pjE3zLymQTWXdPAUxDopFQdJ00aQszlOp5g="; + hash = "sha256-6unmr9iWCmX0ub6Vr0d5gwH4fdjOysUKlKBbO0BSWDw="; }; build-system = [ From 70c8c6bdbd3f2fc33e66b6cc895b78f8c443351b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 42/96] clipbuzz: drop --- pkgs/tools/misc/clipbuzz/default.nix | 33 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/tools/misc/clipbuzz/default.nix diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix deleted file mode 100644 index 8b09430b52ae..000000000000 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - libX11, - libXfixes, - zig, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "clipbuzz"; - version = "2.0.1"; - - src = fetchzip { - url = "https://trong.loang.net/~cnx/clipbuzz/snapshot/clipbuzz-${finalAttrs.version}.tar.gz"; - hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8="; - }; - - nativeBuildInputs = [ zig.hook ]; - - buildInputs = [ - libX11 - libXfixes - ]; - - meta = { - description = "Buzz on new X11 clipboard events"; - homepage = "https://trong.loang.net/~cnx/clipbuzz"; - license = lib.licenses.unlicense; - maintainers = [ lib.maintainers.McSinyx ]; - mainProgram = "clipbuzz"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e399b3a5f936..e50af8e09146 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -457,6 +457,7 @@ mapAliases { clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05 + clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10eb1c12d1ae..9e6778a81ed3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,10 +4580,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - clipbuzz = callPackage ../tools/misc/clipbuzz { - zig = buildPackages.zig_0_12; - }; - # A minimal xar is needed to break an infinite recursion between macfuse-stubs and xar. # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap. xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; }; From e0216a9c71ec873d369c59fa4e48c0ec80b1201c Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 43/96] dt: bump to Zig 0.13 --- pkgs/by-name/dt/dt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix index aaa9070bf69b..3a4e6da36c35 100644 --- a/pkgs/by-name/dt/dt/package.nix +++ b/pkgs/by-name/dt/dt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, testers, - zig_0_12, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU="; }; - nativeBuildInputs = [ zig_0_12.hook ]; + nativeBuildInputs = [ zig_0_13.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 5db9f627f753135e818ef26576677e2d86befd73 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 44/96] cyber: drop There are PRs upstream to support newer Zig versions, but no movement, and the author has no GitHub activity since December: * * --- pkgs/by-name/cy/cyber/package.nix | 40 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/cy/cyber/package.nix diff --git a/pkgs/by-name/cy/cyber/package.nix b/pkgs/by-name/cy/cyber/package.nix deleted file mode 100644 index a2e219ef6f2e..000000000000 --- a/pkgs/by-name/cy/cyber/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig_0_12, -}: - -stdenv.mkDerivation rec { - pname = "cyber"; - version = "0-unstable-2025-12-10"; - - src = fetchFromGitHub { - owner = "fubark"; - repo = "cyber"; - rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506"; - hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw="; - }; - - nativeBuildInputs = [ - zig_0_12.hook - ]; - - zigBuildFlags = [ - "cli" - ]; - - env = { - COMMIT = lib.substring 0 7 src.rev; - }; - - meta = with lib; { - description = "Fast, efficient, and concurrent scripting language"; - mainProgram = "cyber"; - homepage = "https://github.com/fubark/cyber"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - inherit (zig_0_12.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e50af8e09146..a3979b390583 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -502,6 +502,7 @@ mapAliases { cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 + cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 # these are for convenience, not for backward compat and shouldn't expire clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 From a8fd68487459c647712cce20f52f262da453eb0b Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 22:29:29 -0700 Subject: [PATCH 45/96] python3Packages.oru: init at 0.2.3 --- .../python-modules/oru/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/oru/default.nix diff --git a/pkgs/development/python-modules/oru/default.nix b/pkgs/development/python-modules/oru/default.nix new file mode 100644 index 000000000000..e655ea33481b --- /dev/null +++ b/pkgs/development/python-modules/oru/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pyotp, + pyppeteer, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "oru"; + version = "0.2.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wLD1v98Ez5rexQEvtR7XBiY40I8Lb2X9WzU9kcE5iVY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyotp + pyppeteer + requests + ]; + + doCheck = false; + + pythonImportsCheck = [ "oru" ]; + + meta = { + description = "Python client for Orange and Rockland Utility smart energy meters"; + homepage = "https://github.com/bvlaicu/oru"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897ed22dd676..572bda252a64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11084,6 +11084,8 @@ self: super: with self; { ortools = (toPythonModule (pkgs.or-tools.override { python3 = self.python; })).python; + oru = callPackage ../development/python-modules/oru { }; + orvibo = callPackage ../development/python-modules/orvibo { }; oryx = callPackage ../development/python-modules/oryx { }; From 7ea4c220c83840b38d6bdbf7fdf983a7dff55e23 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 17 Aug 2025 22:30:11 -0700 Subject: [PATCH 46/96] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f6ec28d256e9..1d3a9b7636da 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4290,7 +4290,8 @@ ]; "oru" = ps: with ps; [ - ]; # missing inputs: oru + oru + ]; "oru_opower" = ps: with ps; [ ]; From ba90f3c54c63b5c4232644ba6e7564a6021d4237 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 47/96] zig_0_12: drop --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/development/compilers/zig/default.nix | 5 ---- pkgs/development/compilers/zig/generic.nix | 31 +++++----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 145185bdf26e..c700b68dbf6b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -38,6 +38,8 @@ - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). +- Zig 0.12 has been removed. + - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index e1df722f9071..e0d9f82bebff 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,12 @@ { lib, callPackage, - llvmPackages_17, llvmPackages_18, llvmPackages_19, zigVersions ? { }, }: let versions = { - "0.12.1" = { - llvmPackages = llvmPackages_17; - hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s="; - }; "0.13.0" = { llvmPackages = llvmPackages_18; hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM="; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 6d061e310d3f..a7ad51f83ab5 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -81,18 +81,11 @@ stdenv.mkDerivation (finalAttrs: { export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; ''; - # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't - # work in Nix's sandbox. Use env from our coreutils instead. postPatch = - let - zigSystemPath = - if lib.versionAtLeast finalAttrs.version "0.12" then - "lib/std/zig/system.zig" - else - "lib/std/zig/system/NativeTargetInfo.zig"; - in + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. '' - substituteInPlace ${zigSystemPath} \ + substituteInPlace lib/std/zig/system.zig \ --replace-fail "/usr/bin/env" "${lib.getExe' coreutils "env"}" '' # Zig tries to access xcrun and xcode-select at the absolute system path to query the macOS SDK @@ -112,24 +105,14 @@ stdenv.mkDerivation (finalAttrs: { '' stage3/bin/zig build langref --zig-lib-dir $(pwd)/stage3/lib/zig '' - else if lib.versionAtLeast finalAttrs.version "0.13" then + else '' stage3/bin/zig build langref - '' - else - '' - stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig ''; - postInstall = - if lib.versionAtLeast finalAttrs.version "0.13" then - '' - install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html - '' - else - '' - install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html - ''; + postInstall = '' + install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html + ''; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3979b390583..e9ea0bee18e3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2267,6 +2267,7 @@ mapAliases { zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24 zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24 zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09 + zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18 zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11 zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11 zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e6778a81ed3..0a09bcb5a7e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9521,12 +9521,10 @@ with pkgs; (rec { zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig { }); - zig_0_12 = zigPackages."0.12"; zig_0_13 = zigPackages."0.13"; zig_0_14 = zigPackages."0.14"; }) zigPackages - zig_0_12 zig_0_13 zig_0_14 ; From 593a85980b1f84e855f62357b966981fdbdac871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 06:37:17 +0000 Subject: [PATCH 48/96] drupal: 11.2.1 -> 11.2.3 --- pkgs/by-name/dr/drupal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix index dacc22f0acb0..035f56694a78 100644 --- a/pkgs/by-name/dr/drupal/package.nix +++ b/pkgs/by-name/dr/drupal/package.nix @@ -8,17 +8,17 @@ php.buildComposerProject2 (finalAttrs: { pname = "drupal"; - version = "11.2.1"; + version = "11.2.3"; src = fetchFromGitLab { domain = "git.drupalcode.org"; owner = "project"; repo = "drupal"; tag = finalAttrs.version; - hash = "sha256-GlQvgI3dmRSHtNky0ZL4Y4VWIaUrO+EjPwnkkF9DJDQ="; + hash = "sha256-WGto21WkPkSytiYuEmx/C9wUMwKebO9kJTAR7m8GNWA="; }; - vendorHash = "sha256-2XqYxuIlnXzyvOYtY67H1hOuuFjApi0H5VV74j/RJzI="; + vendorHash = "sha256-WP1LCvN54mfLGOAJRKCPBV09MkWkKOow+LofpxiwI58="; composerNoPlugins = false; passthru = { From a6a1b279fa34c859fe05cf61c0aa3b9dfd106418 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Mon, 18 Aug 2025 09:41:17 +0200 Subject: [PATCH 49/96] sherlock-launcher: 0.1.14-2 -> 0.1.14-3; update license Changelog: https://github.com/Skxxtz/sherlock/releases/tag/v0.1.14-3 Diff: https://github.com/Skxxtz/sherlock/compare/v0.1.14-2...v0.1.14-3 License changing commit: https://github.com/Skxxtz/sherlock/commit/cb450a5b8d57da949f34a9783119883d6a0627bf --- pkgs/by-name/sh/sherlock-launcher/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix index 96f481984d75..adf6ae4cb61e 100644 --- a/pkgs/by-name/sh/sherlock-launcher/package.nix +++ b/pkgs/by-name/sh/sherlock-launcher/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sherlock-launcher"; - version = "0.1.14-2"; + version = "0.1.14-3"; src = fetchFromGitHub { owner = "Skxxtz"; repo = "sherlock"; tag = "v${finalAttrs.version}"; - hash = "sha256-k5v1eeRxwCpU7+nBU6/q8I6O2e0kXojyhNTeZ3k/Qxo="; + hash = "sha256-xycHf/3szP0NkSylAOxSQbaxt7Wc52Qg9N7g/YT+vT8="; }; nativeBuildInputs = [ @@ -45,14 +45,14 @@ rustPlatform.buildRustPackage (finalAttrs: { librsvg ]; - cargoHash = "sha256-fct2xHZmrPMn/HXPtMaYraODT0Yi/wZEPw5X8KwhnGk="; + cargoHash = "sha256-Ci/k4g0Zrtzx2IhKt5MjLtim/2qZA4wLIO3AtQ+TkpY="; passthru.updateScript = nix-update-script { }; meta = { description = "Lightweight and efficient application launcher for Wayland built with Rust and GTK4"; homepage = "https://github.com/Skxxtz/sherlock"; - license = lib.licenses.cc-by-nc-40; + license = lib.licenses.gpl3Plus; mainProgram = "sherlock"; maintainers = with lib.maintainers; [ agvantibo ]; }; From 6caf19dc2f7ed0550cf9789b636b1d5c39b4a553 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 15 Aug 2025 01:27:10 -0700 Subject: [PATCH 50/96] gh-f: cleanup - Use `propagatedUserEnvPkgs` - Add `nix-update-script` - `finalAttrs` pattern --- pkgs/by-name/gh/gh-f/package.nix | 55 ++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index c1b6c4329f6e..22ca4fa5a6de 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, - makeWrapper, + makeBinaryWrapper, gh, fzf, coreutils, @@ -10,48 +10,55 @@ gnused, withBat ? false, bat, + nix-update-script, }: -let - binPath = lib.makeBinPath ( - [ - gh - fzf - coreutils - gawk - gnused - ] - ++ lib.optional withBat bat - ); -in -stdenvNoCC.mkDerivation rec { + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gh-f"; version = "1.4.1"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jf7sDn/iRB/Lwz21fGLRduvt9/9cs5FFMhazULgj1ik="; }; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + propagatedUserEnvPkgs = [ + gh + fzf + coreutils + gawk + gnused + ] + ++ lib.optional withBat bat; installPhase = '' + runHook preInstall + install -D -m755 "gh-f" "$out/bin/gh-f" + + runHook postInstall ''; postFixup = '' - wrapProgram "$out/bin/gh-f" --prefix PATH : "${binPath}" + wrapProgram "$out/bin/gh-f" \ + --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs} ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/gennaro-tedesco/gh-f"; description = "GitHub CLI ultimate FZF extension"; - maintainers = with maintainers; [ loicreynier ]; - license = licenses.unlicense; + license = lib.licenses.unlicense; mainProgram = "gh-f"; - platforms = platforms.all; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + loicreynier + yiyu + ]; }; -} +}) From 9f6c20b0b9b42ac967df4c6b7af21eab18232afc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 09:54:51 +0000 Subject: [PATCH 51/96] grafanaPlugins.grafana-metricsdrilldown-app: 1.0.9 -> 1.0.10 --- .../grafana/plugins/grafana-metricsdrilldown-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 9ba934a4dad7..ad4b9e2f7136 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.9"; - zipHash = "sha256-YEchhyKvHmUErLs5IY1ECPOiaaYRzVHRyObk0XvzCBo="; + version = "1.0.10"; + zipHash = "sha256-+6/KbYgBmBxllilxhoukPy6OZcOrgrAmxS143vda2Og="; meta = with lib; { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = licenses.agpl3Only; From bee674d3d056c7c718f4f2b8da3d959326b5ed5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 10:47:54 +0000 Subject: [PATCH 52/96] python3Packages.nextcord: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/nextcord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 58d244a16e19..4dea44796108 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; tag = "v${version}"; - hash = "sha256-E8vRKH2Xgva7W5qW9kJBWzVfCuSiRyoAyO72mcGvkpg="; + hash = "sha256-ex6amnB51Jla5ia2HVaMOZsDOEtgJ8RB1eNTLpXNzSY="; }; patches = [ From 9dfd93392e3d72a9de5a0fa3d75090110ecd8df7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 18 Aug 2025 13:53:11 +0200 Subject: [PATCH 53/96] firebird_4: 4.0.5 -> 4.0.6 Fixes CVE-2025-24975. https://github.com/FirebirdSQL/firebird/security/advisories/GHSA-fx9r-rj68-7p69 https://github.com/FirebirdSQL/firebird/blob/v4.0.6/CHANGELOG.md --- pkgs/servers/firebird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 83c48b3cd2b4..c0a9e67a4ee8 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -85,13 +85,13 @@ rec { firebird_4 = stdenv.mkDerivation ( base // rec { - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - hash = "sha256-OxkPpmnYTl65ns+hKHJd5IAPUiMj0g3HUpyRpwDNut8="; + hash = "sha256-65wfG6huDzvG/tEVllA58OfZqoL4U/ilw5YIDqQywTs="; }; nativeBuildInputs = base.nativeBuildInputs ++ [ unzip ]; From 4c65774ecce10851562fb70e1be525616302bf26 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 18 Aug 2025 01:58:39 +0300 Subject: [PATCH 54/96] gnome-user-share: Fix cross https://gitlab.gnome.org/GNOME/gnome-user-share/-/blob/7ffb23dd5af0fda75c66f03756798dc10e253c36/src/meson.build#L47 --- pkgs/by-name/gn/gnome-user-share/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 130c293073eb..237c137cba30 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -78,6 +78,14 @@ stdenv.mkDerivation (finalAttrs: { glib ]; + postPatch = '' + substituteInPlace src/meson.build \ + --replace-fail "'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@'," "'cp', 'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(), '@OUTPUT@'," + ''; + + # For https://gitlab.gnome.org/GNOME/gnome-user-share/-/blob/7ffb23dd5af0fda75c66f03756798dc10e253c36/src/meson.build#L47 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + doCheck = true; strictDeps = true; From 6e959288bbb37a57f4152d5639476ad064aacc1e Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 23:36:56 +0100 Subject: [PATCH 55/96] lib.systems.examples: bump Android SDK and NDK Per , NDK 26 is EOL. --- doc/release-notes/rl-2511.section.md | 2 ++ lib/systems/examples.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 145185bdf26e..3bac305a4770 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -36,6 +36,8 @@ - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". +- The default Android NDK version has been raised to 27, and the default SDK version to 35. + - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index a3ac648dee18..9686ee8e59ab 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -72,8 +72,8 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; rust.rustcTarget = "armv7-linux-androideabi"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; useAndroidPrebuilt = true; } // platforms.armv7a-android; @@ -81,15 +81,15 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; rust.rustcTarget = "aarch64-linux-android"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; useAndroidPrebuilt = true; }; aarch64-android = { config = "aarch64-unknown-linux-android"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; libc = "bionic"; useAndroidPrebuilt = false; useLLVM = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10eb1c12d1ae..e60d3bbf6b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1775,7 +1775,7 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; - androidndkPkgs = androidndkPkgs_26; + androidndkPkgs = androidndkPkgs_27; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs { })."21"; androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs { })."23"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs { })."24"; From 5381f4d6693f2cae162c30dc9ad2060ec917775c Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 23:39:24 +0100 Subject: [PATCH 56/96] androidndkPackages_{21,23,24,25,26}: drop EOL and depend on EOL LLVMs. --- doc/release-notes/rl-2511.section.md | 1 + pkgs/development/androidndk-pkgs/default.nix | 7 ------- pkgs/top-level/aliases.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 3bac305a4770..380d2ef41cbe 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -37,6 +37,7 @@ - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". - The default Android NDK version has been raised to 27, and the default SDK version to 35. + NDK 21–26 have been removed, as they are end‐of‐life. - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 24771887f008..38e8d8798e49 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -4,7 +4,6 @@ buildPackages, pkgs, targetPackages, - androidndkPkgs_23, config, }: @@ -54,12 +53,6 @@ let in lib.recurseIntoAttrs { - "21" = makeNdkPkgs "21.0.6113669" pkgs.llvmPackages_14; # "9" - "23" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12" - # Versions below 24 use a version not available in nixpkgs/old version which could be removed in the near future so use 14 for them as this is only used to get the hardening flags. - "24" = makeNdkPkgs "24.0.8215888" pkgs.llvmPackages_14; - "25" = makeNdkPkgs "25.2.9519653" pkgs.llvmPackages_14; - "26" = makeNdkPkgs "26.3.11579264" pkgs.llvmPackages_17; "27" = makeNdkPkgs "27.0.12077973" pkgs.llvmPackages_18; "28" = makeNdkPkgs "28.0.13004108" pkgs.llvmPackages_19; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e399b3a5f936..9b1ce6559c2f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -283,7 +283,12 @@ mapAliases { ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 - androidndkPkgs_23b = lib.warnOnInstantiate "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 + androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09 + androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09 + androidndkPkgs_23b = throw "androidndkPkgs_23b has been removed, as it is EOL"; # Added 2025-08-09 + androidndkPkgs_24 = throw "androidndkPkgs_24 has been removed, as it is EOL"; # Added 2025-08-09 + androidndkPkgs_25 = throw "androidndkPkgs_25 has been removed, as it is EOL"; # Added 2025-08-09 + androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60d3bbf6b5b..d4f9c4217e6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1776,11 +1776,6 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; androidndkPkgs = androidndkPkgs_27; - androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs { })."21"; - androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs { })."23"; - androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs { })."24"; - androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs { })."25"; - androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs { })."26"; androidndkPkgs_27 = (callPackage ../development/androidndk-pkgs { })."27"; androidndkPkgs_28 = (callPackage ../development/androidndk-pkgs { })."28"; From d2f58ec9188454c7c688dc067585eeb3337347bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 15:53:11 +0000 Subject: [PATCH 57/96] sdl_gamecontrollerdb: 0-unstable-2025-08-05 -> 0-unstable-2025-08-17 --- pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index c728e8280163..17964243d17d 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-08-05"; + version = "0-unstable-2025-08-17"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "7543fc8af09232396f7d57e19c2342965c53e94f"; - hash = "sha256-y5QyrgT/ipal36jTJurvXMac6uRMt3XOg3Sm6SLe0sk="; + rev = "481a5acb7b3211d6b0c45a7b7fc5f59ac1bc62d8"; + hash = "sha256-DEHHd4E5eOJ0AvOOZFPxxcfFKtSJzCFzIG5+J60VHHs="; }; dontBuild = true; From 93f851d127d12def2784f5cd29411fa29f2c27ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 16:04:50 +0000 Subject: [PATCH 58/96] remind: 05.04.02 -> 06.00.00 --- pkgs/by-name/re/remind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 35720b4b6c90..6ce91dc3e49c 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.04.02"; + version = "06.00.00"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-Vu16s0zlqso1S1KsSJErpmepKxT9ekVDoWYNeQueDkM="; + hash = "sha256-b0S8DgEqsgP201P04Kim06/WAU7QkihnYOcAvW8oNUQ="; }; propagatedBuildInputs = lib.optionals withGui [ From 18a6a462658d940d311e047ad02cdd8e60f8454b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 16:38:00 +0000 Subject: [PATCH 59/96] libretro.nestopia: 0-unstable-2025-08-09 -> 0-unstable-2025-08-14 --- pkgs/applications/emulators/libretro/cores/nestopia.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index a6b7113ff899..19ef7ffc0374 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-08-09"; + version = "0-unstable-2025-08-14"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "d33852f5efe89c87a06f8ce7d12b8b5451e9ae71"; - hash = "sha256-v/jXoXgVEIXpxBgHZ/6oL+YGPDv9jefwdetiqLFBN9I="; + rev = "51ad831fcd9f10a02dcb0cbf398c2cd1b028765e"; + hash = "sha256-4TMJfD9KUBo5qJNOdnSEq2oEftL8Fpak6tHOP+tuG2U="; }; makefile = "Makefile"; From cefe6f9dd4e0275a26b4288c3a73e1efcc894cd5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 18 Aug 2025 11:03:14 -0700 Subject: [PATCH 60/96] debian-devscripts: Add missing IO::String Perl dependency for uscan https://salsa.debian.org/debian/devscripts/-/commit/3786d357c46d641acdfd17620c6cc022b71142d1 Signed-off-by: Anders Kaseorg --- pkgs/by-name/de/debian-devscripts/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 1d7fe8078d25..4480df22767d 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { IPCRun FileDirList FileTouch + IOString ]); preConfigure = '' From 2318ee749e5361c6ff8b9b194eb4bfbb61b4c1ef Mon Sep 17 00:00:00 2001 From: Yuri Albuquerque Date: Mon, 18 Aug 2025 13:20:16 -0300 Subject: [PATCH 61/96] ocamlPackages.mlx: 0.9 -> 0.10 --- pkgs/development/ocaml-modules/mlx/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/mlx/default.nix b/pkgs/development/ocaml-modules/mlx/default.nix index 830938e70330..1b56cb381a9b 100644 --- a/pkgs/development/ocaml-modules/mlx/default.nix +++ b/pkgs/development/ocaml-modules/mlx/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, buildDunePackage, ppxlib, menhir, @@ -9,7 +8,7 @@ buildDunePackage rec { pname = "mlx"; - version = "0.9"; + version = "0.10"; minimalOCamlVersion = "4.14"; @@ -17,16 +16,9 @@ buildDunePackage rec { owner = "ocaml-mlx"; repo = "mlx"; rev = version; - hash = "sha256-3hPtyBKD2dp4UJBykOudW6KR2KXPnBuDnuJ1UNLpAp0="; + hash = "sha256-g2v6U4lubYIVKUkU0j+OwtPxK9tKvleuX+vA4ljJ1bA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ocaml-mlx/mlx/commit/01771e2a8b45f4f70cfd93533af2af9ed4a28a7e.patch"; - hash = "sha256-czA2sIORmunIeaHn7kpcuv0y97uJhe6aUEMj/QHEag4="; - }) - ]; - buildInputs = [ ppxlib menhir From 3aadbd7bb702ac8e3c0fe6484b08305bfa58ae6b Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 18 Aug 2025 14:11:29 -0400 Subject: [PATCH 62/96] maintainers: update kevincox's Matrix address --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5db08cf0f594..19feac86c2c9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13183,7 +13183,7 @@ }; kevincox = { email = "kevincox@kevincox.ca"; - matrix = "@kevincox:matrix.org"; + matrix = "@kevincox:kevincox.ca"; github = "kevincox"; githubId = 494012; name = "Kevin Cox"; From 0b9c0e8084748ce05bea0ff81db780736257df65 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Fri, 15 Aug 2025 14:55:03 +0200 Subject: [PATCH 63/96] opencode: 0.4.26 -> 0.5.6 - Added the `--ignore-scripts` flag to `bun install` to prevent failures caused by post-install scripts for `tree-sitter-bash` wanting to execute `/usr/bin/env`. - Included the `--production` flag to skip installation of development dependencies. --- pkgs/by-name/op/opencode/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index deec46072b9a..f0f00fdacb39 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,10 +14,10 @@ let opencode-node-modules-hash = { - "aarch64-darwin" = "sha256-/s6eAI1VJ0kXrxP5yTi+jwNqHBCRcoltJC86AT7nVdI="; - "aarch64-linux" = "sha256-aG5e5HMcxO9P7ciZ9cg8uY1rxDpTOKdR31z0L2d9dxY="; - "x86_64-darwin" = "sha256-jkAFmTb+cTO/B7a7MgaKqOzZI3QPkM3uW2RULnBcxSI="; - "x86_64-linux" = "sha256-ql4qcMtuaRwSVVma3OeKkc9tXhe21PWMMko3W3JgpB0="; + "aarch64-darwin" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g="; + "aarch64-linux" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g="; + "x86_64-darwin" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g="; + "x86_64-linux" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g="; }; bun-target = { "aarch64-darwin" = "bun-darwin-arm64"; @@ -28,12 +28,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.4.26"; + version = "0.5.6"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-sQ1le6/OJb22Kehjj4glUsavHE08u0e2I7h8lW9MO9E="; + hash = "sha256-dzhthgkAPjvPOxWBnf67OkTwbZ3Htdl68+UDlz45xwI="; }; tui = buildGoModule { @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { modRoot = "packages/tui"; - vendorHash = "sha256-jINbGug/SPGBjsXNsC9X2r5TwvrOl5PJDL+lrOQP69Q="; + vendorHash = "sha256-acDXCL7ZQYW5LnEqbMgDwpTbSgtf4wXnMMVtQI1Dv9s="; subPackages = [ "cmd/opencode" ]; @@ -83,11 +83,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + # Disable post-install scripts to avoid shebang issues bun install \ --filter=opencode \ --force \ --frozen-lockfile \ - --no-progress + --ignore-scripts \ + --no-progress \ + --production runHook postBuild ''; From 64d9c348e35928fcd5bd41f0051658f6ceffb338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 18:46:48 +0000 Subject: [PATCH 64/96] candy-icons: 0-unstable-2025-07-10 -> 0-unstable-2025-08-13 --- pkgs/by-name/ca/candy-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 82ecfad4ef58..6eed91223ff3 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-08-13"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "475c5b27d34e6bde3ed11e985a727bd7ec9f155a"; - hash = "sha256-XU10gw0WYWnzyzbzJlg2oNCksLY/Tt1CJGo0Nu4FLnM="; + rev = "278998cb51c68de9d590c84d8fd1625223772792"; + hash = "sha256-Kl8wTfEo+FBU5SE4ho0yLt7j2LHTJsAIfWor0hLdIlw="; }; nativeBuildInputs = [ gtk3 ]; From 8e093581b5a3e86fce13af4345148c2250faaffe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 Aug 2025 21:02:36 +0200 Subject: [PATCH 65/96] or-tools: re-enable tests on x86_64-linux This needs https://github.com/google/or-tools/pull/4745 to skip SCIP tests if built without SCIP (which we currently do). The tests currently still fail on aarch64-linux (https://github.com/google/or-tools/issues/4746), so we only enable for x86_64-linux. It can be re-tested with a more recent version once or-tools is updated. --- pkgs/by-name/or/or-tools/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index dae04d0b1503..638b77782166 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -7,6 +7,8 @@ ensureNewerSourcesForZipFilesHook, fetchFromGitHub, fetchpatch, + gtest, + gbenchmark, glpk, highs, lib, @@ -55,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch?rev=19"; hash = "sha256-r38ZbRkEW1ZvJb0Uf56c0+HcnfouZZJeEYlIK7quSjQ="; }) + (fetchpatch { + name = "math_opt-only-run-SCIP-tests-if-enabled.patch"; + url = "https://github.com/google/or-tools/commit/b5a2f8ac40dd4bfa4359c35570733171454ec72b.patch"; + hash = "sha256-h96zJkqTtwfBd+m7Lm9r/ks/n8uvY4iSPgxMZe8vtXI="; + }) ]; # or-tools normally attempts to build Protobuf for the build platform when @@ -108,6 +115,8 @@ stdenv.mkDerivation (finalAttrs: { cbc eigen glpk + gbenchmark + gtest highs python3.pkgs.absl-py python3.pkgs.pybind11 @@ -131,11 +140,15 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ python3.pkgs.matplotlib + python3.pkgs.pandas + python3.pkgs.pytest + python3.pkgs.scipy + python3.pkgs.svgwrite python3.pkgs.virtualenv ]; - # some tests fail on linux and hang on darwin - doCheck = false; + # some tests fail on aarch64-linux and hang on darwin + doCheck = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib From de3b71ba40b0af0762f3cb96c1ad18c9db86bc77 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 5 Aug 2025 07:44:12 -0500 Subject: [PATCH 66/96] gst_all_1.gst-editing-services: enable/disable tests in Meson This ensures that tests are disabled when cross-compiling. This is necessary as tests/validate requires `gst-tester-1.0` to be executable. --- pkgs/development/libraries/gstreamer/ges/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 2e2a9fdae3fa..a03b18bb059f 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) ]; postPatch = '' From a8e563e74b29b92ba061153b580d341161564bd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 19:09:48 +0000 Subject: [PATCH 67/96] nextcloud-spreed-signaling: 2.0.3 -> 2.0.4 --- pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix index 4f47573bf675..4c0922d67bf3 100644 --- a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix +++ b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "nextcloud-spreed-signaling"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "strukturag"; repo = "nextcloud-spreed-signaling"; tag = "v${finalAttrs.version}"; - hash = "sha256-JBYhmIXDpovkXM8oYO3B9n2bs+H0GjmuT4Dl3gEQjPo="; + hash = "sha256-im6P76g1OMHoHZAHGFBA+urcdmokWKxmuhPJac2Lz/Y="; }; - vendorHash = "sha256-MGz0tj6QwDXYDtamgN6d5yfIFHToE+XF3HYVsFRxHhM="; + vendorHash = "sha256-zfX4rh1moMVxzeMxsLVlefgUxwzH0MMLxMFbA3qv6hU="; strictDeps = true; From b886b76149c1c3de2df7b9e910ed5c1bed03f105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 19:29:15 +0000 Subject: [PATCH 68/96] rcon-cli: 1.7.1 -> 1.7.2 --- pkgs/by-name/rc/rcon-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 612048095359..6afa73ae7fb9 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-72wlcQ57OuFS8CWIDMavdFGy5jWlBbzIjgdqeP7fbg0="; + hash = "sha256-wog4nnXITV5p2lzfuO9tB//B87nh8KGpsCfSalt8WvE="; }; - vendorHash = "sha256-RX3tCZID9xS4zHQYGyAarmI2jbUwZEFWzo0lh7h3f1s="; + vendorHash = "sha256-vD+i3vMInErO0MpIRgsVe0Fl6HuFIwUS8xKHdZ7lxVM="; subPackages = [ "." ]; passthru.updateScript = nix-update-script { }; From 666545fc487fbba52e161e4ec6c3165b8882aae0 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sat, 26 Jul 2025 22:46:29 +0200 Subject: [PATCH 69/96] mixtool: init at 0-unstable-2025-07-07 --- pkgs/by-name/mi/mixtool/package.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/mi/mixtool/package.nix diff --git a/pkgs/by-name/mi/mixtool/package.nix b/pkgs/by-name/mi/mixtool/package.nix new file mode 100644 index 000000000000..9eb62ede641f --- /dev/null +++ b/pkgs/by-name/mi/mixtool/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "mixtool"; + version = "0-unstable-2025-07-07"; + + src = fetchFromGitHub { + owner = "monitoring-mixins"; + repo = "mixtool"; + rev = "1abe34c3187d53b795d0474535b476bc9b7500c3"; + hash = "sha256-RRoz5Kp/IGkUD6XVK70+k4L05rYqhkqh6LpopihyEd8="; + }; + + vendorHash = "sha256-o9HNcq7XHXH/s6UthYADsktGh9NjgC1rVPbGP11Cfc0="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + meta = { + description = "Helper for easily working with jsonnet mixins"; + homepage = "https://github.com/monitoring-mixins/mixtool"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ arikgrahl ]; + mainProgram = "mixtool"; + }; +}) From 6204e966f9365d7c5af1d1613fdaa360fb310907 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 2 Aug 2025 12:54:27 +0200 Subject: [PATCH 70/96] yubico-piv-tool: 2.7.1 -> 2.7.2 Diff: https://github.com/Yubico/yubico-piv-tool/compare/yubico-piv-tool-2.7.1...yubico-piv-tool-2.7.2 Release: https://github.com/Yubico/yubico-piv-tool/releases/tag/yubico-piv-tool-2.7.2 --- pkgs/by-name/yu/yubico-piv-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix index 0f16312e0bb9..12bf09f8c8cc 100644 --- a/pkgs/by-name/yu/yubico-piv-tool/package.nix +++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.7.1"; + version = "2.7.2"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; tag = "yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-ow9SS7YGCZzSxds3WKsHx9/Vxloy9RqvDjpIBJUBSb0="; + hash = "sha256-1VLSlwwubxCYqdU1ueD2FXEqS5xKtHk4bsJAXOHCDKY="; }; postPatch = '' From 2cbeff92c472aa202f167fce11704c4c5b4276a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 19:44:22 +0000 Subject: [PATCH 71/96] svix-server: 1.71.0 -> 1.73.0 --- pkgs/by-name/sv/svix-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 7daa9e0c0a12..faf0ecce211e 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.71.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-LwU3Bfz/J2bsmaDrIBafHNELlU7mEXSSN6Vy+wslCrw="; + hash = "sha256-Gx8fvOkoTznj3tvJOhn6lVRlf0lWcAgBm9oE7L8pxTs="; }; sourceRoot = "${src.name}/server"; - cargoHash = "sha256-c3pQ6CSvzp8qkuLqWBDF5IZueqwRbjciu0QcG9uO4Vo="; + cargoHash = "sha256-LQefLUSoKQOeAgqhb/HT554j/xEaNvnKzmCOKHTRXq8="; nativeBuildInputs = [ pkg-config ]; From 444831ea24b2bcfa0c7a46581779fd8273de3fd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Aug 2025 20:56:56 +0000 Subject: [PATCH 72/96] autosuspend: 8.0.0 -> 9.0.0 --- pkgs/by-name/au/autosuspend/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index de1f824d1840..c8208b263d1c 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -7,16 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; - disabled = python3.pythonOlder "3.10"; + disabled = python3.pythonOlder "3.11"; src = fetchFromGitHub { owner = "languitar"; repo = "autosuspend"; tag = "v${version}"; - hash = "sha256-ikFZTSYWjl0QGvVAlcMVANCTwcxWN5fkrcK4iQ/QFok="; + hash = "sha256-JOH4QzoiLR1Pp/RVz0nrLxjQw92pDxXTu414jbpCMqk="; }; build-system = with python3.pkgs; [ From bfe9c8949fc584c54a444f90e181db6512f85805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 20:11:24 +0000 Subject: [PATCH 73/96] anyrun: 0-unstable-2025-05-27 -> 0-unstable-2025-08-18 --- pkgs/by-name/an/anyrun/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index ca0c87ae5ec5..55e2715533b5 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage { pname = "anyrun"; - version = "0-unstable-2025-05-27"; + version = "0-unstable-2025-08-18"; src = fetchFromGitHub { owner = "kirottu"; repo = "anyrun"; - rev = "25367153f225a59c5ce5746583e39a71ff052f09"; - hash = "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY="; + rev = "bed987ed5dec0b29865b973ad4fce04c5da2ea21"; + hash = "sha256-2iAIrSC4ubTCEM5BeC+R7dywkj9CAV0K6vHbqxCcCtA="; }; - cargoHash = "sha256-ouAeoSCmkvWgxAUA/VYITm9/XvxmN+TdyZgEGgBGdKI="; + cargoHash = "sha256-n+UJzx80JAQ4hqdk7OjyvSsCYql9I6yKLA5ab9iS9vQ="; strictDeps = true; enableParallelBuilding = true; From 592c0aaeb40571653af61b004ac37310d451eddb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 18 Aug 2025 22:19:05 +0200 Subject: [PATCH 74/96] =?UTF-8?q?gajim:=202.2.0=20=E2=86=92=202.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pythonPackages.nbxmpp: 6.2.0 → 6.3.0 --- .../networking/instant-messengers/gajim/default.nix | 7 ++++--- pkgs/development/python-modules/nbxmpp/default.nix | 12 +++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 353cb14ad423..1ef204d6ad7e 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -11,6 +11,7 @@ adwaita-icon-theme, gtksourceview5, glib-networking, + libadwaita, # Test dependencies xvfb-run, @@ -42,11 +43,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "2.2.0"; + version = "2.3.4"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-TOZuMiE5RjaJYvNWxl2FyCp6uIO+LLWiRb7N9jc1yRk="; + hash = "sha256-mazQcCJXVjDZS0mrbXvvUfZN99/KvD2accJkHx5sXdM="; }; format = "pyproject"; @@ -75,6 +76,7 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook3 gobject-introspection + libadwaita ]; dontWrapGApps = true; @@ -95,7 +97,6 @@ python3.pkgs.buildPythonApplication rec { with python3.pkgs; [ nbxmpp - pygobject3 dbus-python pillow css-parser diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 4ca61a205a29..8d522d0c24e5 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchurl, fetchFromGitLab, gobject-introspection, idna, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "6.2.0"; + version = "6.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-BaRLYuyn0acikX0Imsul2yY+w4jdtXTlE84hAovuZ/4="; + hash = "sha256-s29d3SqmnFuqnr7B6u7N+kPKfccMlmTIoQGtjOe1ipg="; }; nativeBuildInputs = [ @@ -42,7 +43,12 @@ buildPythonPackage rec { idna libsoup_3 packaging - pygobject3 + (pygobject3.overrideAttrs (o: { + src = fetchurl { + url = "mirror://gnome/sources/pygobject/3.52/pygobject-3.52.3.tar.gz"; + hash = "sha256-AOQn0pHpV0Yqj61lmp+ci+d2/4Kot2vfQC8eruwIbYI="; + }; + })) pyopenssl ]; From 74b034b5bf6ff6dd321851d8dd7502df4364fd8c Mon Sep 17 00:00:00 2001 From: Vuks69 <51289041+Vuks69@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:25:36 +0200 Subject: [PATCH 75/96] maintainers: add vuks --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index af14dd8d0cac..945c9823dc68 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27098,6 +27098,12 @@ githubId = 4779365; name = "Johannes Mayrhofer"; }; + vuks = { + email = "vuks@allthingslinux.org"; + github = "Vuks69"; + githubId = 51289041; + name = "Vuks"; + }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; From cee55b8bc0125b42b177806970f3f97c94107892 Mon Sep 17 00:00:00 2001 From: Vuks69 <51289041+Vuks69@users.noreply.github.com> Date: Tue, 15 Jul 2025 23:05:51 +0200 Subject: [PATCH 76/96] kiro: init at 0.2.13 --- pkgs/by-name/ki/kiro/package.nix | 60 ++++++++++++++++ pkgs/by-name/ki/kiro/sources.json | 14 ++++ pkgs/by-name/ki/kiro/update.sh | 110 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 4 files changed, 190 insertions(+) create mode 100644 pkgs/by-name/ki/kiro/package.nix create mode 100644 pkgs/by-name/ki/kiro/sources.json create mode 100755 pkgs/by-name/ki/kiro/update.sh diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix new file mode 100644 index 000000000000..82f12337a538 --- /dev/null +++ b/pkgs/by-name/ki/kiro/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + callPackage, + vscode-generic, + fetchurl, + extraCommandLineArgs ? "", + useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin, +}: + +let + sources = (lib.importJSON ./sources.json).${stdenv.hostPlatform.system}; +in +(callPackage vscode-generic { + inherit useVSCodeRipgrep; + commandLineArgs = extraCommandLineArgs; + + version = "0.2.13"; + pname = "kiro"; + + # You can find the current VSCode version in the About dialog: + # workbench.action.showAboutDialog (Help: About) + vscodeVersion = "1.94.0"; + + executableName = "kiro"; + longName = "Kiro"; + shortName = "kiro"; + libraryName = "kiro"; + iconName = "kiro"; + + src = fetchurl { + url = sources.url; + hash = sources.hash; + }; + sourceRoot = "Kiro"; + patchVSCodePath = true; + + tests = { }; + updateScript = ./update.sh; + + meta = { + description = "IDE for Agentic AI workflows based on VS Code"; + homepage = "https://kiro.dev"; + license = lib.licenses.amazonsl; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ vuks ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "kiro"; + }; + +}).overrideAttrs + (oldAttrs: { + passthru = (oldAttrs.passthru or { }) // { + inherit sources; + }; + }) diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json new file mode 100644 index 000000000000..00f293c8f301 --- /dev/null +++ b/pkgs/by-name/ki/kiro/sources.json @@ -0,0 +1,14 @@ +{ + "x86_64-linux": { + "url": "https://prod.download.desktop.kiro.dev/releases/202508150626--distro-linux-x64-tar-gz/202508150626-distro-linux-x64.tar.gz", + "hash": "sha256-ORgN7gOyHGkO/ewqy62H0oNweZz7ViUAuEtXM1WgYIE=" + }, + "x86_64-darwin": { + "url": "https://prod.download.desktop.kiro.dev/releases/202508150626-Kiro-dmg-darwin-x64.dmg", + "hash": "sha256-8lIiMfDxp8VuRG/tiuojtOksc6oGT0+ZPpSAriRmKYU=" + }, + "aarch64-darwin": { + "url": "https://prod.download.desktop.kiro.dev/releases/202508150626-Kiro-dmg-darwin-arm64.dmg", + "hash": "sha256-2WGLIspDErwa1CZmSTTFa4aNCi6T/8x3vDNalNsm4xQ=" + } +} diff --git a/pkgs/by-name/ki/kiro/update.sh b/pkgs/by-name/ki/kiro/update.sh new file mode 100755 index 000000000000..4da06c84be34 --- /dev/null +++ b/pkgs/by-name/ki/kiro/update.sh @@ -0,0 +1,110 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq +# shellcheck shell=bash + +set -euo pipefail + +# Script configuration +SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" +PACKAGE_NIX="${SCRIPT_DIR}/package.nix" +SOURCES_JSON="${SCRIPT_DIR}/sources.json" + +# Platform configuration +declare -A PLATFORM_URLS=( + ["x86_64-linux"]="https://prod.download.desktop.kiro.dev/stable/metadata-linux-x64-stable.json" + ["x86_64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-x64-stable.json" + ["aarch64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-arm64-stable.json" +) + +# Data storage +declare -A platform_versions +declare -A platform_urls +declare -A platform_hashes + +# Error handling +error_exit() { + echo "Error: $1" >&2 + exit 1 +} + +# Script execution starts here +echo "Starting Kiro update process..." + +# Fetch metadata for all platforms +echo "Fetching platform information..." +for platform in "${!PLATFORM_URLS[@]}"; do + url="${PLATFORM_URLS[$platform]}" + echo "Fetching metadata for $platform..." + + if ! response=$(curl -fsSL "$url"); then + error_exit "Failed to fetch metadata for $platform from $url" + fi + + # Extract file URL and version from metadata + file_url=$(echo "$response" | jq -r ' + .releases[0].updateTo + | select(.url | test("\\.(tar|dmg)(\\.|$)")) + | .url' | head -1) + + if [[ -z "$file_url" || "$file_url" == "null" ]]; then + error_exit "Could not find a valid file URL for $platform in metadata" + fi + + version=$(echo "$response" | jq -r '.currentRelease') + if [[ -z "$version" || "$version" == "null" ]]; then + error_exit "Could not extract version for $platform from metadata" + fi + + platform_versions["$platform"]="$version" + platform_urls["$platform"]="$file_url" +done + +# Determine the maximum version +max_version="" +for platform in "${!platform_versions[@]}"; do + version="${platform_versions[$platform]}" + if [[ -z "$max_version" ]] || [[ "$version" > "$max_version" ]]; then + max_version="$version" + fi +done +echo "Latest version across all platforms: $max_version" + +# Check if update is needed +if [[ ! -f "$PACKAGE_NIX" ]]; then + error_exit "package.nix not found at $PACKAGE_NIX" +fi +current_version=$(grep -E '^ version = ' "$PACKAGE_NIX" | cut -d'"' -f2) +if [[ -z "$current_version" ]]; then + error_exit "Could not extract current version from package.nix" +fi +if [[ "$max_version" == "$current_version" ]]; then + echo "No update needed. Current version is already the latest: $current_version" + exit 0 +fi + +echo "Updating to version: $max_version" +echo "Calculating hashes..." +for platform in "${!platform_urls[@]}"; do + echo " Calculating hash for $platform..." + platform_hashes["$platform"]=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${platform_urls[$platform]}")") +done + +# Update package.nix and generate sources.json +echo "Updating package.nix..." +sed -i "s/version = \".*\"/version = \"$max_version\"/" "$PACKAGE_NIX" + +echo "Generating sources.json..." +json_content="{}" +for platform in "${!platform_urls[@]}"; do + json_content=$(echo "$json_content" | jq --arg platform "$platform" \ + --arg url "${platform_urls[$platform]}" \ + --arg hash "${platform_hashes[$platform]}" \ + '. + {($platform): {url: $url, hash: $hash}}') +done +echo "$json_content" >"$SOURCES_JSON" + +echo "Successfully updated package.nix to version $max_version" +echo "Hashes calculated and updated:" +for platform in "${!platform_hashes[@]}"; do + echo " $platform: ${platform_hashes[$platform]}" +done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a6d9828143e..a08d4f67c496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13807,6 +13807,12 @@ with pkgs; nodejs = nodejs_20; }; + kiro = callPackage ../by-name/ki/kiro/package.nix { + vscode-generic = ../applications/editors/vscode/generic.nix; + }; + kiro-fhs = kiro.fhs; + kiro-fhsWithPackages = kiro.fhsWithPackages; + whispers = with python3Packages; toPythonApplication whispers; # Should always be the version with the most features From d3af8f201c05a810931a6ab34a46ef280fe91c85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 07:58:44 +0000 Subject: [PATCH 77/96] nototools: 0.2.20 -> 0.3.2 --- pkgs/by-name/no/nototools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nototools/package.nix b/pkgs/by-name/no/nototools/package.nix index c2676f413011..d0a2809a75b5 100644 --- a/pkgs/by-name/no/nototools/package.nix +++ b/pkgs/by-name/no/nototools/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "nototools"; - version = "0.2.20"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; tag = "v${version}"; - sha256 = "sha256-id4UhyWOFHrtmBZHhnaY2jHDIK0s7rcGBpg4QsBTLKs="; + sha256 = "sha256-0se0YcnhDwwMbt2C4hep0T/JEidHfFRUnm2Sy7qr2uk="; }; build-system = with python3Packages; [ From 13b0ff3b3cb47e56f814f99778fe6c3ad38a3016 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 06:53:05 +0000 Subject: [PATCH 78/96] mihomo-party: 1.8.3 -> 1.8.4 --- pkgs/by-name/mi/mihomo-party/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 45e1e42db6a8..b5a8cbf3ad9a 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mihomo-party"; - version = "1.8.3"; + version = "1.8.4"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${finalAttrs.version}/mihomo-party-linux-${finalAttrs.version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-3x6xueQS81IWutY0BH52wRdb8Fh2kTQF7QgwZACE6kk="; - aarch64-linux = "sha256-SBPFnY/0CAUhEpZe+wav+HY2kmZ45+gzoXrUn7jUrts="; + x86_64-linux = "sha256-bbKW4kz1v+yF0ZsH9Ew+c780LCdyJUi8tIiHV09An8s="; + aarch64-linux = "sha256-72NAoFCt+Uwbt1blwHNM7FePUX0D6AZoqW3XF0NkT28="; }; }; From fdcfb20b2eb63549f8b6ef7ffac5892b0731a5ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 07:16:19 +0000 Subject: [PATCH 79/96] go-judge: 1.9.4 -> 1.9.5 --- pkgs/by-name/go/go-judge/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index 9661666095d7..e4b2f48f35a5 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "criyle"; repo = "go-judge"; rev = "v${version}"; - hash = "sha256-26Fx3bPhAM/Clb5vkU5ml++W0uYT8dnDNabP5Ir1Lx4="; + hash = "sha256-PLA3WUPrXS+5YpkrUhm66XE7wyO10kvhnzisq3LjHLU="; }; - vendorHash = "sha256-vkPuGoEBU8FPCW6/10HJZYtI2FzjydsWwv9wy8DXwA8="; + vendorHash = "sha256-FJdC5/Ui8rgL29xr8um/eSV+IYf1gceEJYkK4Y0/VXo="; tags = [ "nomsgpack" From e0407abdb410100aa939b590d8a81343f67c6ea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 03:54:50 +0000 Subject: [PATCH 80/96] vscode-extensions.shopify.ruby-lsp: 0.9.31 -> 0.9.32 --- 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 db0cf1915b69..d645a1afa484 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4292,8 +4292,8 @@ let mktplcRef = { publisher = "shopify"; name = "ruby-lsp"; - version = "0.9.31"; - hash = "sha256-ppX0GgLJENXVzXvJ6AZMZihT6FV6o5rkA7qpDrtxhAQ="; + version = "0.9.32"; + hash = "sha256-b8VFojeIkplnr48D8el0HeEtN47al/tgqgq52ozjw9M="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; From d25bc8df5c7ee36545fbbe95a34063f628ca9837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 19:22:28 +0000 Subject: [PATCH 81/96] vscode-extensions.ufo5260987423.magic-scheme: 0.0.5 -> 0.0.6 --- .../vscode/extensions/ufo5260987423.magic-scheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix b/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix index 545f4a268138..971de48c2314 100644 --- a/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ufo5260987423"; name = "magic-scheme"; - version = "0.0.5"; - hash = "sha256-br1Vr4gIC2Zo74NHyCLTJL+GCjFzdOZh2oXIXZdJuRw="; + version = "0.0.6"; + hash = "sha256-ibEdsw/ulr+cagB90uALDbSsQV18dPULANCdnjPvhuI="; }; postInstall = '' From 086e8a6bb0a1ff5932d9cfc78f0bebfa97e874b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 21:45:41 +0000 Subject: [PATCH 82/96] steampipePackages.steampipe-plugin-aws: 1.21.0 -> 1.22.0 --- .../steampipe-packages/steampipe-plugin-aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 9f73fbab22d0..b2f9a741c4d7 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; tag = "v${version}"; - hash = "sha256-RgdQZ3ifJamHVA/+ZZw7FpXZ1x5DejLnE4Edc00cUyQ="; + hash = "sha256-KnKcrbvLf8pX6Jj+HUq+VQTFKOUTFb2kq9z4YWJPPx4="; }; - vendorHash = "sha256-3v8gSA0QXT3FmQSRcL8KV53ieNymCgtcxoeNlkP/FLM="; + vendorHash = "sha256-8hqesnVwLA0dX70/xQvSSz3fpZKiCpNifEL1YUpbHnM="; ldflags = [ "-s" From 1700b1908bedfacc75c9d19e82bce1c1244dcab8 Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Sat, 16 Aug 2025 10:46:32 +0200 Subject: [PATCH 83/96] llama-cpp-rocm: init at 6134 --- pkgs/by-name/ll/llama-cpp-rocm/package.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pkgs/by-name/ll/llama-cpp-rocm/package.nix diff --git a/pkgs/by-name/ll/llama-cpp-rocm/package.nix b/pkgs/by-name/ll/llama-cpp-rocm/package.nix new file mode 100644 index 000000000000..a539c63b8203 --- /dev/null +++ b/pkgs/by-name/ll/llama-cpp-rocm/package.nix @@ -0,0 +1,3 @@ +{ llama-cpp }: + +llama-cpp.override { rocmSupport = true; } From f8a7597f5d80c116d775e86175f5b7592be9b441 Mon Sep 17 00:00:00 2001 From: rczb Date: Sat, 16 Aug 2025 11:06:05 +0800 Subject: [PATCH 84/96] racket: make lib paths consistent --- pkgs/by-name/ra/racket/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/racket/package.nix b/pkgs/by-name/ra/racket/package.nix index 45ee63f0ec7e..82be2c38d614 100644 --- a/pkgs/by-name/ra/racket/package.nix +++ b/pkgs/by-name/ra/racket/package.nix @@ -26,13 +26,6 @@ let minimal = racket-minimal.override { inherit disableDocs; }; - makeLibPaths = lib.concatMapStringsSep " " ( - lib.flip lib.pipe [ - lib.getLib - (x: ''"${x}/lib"'') - ] - ); - manifest = lib.importJSON ./manifest.json; inherit (stdenv.hostPlatform) isDarwin; in @@ -71,7 +64,6 @@ minimal.overrideAttrs ( preBuild = let - libPaths = makeLibPaths finalAttrs.buildInputs; libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in /* @@ -79,7 +71,13 @@ minimal.overrideAttrs ( dependencies, which is integrated into the build process of Racket */ '' - for lib_path in ${libPaths}; do + for lib_path in $( \ + echo "$NIX_LDFLAGS" \ + | tr ' ' '\n' \ + | grep '^-L' \ + | sed 's/^-L//' \ + | awk '!seen[$0]++' \ + ); do addToSearchPath ${libPathsVar} $lib_path done '' From d0dd9e1c3a7a6da6c40ad69e5c9bcbb985638baf Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 24 Jul 2025 00:34:11 +0300 Subject: [PATCH 85/96] nixos/lact: allow configuring declaratively --- nixos/modules/services/hardware/lact.nix | 30 +++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/lact.nix b/nixos/modules/services/hardware/lact.nix index e16712338ab8..e797892b585f 100644 --- a/nixos/modules/services/hardware/lact.nix +++ b/nixos/modules/services/hardware/lact.nix @@ -4,9 +4,10 @@ pkgs, ... }: - let cfg = config.services.lact; + configFormat = pkgs.formats.yaml { }; + configFile = configFormat.generate "lact-config.yaml" cfg.settings; in { meta.maintainers = [ lib.maintainers.johnrtitor ]; @@ -25,15 +26,42 @@ in }; package = lib.mkPackageOption pkgs "lact" { }; + + settings = lib.mkOption { + default = { }; + type = lib.types.submodule { + freeformType = configFormat.type; + }; + + description = '' + Settings for LACT. + + The easiest method of acquiring the settings is to delete + {file}`/etc/lact/config.yaml`, enter your settings and look + at the file. + + ::: {.note} + When `settings` is populated, the config file will be a symbolic link + and thus LACT daemon will not be able to modify it through the GUI. + ::: + ''; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; + environment.etc."lact/config.yaml" = lib.mkIf (cfg.settings != { }) { + source = configFile; + }; + systemd.services.lactd = { description = "LACT GPU Control Daemon"; wantedBy = [ "multi-user.target" ]; + + # Restart when the config file changes. + restartTriggers = lib.mkIf (cfg.settings != { }) [ configFile ]; }; }; } From 403fb390ad8817ff7a4deacabee8041f0c2c2e3e Mon Sep 17 00:00:00 2001 From: qzylinra Date: Thu, 14 Aug 2025 18:37:18 +0800 Subject: [PATCH 86/96] kazumi: 1.7.4 -> 1.7.6 --- pkgs/by-name/ka/kazumi/gitHashes.json | 12 + pkgs/by-name/ka/kazumi/package.nix | 104 ++++---- pkgs/by-name/ka/kazumi/pubspec.lock.json | 296 ++++++++++++++++----- pkgs/by-name/ka/kazumi/update-gitHashes.py | 51 ++++ 4 files changed, 338 insertions(+), 125 deletions(-) create mode 100644 pkgs/by-name/ka/kazumi/gitHashes.json create mode 100755 pkgs/by-name/ka/kazumi/update-gitHashes.py diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json new file mode 100644 index 000000000000..78b8dc65ca92 --- /dev/null +++ b/pkgs/by-name/ka/kazumi/gitHashes.json @@ -0,0 +1,12 @@ +{ + "desktop_webview_window": "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=", + "media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_linux": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_macos_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_libs_windows_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "media_kit_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", + "webview_windows": "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=" +} diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 67542e6b0b0d..a4db51666f49 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -1,50 +1,38 @@ { lib, - fetchFromGitHub, - flutter332, - webkitgtk_4_1, - alsa-lib, - libayatana-appindicator, - autoPatchelfHook, - gst_all_1, stdenv, + flutter332, + fetchFromGitHub, + autoPatchelfHook, + alsa-lib, + gst_all_1, + libayatana-appindicator, mimalloc, - mpv, mpv-unwrapped, - runCommand, - yq, - kazumi, + webkitgtk_4_1, _experimental-update-script-combinators, gitUpdater, + runCommand, + yq-go, }: -flutter332.buildFlutterApplication rec { - pname = "kazumi"; - version = "1.7.4"; +let + version = "1.7.6"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-Tzg8vFu2/ZLHQ1Ijp4et+qNPX0ytTZ//zVqQHJ6QBxs="; + hash = "sha256-avZ0IxxJO9e0xWE58QYkTspDqgwu+nCwzzvV+4rCLOk="; }; +in +flutter332.buildFlutterApplication { + pname = "kazumi"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - webkitgtk_4_1 - alsa-lib - libayatana-appindicator - mpv - gst_all_1.gstreamer - gst_all_1.gst-vaapi - gst_all_1.gst-libav - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - ]; + gitHashes = lib.importJSON ./gitHashes.json; customSourceBuilders = { # unofficial media_kit_libs_linux @@ -63,7 +51,7 @@ flutter332.buildFlutterApplication rec { installPhase = '' runHook preInstall - cp -r . $out + cp -r . "$out" runHook postInstall ''; @@ -79,56 +67,58 @@ flutter332.buildFlutterApplication rec { postPatch = '' sed -i '/set(LIBMPV_ZIP_URL/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{//!d; /set(LIBMPV_ZIP_URL/d}' media_kit_video/linux/CMakeLists.txt sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt - sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt - sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt + sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt + sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt ''; installPhase = '' runHook preInstall - cp -r . $out + cp -r . "$out" runHook postInstall ''; }; }; - gitHashes = - let - media_kit-hash = "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg="; - in - { - desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; - webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="; - media_kit = media_kit-hash; - media_kit_libs_android_video = media_kit-hash; - media_kit_libs_ios_video = media_kit-hash; - media_kit_libs_linux = media_kit-hash; - media_kit_libs_macos_video = media_kit-hash; - media_kit_libs_video = media_kit-hash; - media_kit_libs_windows_video = media_kit-hash; - media_kit_video = media_kit-hash; - }; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + alsa-lib + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-vaapi + gst_all_1.gstreamer + libayatana-appindicator + mpv-unwrapped + webkitgtk_4_1 + ]; postInstall = '' - ln -snf ${mpv}/lib/libmpv.so.2 $out/app/kazumi/lib/libmpv.so.2 - install -Dm0644 assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop - install -Dm0644 assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png + ln -snf ${mpv-unwrapped}/lib/libmpv.so.2 $out/app/$pname/lib/libmpv.so.2 + install -Dm 0644 assets/linux/io.github.Predidit.Kazumi.desktop -t $out/share/applications/ + install -Dm 0644 assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png ''; passthru = { pubspecSource = runCommand "pubspec.lock.json" { - nativeBuildInputs = [ yq ]; - inherit (kazumi) src; + inherit src; + nativeBuildInputs = [ yq-go ]; } '' - cat $src/pubspec.lock | yq > $out + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" ''; updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { }) (_experimental-update-script-combinators.copyAttrOutputToFile "kazumi.pubspecSource" ./pubspec.lock.json) + { + command = [ ./update-gitHashes.py ]; + supportedFeatures = [ "silent" ]; + } ]; }; @@ -136,8 +126,8 @@ flutter332.buildFlutterApplication rec { description = "Watch Animes online with danmaku support"; homepage = "https://github.com/Predidit/Kazumi"; mainProgram = "kazumi"; - license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ ]; + license = lib.licenses.gpl3Plus; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index d3a213cc2c34..2dafbd1b1bea 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -90,11 +90,11 @@ "dependency": "transitive", "description": { "name": "auto_injector", - "sha256": "ad7a95d7c381363d48b54e00cb680f024fd97009067244454e9b4850337608e8", + "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "boolean_selector": { "dependency": "transitive", @@ -110,11 +110,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.4" }, "build_config": { "dependency": "transitive", @@ -140,31 +140,31 @@ "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "2.5.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.5.4" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0" + "version": "9.1.2" }, "built_collection": { "dependency": "transitive", @@ -180,11 +180,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.11.0" }, "cached_network_image": { "dependency": "direct main", @@ -250,11 +250,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "cli_util": { "dependency": "transitive", @@ -411,21 +411,21 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.4.0" + "version": "11.5.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.2" + "version": "7.0.3" }, "dio": { "dependency": "direct main", @@ -573,15 +573,65 @@ "source": "hosted", "version": "0.6.0" }, + "flutter_inappwebview_android": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "flutter_inappwebview_ios": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_inappwebview_macos": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0+1" + }, "flutter_launcher_icons": { "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", + "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.14.3" + "version": "0.14.4" }, "flutter_lints": { "dependency": "direct dev", @@ -613,11 +663,11 @@ "dependency": "direct main", "description": { "name": "flutter_modular", - "sha256": "bc17a1eb1da676b9111e59d27834fb6673bdea01aead12f0803a0847ff9d451c", + "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.4" + "version": "6.4.1" }, "flutter_native_splash": { "dependency": "direct dev", @@ -653,11 +703,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", + "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "flutter_test": { "dependency": "direct dev", @@ -695,11 +745,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "sha256": "f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.7.0" + "version": "8.0.3" }, "glob": { "dependency": "transitive", @@ -885,11 +935,11 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.1" }, "logging": { "dependency": "transitive", @@ -1063,31 +1113,31 @@ "dependency": "direct dev", "description": { "name": "mobx_codegen", - "sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc", + "sha256": "e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.7.1" }, "modular_core": { "dependency": "transitive", "description": { "name": "modular_core", - "sha256": "bd60317c81cff3a510aca19d6ddd661c7c79e3cba97b9f39e9ad199156ff255d", + "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.3" + "version": "3.4.1" }, "msix": { "dependency": "direct dev", "description": { "name": "msix", - "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f", + "sha256": "bbb9b3ff4a9f8e7e7507b2a22dc0517fd1fe3db44e72de7ab052cb6b362406ee", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.9" + "version": "3.16.10" }, "nested": { "dependency": "transitive", @@ -1119,6 +1169,26 @@ "source": "hosted", "version": "2.1.0" }, + "open_filex": { + "dependency": "direct main", + "description": { + "name": "open_filex", + "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.7.0" + }, + "os_detect": { + "dependency": "transitive", + "description": { + "name": "os_detect", + "sha256": "7d87c0dd98c6faf110d5aa498e9a6df02ffce4bb78cc9cfc8ad02929be9bb71f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, "package_config": { "dependency": "transitive", "description": { @@ -1273,11 +1343,11 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.0.3" }, "provider": { "dependency": "direct main", @@ -1323,11 +1393,11 @@ "dependency": "transitive", "description": { "name": "result_dart", - "sha256": "3c69c864a08df0f413a86be211d07405e9a53cc1ac111e3cc8365845a0fb5288", + "sha256": "0666b21fbdf697b3bdd9986348a380aa204b3ebe7c146d8e4cdaa7ce735e6054", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "2.1.1" }, "rxdart": { "dependency": "transitive", @@ -1363,21 +1433,21 @@ "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", + "sha256": "fb5fa43cb89d0c9b8534556c427db1e97e46594ac5d66ebdcf16063b773d54ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "screen_brightness_ios": { "dependency": "transitive", "description": { "name": "screen_brightness_ios", - "sha256": "bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb", + "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "screen_brightness_platform_interface": { "dependency": "direct main", @@ -1459,6 +1529,76 @@ "source": "hosted", "version": "1.26.1" }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.11" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, "shelf": { "dependency": "transitive", "description": { @@ -1493,11 +1633,11 @@ "dependency": "direct main", "description": { "name": "skeletonizer", - "sha256": "c34a48b3f7ec460bad2d5623ce5dc227042a6dee639c5e3a8e32ab08188426fe", + "sha256": "eebc03dc86b298e2d7f61e0ebce5713e9dbbc3e786f825909b4591756f196eb6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0-pre" + "version": "2.1.0+1" }, "sky_engine": { "dependency": "transitive", @@ -1569,11 +1709,11 @@ "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_darwin": { "dependency": "transitive", @@ -1639,11 +1779,11 @@ "dependency": "direct main", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -1715,6 +1855,16 @@ "source": "hosted", "version": "1.1.0" }, + "upgrader": { + "dependency": "direct main", + "description": { + "name": "upgrader", + "sha256": "60293b391f4146ce1e381ed6198b6374559a4aadf885d313e94e6c7d454d03ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.4.0" + }, "uri_parser": { "dependency": "transitive", "description": { @@ -1729,11 +1879,11 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_android": { "dependency": "transitive", @@ -1819,11 +1969,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.18" + "version": "1.1.19" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1839,11 +1989,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.16" + "version": "1.1.17" }, "vector_math": { "dependency": "transitive", @@ -1855,6 +2005,16 @@ "source": "hosted", "version": "2.1.4" }, + "version": { + "dependency": "transitive", + "description": { + "name": "version", + "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, "vm_service": { "dependency": "transitive", "description": { @@ -1899,11 +2059,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "web": { "dependency": "transitive", @@ -1949,41 +2109,41 @@ "dependency": "direct main", "description": { "name": "webview_flutter", - "sha256": "62d763c27ce7f6cef04b3bec01c85a28d60149bffd155884aa4b8fd4941ea2e4", + "sha256": "c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.12.0" + "version": "4.13.0" }, "webview_flutter_android": { "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678", + "sha256": "414174cacd339046a1a6dbf93cac62422194c676fed11119ccf228b81640e887", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.0" + "version": "4.9.1" }, "webview_flutter_platform_interface": { "dependency": "transitive", "description": { "name": "webview_flutter_platform_interface", - "sha256": "7cb32b21825bd65569665c32bb00a34ded5779786d6201f5350979d2d529940d", + "sha256": "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.0" + "version": "2.14.0" }, "webview_flutter_wkwebview": { "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3", + "sha256": "fb46db8216131a3e55bcf44040ca808423539bc6732e7ed34fb6d8044e3d512f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.22.0" + "version": "3.23.0" }, "webview_windows": { "dependency": "direct main", @@ -2000,11 +2160,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.0" + "version": "5.14.0" }, "win32_registry": { "dependency": "transitive", @@ -2078,7 +2238,7 @@ } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.32.5" + "dart": ">=3.8.0 <4.0.0", + "flutter": ">=3.32.8" } } diff --git a/pkgs/by-name/ka/kazumi/update-gitHashes.py b/pkgs/by-name/ka/kazumi/update-gitHashes.py new file mode 100755 index 000000000000..ffa6feb66653 --- /dev/null +++ b/pkgs/by-name/ka/kazumi/update-gitHashes.py @@ -0,0 +1,51 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix-prefetch-git + +import json +import subprocess +import sys +from pathlib import Path + +THIS_FOLDER = Path(__file__).parent.resolve() +PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json" +GIT_HASHES = THIS_FOLDER / "gitHashes.json" + + +def fetch_git_hash(url: str, rev: str) -> str: + result = subprocess.run( + ["nix-prefetch-git", "--url", url, "--rev", rev], + capture_output=True, + text=True, + check=True, + ) + return json.loads(result.stdout)["hash"] + + +def main() -> None: + if not PUBSPEC_LOCK.exists(): + sys.exit(1) + try: + data = json.loads(PUBSPEC_LOCK.read_text()) + except json.JSONDecodeError: + sys.exit(1) + output: dict[str, str] = {} + for name, info in data.get("packages", {}).items(): + if info.get("source") != "git": + continue + desc = info.get("description") + if not isinstance(desc, dict): + continue + url = desc.get("url") + rev = desc.get("resolved-ref") + if not (isinstance(url, str) and isinstance(rev, str)): + continue + try: + package_hash = fetch_git_hash(url, rev) + except subprocess.CalledProcessError: + continue + output[name] = package_hash + GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n") + + +if __name__ == "__main__": + main() From 8806e6d17584774d4d2f7ad66fb8be4428a68f3f Mon Sep 17 00:00:00 2001 From: qzylinra Date: Sat, 16 Aug 2025 11:06:32 +0800 Subject: [PATCH 87/96] localsend: fix tests.localsend --- nixos/tests/localsend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/localsend.nix b/nixos/tests/localsend.nix index 047a3d1598c9..7e2905a5d77a 100644 --- a/nixos/tests/localsend.nix +++ b/nixos/tests/localsend.nix @@ -14,7 +14,7 @@ machine.succeed("localsend_app >&2 &") machine.wait_for_open_port(53317) machine.wait_for_window("LocalSend", 10) - machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'") - machine.succeed("netstat --listening --program --udp | grep -P 'udp.*53317.*localsend'") + machine.succeed("ss --listening --tcp --numeric --processes | grep -P '53317.*localsend'") + machine.succeed("ss --listening --udp --numeric --processes | grep -P '53317.*localsend'") ''; } From 55d5d3e68d2fe28b8f88d060009cba7eec0fc7cd Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Mon, 18 Aug 2025 23:30:51 +0200 Subject: [PATCH 88/96] obsidian: 1.8.10 -> 1.9.10 Changelog: https://obsidian.md/changelog/2025-08-18-desktop-v1.9.10/ --- pkgs/by-name/ob/obsidian/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index d845b9ec919c..4f82de5b0250 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.8.10"; + version = "1.9.10"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -36,9 +36,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-3BiPbT1ME75WpR/mTDl8/TI+yq6+WMU+RaZXykUG8yE=" + "sha256-tUT50nGF2rua5Wm1nqwO4I83u8o+BwwrapIbxgaAi1Y=" else - "sha256-xZoi4Z9JMM/FEPfvjBXEag3pT/uJH9dvFp8qHnTFNKE="; + "sha256-5d9x92Nu8dzAGCnTeYHmv5XQN6aWxRemRyjC6wN6lDQ="; }; icon = fetchurl { From ec2de0cc223a631b51e70cd630dc817b9aa8241f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 21:41:52 +0000 Subject: [PATCH 89/96] haven: 1.0.6 -> 1.1.0 --- pkgs/by-name/ha/haven/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/haven/package.nix b/pkgs/by-name/ha/haven/package.nix index 316be3568367..36d58fdc3455 100644 --- a/pkgs/by-name/ha/haven/package.nix +++ b/pkgs/by-name/ha/haven/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "haven"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bitvora"; repo = "haven"; tag = "v${version}"; - hash = "sha256-ddOZydweF3wVH81Bm8LIuP2HHGrGooIDeAH/Ro5LKu4="; + hash = "sha256-2947XUAppZ3DLA5A4U6D/4O9pZQfCsPxjRn/4iHkrCg="; }; - vendorHash = "sha256-JJ5kcTgjMB9d5JdMg2FiOOoAFeDhcEAsxWynd1aGNfs="; + vendorHash = "sha256-kcy18MDwb4pPwtJmHi7Riw9/+Rs47VrVIIXKbfnv1DI="; postInstall = '' mkdir -p $out/share/haven From 0e037ba07d3d71ed0d5e8050c190c4fca811be23 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 18 Aug 2025 20:15:14 +0200 Subject: [PATCH 90/96] roon-server: 2.53.1544 -> 2.54.1554 release notes: https://community.roonlabs.com/t/roon-2-54-build-1554-and-arc-1-69-build-369-are-live/304770 --- pkgs/by-name/ro/roon-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index 6c075f3c4752..c86f168f2e38 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.53.1544"; + version = "2.54.1554"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-Hbe2EfBbpA3Xzyh4ZYjm1G8qrwg+dEq5YAwZEG59ClI="; + hash = "sha256-tE+WhsXJn1fVkD8wCuu5ZVaBDwsm9hss2KA0nocME+E="; }; dontConfigure = true; From 0a961b639b2a4f54c2d4be98546b5d25ea9d7d0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 23:21:08 +0000 Subject: [PATCH 91/96] mtail: 3.2.11 -> 3.2.12 --- pkgs/by-name/mt/mtail/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index fc96db05fc39..25942790f283 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mtail"; - version = "3.2.11"; + version = "3.2.12"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-ScR07AHQBSXgVEHVQDyz/SJPMti+5TNAXlRjfTr7ZMU="; + hash = "sha256-G2yDTIAz39PwmJkHHMZDKfocmJgio8sArxkQwMCOdf8="; }; vendorHash = "sha256-+Ym+vn7yHUSS7So7m53cCUNSmznwgyvg+Xj4nKUbD7U="; From 56785485669a9864c2087f739a1496e87cb86b69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 13:37:39 +0000 Subject: [PATCH 92/96] python3Packages.hist: 2.8.1 -> 2.9.0 --- pkgs/development/python-modules/hist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix index 6e4da9897e76..932d50a4c9de 100644 --- a/pkgs/development/python-modules/hist/default.nix +++ b/pkgs/development/python-modules/hist/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hist"; - version = "2.8.1"; + version = "2.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fafJAOLvbUJXk9oamtrEJOvAE6jqvymyQwH3CJghjZ0="; + hash = "sha256-FtSPIhoeEi+B3z2j1vt2O92COIdo4D/FXcGSYZBsdOs="; }; buildInputs = [ From d2b428afa8cd1d6853999b53ba1b29cf113acae4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 23:43:06 +0000 Subject: [PATCH 93/96] python3Packages.mss: 10.0.0 -> 10.1.0 --- pkgs/development/python-modules/mss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index d7585caecb68..a7436cd646d0 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "mss"; - version = "10.0.0"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2QPg1RJivw+HgoQc8W6qbX4+HxLq41q0HC4xiDfGY38="; + hash = "sha256-cYK69+4WylaeKAQCi2q5vL9r5cRvwogIQPM7UTuctPg="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ From d31f96b146e553d0ccb84edad93b772a834c35bf Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 17 Aug 2025 22:49:11 -0400 Subject: [PATCH 94/96] isort: migrate to by-name Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/is/isort/package.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 pkgs/by-name/is/isort/package.nix diff --git a/pkgs/by-name/is/isort/package.nix b/pkgs/by-name/is/isort/package.nix new file mode 100644 index 000000000000..6515b6abb20e --- /dev/null +++ b/pkgs/by-name/is/isort/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication isort diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a08d4f67c496..aba733d22a13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8286,8 +8286,6 @@ with pkgs; isoimagewriter = libsForQt5.callPackage ../tools/misc/isoimagewriter { }; - isort = with python3Packages; toPythonApplication isort; - isso = callPackage ../servers/isso { nodejs = nodejs_20; }; From 40ba664bbf3045bb4cdf971ae5f388664bf79133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Aug 2025 03:24:21 +0000 Subject: [PATCH 95/96] libretro-shaders-slang: 0-unstable-2025-08-07 -> 0-unstable-2025-08-14 --- pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index ede5549a0ad8..fbb2db132742 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-08-07"; + version = "0-unstable-2025-08-14"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "a2ccf619c2df565ac8f3e66c91170faa5ba06aa4"; - hash = "sha256-0OjqfYgxJGtFCuPFqlSorqOEOqCf0gdyDUzG15Z/FlA="; + rev = "69e3dbb8947e749156ff1f70e32c88f3c37e6793"; + hash = "sha256-C+qO/B3Lb8vtQUV3u6ZqiVZlg2prytR+9IbTnvyQGMg="; }; dontConfigure = true; From 97eb7ee0da337d385ab015a23e15022c865be75c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 Aug 2025 09:34:23 +0200 Subject: [PATCH 96/96] =?UTF-8?q?ocamlPackages.ppxlib:=200.33.0=20?= =?UTF-8?q?=E2=86=92=200.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.base_quickcheck: 0.17.0 → 0.17.1 ocamlPackages.optcomp: 0.17.0 → 0.17.1 ocamlPackages.ppx_bench: 0.17.0 → 0.17.1 ocamlPackages.ppx_bin_prot: 0.17.0 → 0.17.1 ocamlPackages.ppx_deriving: 6.0.3 → 6.1.0 ocamlPackages.ppx_deriving_qcheck: 0.6 → 0.7 ocamlPackages.ppx_deriving_yaml: 0.3.0 → 0.4.1 ocamlPackages.ppx_deriving_yojson: 3.9.0 → 3.10.0 ocamlPackages.ppx_diff: 0.17.0 → 0.17.1 ocamlPackages.ppx_expect: 0.17.2 → 0.17.3 ocamlPackages.ppx_globalize: 0.17.0 → 0.17.2 ocamlPackages.ppx_inline_test: 0.17.0 → 0.17.1 ocamlPackages.ppx_let: 0.17.0 → 0.17.1 ocamlPackages.ppx_stable: 0.17.0 → 0.17.1 ocamlPackages.ppx_tydi: 0.17.0 → 0.17.1 ocamlPackages.ppx_typeprep_conv: 0.17.0 → 0.17.1 ocamlPackages.ppx_variants_conv: 0.17.0 → 0.17.1 ocamlPackages.sexp_conv: 0.17.0 → 0.17.1 ocamlPackages.sexp_message: 0.17.2 → 0.17.4 reason: 3.15.0 → 3.16.0 ocamlPackages.bisect_ppx: make compatible with ppxlib 0.36 ocamlPackages.config: make compatible with ppxlib 0.36 ocamlPackages.lwt_ppx: make compatible with ppxlib 0.36 ocamlPackages.melange: make compatible with ppxlib 0.36 ocamlPackages.ppx_bitstring: make compatible with ppxlib 0.36 ocamlPackages.ppx_repr: make compatible with ppxlib 0.36 ocamlPackages.bistro: mark as broken ocamlPackages.dream-html: mark as broken ocamlPackages.ocsigen-ppx-rpc: mark as broken ocamlPackages.ppx_deriving_cmdliner: mark as broken ocamlPackages.reason-react-ppx: mark as broken --- pkgs/development/compilers/reason/default.nix | 19 +- .../ocaml-modules/bisect_ppx/default.nix | 7 + .../ocaml-modules/bistro/default.nix | 2 + .../ocaml-modules/bitstring/ppx.nix | 6 +- .../ocaml-modules/config/default.nix | 7 + .../ocaml-modules/dream-html/default.nix | 1 + .../ocaml-modules/elpi/default.nix | 4 - .../ocaml-modules/gen_js_api/default.nix | 2 +- .../ocaml-modules/janestreet/0.17.nix | 459 +++++++++++++----- .../ocaml-modules/landmarks-ppx/default.nix | 1 + pkgs/development/ocaml-modules/lun/ppx.nix | 1 + pkgs/development/ocaml-modules/lwt/ppx.nix | 7 + .../ocaml-modules/ocsigen-ppx-rpc/default.nix | 3 +- .../ocaml-modules/ppx_deriving/default.nix | 5 +- .../ppx_deriving_cmdliner/default.nix | 1 + .../ppx_deriving_rpc/default.nix | 7 +- .../ppx_deriving_yaml/default.nix | 23 +- .../ppx_deriving_yojson/default.nix | 8 +- .../ocaml-modules/ppxlib/default.nix | 9 +- .../qcheck/ppx_deriving_qcheck.nix | 22 +- .../ocaml-modules/reason-react/ppx.nix | 1 + pkgs/development/ocaml-modules/repr/ppx.nix | 7 + .../tools/ocaml/melange/default.nix | 9 + pkgs/top-level/all-packages.nix | 8 +- pkgs/top-level/ocaml-packages.nix | 20 +- 25 files changed, 478 insertions(+), 161 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 0995bb457faf..f6e3b181fcd8 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -14,15 +14,30 @@ dune-build-info, }: +let + param = + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "3.16.0"; + hash = "sha256-R7DkOn00jiqFBlirS+xaT7u5/U/z7IocGBZRFVjFNk4="; + } + else + { + version = "3.15.0"; + + hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY="; + }; +in + buildDunePackage rec { pname = "reason"; - version = "3.15.0"; + inherit (param) version; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY="; + inherit (param) hash; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index a2ecd17f418e..580fb797546e 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildDunePackage, cmdliner, ppxlib, @@ -17,6 +18,12 @@ buildDunePackage rec { hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o="; }; + # Ensure compatibility with ppxlib 0.36 + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/aantron/bisect_ppx/commit/f35fdf4bdcb82c308d70f7c9c313a77777f54bdf.patch"; + hash = "sha256-hQMDU6zrHDV9JszGAj2p4bd9zlqqjc1TLU+cfMEgz9c="; + }); + minimalOCamlVersion = "4.11"; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 29e2a681993b..a861414c4a27 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -13,6 +13,7 @@ rresult, sexplib, tyxml, + ppxlib, }: buildDunePackage rec { @@ -47,5 +48,6 @@ buildDunePackage rec { description = "Build and execute typed scientific workflows"; maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.gpl2; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix index be5fb657f908..18055887c8c6 100644 --- a/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, + fetchpatch, ocaml, bitstring, ppxlib, @@ -15,7 +16,10 @@ else pname = "ppx_bitstring"; inherit (bitstring) version src; - duneVersion = "3"; + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch"; + hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g="; + }); buildInputs = [ bitstring diff --git a/pkgs/development/ocaml-modules/config/default.nix b/pkgs/development/ocaml-modules/config/default.nix index bd09b86be904..8971f66d2036 100644 --- a/pkgs/development/ocaml-modules/config/default.nix +++ b/pkgs/development/ocaml-modules/config/default.nix @@ -2,6 +2,7 @@ lib, buildDunePackage, fetchurl, + fetchpatch, ppxlib, spices, }: @@ -15,6 +16,12 @@ buildDunePackage rec { hash = "sha256-bcRCfLX2ro8vnQTJiX2aYGJC+eD26vkPynMYg817YFM="; }; + # Compatibility with ppxlib 0.36 + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/ocaml-sys/config.ml/commit/89222d8088cc3c530eb0094d7ff8ec8a67da07d1.patch"; + hash = "sha256-/jNsUXoUrfza5BCpEo7XtEjKwQX3ofEq99v0+UBh7ss="; + }); + propagatedBuildInputs = [ ppxlib spices diff --git a/pkgs/development/ocaml-modules/dream-html/default.nix b/pkgs/development/ocaml-modules/dream-html/default.nix index f5b4ae912493..dc115db96c31 100644 --- a/pkgs/development/ocaml-modules/dream-html/default.nix +++ b/pkgs/development/ocaml-modules/dream-html/default.nix @@ -23,5 +23,6 @@ buildDunePackage { description = "Write HTML directly in your OCaml source files with editor support"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.naora ]; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 2396e4756693..28c7eda5a44d 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -11,9 +11,7 @@ re, perl, ncurses, - ppxlib, ppx_deriving, - ppxlib_0_15, ppx_deriving_0_15, coqPackages, version ? @@ -88,12 +86,10 @@ buildDunePackage { ++ ( if lib.versionAtLeast version "1.13" || version == "dev" then [ - ppxlib ppx_deriving ] else [ - ppxlib_0_15 ppx_deriving_0_15 ] ); diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index a3fa6a95790a..0d7438949493 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -30,7 +30,7 @@ buildDunePackage rec { js_of_ocaml-compiler nodejs ]; - doCheck = lib.versionAtLeast ocaml.version "4.13"; + doCheck = lib.versionAtLeast ocaml.version "4.13" && !(lib.versionAtLeast ppxlib.version "0.36"); meta = { homepage = "https://github.com/LexiFi/gen_js_api"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 8df7078ac225..1d3d058695bf 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -133,6 +133,7 @@ with self; js_of_ocaml uri-sexp ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; async_kernel = janePackage { @@ -297,18 +298,31 @@ with self; ]; }; - base_quickcheck = janePackage { - pname = "base_quickcheck"; - hash = "sha256-jDxO+/9Qnntt6ZNX1xvaWvoJ0JpnPqeq8X8nsYpeqsY="; - meta.description = "Randomized testing framework, designed for compatibility with Base"; - propagatedBuildInputs = [ - ppx_base - ppx_fields_conv - ppx_let - ppx_sexp_value - splittable_random - ]; - }; + base_quickcheck = janePackage ( + { + pname = "base_quickcheck"; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ + ppx_base + ppx_fields_conv + ppx_let + ppx_sexp_value + splittable_random + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-0s40sGu2FvaUjvC5JSvHlRhbyQV1bVPrVTTWdHtTQ+k="; + } + else + { + version = "0.17.0"; + hash = "sha256-jDxO+/9Qnntt6ZNX1xvaWvoJ0JpnPqeq8X8nsYpeqsY="; + } + ) + ); bidirectional_map = janePackage { pname = "bidirectional_map"; @@ -818,6 +832,7 @@ with self; js_of_ocaml-ppx ]; patches = [ ./js_of_ocaml_patches.patch ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; jsonaf = janePackage { @@ -1083,23 +1098,49 @@ with self; ]; }; - ppx_bench = janePackage { - pname = "ppx_bench"; - hash = "sha256-y4nL/wwjJUL2Fa7Ne0f7SR5flCjT1ra9M1uBHOUZWCg="; - meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; - propagatedBuildInputs = [ ppx_inline_test ]; - }; + ppx_bench = janePackage ( + { + pname = "ppx_bench"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-nHqZSyJ5mZ86SGu9WtoVNfYTnd5kslyI8Zm/LJ7b/Fo="; + } + else + { + version = "0.17.0"; + hash = "sha256-y4nL/wwjJUL2Fa7Ne0f7SR5flCjT1ra9M1uBHOUZWCg="; + } + ) + ); - ppx_bin_prot = janePackage { - pname = "ppx_bin_prot"; - hash = "sha256-nQps/+Csx3+6H6KBzIm/dLCGWJ9fcRD7JxB4P2lky0o="; - meta.description = "Generation of bin_prot readers and writers from types"; - propagatedBuildInputs = [ - bin_prot - ppx_here - ]; - doCheck = false; # circular dependency with ppx_jane - }; + ppx_bin_prot = janePackage ( + { + pname = "ppx_bin_prot"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ + bin_prot + ppx_here + ]; + doCheck = false; # circular dependency with ppx_jane + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-9TNtRwieITJMZs+7RT7tOf1GwVlxuGeKZktVon9B7g4="; + } + else + { + version = "0.17.0"; + hash = "sha256-nQps/+Csx3+6H6KBzIm/dLCGWJ9fcRD7JxB4P2lky0o="; + } + ) + ); ppx_cold = janePackage { pname = "ppx_cold"; @@ -1186,20 +1227,34 @@ with self; ppx_jane ppxlib ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; - ppx_diff = janePackage { - pname = "ppx_diff"; - hash = "sha256-MAn+vcU6vLR8g16Wq1sORyLcLgWxLsazMQY1syY6HsA="; - meta.description = "Generation of diffs and update functions for ocaml types"; - propagatedBuildInputs = [ - base - gel - ppx_compare - ppx_enumerate - ppx_jane - ]; - }; + ppx_diff = janePackage ( + { + pname = "ppx_diff"; + meta.description = "Generation of diffs and update functions for ocaml types"; + propagatedBuildInputs = [ + base + gel + ppx_compare + ppx_enumerate + ppx_jane + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-eWzlEIPjNcxhz2Q5+y7fv9mJDJzauOpJ993CXoy8nh4="; + } + else + { + version = "0.17.0"; + hash = "sha256-MAn+vcU6vLR8g16Wq1sORyLcLgWxLsazMQY1syY6HsA="; + } + ) + ); ppx_disable_unused_warnings = janePackage { pname = "ppx_disable_unused_warnings"; @@ -1230,18 +1285,30 @@ with self; ]; }; - ppx_expect = janePackage { - pname = "ppx_expect"; - version = "0.17.2"; - hash = "sha256-na9n/+shkiHIIUQ2ZitybQ6NNsSS9gWFNAFxij+JNVo="; - meta.description = "Cram like framework for OCaml"; - propagatedBuildInputs = [ - ppx_here - ppx_inline_test - re - ]; - doCheck = false; # test build rules broken - }; + ppx_expect = janePackage ( + { + pname = "ppx_expect"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ + ppx_here + ppx_inline_test + re + ]; + doCheck = false; # test build rules broken + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.3"; + hash = "sha256-eYZ3p3FYjHd15pj79TKyHSHNKRSWj80iHJFxBZN40s4="; + } + else + { + version = "0.17.2"; + hash = "sha256-na9n/+shkiHIIUQ2ZitybQ6NNsSS9gWFNAFxij+JNVo="; + } + ) + ); ppx_fields_conv = janePackage { pname = "ppx_fields_conv"; @@ -1260,16 +1327,29 @@ with self; propagatedBuildInputs = [ ppxlib ]; }; - ppx_globalize = janePackage { - pname = "ppx_globalize"; - hash = "sha256-LKV5zfaf6AXn3NzOhN2ka8NtjItPTIsfmoJVBw5bYi8="; - meta.description = "PPX rewriter that generates functions to copy local values to the global heap"; - propagatedBuildInputs = [ - base - ppxlib - ppxlib_jane - ]; - }; + ppx_globalize = janePackage ( + { + pname = "ppx_globalize"; + meta.description = "PPX rewriter that generates functions to copy local values to the global heap"; + propagatedBuildInputs = [ + base + ppxlib + ppxlib_jane + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.2"; + hash = "sha256-5pHqyv94DXpSG69TEATcnJwFh5YurxVCM5ZPtrlbXSo="; + } + else + { + version = "0.17.0"; + hash = "sha256-LKV5zfaf6AXn3NzOhN2ka8NtjItPTIsfmoJVBw5bYi8="; + } + ) + ); ppx_hash = janePackage { pname = "ppx_hash"; @@ -1296,16 +1376,29 @@ with self; propagatedBuildInputs = [ ppxlib ]; }; - ppx_inline_test = janePackage { - pname = "ppx_inline_test"; - hash = "sha256-pNdrmAlT3MUbuPUcMmCRcUIXv4fZ/o/IofJmnUKf8Cs="; - meta.description = "Syntax extension for writing in-line tests in ocaml code"; - propagatedBuildInputs = [ - ppxlib - time_now - ]; - doCheck = false; # test build rules broken - }; + ppx_inline_test = janePackage ( + { + pname = "ppx_inline_test"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ + ppxlib + time_now + ]; + doCheck = false; # test build rules broken + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-wNDDdNUeWTW87HRKbRSuOXaCPQnDWx7/RXuCDISc9Pg="; + } + else + { + version = "0.17.0"; + hash = "sha256-pNdrmAlT3MUbuPUcMmCRcUIXv4fZ/o/IofJmnUKf8Cs="; + } + ) + ); ppx_jane = janePackage { pname = "ppx_jane"; @@ -1342,6 +1435,7 @@ with self; ppx_jane ppxlib ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; ppx_js_style = janePackage { @@ -1352,17 +1446,31 @@ with self; octavius ppxlib ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; - ppx_let = janePackage { - pname = "ppx_let"; - hash = "sha256-JkNQgbPHVDH659m4Xy9ipcZ/iqGtj5q1qQn1P+O7TUY="; - meta.description = "Monadic let-bindings"; - propagatedBuildInputs = [ - ppxlib - ppx_here - ]; - }; + ppx_let = janePackage ( + { + pname = "ppx_let"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ + ppxlib + ppx_here + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-41C60UcMpERZs2eAPprg63uPnmjj33n7cd5s5IFZBGE="; + } + else + { + version = "0.17.0"; + hash = "sha256-JkNQgbPHVDH659m4Xy9ipcZ/iqGtj5q1qQn1P+O7TUY="; + } + ) + ); ppx_log = janePackage { pname = "ppx_log"; @@ -1393,12 +1501,25 @@ with self; propagatedBuildInputs = [ time_now ]; }; - ppx_optcomp = janePackage { - pname = "ppx_optcomp"; - hash = "sha256-H9oTzhJx9IGRkcwY2YEvcvNgeJ8ETNO95qKcjTXJBwk="; - meta.description = "Optional compilation for OCaml"; - propagatedBuildInputs = [ ppxlib ]; - }; + ppx_optcomp = janePackage ( + { + pname = "ppx_optcomp"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-mi9YM0WGkc4sI1GF2YGTFwmPdF+4s5Ou2l7i07ys9nw="; + } + else + { + version = "0.17.0"; + hash = "sha256-H9oTzhJx9IGRkcwY2YEvcvNgeJ8ETNO95qKcjTXJBwk="; + } + ) + ); ppx_optional = janePackage { pname = "ppx_optional"; @@ -1415,6 +1536,7 @@ with self; hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA="; meta.description = "PPX for writing fast incremental bind nodes in a pattern match"; propagatedBuildInputs = [ ppx_let ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; ppx_pipebang = janePackage { @@ -1454,19 +1576,33 @@ with self; ppx_sexp_conv ppx_sexp_message ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; - ppx_sexp_conv = janePackage { - pname = "ppx_sexp_conv"; - hash = "sha256-hUi0I50SODK1MpL86xy8eM8yn8f4q1Hv4LP9zFnnr70="; - meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; - propagatedBuildInputs = [ - ppxlib - ppxlib_jane - sexplib0 - base - ]; - }; + ppx_sexp_conv = janePackage ( + { + pname = "ppx_sexp_conv"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ + ppxlib + ppxlib_jane + sexplib0 + base + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-yQJluA/NSzCAID/ydBgRuc1sFHyjbXare9vxen6f1iw="; + } + else + { + version = "0.17.0"; + hash = "sha256-hUi0I50SODK1MpL86xy8eM8yn8f4q1Hv4LP9zFnnr70="; + } + ) + ); ppx_sexp_message = janePackage { pname = "ppx_sexp_message"; @@ -1488,12 +1624,25 @@ with self; ]; }; - ppx_stable = janePackage { - pname = "ppx_stable"; - hash = "sha256-N5oPjjQcLgiO9liX8Z0vg0IbQXaGZ4BqOgwvuIKSKaA="; - meta.description = "Stable types conversions generator"; - propagatedBuildInputs = [ ppxlib ]; - }; + ppx_stable = janePackage ( + { + pname = "ppx_stable"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-iVAgRVSOdLzajuUT8Yz+YMiMeChIx5DT8lBf104QMuE="; + } + else + { + version = "0.17.0"; + hash = "sha256-N5oPjjQcLgiO9liX8Z0vg0IbQXaGZ4BqOgwvuIKSKaA="; + } + ) + ); ppx_stable_witness = janePackage { pname = "ppx_stable_witness"; @@ -1527,15 +1676,28 @@ with self; ]; }; - ppx_tydi = janePackage { - pname = "ppx_tydi"; - hash = "sha256-PM89fP6Rb6M99HgEzQ7LfpW1W5adw6J/E1LFQJtdd0U="; - meta.description = "Let expressions, inferring pattern type from expression"; - propagatedBuildInputs = [ - base - ppxlib - ]; - }; + ppx_tydi = janePackage ( + { + pname = "ppx_tydi"; + meta.description = "Let expressions, inferring pattern type from expression"; + propagatedBuildInputs = [ + base + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-dkZwu4Ujj7GKb4qo76f/ef5dvGrYSkk9B3y+Rg72CAM="; + } + else + { + version = "0.17.0"; + hash = "sha256-PM89fP6Rb6M99HgEzQ7LfpW1W5adw6J/E1LFQJtdd0U="; + } + ) + ); ppx_typed_fields = janePackage { pname = "ppx_typed_fields"; @@ -1546,27 +1708,54 @@ with self; ppx_jane ppxlib ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; - ppx_typerep_conv = janePackage { - pname = "ppx_typerep_conv"; - hash = "sha256-V9yOSy3cj5/bz9PvpO3J+aeFu1G+qGQ8AR3gSczUZbY="; - meta.description = "Generation of runtime types from type declarations"; - propagatedBuildInputs = [ - ppxlib - typerep - ]; - }; + ppx_typerep_conv = janePackage ( + { + pname = "ppx_typerep_conv"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ + ppxlib + typerep + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-rxqL2v5vqjc7MgKUSkJEyIhm9GO5YqvxEYSM/uXdeBc="; + } + else + { + version = "0.17.0"; + hash = "sha256-V9yOSy3cj5/bz9PvpO3J+aeFu1G+qGQ8AR3gSczUZbY="; + } + ) + ); - ppx_variants_conv = janePackage { - pname = "ppx_variants_conv"; - hash = "sha256-Av2F699LzVCpwcdji6qG0jt5DVxCnIY4eBLaPK1JC10="; - meta.description = "Generation of accessor and iteration functions for ocaml variant types"; - propagatedBuildInputs = [ - variantslib - ppxlib - ]; - }; + ppx_variants_conv = janePackage ( + { + pname = "ppx_variants_conv"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ + variantslib + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-4v9sXtu7rDM+W3phPloizeMczRbBhku5dsCG4NqhdfU="; + } + else + { + version = "0.17.0"; + hash = "sha256-Av2F699LzVCpwcdji6qG0jt5DVxCnIY4eBLaPK1JC10="; + } + ) + ); ppxlib_jane = janePackage ( { @@ -1575,7 +1764,12 @@ with self; propagatedBuildInputs = [ ppxlib ]; } // ( - if lib.versionAtLeast ocaml.version "5.3" then + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.4"; + hash = "sha256-cqF7aT0ubutRxsSTD5aHnHx4zvlPDkTzdBqONU6EgO0="; + } + else if lib.versionAtLeast ocaml.version "5.3" then { version = "0.17.2"; hash = "sha256-AQJSdKtF6p/aG5Lx8VHVEOsisH8ep+iiml6DtW+Hdik="; @@ -1847,6 +2041,7 @@ with self; ppx_jane ppxlib ]; + meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; textutils = janePackage { diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix index f6676696bb9a..724d8c10c73e 100644 --- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -23,5 +23,6 @@ buildDunePackage { Automatically or semi-automatically instrument your code using landmarks library. ''; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/lun/ppx.nix b/pkgs/development/ocaml-modules/lun/ppx.nix index 8c701e7042b9..c54c07d8a63b 100644 --- a/pkgs/development/ocaml-modules/lun/ppx.nix +++ b/pkgs/development/ocaml-modules/lun/ppx.nix @@ -22,5 +22,6 @@ buildDunePackage { meta = lun.meta // { description = "Optics with lun package and PPX"; license = lib.licenses.mit; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index fd7fbf0cc6bf..92e174efea4b 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,5 +1,7 @@ { + lib, fetchFromGitHub, + fetchpatch, buildDunePackage, lwt, ppxlib, @@ -9,6 +11,11 @@ buildDunePackage { pname = "lwt_ppx"; inherit (lwt) version src; + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/ocsigen/lwt/commit/96b7ac686208968503786bb6d101f4ee84c8d2e6.patch"; + hash = "sha256-uxTwNVqV0O11WEKy66fphvGqW17FWDEzEylhVYNwNnY="; + }); + propagatedBuildInputs = [ lwt ppxlib diff --git a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix index ae41c0549029..853a6a1d66a6 100644 --- a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "ocsigen-ppx-rpc"; version = "1.0"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "ocsigen"; repo = pname; @@ -25,6 +23,7 @@ buildDunePackage rec { description = "Syntax for RPCs for Eliom and Ocsigen Start"; license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.vbgl ]; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index c71994967efd..50dbbf1201b3 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -12,7 +12,9 @@ ounit2, ocaml-migrate-parsetree, version ? - if lib.versionAtLeast ppxlib.version "0.32" then + if lib.versionAtLeast ppxlib.version "0.36" then + "6.1.0" + else if lib.versionAtLeast ppxlib.version "0.32" then "6.0.3" else if lib.versionAtLeast ppxlib.version "0.20" then "5.2.1" @@ -25,6 +27,7 @@ let hash = { + "6.1.0" = "sha256-dHpWiOpjD3elCw6QJUrG+KZr3Ul0suhzdjQUJ4B9S1Y="; "6.0.3" = "sha256-N0qpezLF4BwJqXgQpIv6IYwhO1tknkRSEBRVrBnJSm0="; "5.2.1" = "sha256:11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9"; "5.1" = "sha256:1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh"; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index d289734a9a1c..650bca436065 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -52,5 +52,6 @@ buildDunePackage rec { homepage = "https://github.com/hammerlab/ppx_deriving_cmdliner"; license = licenses.asl20; maintainers = [ maintainers.romildo ]; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 62fa34853599..ce2fd8cead1b 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, + fetchpatch, rpclib, alcotest, ppxlib, @@ -14,7 +15,11 @@ buildDunePackage { inherit (rpclib) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; + + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/mirage/ocaml-rpc/commit/678b7c0e59f6add174f2a732861be21c3e9583d0.patch"; + hash = "sha256-6Vl4/C02NQ/nPn+h9I/eT86R7GLZ/C8nSqBs4Ywzhwc="; + }); propagatedBuildInputs = [ ppxlib diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index c33ad55e9b19..5b0c870efb4a 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -9,15 +9,29 @@ yaml, }: +let + param = + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.4.1"; + hash = "sha256-3CvvMEOq/3I3WJ6X5EyopiaMjshZoEMPk2K4Lx0ldSo="; + } + else + { + version = "0.4.0"; + hash = "sha256-MVwCFAZY9Ui1gOckfbbj882w2aloHCGmJhpL1BDUEAg="; + }; +in + buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.3.0"; + inherit (param) version; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - hash = "sha256-HLY0ozmy6zY0KjXkwP3drTdz857PvLS/buN1nB+xf1s="; + inherit (param) hash; }; propagatedBuildInputs = [ @@ -27,7 +41,10 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ alcotest ]; + checkInputs = [ + alcotest + mdx + ]; nativeCheckInputs = [ mdx.bin ]; meta = { diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 1a09e1cd791a..55268ac06f2c 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -13,7 +13,13 @@ let param = - if lib.versionAtLeast ppxlib.version "0.30" then + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "3.10.0"; + sha256 = "sha256-Dy9egNpZdxsTPLo2mbpiFTMh5cYUXXOlOZLlQJuAK+E="; + checkInputs = [ ounit2 ]; + } + else if lib.versionAtLeast ppxlib.version "0.30" then { version = "3.9.0"; sha256 = "sha256-0d6YcBkeFoHXffCYjLIIvruw8B9ZB6NbUijhTv9uyN8="; diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index d0ca29f18d12..027532b4a552 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -6,7 +6,10 @@ version ? if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then - if lib.versionAtLeast ocaml.version "4.11" then "0.33.0" else "0.24.0" + if lib.versionAtLeast ocaml.version "4.11" then + if lib.versionAtLeast ocaml.version "5.03" then "0.36.0" else "0.33.0" + else + "0.24.0" else "0.15.0" else @@ -84,6 +87,10 @@ let sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; min_version = "4.07"; }; + "0.36.0" = { + sha256 = "sha256-WrobzhTFMQhhQTARDIQ9AEv5O9LPOgd4/XCGuFOQpDQ="; + min_version = "4.08"; + }; } ."${version}"; in diff --git a/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix b/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix index bc45242a719c..61949197177d 100644 --- a/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix +++ b/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix @@ -1,4 +1,5 @@ { + lib, buildDunePackage, fetchFromGitHub, qcheck, @@ -6,15 +7,30 @@ ppx_deriving, }: +let + param = + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.7"; + tag = "v0.25"; + hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ="; + } + else + { + version = "0.6"; + tag = "v0.24"; + hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g="; + }; +in + buildDunePackage { pname = "ppx_deriving_qcheck"; - version = "0.6"; + inherit (param) version; src = fetchFromGitHub { owner = "c-cube"; repo = "qcheck"; - tag = "v0.24"; - hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g="; + inherit (param) tag hash; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/reason-react/ppx.nix b/pkgs/development/ocaml-modules/reason-react/ppx.nix index a6a585500a62..d81cbf021849 100644 --- a/pkgs/development/ocaml-modules/reason-react/ppx.nix +++ b/pkgs/development/ocaml-modules/reason-react/ppx.nix @@ -23,5 +23,6 @@ buildDunePackage { homepage = "https://github.com/reasonml/reason-react"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vog ]; + broken = lib.versionAtLeast ppxlib.version "0.36"; }; } diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index 82d3d85611f4..c9e7729d86c1 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,5 +1,7 @@ { + lib, buildDunePackage, + fetchpatch, ppx_deriving, ppxlib, repr, @@ -12,6 +14,11 @@ buildDunePackage { inherit (repr) src version; + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/mirage/repr/commit/9dcaeaa7e5f45998f76e1eab68f8fd18edc980cc.patch"; + hash = "sha256-MKuZ4f8m/nNlgZpomGgqr80s5btynKcb1b4khpIIOY4="; + }); + propagatedBuildInputs = [ ppx_deriving ppxlib diff --git a/pkgs/development/tools/ocaml/melange/default.nix b/pkgs/development/tools/ocaml/melange/default.nix index 0578dc0c18fc..b399fbe6f6d6 100644 --- a/pkgs/development/tools/ocaml/melange/default.nix +++ b/pkgs/development/tools/ocaml/melange/default.nix @@ -4,6 +4,7 @@ cppo, dune-build-info, fetchurl, + fetchpatch, jq, lib, makeWrapper, @@ -54,6 +55,14 @@ buildDunePackage { url = "https://github.com/melange-re/${pname}/releases/download/${version}/${pname}-${version}.tbz"; inherit hash; }; + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/melange-re/melange/pull/1352.patch"; + hash = "sha256-PMf66nB743nzW4/xblHjNZFv1BS8xC9maD+eCDDUWAY="; + excludes = [ + "*.opam" + "*.template" + ]; + }); nativeBuildInputs = [ cppo makeWrapper diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba733d22a13..eba0aae5c634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7104,7 +7104,13 @@ with pkgs; haskellPackages.callPackage ../tools/misc/fffuu { } ); - flow = callPackage ../development/tools/analysis/flow { }; + flow = callPackage ../development/tools/analysis/flow { + ocamlPackages = ocaml-ng.ocamlPackages.overrideScope ( + self: super: { + ppxlib = super.ppxlib.override { version = "0.33.0"; }; + } + ); + }; fswatch = callPackage ../development/tools/misc/fswatch { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0a13833c7941..f82442ec2c34 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -536,15 +536,17 @@ let elpi = callPackage ../development/ocaml-modules/elpi ( let - ppxlib_0_15 = - if lib.versionAtLeast ppxlib.version "0.15" then - ppxlib.override { version = "0.15.0"; } - else - ppxlib; + ppx_deriving_ = + cap: + ppx_deriving.override { + ppxlib = ppxlib.override { + version = if lib.versionAtLeast ppxlib.version cap then cap else ppxlib.version; + }; + }; in { - ppx_deriving_0_15 = ppx_deriving.override { ppxlib = ppxlib_0_15; }; - inherit ppxlib_0_15; + ppx_deriving_0_15 = ppx_deriving_ "0.15"; + ppx_deriving = ppx_deriving_ "0.33.0"; } ); @@ -1695,7 +1697,9 @@ let ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; - ppx_deriving_yaml = callPackage ../development/ocaml-modules/ppx_deriving_yaml { }; + ppx_deriving_yaml = callPackage ../development/ocaml-modules/ppx_deriving_yaml { + mdx = mdx.override { inherit logs; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson { };