Merge staging-next into staging

authored by nixpkgs-ci[bot] and committed by GitHub 3a36f888 b77166a1

+268 -194
+7
maintainers/maintainer-list.nix
··· 18311 18311 githubId = 1254858; 18312 18312 keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; 18313 18313 }; 18314 + notohh = { 18315 + email = "contact@notohh.dev"; 18316 + github = "notohh"; 18317 + githubId = 31116143; 18318 + name = "notohh"; 18319 + keys = [ { fingerprint = "C3CB 3B31 AF3F 986C 39E0 BE5B BD47 506D 475E E86D"; } ]; 18320 + }; 18314 18321 notthebee = { 18315 18322 email = "moe@notthebe.ee"; 18316 18323 github = "notthebee";
+4
nixos/modules/services/misc/invidious-router.nix
··· 101 101 config = lib.mkIf cfg.enable { 102 102 systemd.services.invidious-router = { 103 103 wantedBy = [ "multi-user.target" ]; 104 + 105 + after = [ "network-online.target" ]; 106 + requires = [ "network-online.target" ]; 107 + 104 108 serviceConfig = { 105 109 Restart = "on-failure"; 106 110 ExecStart = "${lib.getExe cfg.package} --configfile ${configFile}";
+2 -2
pkgs/applications/misc/gpxsee/default.nix
··· 19 19 in 20 20 stdenv.mkDerivation (finalAttrs: { 21 21 pname = "gpxsee"; 22 - version = "13.44"; 22 + version = "13.45"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "tumic0"; 26 26 repo = "GPXSee"; 27 27 tag = finalAttrs.version; 28 - hash = "sha256-eFANrUMESQVsZwTfz20VW2Qf7hiSgtkeKszCiJ8i/jk="; 28 + hash = "sha256-3GPpr8L+oMHCGXo3RVaky6EjDrEiBERRU6w56o17Xhc="; 29 29 }; 30 30 31 31 buildInputs =
+2 -2
pkgs/by-name/aw/awsebcli/package.nix
··· 25 25 26 26 python.pkgs.buildPythonApplication rec { 27 27 pname = "awsebcli"; 28 - version = "3.24.1"; 28 + version = "3.25"; 29 29 pyproject = true; 30 30 31 31 src = fetchFromGitHub { 32 32 owner = "aws"; 33 33 repo = "aws-elastic-beanstalk-cli"; 34 34 tag = version; 35 - hash = "sha256-t6dqiC9zY3Apcc4F/x5c/QhsNKGBZxIY20a50wCEER8="; 35 + hash = "sha256-RqUVG4aIZDAVuKcT41ODKkyEidmschcFaY24P1CjosU="; 36 36 }; 37 37 38 38 pythonRelaxDeps = [
+3 -3
pkgs/by-name/ch/chirp/package.nix
··· 11 11 12 12 python3Packages.buildPythonApplication { 13 13 pname = "chirp"; 14 - version = "0.4.0-unstable-2025-06-26"; 14 + version = "0.4.0-unstable-2025-07-03"; 15 15 pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "kk7ds"; 19 19 repo = "chirp"; 20 - rev = "a9932a43c22f489951335e194b2b2b9b97028b44"; 21 - hash = "sha256-ckC0KYk+Ezr8ftWutbvBWNicJldY4OzRyN+kno8Z2Fw="; 20 + rev = "1f2beb0c7cfa53340a7f38c03d4c8f99bf052643"; 21 + hash = "sha256-WGhS4VUeRwi/iBG2ZVXNyKEng9V6qOoI51Ak8PYljJk="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+9
pkgs/by-name/co/cosmic-applets/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 + fetchpatch2, 5 6 rustPlatform, 6 7 libcosmicAppHook, 7 8 just, ··· 31 32 32 33 useFetchCargoVendor = true; 33 34 cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg="; 35 + 36 + patches = [ 37 + (fetchpatch2 { 38 + name = "fix-bluetooth-dbus-spam.patch"; 39 + url = "https://github.com/pop-os/cosmic-applets/commit/b6bb982f2dace0a3d19c78b4b4247760a8010d5b.patch?full_index=1"; 40 + hash = "sha256-S5F9rqYrB38T9R6i/n/j3s79Xeh6BMmNkC+E2kTsus4="; 41 + }) 42 + ]; 34 43 35 44 nativeBuildInputs = [ 36 45 just
+2 -2
pkgs/by-name/de/devcontainer/package.nix
··· 19 19 in 20 20 stdenv.mkDerivation (finalAttrs: { 21 21 pname = "devcontainer"; 22 - version = "0.78.0"; 22 + version = "0.80.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "devcontainers"; 26 26 repo = "cli"; 27 27 tag = "v${finalAttrs.version}"; 28 - hash = "sha256-xQrfYtBL9hUiB6KZcA03KNgGfL8DpkxVNmjl+wS1L00="; 28 + hash = "sha256-p6iBDNTGYgOPQUTRbiu8IT7kN72OCrw7R0ouhWW9yok="; 29 29 }; 30 30 31 31 yarnOfflineCache = fetchYarnDeps {
+15 -11
pkgs/by-name/ga/gale/package.nix
··· 2 2 lib, 3 3 rustPlatform, 4 4 fetchFromGitHub, 5 + nix-update-script, 5 6 6 7 jq, 7 8 moreutils, 8 - fetchNpmDeps, 9 - npmHooks, 9 + pnpm_10, 10 10 nodejs, 11 11 cargo-tauri, 12 12 pkg-config, ··· 20 20 21 21 rustPlatform.buildRustPackage (finalAttrs: { 22 22 pname = "gale"; 23 - version = "1.7.1"; 23 + version = "1.8.6"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "Kesomannen"; 27 27 repo = "gale"; 28 28 tag = finalAttrs.version; 29 - hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc="; 29 + hash = "sha256-5xUBW9Owyeet8Jyc+7TQr6XQTbkopbJLeyI5c35iqr0="; 30 30 }; 31 31 32 32 postPatch = '' 33 33 jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json 34 34 ''; 35 35 36 - npmDeps = fetchNpmDeps { 37 - name = "gale-${finalAttrs.version}-npm-deps"; 38 - inherit (finalAttrs) src; 39 - hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs="; 36 + pnpmDeps = pnpm_10.fetchDeps { 37 + inherit (finalAttrs) pname version src; 38 + hash = "sha256-QQXP/x7AjDtUpe6h+pC6vUsIAptv1kN/1MJZjHAIdMo="; 40 39 }; 41 40 42 41 cargoRoot = "src-tauri"; 43 42 buildAndTestSubdir = finalAttrs.cargoRoot; 44 43 45 - cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8="; 44 + cargoHash = "sha256-6yWRl9WAPJoqoXm0kLfZhEf7AYD6J//FlOmDxzeknFo="; 46 45 47 46 nativeBuildInputs = [ 48 47 jq 49 48 moreutils 50 - npmHooks.npmConfigHook 49 + pnpm_10.configHook 51 50 nodejs 52 51 cargo-tauri.hook 53 52 pkg-config ··· 61 60 webkitgtk_4_1 62 61 ]; 63 62 63 + passthru.updateScript = nix-update-script { }; 64 + 64 65 meta = { 65 66 description = "Lightweight Thunderstore client"; 66 67 homepage = "https://github.com/Kesomannen/gale"; 67 68 license = lib.licenses.gpl3Only; 68 69 mainProgram = "gale"; 69 - maintainers = with lib.maintainers; [ tomasajt ]; 70 + maintainers = with lib.maintainers; [ 71 + tomasajt 72 + notohh 73 + ]; 70 74 platforms = lib.platforms.linux; 71 75 }; 72 76 })
+2 -2
pkgs/by-name/gi/github-mcp-server/package.nix
··· 7 7 8 8 buildGoModule (finalAttrs: { 9 9 pname = "github-mcp-server"; 10 - version = "0.6.0"; 10 + version = "0.7.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "github"; 14 14 repo = "github-mcp-server"; 15 15 tag = "v${finalAttrs.version}"; 16 - hash = "sha256-jW/X8vwV47J20aa3E+WqjRL5n9H+Pb2EQwIVIg1pfug="; 16 + hash = "sha256-9IEsoIq4cuHgcYRuGEEkx5CFHaJzp0pNTpb1pNedzCE="; 17 17 }; 18 18 19 19 vendorHash = "sha256-GYfK5QQH0DhoJqc4ynZBWuhhrG5t6KoGpUkZPSfWfEQ=";
-18
pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch
··· 1 - diff --git src/pkg-xml2.c src/pkg-xml2.c 2 - index 048ca38c..9ea4de35 100644 3 - --- src/pkg-xml2.c 4 - +++ src/pkg-xml2.c 5 - @@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp) 6 - return sp; 7 - } 8 - 9 - +#if LIBXML_VERSION >= 21200 10 - +static void 11 - +xml_pkg_error_handler(void * userData, const xmlError *error) 12 - +#else 13 - static void 14 - xml_pkg_error_handler(void * userData, xmlErrorPtr error) 15 - +#endif 16 - { 17 - if (error) 18 - {
+16 -12
pkgs/by-name/ld/ldmud/package.nix
··· 26 26 python310, 27 27 }: 28 28 29 - stdenv.mkDerivation rec { 29 + stdenv.mkDerivation (finalAttrs: { 30 30 pname = "ldmud"; 31 - version = "3.6.7"; 31 + version = "3.6.8"; 32 32 33 33 src = fetchFromGitHub { 34 34 owner = "ldmud"; 35 35 repo = "ldmud"; 36 - rev = version; 37 - sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; 36 + tag = finalAttrs.version; 37 + hash = "sha256-ojOLM1vkuwuF0vXx6lCH0+OlyLkkOOnTJEUiZPpUhzo="; 38 38 }; 39 39 40 40 patches = [ 41 - ./libxml2-2.12.0-compat.patch 42 41 ./mysql-compat.patch 43 42 ]; 44 43 45 - sourceRoot = "${src.name}/src"; 44 + sourceRoot = "${finalAttrs.src.name}/src"; 46 45 47 46 nativeBuildInputs = [ 48 47 autoreconfHook 49 48 pkg-config 50 49 bison 51 50 ]; 51 + 52 52 buildInputs = 53 53 [ 54 54 libgcrypt ··· 86 86 (lib.enableFeature pythonSupport "use-python") 87 87 ]; 88 88 89 - preConfigure = lib.optionalString mysqlSupport '' 90 - export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql" 91 - export LDFLAGS="-L${libmysqlclient}/lib/mysql" 92 - ''; 89 + preConfigure = 90 + lib.optionalString mysqlSupport '' 91 + export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql" 92 + export LDFLAGS="-L${libmysqlclient}/lib/mysql" 93 + '' 94 + + lib.optionalString stdenv.hostPlatform.isDarwin '' 95 + export LDFLAGS="$LDFLAGS -L${libiconv}/lib -liconv" 96 + ''; 93 97 94 98 installTargets = [ 95 99 "install-driver" ··· 105 109 meta = { 106 110 description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime"; 107 111 homepage = "https://ldmud.eu"; 108 - changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY"; 112 + changelog = "https://github.com/ldmud/ldmud/blob/${finalAttrs.version}/HISTORY"; 109 113 longDescription = '' 110 114 LDMud started as a project to clean up and modernize Amylaar's LPMud 111 115 gamedriver. Primary goals are full documentation, a commented source body ··· 120 124 platforms = with lib.platforms; linux ++ darwin; 121 125 maintainers = with lib.maintainers; [ cpu ]; 122 126 }; 123 - } 127 + })
+6 -6
pkgs/by-name/li/libiio/cmake-fix-libxml2-find-package.patch
··· 1 - diff --color -ur a/CMakeLists.txt b/CMakeLists.txt 2 - --- a/CMakeLists.txt 2022-06-02 02:57:01.503340155 +0300 3 - +++ b/CMakeLists.txt 2022-06-02 02:54:33.726941188 +0300 4 - @@ -378,7 +378,7 @@ 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index d5313c50..0ef102bf 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -408,7 +408,7 @@ if (WITH_XML_BACKEND) 5 6 # So, try first to find the CMake module provided by libxml2 package, then fallback 6 7 # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially 7 8 # in static build case). 8 - - find_package(LibXml2 QUIET NO_MODULE) 9 + - find_package(LibXml2 QUIET NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH) 9 10 + find_package(LibXml2 QUIET MODULE) 10 11 if(DEFINED LIBXML2_VERSION_STRING) 11 12 set(LIBXML2_FOUND ON) 12 13 set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) 13 - Seulement dans b: good.patch
+11 -30
pkgs/by-name/li/libiio/hardcode-library-path.patch
··· 1 1 diff --git a/bindings/python/iio.py b/bindings/python/iio.py 2 - index 5306daa..f8962ee 100644 2 + index b91260cc..04bcfa7f 100644 3 3 --- a/bindings/python/iio.py 4 4 +++ b/bindings/python/iio.py 5 - @@ -229,9 +229,9 @@ if "Windows" in _system(): 6 - _iiolib = "libiio.dll" 7 - else: 8 - # Non-windows, possibly Posix system 5 + @@ -218,13 +218,7 @@ _ChannelPtr = _POINTER(_Channel) 6 + _BufferPtr = _POINTER(_Buffer) 7 + _DataFormatPtr = _POINTER(DataFormat) 8 + 9 + -if "Windows" in _system(): 10 + - _iiolib = "libiio.dll" 11 + -else: 12 + - # Non-windows, possibly Posix system 9 13 - _iiolib = "iio" 10 - + _iiolib = "@libiio@" 11 - 14 + - 12 15 -_lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) 13 - +_lib = _cdll(_iiolib, use_errno=True, use_last_error=True) 16 + +_lib = _cdll("@libiio@", use_errno=True, use_last_error=True) 14 17 15 18 _get_backends_count = _lib.iio_get_backends_count 16 19 _get_backends_count.restype = c_uint 17 - diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein 18 - index cd14e2e..516c409 100644 19 - --- a/bindings/python/setup.py.cmakein 20 - +++ b/bindings/python/setup.py.cmakein 21 - @@ -62,7 +62,7 @@ class InstallWrapper(install): 22 - _iiolib = "libiio.dll" 23 - else: 24 - # Non-windows, possibly Posix system 25 - - _iiolib = "iio" 26 - + _iiolib = "@libiio@" 27 - try: 28 - import os 29 - 30 - @@ -72,7 +72,7 @@ class InstallWrapper(install): 31 - fulllibpath = find_recursive(destdir, "libiio.so") 32 - _lib = _cdll(fulllibpath, use_errno=True, use_last_error=True) 33 - else: 34 - - _lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) 35 - + _lib = _cdll(_iiolib, use_errno=True, use_last_error=True) 36 - if not _lib._name: 37 - raise OSError 38 - except OSError:
+18 -10
pkgs/by-name/li/libiio/package.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "libiio"; 21 - version = "0.24"; 21 + version = "0.26"; 22 22 23 23 outputs = [ 24 24 "out" ··· 29 29 src = fetchFromGitHub { 30 30 owner = "analogdevicesinc"; 31 31 repo = "libiio"; 32 - rev = "v${version}"; 33 - sha256 = "sha256-c5HsxCdp1cv5BGTQ/8dc8J893zk9ntbfAudLpqoQ1ow="; 32 + tag = "v${version}"; 33 + hash = "sha256-nrpGccj9Q3S9wYs0/dHC3YAy5ZvTiPiSUtPY6r5WlaE="; 34 34 }; 35 35 36 36 # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is 37 37 # fixed properly 38 - patches = [ ./cmake-fix-libxml2-find-package.patch ]; 38 + patches = [ 39 + ./cmake-fix-libxml2-find-package.patch 40 + ]; 39 41 40 42 nativeBuildInputs = 41 43 [ ··· 79 81 80 82 postPatch = 81 83 '' 82 - substituteInPlace libiio.rules.cmakein \ 83 - --replace /bin/sh ${runtimeShell} 84 + patchShebangs libiio.rules.cmakein 84 85 '' 85 86 + lib.optionalString pythonSupport '' 86 87 # Hardcode path to the shared library into the bindings. ··· 92 93 moveToOutput ${python3.sitePackages} "$python" 93 94 ''; 94 95 95 - meta = with lib; { 96 + nativeInstallCheckInputs = lib.optionals pythonSupport [ 97 + python3.pkgs.pythonImportsCheckHook 98 + ]; 99 + 100 + pythonImportsCheck = [ "iio" ]; 101 + 102 + meta = { 103 + changelog = "https://github.com/analogdevicesinc/libiio/releases/tag/${src.tag}"; 96 104 description = "API for interfacing with the Linux Industrial I/O Subsystem"; 97 105 homepage = "https://github.com/analogdevicesinc/libiio"; 98 - license = licenses.lgpl21Plus; 99 - platforms = platforms.linux ++ platforms.darwin; 100 - maintainers = with maintainers; [ thoughtpolice ]; 106 + license = lib.licenses.lgpl21Plus; 107 + platforms = lib.platforms.linux ++ lib.platforms.darwin; 108 + maintainers = with lib.maintainers; [ thoughtpolice ]; 101 109 }; 102 110 }
+2 -2
pkgs/by-name/lu/lunar-client/package.nix
··· 7 7 8 8 appimageTools.wrapType2 rec { 9 9 pname = "lunarclient"; 10 - version = "3.4.3"; 10 + version = "3.4.4"; 11 11 12 12 src = fetchurl { 13 13 url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; 14 - hash = "sha512-ipGB+A/B0N7Ws3Y1qWUlBj+Syo7H8UHU3dBDkHfatB4UNL053koT9EVxyPuGpU7YMjPDLuczuCsNaSTNuL/2bQ=="; 14 + hash = "sha512-2ShSTAyFQtGDDQsBSqg7ZPZDZWpx/T3H3yuYUn/WMkcMJOXqQO+qyth73WjZYoa6hOqc1yp5OzE7H9lLGLIW/g=="; 15 15 }; 16 16 17 17 nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/by-name/ne/necesse-server/package.nix
··· 6 6 }: 7 7 8 8 let 9 - version = "0.32.1-18336931"; 9 + version = "0.33.0-19201409"; 10 10 urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; 11 11 12 12 in ··· 16 16 17 17 src = fetchzip { 18 18 url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; 19 - hash = "sha256-vvTbwEcfpzLIWSjbkUqKBOyAsT2fFk27v9UB9V+fTfw="; 19 + hash = "sha256-VpBWQ/Sl6uCRyR2WQYkZcIcSX89+AshHdRCqbKneqvM="; 20 20 }; 21 21 22 22 # removing packaged jre since we use our own
+1 -1
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
··· 281 281 copy_flags = common_flags | vars(args_groups["copy_flags"]) 282 282 283 283 if args.upgrade or args.upgrade_all: 284 - nix.upgrade_channels(bool(args.upgrade_all)) 284 + nix.upgrade_channels(args.upgrade_all, args.sudo) 285 285 286 286 action = Action(args.action) 287 287 # Only run shell scripts from the Nixpkgs tree if the action is
+12 -2
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
··· 693 693 ) 694 694 695 695 696 - def upgrade_channels(all_channels: bool = False) -> None: 696 + def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None: 697 697 """Upgrade channels for classic Nix. 698 698 699 699 It will either upgrade just the `nixos` channel (including any channel 700 700 that has a `.update-on-nixos-rebuild` file) or all. 701 701 """ 702 + if not sudo and os.geteuid() != 0: 703 + raise NixOSRebuildError( 704 + "if you pass the '--upgrade' or '--upgrade-all' flag, you must " 705 + "also pass '--sudo' or run the command as root (e.g., with sudo)" 706 + ) 707 + 702 708 for channel_path in Path("/nix/var/nix/profiles/per-user/root/channels/").glob("*"): 703 709 if channel_path.is_dir() and ( 704 710 all_channels 705 711 or channel_path.name == "nixos" 706 712 or (channel_path / ".update-on-nixos-rebuild").exists() 707 713 ): 708 - run_wrapper(["nix-channel", "--update", channel_path.name], check=False) 714 + run_wrapper( 715 + ["nix-channel", "--update", channel_path.name], 716 + check=False, 717 + sudo=sudo, 718 + )
+26 -9
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
··· 836 836 ], 837 837 ) 838 838 @patch("pathlib.Path.is_dir", autospec=True, return_value=True) 839 - def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: 840 - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: 841 - n.upgrade_channels(False) 842 - mock_run.assert_called_once_with(["nix-channel", "--update", "nixos"], check=False) 839 + @patch("os.geteuid", autospec=True, return_value=1000) 840 + @patch(get_qualified_name(n.run_wrapper, n), autospec=True) 841 + def test_upgrade_channels( 842 + mock_run: Mock, 843 + mock_geteuid: Mock, 844 + mock_is_dir: Mock, 845 + mock_glob: Mock, 846 + ) -> None: 847 + with pytest.raises(m.NixOSRebuildError) as e: 848 + n.upgrade_channels(all_channels=False, sudo=False) 849 + assert str(e.value) == ( 850 + "error: if you pass the '--upgrade' or '--upgrade-all' flag, you must " 851 + "also pass '--sudo' or run the command as root (e.g., with sudo)" 852 + ) 853 + 854 + n.upgrade_channels(all_channels=False, sudo=True) 855 + mock_run.assert_called_once_with( 856 + ["nix-channel", "--update", "nixos"], check=False, sudo=True 857 + ) 843 858 844 - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: 845 - n.upgrade_channels(True) 859 + mock_geteuid.return_value = 0 860 + n.upgrade_channels(all_channels=True, sudo=False) 846 861 mock_run.assert_has_calls( 847 862 [ 848 - call(["nix-channel", "--update", "nixos"], check=False), 849 - call(["nix-channel", "--update", "nixos-hardware"], check=False), 850 - call(["nix-channel", "--update", "home-manager"], check=False), 863 + call(["nix-channel", "--update", "nixos"], check=False, sudo=False), 864 + call( 865 + ["nix-channel", "--update", "nixos-hardware"], check=False, sudo=False 866 + ), 867 + call(["nix-channel", "--update", "home-manager"], check=False, sudo=False), 851 868 ] 852 869 )
+2 -2
pkgs/by-name/po/podman-tui/package.nix
··· 8 8 9 9 buildGoModule (finalAttrs: { 10 10 pname = "podman-tui"; 11 - version = "1.6.1"; 11 + version = "1.7.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "containers"; 15 15 repo = "podman-tui"; 16 16 tag = "v${finalAttrs.version}"; 17 - hash = "sha256-U+oQUdqOhF6p52bEvMBqoxn4Z5WexsYe97XFOEMSFpk="; 17 + hash = "sha256-WNaHpr5Ujq2xiA0LJV7KHRT3qGHojYex4LZhiFTGusk="; 18 18 }; 19 19 20 20 vendorHash = null;
+3 -3
pkgs/by-name/re/repomix/package.nix
··· 8 8 9 9 buildNpmPackage rec { 10 10 pname = "repomix"; 11 - version = "1.0.0"; 11 + version = "1.1.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "yamadashy"; 15 15 repo = "repomix"; 16 16 tag = "v${version}"; 17 - hash = "sha256-7N3xxSkVBYg7JOLab+YYbykQ4Zvlcmmlr/5wn1RtlXo="; 17 + hash = "sha256-kqbVQCXLxcDYtKJt34gzhvgXdpF786uk5N2j2W4pcRg="; 18 18 }; 19 19 20 - npmDepsHash = "sha256-msF68DUgD8Nt//fGf7bBHCovUYZv5DJ/eqMFm77CrTA="; 20 + npmDepsHash = "sha256-Ewyfhx1VwbUVM045KcDvgTzTCEVEssMVQrNbbnwnz+8="; 21 21 22 22 nativeInstallCheckInputs = [ versionCheckHook ]; 23 23 doInstallCheck = true;
+2 -2
pkgs/by-name/rm/rmapi/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "rmapi"; 9 - version = "0.0.30"; 9 + version = "0.0.31"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "ddvk"; 13 13 repo = "rmapi"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-TD8edRMZEn05HHvSwwPpeA6AzXMNkNz6mrQl4zF8Kfk="; 15 + sha256 = "sha256-8OzDXOyyz0VTeJg0P6jOBTA9OZbCLSK8SASSEHsrBxc="; 16 16 }; 17 17 18 18 vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc=";
+3 -3
pkgs/by-name/si/sing-box/package.nix
··· 10 10 11 11 buildGoModule (finalAttrs: { 12 12 pname = "sing-box"; 13 - version = "1.11.14"; 13 + version = "1.11.15"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "SagerNet"; 17 17 repo = "sing-box"; 18 18 tag = "v${finalAttrs.version}"; 19 - hash = "sha256-GgFsTLMyrNsYT9GUlnXnSzynIa2D2ECtcYvKMfvndkA="; 19 + hash = "sha256-uqPV3PGk3hFpV1B8+htBG9x58RVWew0sBDUItpxyv8Q="; 20 20 }; 21 21 22 - vendorHash = "sha256-ULfPmVQ2Ngr1ujeCmUPOOaqxyQmbgqH1w6P9TwvjhSo="; 22 + vendorHash = "sha256-qZlnY0MxB4/ttgjuAroTfqGWqGRea549EyIjSxPAlOI="; 23 23 24 24 tags = [ 25 25 "with_quic"
+6 -27
pkgs/by-name/vi/victorialogs/package.nix
··· 8 8 9 9 buildGoModule (finalAttrs: { 10 10 pname = "VictoriaLogs"; 11 - version = "1.24.0"; 11 + version = "1.25.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "VictoriaMetrics"; 15 - repo = "VictoriaMetrics"; 16 - tag = "v${finalAttrs.version}-victorialogs"; 17 - hash = "sha256-E52hvxazzbz9FcPFZFcRHs2vVg6fJJQ8HsieQovQSi4="; 15 + repo = "VictoriaLogs"; 16 + tag = "v${finalAttrs.version}"; 17 + hash = "sha256-KhXB+37uK08dDYXtnaPDS7gP/gBGZ0gqyR0u572QOx8="; 18 18 }; 19 19 20 20 vendorHash = null; ··· 28 28 "app/vlogscli" 29 29 ]; 30 30 31 - postPatch = '' 32 - # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package 33 - # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web 34 - # 35 - # This appears to be some kind of test server for development purposes only. 36 - # rm -f app/vmui/packages/vmui/web/{go.mod,main.go} 37 - 38 - # Increase timeouts in tests to prevent failure on heavily loaded builders 39 - substituteInPlace lib/storage/storage_test.go \ 40 - --replace-fail "time.After(10 " "time.After(120 " \ 41 - --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \ 42 - --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ 43 - ''; 44 - 45 31 ldflags = [ 46 32 "-s" 47 33 "-w" 48 34 "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}" 49 35 ]; 50 36 51 - preCheck = '' 52 - # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset 53 - export ldflags=''${ldflags//=${finalAttrs.version}/=} 54 - ''; 55 - 56 37 __darwinAllowLocalNetworking = true; 57 38 58 39 passthru = { ··· 61 42 victorialogs 62 43 ; 63 44 }; 64 - updateScript = nix-update-script { 65 - extraArgs = [ "--version-regex=(.*)-victorialogs" ]; 66 - }; 45 + updateScript = nix-update-script { }; 67 46 }; 68 47 69 48 meta = { ··· 71 50 description = "User friendly log database from VictoriaMetrics"; 72 51 license = lib.licenses.asl20; 73 52 maintainers = with lib.maintainers; [ marie ]; 74 - changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/${finalAttrs.src.tag}"; 53 + changelog = "https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/${finalAttrs.src.tag}"; 75 54 mainProgram = "victoria-logs"; 76 55 }; 77 56 })
+6 -7
pkgs/development/python-modules/acme-tiny/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "acme-tiny"; 14 - version = "5.0.1"; 14 + version = "5.0.2"; 15 15 pyproject = true; 16 16 17 17 src = fetchPypi { 18 - inherit pname version; 19 - sha256 = "378549808eece574c3b5dcea82b216534949423d5c7ac241d9419212d676bc8d"; 18 + pname = "acme_tiny"; 19 + inherit version; 20 + hash = "sha256-s84ZVYPcLxOnxvqQBS+Ks0myMtvCZ62cv0co6u2E3dg="; 20 21 }; 21 22 22 23 patchPhase = '' ··· 35 36 fuse 36 37 ]; 37 38 38 - doCheck = false; # seems to hang, not sure 39 - 40 39 pythonImportsCheck = [ "acme_tiny" ]; 41 40 42 - meta = with lib; { 41 + meta = { 43 42 description = "Tiny script to issue and renew TLS certs from Let's Encrypt"; 44 43 mainProgram = "acme-tiny"; 45 44 homepage = "https://github.com/diafygi/acme-tiny"; 46 - license = licenses.mit; 45 + license = lib.licenses.mit; 47 46 }; 48 47 }
+10
pkgs/development/python-modules/gymnasium/default.nix
··· 15 15 pythonOlder, 16 16 importlib-metadata, 17 17 18 + # optional-dependencies 19 + # atari 20 + ale-py, 21 + 18 22 # tests 19 23 array-api-compat, 20 24 dill, ··· 53 57 numpy 54 58 typing-extensions 55 59 ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; 60 + 61 + optional-dependencies = { 62 + atari = [ 63 + ale-py 64 + ]; 65 + }; 56 66 57 67 pythonImportsCheck = [ "gymnasium" ]; 58 68
+10 -5
pkgs/development/python-modules/ibis-framework/default.nix
··· 112 112 hatchling 113 113 ]; 114 114 115 - pythonRelaxDeps = [ 116 - # "toolz" 117 - ]; 118 - 119 115 dependencies = [ 120 116 atpublic 121 117 parsy ··· 171 167 172 168 # AssertionError: value does not match the expected value in snapshot ibis/backends/tests/snapshots/test_sql/test_rewrite_context/sqlite/out.sql 173 169 "test_rewrite_context" 170 + 171 + # Assertion error comparing a calculated version string with the actual (during nixpkgs-review) 172 + "test_builtin_scalar_noargs" 173 + 174 + # duckdb ParserError: syntax error at or near "AT" 175 + "test_90" 174 176 ]; 175 177 176 178 # patch out tests that check formatting with black ··· 352 354 homepage = "https://github.com/ibis-project/ibis"; 353 355 changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; 354 356 license = lib.licenses.asl20; 355 - maintainers = with lib.maintainers; [ cpcloud ]; 357 + maintainers = with lib.maintainers; [ 358 + cpcloud 359 + sarahec 360 + ]; 356 361 }; 357 362 }
+2 -2
pkgs/development/python-modules/sagemaker-core/default.nix
··· 28 28 29 29 buildPythonPackage rec { 30 30 pname = "sagemaker-core"; 31 - version = "1.0.41"; 31 + version = "1.0.42"; 32 32 pyproject = true; 33 33 34 34 src = fetchFromGitHub { 35 35 owner = "aws"; 36 36 repo = "sagemaker-core"; 37 37 tag = "v${version}"; 38 - hash = "sha256-XW7BJZc4VZiWe2d1p8MySYXWhzkwe0YjuPGwyswYUjY="; 38 + hash = "sha256-To4VjTuE9fkVQSXR1k6NMAjrByzFhAidvui8w+etOQc="; 39 39 }; 40 40 41 41 build-system = [
+2 -2
pkgs/development/python-modules/simsimd/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "simsimd"; 14 - version = "6.4.9"; 14 + version = "6.5.0"; 15 15 pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "ashvardanian"; 19 19 repo = "simsimd"; 20 20 tag = "v${version}"; 21 - hash = "sha256-q992FqXRmsMk3PJ/b3+BQcytitlDdk3hcLWRrZIZFXY="; 21 + hash = "sha256-un3Wyvj1vwhDiai2FSflkEYOpLbeH7aFznDilB7cupU="; 22 22 }; 23 23 24 24 build-system = [
+2 -2
pkgs/development/python-modules/tensordict/default.nix
··· 28 28 29 29 buildPythonPackage rec { 30 30 pname = "tensordict"; 31 - version = "0.8.3"; 31 + version = "0.9.0"; 32 32 pyproject = true; 33 33 34 34 src = fetchFromGitHub { 35 35 owner = "pytorch"; 36 36 repo = "tensordict"; 37 37 tag = "v${version}"; 38 - hash = "sha256-d/6JKGFcFLXY9pxsnP27uwnAnIQ9EKvfTS30DCwQrCM="; 38 + hash = "sha256-actBFzWb2JBPsLhRZiD6zRpk7eyX2OHUPMU9JpJ90Wc="; 39 39 }; 40 40 41 41 build-system = [
-6
pkgs/development/python-modules/textual/default.nix
··· 77 77 disabledTests = [ 78 78 # Assertion issues 79 79 "test_textual_env_var" 80 - 81 - # Fail since tree-sitter-markdown was updated to 0.5.0 82 - # ValueError: Incompatible Language version 15. Must be between 13 and 14 83 - # https://github.com/Textualize/textual/issues/5868 84 - "test_setting_builtin_language_via_attribute" 85 - "test_setting_builtin_language_via_constructor" 86 80 ]; 87 81 88 82 pytestFlags = [
+68 -11
pkgs/development/python-modules/torchrl/default.nix
··· 17 17 torch, 18 18 19 19 # optional-dependencies 20 - ale-py, 21 - gym, 22 - pygame, 23 - torchsnapshot, 20 + # atari 24 21 gymnasium, 22 + # checkpointing 23 + torchsnapshot, 24 + # gym-continuous 25 25 mujoco, 26 + # llm 27 + accelerate, 28 + datasets, 29 + einops, 30 + immutabledict, 31 + langdetect, 32 + nltk, 33 + playwright, 34 + protobuf, 35 + safetensors, 36 + sentencepiece, 37 + transformers, 38 + vllm, 39 + # offline-data 26 40 h5py, 27 41 huggingface-hub, 28 42 minari, ··· 32 46 scikit-learn, 33 47 torchvision, 34 48 tqdm, 49 + # rendering 35 50 moviepy, 51 + # utils 36 52 git, 37 53 hydra-core, 38 54 tensorboard, ··· 48 64 49 65 buildPythonPackage rec { 50 66 pname = "torchrl"; 51 - version = "0.8.1"; 67 + version = "0.9.1"; 52 68 pyproject = true; 53 69 54 70 src = fetchFromGitHub { 55 71 owner = "pytorch"; 56 72 repo = "rl"; 57 73 tag = "v${version}"; 58 - hash = "sha256-ANoqIAVKSq023hG83Q71t8oLzud1LeVN5WVPYL3nOks="; 74 + hash = "sha256-afaWDX5lIAoGTfrBSqrktYoA1S4hv6ogBaKYHc8dQ6E="; 59 75 }; 60 76 61 77 build-system = [ ··· 73 89 ]; 74 90 75 91 optional-dependencies = { 76 - atari = [ 77 - ale-py 78 - gym 79 - pygame 80 - ]; 92 + atari = gymnasium.optional-dependencies.atari; 81 93 checkpointing = [ torchsnapshot ]; 82 94 gym-continuous = [ 83 95 gymnasium 84 96 mujoco 85 97 ]; 98 + llm = [ 99 + accelerate 100 + datasets 101 + einops 102 + immutabledict 103 + langdetect 104 + nltk 105 + playwright 106 + protobuf 107 + safetensors 108 + sentencepiece 109 + transformers 110 + vllm 111 + ]; 86 112 offline-data = [ 87 113 h5py 88 114 huggingface-hub ··· 131 157 ] 132 158 ++ optional-dependencies.atari 133 159 ++ optional-dependencies.gym-continuous 160 + ++ optional-dependencies.llm 134 161 ++ optional-dependencies.rendering; 135 162 136 163 disabledTests = 137 164 [ 165 + # Require network 166 + "test_create_or_load_dataset" 167 + "test_from_text_env_tokenizer" 168 + "test_from_text_env_tokenizer_catframes" 169 + "test_from_text_rb_slicesampler" 170 + "test_generate" 171 + "test_get_dataloader" 172 + "test_get_scores" 173 + "test_preproc_data" 174 + "test_prompt_tensordict_tokenizer" 175 + "test_reward_model" 176 + "test_tensordict_tokenizer" 177 + "test_transform_compose" 178 + "test_transform_model" 179 + "test_transform_no_env" 180 + "test_transform_rb" 181 + 182 + # ray.exceptions.RuntimeEnvSetupError: Failed to set up runtime environment 183 + "TestRayCollector" 184 + 138 185 # torchrl is incompatible with gymnasium>=1.0 139 186 # https://github.com/pytorch/rl/discussions/2483 140 187 "test_resetting_strategies" ··· 193 240 # AssertionError: assert tensor([51.]) == ((5 * 11) + 2) 194 241 "test_vecnorm_parallel_auto" 195 242 ]; 243 + 244 + disabledTestPaths = [ 245 + # ERROR collecting test/smoke_test.py 246 + # import file mismatch: 247 + # imported module 'smoke_test' has this __file__ attribute: 248 + # /build/source/test/llm/smoke_test.py 249 + # which is not the same as the test file we want to collect: 250 + # /build/source/test/smoke_test.py 251 + "test/llm" 252 + ]; 196 253 197 254 meta = { 198 255 description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
+7 -3
pkgs/development/python-modules/tree-sitter-markdown/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "tree-sitter-markdown"; 12 - version = "0.5.0"; 12 + # only update to the latest version on PyPI 13 + version = "0.3.2"; 13 14 pyproject = true; 14 15 15 16 src = fetchFromGitHub { 16 17 owner = "tree-sitter-grammars"; 17 18 repo = "tree-sitter-markdown"; 18 19 tag = "v${version}"; 19 - hash = "sha256-I9KDE1yZce8KIGPLG5tmv5r/NCWwN95R6fIyvGdx+So="; 20 + hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; 20 21 }; 21 22 22 23 build-system = [ ··· 41 42 homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; 42 43 changelog = "https://github.com/tree-sitter-grammars/tree-sitter-markdown/releases/tag/${src.tag}"; 43 44 license = lib.licenses.mit; 44 - maintainers = with lib.maintainers; [ GaetanLepage ]; 45 + maintainers = with lib.maintainers; [ 46 + GaetanLepage 47 + gepbird 48 + ]; 45 49 }; 46 50 }
+3 -3
pkgs/os-specific/linux/kernel/zen-kernels.nix
··· 23 23 }; 24 24 # ./update-zen.py lqx 25 25 lqx = { 26 - version = "6.15.4"; # lqx 27 - suffix = "lqx2"; # lqx 28 - sha256 = "197m75li8lhkcil8mkb402v8f166n0m52l450dar8mq4y89r7x3j"; # lqx 26 + version = "6.15.6"; # lqx 27 + suffix = "lqx1"; # lqx 28 + sha256 = "092yz6r6wzkafr0rafb1qdapghjwr33dlx3id5jn03jkq4g8jgmd"; # lqx 29 29 isLqx = true; 30 30 }; 31 31 };
+2 -2
pkgs/tools/security/sslscan/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "sslscan"; 10 - version = "2.1.6"; 10 + version = "2.2.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "rbsec"; 14 14 repo = "sslscan"; 15 15 tag = version; 16 - hash = "sha256-XFoTwBtufkT/Ja0a3MEytPHx37eg3ZZ7x15EXHjZey4="; 16 + hash = "sha256-i8nrGni7mClJQIlkDt20JXyhlJALKCR0MZk51ACtev0="; 17 17 }; 18 18 19 19 buildInputs = [ openssl ];