From f641a43f6f5084793371672b075448c33d8a0040 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jun 2025 17:59:49 +0000 Subject: [PATCH 001/212] snis-unwrapped: 1.0.8 -> 1.0.9 --- pkgs/by-name/sn/snis-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix index efbb19ddc8c0..d274737370d3 100644 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ b/pkgs/by-name/sn/snis-unwrapped/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snis"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "smcameron"; repo = "space-nerds-in-space"; tag = "v${finalAttrs.version}"; - hash = "sha256-WxxJW0o4PtOhmloeRLqxJahJwWlGpcdpQjrjrah+Ixk="; + hash = "sha256-H6ZeZOeKy8Z5HGicQs9CmjR2tDzD8AGvLr75Xx0YkAg="; }; enableParallelBuilding = true; From 19d4db0923f4d789ade029075b3337c2ac938011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 03:28:34 +0000 Subject: [PATCH 002/212] python3Packages.qpsolvers: 4.7.1 -> 4.8.0 --- pkgs/development/python-modules/qpsolvers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 8e89b41c5fcc..deba6e607f29 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -23,14 +23,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-sGnr1my1/1xA+pVX1SLsj8WtNViJ/nKRwN6Kl0HsJV0="; + hash = "sha256-GBZrqBnZajbgiNSj+fcd1Ytz7MC8g7Zk1FNVpbJ22EI="; }; build-system = [ flit-core ]; From d6b0a9a2902f9067652a80302f2027c943105245 Mon Sep 17 00:00:00 2001 From: Anton Lydike Date: Mon, 7 Jul 2025 15:49:36 +0100 Subject: [PATCH 003/212] python3Packages.filecheck: 0.0.24 -> 1.0.2 --- .../python-modules/filecheck/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix index f0b5e1622af3..c815fc4e6243 100644 --- a/pkgs/development/python-modules/filecheck/default.nix +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -2,33 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, - hatchling, + poetry-core, pytestCheckHook, }: buildPythonPackage rec { pname = "filecheck"; - version = "0.0.24"; - format = "pyproject"; + version = "1.0.2"; + pyproject = true; src = fetchFromGitHub { - owner = "mull-project"; - repo = "FileCheck.py"; + owner = "AntonLydike"; + repo = "filecheck"; tag = "v${version}"; - hash = "sha256-VbMlCqGd3MVpj0jEKjSGC2L0s/3e/d53b+2eZcXZneo="; + hash = "sha256-73HQ8dGp52+SyuwacthCjSQsA5v3LU49sabI066wuwU="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "filecheck" ]; meta = with lib; { - changelog = "https://github.com/mull-project/FileCheck.py/releases/tag/v${version}"; - homepage = "https://github.com/mull-project/FileCheck.py"; + changelog = "https://github.com/antonlydike/filecheck/releases/tag/v${version}"; + homepage = "https://github.com/antonlydike/filecheck"; license = licenses.asl20; - description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"; + description = "Python-native clone of LLVMs FileCheck tool"; mainProgram = "filecheck"; maintainers = with maintainers; [ yorickvp ]; }; From 2cddd1165a02d30ad78ae58d0a8f6bb71db3bd85 Mon Sep 17 00:00:00 2001 From: ppom <> Date: Tue, 8 Jul 2025 12:00:00 +0200 Subject: [PATCH 004/212] reaction: 2.1.0 -> 2.1.1 --- pkgs/by-name/re/reaction/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 657a9ec2d0e1..89c94bde7872 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "reaction"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "ppom"; repo = "reaction"; tag = "v${finalAttrs.version}"; - hash = "sha256-3FJv1n1+cpV4yrBR6PKTAhSkjas/4uTZqn4nW948jAk="; + hash = "sha256-F/vewPUqBXq5HsD2aWPEpvTlt4MAPmaGadZMR568HFQ="; }; - cargoHash = "sha256-Is8Mkl7Qfbe2CwYB+Da99NDQZd9+qR4NnT8iU/JMPJ0="; + cargoHash = "sha256-YvTeZJqVMRr0Iw8jynWigQPs1Y+gMao4zQnNdQxhGlM="; nativeBuildInputs = [ installShellFiles From a0eb65a139177abc6abd8c94d07d8f1efbf8535d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 11 Jul 2025 12:22:19 -0400 Subject: [PATCH 005/212] python3Packages.datalad: 1.2.0 -> 1.2.1 Diff: https://github.com/datalad/datalad/compare/refs/tags/1.2.0...refs/tags/1.2.1 --- pkgs/development/python-modules/datalad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 9b4e21b0d205..a8408f9e9576 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datalad"; tag = version; - hash = "sha256-jLbtx6gNuMdZ34LVC7PY79k2w3B9aJ0ijCh9HhALQQc="; + hash = "sha256-QcKhMiJNlETlxmRoPwKKGYK7zKbJ0pQpbRZDyJ+yrN0="; }; postPatch = '' From f8977191368d91213a4981a523db989325f5fbde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 18:39:31 +0000 Subject: [PATCH 006/212] python3Packages.evaluate: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/evaluate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index b0ecf70ed8ae..a209569da1cf 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "evaluate"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "evaluate"; tag = "v${version}"; - hash = "sha256-zN0Kud4CJMM5gazWKOR9kmwTVHYgT7DsZqbHjFIe47w="; + hash = "sha256-YcKlGun9zZdr8l2Oz49J8OYV9/VUHyyGyaJk/7PGS0o="; }; build-system = [ setuptools ]; From 118d81aeefa749dc1f0abb387eb4f2027f9a55b5 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Tue, 8 Jul 2025 14:03:38 +0300 Subject: [PATCH 007/212] fex: 2506 -> 2507.1 --- pkgs/by-name/fe/fex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index fb4c4ece16f1..e88b55f3c557 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -15,14 +15,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2506"; + version = "2507.1"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-wzUAyNCfMlABBd3yzFZkPUiy7spuHrekTqVoyUB9jxI="; + hash = "sha256-F6rMEPmw2UxWw+XWsUXrrUjvrDcIA1W+spkcq3tdUMI="; leaveDotGit = true; postFetch = '' From 066355bf8ef67d9e5f1427e79fffad99d65d5ab1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 15:04:16 +0000 Subject: [PATCH 008/212] usbguard: 1.1.3 -> 1.1.4 --- pkgs/by-name/us/usbguard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index 5ff76bf68f60..baa057785a9b 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -25,14 +25,14 @@ let protobuf = protobuf_29; in stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.1.4"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = "usbguard"; rev = "usbguard-${version}"; - hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s="; + hash = "sha256-PDuYszdG6BK4fkAHWWBct1d7tnwwe+5XOw+xmSPoPCY="; fetchSubmodules = true; }; From f14862591ee5281b5b9387b12461f259a88fdb91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 16:56:36 +0000 Subject: [PATCH 009/212] bettercap: 2.41.0 -> 2.41.1 --- pkgs/by-name/be/bettercap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix index 5350ae76ebe0..860e59a215e4 100644 --- a/pkgs/by-name/be/bettercap/package.nix +++ b/pkgs/by-name/be/bettercap/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.41.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "bettercap"; repo = "bettercap"; rev = "v${version}"; - sha256 = "sha256-qQNsdKUiTSXkvfIguR1Rjs3A1WW4G1ernqRWTKBjIVI="; + sha256 = "sha256-NvCAG5+oZ5Xf2gbFKNlLXNxkvvK10py+qksJ5te2aGI="; }; - vendorHash = "sha256-OxcBk22TvlcnHqJ0VzuewZtWLm/DPo6Cdq7RKabOg8w="; + vendorHash = "sha256-1kgjMPsj8z2Cl0YWe/1zY0Zuiza0X+ZAIgsMqPhCrMw="; doCheck = false; From 6d363462fa33dcbceeba59218ac0c5a22e7b62c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 20:44:16 +0000 Subject: [PATCH 010/212] oapi-codegen: 2.4.1 -> 2.5.0 --- pkgs/by-name/oa/oapi-codegen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix index 5deb88e7ed80..eb12afdba0ff 100644 --- a/pkgs/by-name/oa/oapi-codegen/package.nix +++ b/pkgs/by-name/oa/oapi-codegen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "deepmap"; repo = "oapi-codegen"; tag = "v${version}"; - hash = "sha256-21VhHSyfF+NHkXlr2svjwBNZmfS1O448POBP9XUQxak="; + hash = "sha256-Z10rJMancQLefyW0wXWaODIKfSY+4b3T+TAro//xsAQ="; }; - vendorHash = "sha256-bp5sFZNJFQonwfF1RjCnOMKZQkofHuqG0bXdG5Hf3jU="; + vendorHash = "sha256-obpY7ZATebI/7bkPMidC83xnN60P0lZsJhSuKr2A5T4="; # Tests use network doCheck = false; From 62d1bb1130c50bc6d431319249319da1a54d2e02 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Fri, 18 Jul 2025 17:47:02 +0200 Subject: [PATCH 011/212] lasuite-docs: 3.4.1 -> 3.4.2 https://github.com/suitenumerique/docs/releases/tag/v3.4.2 https://github.com/suitenumerique/docs/compare/v3.4.1...v3.4.2 --- pkgs/by-name/la/lasuite-docs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 2d5db8c2cf30..f25376f6080e 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -24,14 +24,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-docs"; - version = "3.4.1"; + version = "3.4.2"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw="; + hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; }; sourceRoot = "source/src/backend"; From 5b3f87a47f45b5f7889d88e0762f6bf17598fe7f Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Fri, 18 Jul 2025 17:47:45 +0200 Subject: [PATCH 012/212] lasuite-docs-collaboration-server: 3.4.1 -> 3.4.2 https://github.com/suitenumerique/docs/releases/tag/v3.4.2 https://github.com/suitenumerique/docs/compare/v3.4.1...v3.4.2 --- pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 1f06cef39891..44e340b76f74 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-collaboration-server"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw="; + hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; }; sourceRoot = "source/src/frontend"; From 9ab0a5384276f5a00ce4b72fa74d7d02ec52e7f2 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Fri, 18 Jul 2025 17:48:12 +0200 Subject: [PATCH 013/212] lasuite-docs-frontend: 3.4.1 -> 3.4.2 https://github.com/suitenumerique/docs/releases/tag/v3.4.2 https://github.com/suitenumerique/docs/compare/v3.4.1...v3.4.2 --- pkgs/by-name/la/lasuite-docs-frontend/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index a0ef034740d7..de5d31a94019 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-frontend"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw="; + hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; }; sourceRoot = "source/src/frontend"; From 0e9e9014c4638a2107e242bd84bced1d72be1e70 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Jul 2025 12:57:37 +0300 Subject: [PATCH 014/212] python313Packages.lmfit: 1.3.3 -> 1.3.4 Changelog: https://github.com/lmfit/lmfit-py/releases/tag/1.3.4 --- pkgs/development/python-modules/lmfit/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 7a2045a7cce3..4a8cabbaa2b7 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, asteval, dill, fetchPypi, @@ -19,22 +18,15 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-czIea4gfL2hiNXIaffwCr2uw8DCiXv62Zjj2KxxgU6E="; + hash = "sha256-PCLCjEP3F/bFtKO9geiTohSXOcJqWSwEby4zwjz75Jc="; }; - patches = [ - # https://github.com/lmfit/lmfit-py/issues/999 - (fetchpatch { - url = "https://github.com/lmfit/lmfit-py/commit/d4f4e3755d50cb9720c616fcff2cd7b58fbabba5.patch"; - hash = "sha256-h1WK3ajnoX3pOZOduFBKpPz3exfoKzkbO/QNgROLT7c="; - }) - ]; build-system = [ setuptools From 66e5509a89f7f978f8a163c7faf148c1dd6c9d1f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Jul 2025 13:00:21 +0300 Subject: [PATCH 015/212] python312Packages.lmfit: reorder inputs & arguments --- .../python-modules/lmfit/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 4a8cabbaa2b7..697d120dd744 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -1,19 +1,25 @@ { lib, buildPythonPackage, + fetchPypi, + pythonOlder, + + # build-system + setuptools, + setuptools-scm, + + # dependencies asteval, dill, - fetchPypi, - matplotlib, numpy, - pandas, - pytest-cov-stub, - pytestCheckHook, - pythonOlder, scipy, - setuptools-scm, - setuptools, uncertainties, + + # tests + pytestCheckHook, + pytest-cov-stub, + matplotlib, + pandas, }: buildPythonPackage rec { @@ -42,10 +48,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub matplotlib pandas - pytest-cov-stub - pytestCheckHook ]; pythonImportsCheck = [ "lmfit" ]; From 2bc23a4281965c8598358f676b92cb061de9f572 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Jul 2025 13:00:38 +0300 Subject: [PATCH 016/212] python312Packages.lmfit: no with lib; in meta --- pkgs/development/python-modules/lmfit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 697d120dd744..9825021c6e2e 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -58,11 +58,11 @@ buildPythonPackage rec { disabledTests = [ "test_check_ast_errors" ]; - meta = with lib; { + meta = { description = "Least-Squares Minimization with Bounds and Constraints"; homepage = "https://lmfit.github.io/lmfit-py/"; changelog = "https://github.com/lmfit/lmfit-py/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ nomeata ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nomeata ]; }; } From 77c7a5c2fa3fdcd2ea865cab94d5f643898cc1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 12 Jul 2025 14:46:24 +0700 Subject: [PATCH 017/212] =?UTF-8?q?ejabberd:=2025.04=20=E2=86=92=2025.07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ej/ejabberd/package.nix | 4 +- pkgs/by-name/ej/ejabberd/rebar-deps.nix | 96 ++++++++++++------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index dee0cad6572c..27a32cc996a5 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "25.04"; + version = "25.07"; nativeBuildInputs = [ makeWrapper @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo="; + hash = "sha256-DDvxmRennd9tAC9LqV8eAAzcF+kZemvgsOviWD9CHlM="; }; passthru.tests = { diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index bd5b79474028..0742da7d2665 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -14,11 +14,11 @@ let packages = with self; { unicode_util_compat = builder { name = "unicode_util_compat"; - version = "0.7.0"; + version = "0.7.1"; src = fetchHex { pkg = "unicode_util_compat"; - version = "0.7.0"; - sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE="; + version = "0.7.1"; + sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI="; }; beamDeps = [ ]; }; @@ -44,21 +44,21 @@ let }; yconf = builder { name = "yconf"; - version = "1.0.18"; + version = "1.0.20"; src = fetchHex { pkg = "yconf"; - version = "1.0.18"; - sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo="; + version = "1.0.20"; + sha256 = "sha256-8rPXMHVvwuSv0cCwq277mfDkSJUtJdwV7XWsFjW/iII="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "1.10.0"; + version = "1.11.0"; src = fetchHex { pkg = "xmpp"; - version = "1.10.0"; - sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU="; + version = "1.11.0"; + sha256 = "sha256-NKGR1qO3To8KQjRvhZ4sq1s6Kuflwo85Lly1ZhLnzoU="; }; beamDeps = [ ezlib @@ -71,11 +71,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.17"; + version = "1.2.20"; src = fetchHex { pkg = "stun"; - version = "1.2.17"; - sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0="; + version = "1.2.20"; + sha256 = "sha256-eeSfgmpPfVIsk5q2M9k1x519ayKeTLfgX2LzO1AXdBQ="; }; beamDeps = [ fast_tls @@ -84,11 +84,11 @@ let }; stringprep = builder { name = "stringprep"; - version = "1.0.31"; + version = "1.0.33"; src = fetchHex { pkg = "stringprep"; - version = "1.0.31"; - sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA="; + version = "1.0.33"; + sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA="; }; beamDeps = [ p1_utils ]; }; @@ -114,21 +114,21 @@ let }; p1_utils = builder { name = "p1_utils"; - version = "1.0.26"; + version = "1.0.28"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.27"; - sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA="; + version = "1.0.28"; + sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.32"; + version = "1.1.34"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.32"; - sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4="; + version = "1.1.34"; + sha256 = "sha256-yw4y4IbJw10OPpZuOGPYMnN8e00rXxRzFqRlwLJD6n8="; }; beamDeps = [ xmpp ]; }; @@ -154,11 +154,11 @@ let }; p1_acme = builder { name = "p1_acme"; - version = "1.0.25"; + version = "1.0.27"; src = fetchHex { pkg = "p1_acme"; - version = "1.0.25"; - sha256 = "sha256-p7VbR0ld20+YoV5lRR7DrUP0Y3uVXHTNaV2Y5qZF0Iw="; + version = "1.0.27"; + sha256 = "sha256-qmS2qIVrGiKaEovqJ2Md4uGiIZg146gz+hETcUOo13M="; }; beamDeps = [ base64url @@ -170,11 +170,11 @@ let }; mqtree = builder { name = "mqtree"; - version = "1.0.17"; + version = "1.0.19"; src = fetchHex { pkg = "mqtree"; - version = "1.0.17"; - sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM="; + version = "1.0.19"; + sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw="; }; beamDeps = [ p1_utils ]; }; @@ -210,51 +210,51 @@ let }; fast_yaml = builder { name = "fast_yaml"; - version = "1.0.37"; + version = "1.0.39"; src = fetchHex { pkg = "fast_yaml"; - version = "1.0.37"; - sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k="; + version = "1.0.39"; + sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40="; }; beamDeps = [ p1_utils ]; }; fast_xml = builder { name = "fast_xml"; - version = "1.1.55"; + version = "1.1.57"; src = fetchHex { pkg = "fast_xml"; - version = "1.1.55"; - sha256 = "sha256-g/PiOngO1fVnzexzlT8GyVuDjXCdv6hrWamKjSPJn4U="; + version = "1.1.57"; + sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk="; }; beamDeps = [ p1_utils ]; }; fast_tls = builder { name = "fast_tls"; - version = "1.1.22"; + version = "1.1.24"; src = fetchHex { pkg = "fast_tls"; - version = "1.1.22"; - sha256 = "sha256-5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs="; + version = "1.1.24"; + sha256 = "sha256-//iK2jn60QRkVnoWBkP0Up70rtSdFWkZ9dH0FbbNu7Y="; }; beamDeps = [ p1_utils ]; }; ezlib = builder { name = "ezlib"; - version = "1.0.13"; + version = "1.0.15"; src = fetchHex { pkg = "ezlib"; - version = "1.0.13"; - sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s="; + version = "1.0.15"; + sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs="; }; beamDeps = [ p1_utils ]; }; esip = builder { name = "esip"; - version = "1.0.57"; + version = "1.0.58"; src = fetchHex { pkg = "esip"; - version = "1.0.57"; - sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0="; + version = "1.0.58"; + sha256 = "sha256-4PQgSl7eD6fQDaPMQvZECqNiusf69Tb3HqKfo/D6fHU="; }; beamDeps = [ fast_tls @@ -284,21 +284,21 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.24"; + version = "1.0.26"; src = fetchHex { pkg = "eimp"; - version = "1.0.24"; - sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0="; + version = "1.0.26"; + sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw="; }; beamDeps = [ p1_utils ]; }; cache_tab = builder { name = "cache_tab"; - version = "1.0.31"; + version = "1.0.33"; src = fetchHex { pkg = "cache_tab"; - version = "1.0.31"; - sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E="; + version = "1.0.33"; + sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA="; }; beamDeps = [ p1_utils ]; }; From c9de66f3d72ffc71b9c267949a75616e0dd0a848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sun, 20 Jul 2025 20:19:00 +0700 Subject: [PATCH 018/212] ejabberd: add toastal to maintainers --- pkgs/by-name/ej/ejabberd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 27a32cc996a5..5c346117b494 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -222,6 +222,7 @@ stdenv.mkDerivation (finalAttrs: { sander abbradar chuangzhu + toastal ]; }; }) From 281fbc0224f4c8cdabfb475c70694e531845f154 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Mon, 21 Jul 2025 22:19:25 +0200 Subject: [PATCH 019/212] hyprlandPlugins.hyprsplit: 0.49.0 -> 0.50.1 https://github.com/shezdy/hyprsplit/releases/tag/v0.50.1 --- .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index a094d3c8478f..06b0f1e10ce7 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -9,13 +9,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.49.0"; + version = "0.50.1"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; - rev = "refs/tags/v${version}"; - hash = "sha256-0jrsiUoQi/VXM2Ji7YTOEYDYYlBI2C3ZbgQpYoAEVKI="; + tag = "v${version}"; + hash = "sha256-D0zfdUJXBRnNMmv/5qW+X4FJJ3/+t7yQmwJFkBuEgck="; }; nativeBuildInputs = [ From 63874bba45f0108d0b8bba4e5b575dfa08c69bed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:13 +0200 Subject: [PATCH 020/212] python312Packages.mypy-boto3-cloudfront: 1.39.8 -> 1.39.10 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a9f3ef8b8d7f..9af70212d69a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-c0qUMt2dvFgmJCTabQSkliysaBDBepkz5kOBgNIlQSk="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.39.8" - "sha256-N1QVZiMkTf9AS9I2nm+2foIozWGhuLtauNZHvDvA1nk="; + buildMypyBoto3Package "cloudfront" "1.39.10" + "sha256-2v3ZBFKuD2bfjTaZpW4gpaKKSJ4FhpTnOyFbeBInkOo="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.39.0" From e72d6afdc12fcfa7edb6ea17f73813666395dce1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:26 +0200 Subject: [PATCH 021/212] python312Packages.mypy-boto3-ec2: 1.39.8 -> 1.39.10 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9af70212d69a..6a127ffe0ba2 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-uYeekAsfyETYQYWR3L8S+uzlp6EQpvYEWsqiX+60b/Y="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.39.8" - "sha256-jdFnyTA5Po3XaVWVCwEtY10JeyiIC453jw8cTZ6xjFs="; + buildMypyBoto3Package "ec2" "1.39.10" + "sha256-8fxtJZJnC0UDtEqRMdOzU92mht0oAg4zjxcS1kb6biw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.39.0" From 3e62deec1090c455f8f9fc67760ade85d68a57c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:28 +0200 Subject: [PATCH 022/212] python312Packages.mypy-boto3-ecr: 1.39.0 -> 1.39.11 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 6a127ffe0ba2..9c67dae54410 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -454,8 +454,8 @@ rec { "sha256-VbEhzVf9uNm1DmyEvAUBEkHawITLiArgya5kwotuYbI="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.39.0" - "sha256-fsGs0xUocXqkO2ANby3RuluJizT9HGgo6GhdeG5SMJg="; + buildMypyBoto3Package "ecr" "1.39.11" + "sha256-1tIxouuj5FmgUyz+W5vfbVYRMH5FkCYBR5oechO9tXo="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.39.0" From bc11926fd92b79a97c6e33e55f6bbe99b1c9ee5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:32 +0200 Subject: [PATCH 023/212] python312Packages.mypy-boto3-emr: 1.39.0 -> 1.39.11 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9c67dae54410..737f4311c52a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -498,8 +498,8 @@ rec { "sha256-WK1TbY46qCD6V+lRv2hqEG8xtjF37xJO6K2t5gj2xLU="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.39.0" - "sha256-Nxu4G4ww6yTBukU9TwhO7jVGL57cEFdsNadDUCDvQKI="; + buildMypyBoto3Package "emr" "1.39.11" + "sha256-C/Ui2pSoYCB2sCFR53UAEj17YPvW8Z8vtV7tmJTz0iA="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.39.0" From eca08dd180155af9a3d653dc222d7b86e39aba30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:47 +0200 Subject: [PATCH 024/212] python312Packages.mypy-boto3-lambda: 1.39.0 -> 1.39.11 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 737f4311c52a..98c6d1332a15 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -770,8 +770,8 @@ rec { "sha256-UMrR80IPpkYrz4iBsArrjWbt+n58KmNOIFUUlp05eNk="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.39.0" - "sha256-ZDoMZQQn6ElClTDZtXDm1XPecnSYQZPxggM8y/ylXQw="; + buildMypyBoto3Package "lambda" "1.39.11" + "sha256-qYZ7pUztjP0el3r67gU9EmTI1k7yFf6NEyuaOkc2/gc="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.39.0" From 2b1e530bc9cc1c4f79e4ad0c2cf4292548a7bac2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:30:58 +0200 Subject: [PATCH 025/212] python312Packages.mypy-boto3-neptunedata: 1.39.0 -> 1.39.11 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 98c6d1332a15..b6663bb49c39 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -946,8 +946,8 @@ rec { "sha256-q8NsWE/syMihH6TE1b1nBFgHhNavOBaFdwgQnDQXrXs="; mypy-boto3-neptunedata = - buildMypyBoto3Package "neptunedata" "1.39.0" - "sha256-Jrgjn7fXiMBZ87VKHcknDlexLfHmDYuN4TIyGQA4fAw="; + buildMypyBoto3Package "neptunedata" "1.39.11" + "sha256-KdPpWb+esR94Abnfs1K09qf2MWfTkj28yLRSg/1QCFI="; mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.39.0" From fe1818fcef3cb471ebad2e14dec9c131f04b8d74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:31:11 +0200 Subject: [PATCH 026/212] python312Packages.mypy-boto3-sagemaker: 1.39.5 -> 1.39.10 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b6663bb49c39..5f9271c16395 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-vW033S6oYNQN+iCLiDEGbgaNOxjDM0FK0P/SrSHEprA="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.39.5" - "sha256-mEYdxdkrTwbl8ByvLIfqJnZw12+xstzevnFMqC2uWFY="; + buildMypyBoto3Package "sagemaker" "1.39.10" + "sha256-jqLHNFIZ4P03QO0NgXzU9V0RdLbR/i0er6VPk4QDbks="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.39.0" From f80d88b2ebd575ceee9c617038b1f82d86d78fab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:31:33 +0200 Subject: [PATCH 027/212] python313Packages.boto3-stubs: 1.39.9 -> 1.39.11 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8d9f622dcad1..33eed93b7e88 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.39.9"; + version = "1.39.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-neoNjC22AkSykCziRCs5L74gymljglGgLUdSecfeMto="; + hash = "sha256-3Ig1yx4lbzCWAx5ehFVkNk0LKNXLT/7/5U7K99smaug="; }; build-system = [ setuptools ]; From 8ac16eaf77bbdddf0b3ff819a428de15abe977a1 Mon Sep 17 00:00:00 2001 From: Alexandru Nechita Date: Fri, 18 Jul 2025 14:14:02 +0200 Subject: [PATCH 028/212] aerospace: 0.18.5-Beta -> 0.19.2-Beta --- pkgs/by-name/ae/aerospace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index 1731a4a66d9a..dfedcbf3dea0 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.18.5-Beta"; + version = "0.19.2-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-rF4emnLNVE1fFlxExliN7clSBocBrPwQOwBqRtX9Q4o="; + sha256 = "sha256-6RyGw84GhGwULzN0ObjsB3nzRu1HYQS/qoCvzVWOYWQ="; }; nativeBuildInputs = [ installShellFiles ]; From da80a269bb878fbaf11e185f2deb835d1bb6f873 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 10:05:33 +0000 Subject: [PATCH 029/212] armadillo: 14.4.3 -> 14.6.1 --- pkgs/by-name/ar/armadillo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index e028b918071f..41e52c944351 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "14.4.3"; + version = "14.6.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-w6rdWb2w6kM5sFbymXL5LuGf3FL2jreNMtLkyvTYDDo="; + hash = "sha256-vsZ/No/GFnPEyelCnSATWkK6gKLH+FkrkS5fl+KJv8A="; }; nativeBuildInputs = [ cmake ]; From cd551ef791ea34409fc971e299c754bf31f910d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 20:47:42 +0000 Subject: [PATCH 030/212] tideways-daemon: 1.9.44 -> 1.9.46 --- pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 3fe6156af3e9..cf3e089b8450 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.44"; + version = "1.9.46"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-JzsSyUqKuH4msdSqN+rFdfrnNvlkFFFmspfpYLsiRZc="; + hash = "sha256-QIXnKaANoPEkVU2PiRkfNzJQ1rJ+D8Di9qGqiFMS9so="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-1nE61XHqnycMgjvjKIZnbgVSak0HYOIUHgF67RjcJi8="; + hash = "sha256-/aGqC5qV9fFV+7QLFUFaMz5eUixL4RiATelq+M/yzkM="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4KwUsFK3G73hGiVGqF1sAOv7gEjqJXSAj99wLyHE+qM="; + hash = "sha256-diATzMDw2sE5Ab/291pA7b6TQz+uJxIzECWQXVh5mng="; }; }; updateScript = "${ From b84918327b2e6ef1e053020058776e9b3f41cdf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 03:35:57 +0000 Subject: [PATCH 031/212] crowdsec: 1.6.9 -> 1.6.11 --- pkgs/by-name/cr/crowdsec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 4d0ec7135a5c..bde17e611c88 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.9"; + version = "1.6.11"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "crowdsec"; tag = "v${version}"; - hash = "sha256-Gu4Ds9o4CsimMoKqJV2weAQYH34Z7GN3rPbhbtoVuHU="; + hash = "sha256-fHnd/pnmVAPvCtae4aRS66tXmMp6DgNagqWNrT9hcw8="; }; - vendorHash = "sha256-xUzYHVhqyMUQQH5ICkwgaDiFi/L4exROjvJNWS2j9ZU="; + vendorHash = "sha256-ImrXOD3kIlNsEZOTeMA6UFvMZCnfMOTZOXtY3ger8YI="; nativeBuildInputs = [ installShellFiles ]; From 2dead82c9ef5d72ce2395952f30cf7fe75b871eb Mon Sep 17 00:00:00 2001 From: RoGreat Date: Tue, 27 May 2025 00:05:44 -0500 Subject: [PATCH 032/212] minigalaxy: 1.3.1 -> 1.4.0 --- .../minigalaxy/inject-launcher-steam-run.diff | 16 +++---- pkgs/by-name/mi/minigalaxy/package.nix | 44 ++++++++++++------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff index 44850e9fbcea..d619219f50fe 100644 --- a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff +++ b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff @@ -1,8 +1,8 @@ diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py -index 641db77..712c55b 100644 +index aeca3e3..aeb6763 100644 --- a/minigalaxy/launcher.py +++ b/minigalaxy/launcher.py -@@ -77,6 +77,7 @@ def get_execute_command(game) -> list: +@@ -84,6 +84,7 @@ def get_execute_command(game) -> list: if game.get_info("use_mangohud") is True: exe_cmd.insert(0, "mangohud") exe_cmd.insert(1, "--dlsym") @@ -11,22 +11,22 @@ index 641db77..712c55b 100644 logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) return exe_cmd diff --git a/tests/test_installer.py b/tests/test_installer.py -index 8e6cb76..a9d9f46 100644 +index d459b62..dee93cb 100644 --- a/tests/test_installer.py +++ b/tests/test_installer.py -@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which): +@@ -405,13 +405,13 @@ class Test(TestCase): mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] result1 = installer.get_exec_line(game1) -- self.assertEqual(result1, "scummvm -c beneath.ini") -+ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini") +- self.assertEqual("scummvm -c beneath.ini", result1) ++ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1) game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] result2 = installer.get_exec_line(game2) -- self.assertEqual(result2, "./start.sh") -+ self.assertEqual(result2, "@steamrun@ ./start.sh") +- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) ++ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) @mock.patch('os.path.getsize') @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 9d3772d91b44..51791c74717d 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -6,24 +6,26 @@ gobject-introspection, gtk3, libnotify, + nix-update-script, python3Packages, steam-run, replaceVars, unzip, webkitgtk_4_1, wrapGAppsHook3, + xdg-utils, }: python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.3.1"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "sharkwouter"; repo = "minigalaxy"; tag = version; - hash = "sha256-nxWJm+CkxZqRMUYQA0ZJKOb2fD1tPYXnYhy+DOnDbkQ="; + hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw="; }; patches = [ @@ -32,12 +34,6 @@ python3Packages.buildPythonApplication rec { }) ]; - postPatch = '' - substituteInPlace minigalaxy/installer.py \ - --replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \ - --replace-fail "'unzip'" "\"${lib.getExe unzip}\"" - ''; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -47,6 +43,16 @@ python3Packages.buildPythonApplication rec { glib-networking gtk3 libnotify + webkitgtk_4_1 + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests ]; nativeCheckInputs = with python3Packages; [ @@ -59,25 +65,29 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - pythonPath = [ - python3Packages.pygobject3 - python3Packages.requests - webkitgtk_4_1 - ]; - dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --suffix PATH : "${ + lib.makeBinPath [ + unzip + xdg-utils + ] + }" + ) ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://sharkwouter.github.io/minigalaxy/"; changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md"; downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "Simple GOG client for Linux"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ RoGreat ]; platforms = lib.platforms.linux; }; } From f02df8c21f6d9f4bf53a74842f1f3b4b75ea2fa6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 17 Jul 2025 14:59:53 +0800 Subject: [PATCH 033/212] gmsh: remove redundant enableParalleBuilding --- pkgs/by-name/gm/gmsh/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index d0be8fc8fc50..271950d1a087 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -57,8 +57,6 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enablePython python; - enableParallelBuilding = true; - patches = [ (fetchpatch { url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; From 485fd2c0fa4842974b9fff1d6c5a68fec9b80e3b Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 17 Jul 2025 15:11:54 +0800 Subject: [PATCH 034/212] python3Packages.gmsh: use python3Packages --- pkgs/by-name/gm/gmsh/package.nix | 29 ++++++++++++++++------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 271950d1a087..2f5793d4b950 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -16,12 +16,11 @@ xorg, opencascade-occt, llvmPackages, - python ? null, + python3Packages, enablePython ? false, }: assert (!blas.isILP64) && (!lapack.isILP64); -assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; @@ -32,6 +31,14 @@ stdenv.mkDerivation rec { hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0="; }; + nativeBuildInputs = [ + cmake + gfortran + ] + ++ lib.optional ( + enablePython && stdenv.buildPlatform == stdenv.hostPlatform + ) python3Packages.pythonImportsCheckHook; + buildInputs = [ blas lapack @@ -54,8 +61,7 @@ stdenv.mkDerivation rec { xorg.libSM xorg.libICE ] - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp - ++ lib.optional enablePython python; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; patches = [ (fetchpatch { @@ -76,18 +82,15 @@ stdenv.mkDerivation rec { "-DENABLE_OPENMP=ON" ]; - nativeBuildInputs = [ - cmake - gfortran - ]; + doCheck = true; - postFixup = lib.optionalString enablePython '' - mkdir -p $out/lib/python${python.pythonVersion}/site-packages - mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages - mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages + postInstall = lib.optionalString enablePython '' + mkdir -p $out/${python3Packages.python.sitePackages} + mv $out/lib/gmsh.py $out/${python3Packages.python.sitePackages} + mv $out/lib/*.dist-info $out/${python3Packages.python.sitePackages} ''; - doCheck = true; + pythonImportsCheck = [ "gmsh" ]; meta = { description = "Three-dimensional finite element mesh generator"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c6e5180a9ce..4703e4493143 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5885,7 +5885,7 @@ self: super: with self; { gmsh = toPythonModule ( pkgs.gmsh.override { - inherit (self) python; + python3Packages = self; enablePython = true; } ); From 02e8e98152361c02cbbf0a9562f176b1626f2d6e Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 17 Jul 2025 16:06:47 +0800 Subject: [PATCH 035/212] gmsh: add desktopItem --- pkgs/by-name/gm/gmsh/package.nix | 46 +++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 2f5793d4b950..098cf4e51eaf 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -3,6 +3,8 @@ stdenv, fetchurl, fetchpatch, + makeDesktopItem, + copyDesktopItems, cmake, blas, lapack, @@ -22,12 +24,12 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmsh"; version = "4.13.1"; src = fetchurl { - url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; + url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz"; hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0="; }; @@ -37,7 +39,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional ( enablePython && stdenv.buildPlatform == stdenv.hostPlatform - ) python3Packages.pythonImportsCheckHook; + ) python3Packages.pythonImportsCheckHook + ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ blas @@ -84,11 +87,36 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = lib.optionalString enablePython '' - mkdir -p $out/${python3Packages.python.sitePackages} - mv $out/lib/gmsh.py $out/${python3Packages.python.sitePackages} - mv $out/lib/*.dist-info $out/${python3Packages.python.sitePackages} - ''; + desktopItems = [ + (makeDesktopItem { + name = "gmsh"; + exec = "gmsh"; + comment = finalAttrs.meta.description; + desktopName = "Gmsh"; + genericName = "3D Mesh Generator"; + categories = [ + "Science" + "Math" + ]; + icon = "gmsh"; + }) + ]; + + postInstall = + let + logo = fetchurl { + url = "https://salsa.debian.org/science-team/gmsh/-/raw/d2d8b4e3488c7b0f51879f809f624b537b4bd28f/debian/gmsh.svg"; + hash = "sha256-p69Cju3bn1ShWmESOSOmJj0x3IYDGI9oD25SFTh2GLo="; + }; + in + lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 ${logo} $out/share/icons/hicolor/scalable/apps/gmsh.svg + '' + + lib.optionalString enablePython '' + mkdir -p $out/${python3Packages.python.sitePackages} + mv $out/lib/gmsh.py $out/${python3Packages.python.sitePackages} + mv $out/lib/*.dist-info $out/${python3Packages.python.sitePackages} + ''; pythonImportsCheck = [ "gmsh" ]; @@ -98,4 +126,4 @@ stdenv.mkDerivation rec { homepage = "https://gmsh.info/"; license = lib.licenses.gpl2Plus; }; -} +}) From 2de67f8be5de0e25ddb2c2b0ab7aa2f50205da2d Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 17 Jul 2025 14:58:56 +0800 Subject: [PATCH 036/212] gmsh: 4.13.1 -> 4.14.0 changelog: https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_4_14_0#changelog --- pkgs/by-name/gm/gmsh/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 098cf4e51eaf..c2b341e5f15e 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, makeDesktopItem, copyDesktopItems, cmake, @@ -26,11 +25,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "gmsh"; - version = "4.13.1"; + version = "4.14.0"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz"; - hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0="; + hash = "sha256-2019ogYumkNWqCCDITirmfl69jiL/rIVmaLq37C3aig="; }; nativeBuildInputs = [ @@ -66,18 +65,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - patches = [ - (fetchpatch { - url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; - hash = "sha256-3atm1NGsMI4KEct2xakRG6EasRpF6YRI4raoVYxBV4g="; - }) - ]; - - postPatch = '' - substituteInPlace api/gmsh.py \ - --replace-fail 'find_library("gmsh")' \"$out/lib/libgmsh${stdenv.hostPlatform.extensions.sharedLibrary}\" - ''; - # N.B. the shared object is used by bindings cmakeFlags = [ "-DENABLE_BUILD_SHARED=ON" @@ -124,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Three-dimensional finite element mesh generator"; mainProgram = "gmsh"; homepage = "https://gmsh.info/"; + changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog"; license = lib.licenses.gpl2Plus; }; }) From 923a6606b7183f251a14e5f8c53a9626bcc09695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 22:23:24 +0000 Subject: [PATCH 037/212] python3Packages.langchain-xai: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/langchain-xai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix index 62b7b4595438..f2f03822177e 100644 --- a/pkgs/development/python-modules/langchain-xai/default.nix +++ b/pkgs/development/python-modules/langchain-xai/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "langchain-xai"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-xai==${version}"; - hash = "sha256-uH9D1mbpVfoxhF8e4uUycrj3hwV4r+hc/CBpeCVZ2eE="; + hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc="; }; sourceRoot = "${src.name}/libs/partners/xai"; From 05a576c69ef75c39169518a207fd05d5e48a4c16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 22:24:46 +0000 Subject: [PATCH 038/212] python3Packages.langchain-text-splitters: 0.3.8 -> 0.3.9 --- .../python-modules/langchain-text-splitters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index a0d3a84473fa..73398f9cf85b 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-Ia3ZZ94uLZUVr1/w4HLPZLM6u8leA4OJtAwUf7eSAE0="; + hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs="; }; sourceRoot = "${src.name}/libs/text-splitters"; From 3eb30f32ab10898fff45461963da00cffc59cd2c Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Fri, 25 Jul 2025 00:10:34 +0000 Subject: [PATCH 039/212] rawtherapee: fix version information The existing version logic dates to 68a38d6c0fac3 (PR 18368 on September 25, 2016). But rawtherapee switched from hg to git around 2015, so these cmake variables were wrong almost as soon as they were set. Without this patch, running rawtherapee-cli --version has the output RawTherapee, version , command line. With this patch: RawTherapee, version 5.12, command line. which is significantly better, although personally I'd prefer to also have a git commit ID. --- pkgs/applications/graphics/rawtherapee/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 307e3cf403ba..e1d571e4dbd0 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -50,7 +50,15 @@ stdenv.mkDerivation rec { }; postPatch = '' - echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake + cat < ReleaseInfo.cmake + set(GIT_DESCRIBE ${version}) + set(GIT_BRANCH ${version}) + set(GIT_VERSION ${version}) + # Missing GIT_COMMIT and GIT_COMMIT_DATE, which are not easy to obtain. + set(GIT_COMMITS_SINCE_TAG 0) + set(GIT_COMMITS_SINCE_BRANCH 0) + set(GIT_VERSION_NUMERIC_BS ${version}) + EOF substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ --replace "/Applications" "${placeholder "out"}/Applications" ''; From 85d62a866e8924c8b7c10b71d044f2d6e4307206 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 01:18:56 +0000 Subject: [PATCH 040/212] haven: 1.0.5 -> 1.0.6 --- 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 94576cfe985d..316be3568367 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.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "bitvora"; repo = "haven"; tag = "v${version}"; - hash = "sha256-rSycrHW53TgqbsfgaRn3492EWtpu440GtbegozqnzMQ="; + hash = "sha256-ddOZydweF3wVH81Bm8LIuP2HHGrGooIDeAH/Ro5LKu4="; }; - vendorHash = "sha256-5d6C2sNG8aCaC+z+hyLgOiEPWP/NmAcRRbRVC4KuCEw="; + vendorHash = "sha256-JJ5kcTgjMB9d5JdMg2FiOOoAFeDhcEAsxWynd1aGNfs="; postInstall = '' mkdir -p $out/share/haven From 4c2e1e2e2961e7f57bd0902c5aa22783d9ae148a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 01:29:07 +0000 Subject: [PATCH 041/212] kubernetes-polaris: 9.6.4 -> 10.0.0 --- pkgs/by-name/ku/kubernetes-polaris/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 0b6c83434559..2587ad0b9a4c 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.6.4"; + version = "10.0.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-ymChgk3r1m4B6jiX3cL+vo4KzmvzsjUxA0t/MjfYvrU="; + sha256 = "sha256-yJPtTIj6vfzWwjozwcsIJjZGfy3QS6h8uOcoL4OXrnQ="; }; - vendorHash = "sha256-F7QGVowpwRyHxvgKYtuSqH2A/IH2Bvxr3vU78PNN0Z0="; + vendorHash = "sha256-4H1NHeYGd3ujtOo+UDkjIQaH+rkODS41C865OE1S9YA="; nativeBuildInputs = [ installShellFiles ]; From 2a057d8821db42f0ced4fe9adbb829be2f7cb3d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 03:14:34 +0000 Subject: [PATCH 042/212] renode-unstable: 1.15.3+20250711gitb35bde0fb -> 1.15.3+20250720git2309db7fd --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index d7b3b3247a3c..b33a4af28867 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250711gitb35bde0fb"; + version = "1.15.3+20250720git2309db7fd"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-jjs8e8+ipyrF96c/lKwS8S6JXyiRLy9Lf1RYsU+Tk6s="; + hash = "sha256-pcgjT27cBlHzHnh4q9AsgVAVXshdvA0Tdo0dsq9rXP4="; }; passthru.updateScript = From 6f631867043e4a7b001b2ed63b2b1f1681729d24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 04:20:44 +0000 Subject: [PATCH 043/212] python3Packages.aioimmich: 0.10.2 -> 0.11.1 --- pkgs/development/python-modules/aioimmich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix index 2f7330e737bc..4f7cafd03ee8 100644 --- a/pkgs/development/python-modules/aioimmich/default.nix +++ b/pkgs/development/python-modules/aioimmich/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aioimmich"; - version = "0.10.2"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "mib1185"; repo = "aioimmich"; tag = "v${version}"; - hash = "sha256-+k696FDr8LoJr90SfCNzjhwxC3776IN3kRLqdtPk/LI="; + hash = "sha256-f/zTgaLqR0WRhi7ea2djfHbI3/qz2p5lArsKNLz/Y1s="; }; postPatch = '' From 611e5cd000ad44d720ff237c552fa02f3ec184b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 04:54:33 +0000 Subject: [PATCH 044/212] hydralauncher: 3.6.2 -> 3.6.3 --- pkgs/by-name/hy/hydralauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 02dba3a30849..f2b850c18895 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-ybSTrglU0ktDJahGtqoTBVqqCPATtQYgo83Bd53HSeM="; + hash = "sha256-WFkO5N9KY0RFMzIrr5IyaNc2GZSusC4GQq5Jepwa1JA="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 2a0273746977c744db7f432eb668c1f4adf1ff72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 05:51:52 +0000 Subject: [PATCH 045/212] flyctl: 0.3.157 -> 0.3.161 --- pkgs/by-name/fl/flyctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 1eedf6ed722e..f9d6b7192b1f 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.157"; + version = "0.3.161"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-R5hZLY7uKYfSQdSnYkCruobdHiUZfHshnb/oIYbCMEc="; + hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo="; }; vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0="; From aa3646e320362bcbf5a1a0208e867ee031182eac Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Fri, 25 Jul 2025 08:44:12 +0200 Subject: [PATCH 046/212] buffer: 0.10.0 -> 0.10.1 --- pkgs/by-name/bu/buffer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 6dd991fa261b..2e91c32e236c 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; tag = finalAttrs.version; - hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU="; + hash = "sha256-AkgmKMMy3tBgJudJ2Mm8LFV+aE0QbviKxgAJEZ9A3cg="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 3a383c24711e68eb175f2eb1754e42d5482a66e3 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 25 Jul 2025 10:24:08 +0200 Subject: [PATCH 047/212] wealthfolio: 1.1.5 -> 1.1.6 https://github.com/afadil/wealthfolio/releases/tag/v1.1.6 --- pkgs/by-name/we/wealthfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 31b6c06ef864..40f667ecc140 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-w/NA8rOkJHCrxQc4VTt3q9iLlTlQHp3x23lpcZJj9sI="; + hash = "sha256-YjCAMWyGSEEC4NhSKxWbaP11yP9xLs5Mk5B+NZRQwDo="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-FU02JpDc3VvFqwXTBzpBQM2RBp/BcdPlEg2iCvvskA8="; + hash = "sha256-scgo526LDZTj7XHiX4/hF8PRPJuA7ul8DD3kIZyPUKs="; }; nativeBuildInputs = [ From 32d4f472a0eb4cef6c351ce291552e5db40ac609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 09:02:15 +0000 Subject: [PATCH 048/212] werf: 2.41.3 -> 2.42.0 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 9ae11959a662..4d66aaadb0b6 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.41.3"; + version = "2.42.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-0ttukgb698ipdW2JTS9xbja+3R/VjXQVoXLJYs2lYTs="; + hash = "sha256-HZT8MYPnSe6BQtGNiCCB/MfAsj1HQz9oXyZlKgBzbBg="; }; proxyVendor = true; - vendorHash = "sha256-eXZQYT65tHhMSTulXJ9UBN+9HggQL7Oo3sVFVfJDnGg="; + vendorHash = "sha256-IlXE1mNSc/CFN5lSXvXonGQanyDS+XH8Wa3FCLM/gXc="; subPackages = [ "cmd/werf" ]; From 4270f5256d0c1d04c98602ea5776a1b25d57d759 Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Tue, 8 Jul 2025 09:18:07 +0300 Subject: [PATCH 049/212] rocmPackages.rocdbgapi: fix build --- .../rocm-modules/6/rocdbgapi/default.nix | 19 ++++ .../6/rocdbgapi/override_doxygen_tables.sty | 89 +++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix index 16ef4b115bdd..cd07af5d4cdf 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix @@ -37,6 +37,15 @@ let helvetic wasy courier + # FIXME: The following packages are used in the Doxygen table + # workaround, can be removed once + # https://github.com/doxygen/doxygen/issues/11634 is fixed, depending + # on what the fix is + tabularray + ninecolors + codehigh + catchfile + environ ] ) ); @@ -59,6 +68,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6itfBrWVspobU47aiJAOQoxT8chwrq9scRn0or3bXto="; }; + # FIXME: remove once https://github.com/doxygen/doxygen/issues/11634 is resolved + # Applies workaround based on what was suggested in + # https://github.com/doxygen/doxygen/issues/11634#issuecomment-3027000655, + # but rewritten to use the `tabularray` LaTeX package. Unfortunately, + # verbatim code snippets in the documentation are not formatted very nicely + # with this workaround. + postPatch = '' + substituteInPlace doc/Doxyfile.in --replace 'LATEX_EXTRA_STYLESHEET =' 'LATEX_EXTRA_STYLESHEET = ${./override_doxygen_tables.sty}' + ''; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty b/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty new file mode 100644 index 000000000000..6732649570ad --- /dev/null +++ b/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty @@ -0,0 +1,89 @@ +\NeedsTeXFormat{LaTeX2e} + +% Packages used by this style file +\RequirePackage{doxygen} +\RequirePackage{tabularray} +\UseTblrLibrary{varwidth} +\RequirePackage{codehigh} +\RequirePackage{environ} + +% Used by parameter lists +\renewenvironment{DoxyParams}[2][]{% + \par% + \ifthenelse{\equal{#1}{}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|}}}% name + description + {\ifthenelse{\equal{#1}{1}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + name + desc + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + type + name + desc + } + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used for fields of simple structs +\renewenvironment{DoxyFields}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|X[-1,l]|}}% + \SetCell[c=3]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used for fields simple class style enums +\renewenvironment{DoxyEnumFields}[2][]{% + \par% + \ifthenelse{\equal{#1}{2}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,r]|X[-1,l]|}}}% with init value + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by return value lists +\renewenvironment{DoxyRetVals}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by exception lists +\renewenvironment{DoxyExceptions}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|l[-1,r]|l[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by template parameter lists +\renewenvironment{DoxyTemplParams}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% NOTE: this is not a perfect workaround, and known to loose linebreaks, repeated spaces, etc +\RenewEnviron{DoxyVerb}{% + \par% + \footnotesize% + \ExpandArgs{o}\fakeverb{\BODY}% + \normalsize% +} From f250323cf12bdb807cc8090e49e4aa8c90954103 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 10:23:02 +0000 Subject: [PATCH 050/212] xk6: 1.1.1 -> 1.1.2 --- pkgs/by-name/xk/xk6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index a83507c16b6f..5bfba7bd4aa4 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-cypxnBQwVW4gdesRljlT8ATmgojOj5RxU+lScMTj5Ac="; + hash = "sha256-o+sN/xAGewqHo6/aoN23+FG1YrtNykc4voSg5wO74uA="; }; vendorHash = null; From ffeda3215ac859647a08457523688c7e22dcfa58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 11:05:21 +0000 Subject: [PATCH 051/212] python3Packages.scancode-toolkit: 32.4.0 -> 32.4.1 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 91330b55d48e..bd89b5a31047 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.4.0"; + version = "32.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kTIDmaXOQusDy0XIDui7cKnR1RcjMeQDjDijufh07cQ="; + hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28="; }; dontConfigure = true; From c312fda7f492fc075d56889cc95a25990d4e6bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 12:43:56 +0000 Subject: [PATCH 052/212] uid_wrapper: 1.3.1 -> 1.3.2 --- pkgs/by-name/ui/uid_wrapper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ui/uid_wrapper/package.nix b/pkgs/by-name/ui/uid_wrapper/package.nix index c26c7b2e6007..1bfa6b1f8e34 100644 --- a/pkgs/by-name/ui/uid_wrapper/package.nix +++ b/pkgs/by-name/ui/uid_wrapper/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "uid_wrapper"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; - sha256 = "sha256-9mB9hketooqW+rg8Sa1y/IPrbTiZHKJ7JJWzWP8Pbew="; + sha256 = "sha256-rkvzuPCnSPRwUxplBDazkYLIIX7pJpqcfpJcZDgKm9o="; }; nativeBuildInputs = [ From 04b76f700748f7dc48cb7b8298290ed63eb6a764 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 13:03:17 +0000 Subject: [PATCH 053/212] mendeley: 2.135.0 -> 2.136.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2e08508ef6f5..44be311190a3 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.135.0"; + version = "2.136.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-fJ2rW3VKN4TqwDCCDlPpSFckoBjBtmMOvXanqqMS7AM="; + hash = "sha256-NAH4BwWEdI1WFWgPJIPbWkpkN/qxR2+8NwGtdCeohbA="; }; appimageContents = appimageTools.extractType2 { From 5e5cb9e12400a358267d76b6b8bcdc01b827b857 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:08:27 +0200 Subject: [PATCH 054/212] charybdis: unpin autotools --- pkgs/servers/irc/charybdis/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 1b9dc0757466..52235a2e3a97 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchurl, autoreconfHook, bison, flex, @@ -20,6 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; }; + patches = [ + (fetchurl { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/d13eb723d7e9512fb2f2516e5934bd927a92eb2c/community/charybdis/fix-missing-include.patch"; + hash = "sha256-8JXYuIjoHQg+l33OjseF5nnd5ZPagBA2/bSa3Il5Te4="; + }) + ]; + postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 230e160b992a..682cf2680031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10156,9 +10156,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; - charybdis = callPackage ../servers/irc/charybdis { - autoreconfHook = buildPackages.autoreconfHook269; - }; + charybdis = callPackage ../servers/irc/charybdis { }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; From 4363ac0799e7d792e4de318ddfab7ad282100628 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:27:06 +0200 Subject: [PATCH 055/212] celestia: unpin autotools --- .../science/astronomy/celestia/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 407a47964c76..288ccfa194db 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, pkg-config, libglut, gtk2, @@ -27,6 +28,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/CelestiaProject/Celestia/commit/94894bed3bf98d41c5097e7829d491d8ff8d4a62.patch?full_index=1"; + hash = "sha256-hEZ6BhSEx6Qm+fLisc63xSCDT6GX92AHD0BuldOhzFk="; + }) + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail "dnl AM_GNU_GETTEXT_VERSION([0.15])" "AM_GNU_GETTEXT_VERSION([0.15])" + ''; + nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 230e160b992a..49e8f8399ae4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15703,7 +15703,6 @@ with pkgs; boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; }; celestia = callPackage ../applications/science/astronomy/celestia { - autoreconfHook = buildPackages.autoreconfHook269; inherit (gnome2) gtkglext; }; From 28b6b2f919cf108b1df7a3537db3999672f9a15e Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Fri, 25 Jul 2025 15:45:38 +0200 Subject: [PATCH 056/212] lasuite-meet: 0.1.30 -> 0.1.33 https://github.com/suitenumerique/meet/compare/v0.1.30..v0.1.33 --- pkgs/by-name/la/lasuite-meet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index faddadda77d6..449cbaef88a2 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "0.1.30"; + version = "0.1.33"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-Ow2xi3twW6FeG88Ya5AeRNk6MIY5JGqd7e1qukKTfQs="; + hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y="; }; sourceRoot = "source/src/backend"; From 73f4ee6a8e5148733ad5142a75cf879591822364 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Fri, 25 Jul 2025 15:46:22 +0200 Subject: [PATCH 057/212] lasuite-meet-frontend: 0.1.30 -> 0.1.33 https://github.com/suitenumerique/meet/compare/v0.1.30..v0.1.33 --- pkgs/by-name/la/lasuite-meet-frontend/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index 037de4dd5d79..a12e93ef6885 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "lasuite-meet-frontend"; - version = "0.1.30"; + version = "0.1.33"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-Ow2xi3twW6FeG88Ya5AeRNk6MIY5JGqd7e1qukKTfQs="; + hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y="; }; sourceRoot = "source/src/frontend"; @@ -21,7 +21,7 @@ buildNpmPackage rec { npmDeps = fetchNpmDeps { inherit version src; sourceRoot = "source/src/frontend"; - hash = "sha256-Id4taAuW/tu9YhbGxjNegdSqyNmUFRQOLF3glkFw0Vc="; + hash = "sha256-s5HgGFY7yPct7P2nutYab1KsMbzHWBHKEm4W74qsgIw="; }; buildPhase = '' From 5395c86a137bcfb20368bdb127e1d046d695cea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 13:50:29 +0000 Subject: [PATCH 058/212] kubectl-cnpg: 1.26.0 -> 1.26.1 --- pkgs/by-name/ku/kubectl-cnpg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix index 67a7d3f61704..2385c48877bc 100644 --- a/pkgs/by-name/ku/kubectl-cnpg/package.nix +++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-IYHzgP9KDNGlNe1znWKv/IST1if9Nnn2cP9rerAIgkY="; + hash = "sha256-CRQrHW8mJ6yzWCLfU/4G10w1h/Hp1+7UqlZ9ziQqjNs="; }; - vendorHash = "sha256-mJyriMf2/2J1ol4gBxgmEdNT1qWCBnwKwIB0yyubxc4="; + vendorHash = "sha256-mlVfJrsuBDtk4b78uEWYmXRbzAl91Pqp5twe9tolGdI="; subPackages = [ "cmd/kubectl-cnpg" ]; From 1ca595d4d464284fe4591588fb35a675dc876bf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 15:05:11 +0000 Subject: [PATCH 059/212] python3Packages.blosc2: 3.5.1 -> 3.6.1 --- pkgs/development/python-modules/blosc2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 638ee54f12e7..a1cb18bb5633 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "blosc2"; - version = "3.5.1"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; tag = "v${version}"; - hash = "sha256-ToPlN8OMgH6BCp0mPanfH0SUJWnrPDxVncF6pBpRhRI="; + hash = "sha256-MSGuG9Vqniz6gie0je84XNTHLZaZho9tmqELMKoDh/U="; }; nativeBuildInputs = [ From 87f679dc0a945d8664ffa34bdda7b8147b7e2656 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Tue, 22 Jul 2025 19:33:01 +0800 Subject: [PATCH 060/212] hydra-check: patch to fix x86_64-darwin, rust 1.88 Co-authored-by: Doron Behar --- .../hy/hydra-check/fix-cargo-1_88-reqwest.patch | 15 +++++++++++++++ pkgs/by-name/hy/hydra-check/package.nix | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch diff --git a/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch b/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch new file mode 100644 index 000000000000..5e551621e757 --- /dev/null +++ b/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch @@ -0,0 +1,15 @@ +diff --git a/Cargo.toml b/Cargo.toml +index bb8d370..7c5b7ac 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -35,6 +35,10 @@ anyhow = "1.0.89" + insta.opt-level = 3 + similar.opt-level = 3 + ++# work around https://github.com/NixOS/nixpkgs/issues/427072 ++[profile.release.package.hyper] ++opt-level = 0 ++ + [lints.clippy] + pedantic = { level = "warn", priority = -1 } + cargo = { level = "warn", priority = -1 } diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix index 10c3b31c195a..0878bdd4dd25 100644 --- a/pkgs/by-name/hy/hydra-check/package.nix +++ b/pkgs/by-name/hy/hydra-check/package.nix @@ -23,6 +23,15 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g="; + patches = + lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") + # work around rust 1.88 compiler / linker bug for x86_64-darwin. This is + # applied conditionally because it will introduce a performance penalty on + # other host platforms. NOTE: Please check the patch applies if you update + # the package on a different platform (e.g x86_64-linux). + # see: https://github.com/NixOS/nixpkgs/issues/427072 + ./fix-cargo-1_88-reqwest.patch; + nativeBuildInputs = [ pkg-config installShellFiles From 71f0179a2456f1f642b26a58cd8083e10ef42179 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 16:11:55 +0000 Subject: [PATCH 061/212] owi: 0.2-unstable-2025-07-11 -> 0.2-unstable-2025-07-23 --- pkgs/by-name/ow/owi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 4b306120a697..d1e52452ccac 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage rec { pname = "owi"; - version = "0.2-unstable-2025-07-11"; + version = "0.2-unstable-2025-07-23"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "be3d93320dcbf7d4e991f9b240ff490b5a1b0acc"; + rev = "bcebeb15de0a4968d1cb59970ee4a0c635e78bf4"; fetchSubmodules = true; - hash = "sha256-yc/f/N+smGk3NwtZnP/k4ISN3mvp1GL9VTcjgosbQJw="; + hash = "sha256-MOgh5Q5Ai1Nk8DllUswiOk+Qu+hMRp7Q6mYPNSUs/1A="; }; nativeBuildInputs = with ocamlPackages; [ From 85f9a28bf2225fd9f304aab30ef59e837c49032e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 16:47:13 +0000 Subject: [PATCH 062/212] terraform-providers.aci: 2.16.0 -> 2.17.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3319c11fb0d4..f0fc7b93efe8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,11 +9,11 @@ "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0=" }, "aci": { - "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=", + "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.16.0", + "rev": "v2.17.0", "spdx": "MPL-2.0", "vendorHash": null }, From 24562e4a879ccbc28b417d662136f4735e141d2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 16:54:02 +0000 Subject: [PATCH 063/212] python3Packages.falconpy: 1.5.3 -> 1.5.4 --- pkgs/development/python-modules/falconpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index d45bbc0dded8..706c2cdaacbc 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "falconpy"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; tag = "v${version}"; - hash = "sha256-yK6delBTDnK5cP8mWIQZRfZClRsM2IeqjqrqOjbrlnc="; + hash = "sha256-m/pW9M2HXTtu42UIOCq7J1lr+y9mc3N74lD+qaCjaVE="; }; build-system = [ hatchling ]; From cf5699f78c032ea47705793210b0ef2c509a7955 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 25 Jul 2025 20:55:42 +0400 Subject: [PATCH 064/212] =?UTF-8?q?mepo:=201.3.3=20=E2=86=92=201.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/me/mepo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix index 12601684e2bb..d4c5b407281e 100644 --- a/pkgs/by-name/me/mepo/package.nix +++ b/pkgs/by-name/me/mepo/package.nix @@ -18,23 +18,23 @@ util-linux, xwininfo, zenity, - zig_0_13, + zig_0_14, }: stdenv.mkDerivation (finalAttrs: { pname = "mepo"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromSourcehut { owner = "~mil"; repo = "mepo"; rev = finalAttrs.version; - hash = "sha256-hEsQpTrj2WCoRgNWdhcUnQRzhI/6BydcbG9kRePstgg="; + hash = "sha256-1NE8lADvcxWGi01kxYW2tCOhnVee+T76ITvwSj6M5DM="; }; nativeBuildInputs = [ pkg-config - zig_0_13.hook + zig_0_14.hook makeWrapper ]; From 3b519806b989c632099443533eec2c47c1952f6a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 25 Jul 2025 22:08:30 +0400 Subject: [PATCH 065/212] =?UTF-8?q?tg:=200.19.0=20=E2=86=92=200.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telegram/tg/default.nix | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix index 26f850e0726b..a12db6326f4e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix @@ -2,49 +2,50 @@ lib, buildPythonApplication, fetchFromGitHub, + poetry-core, pythonOlder, - fetchpatch, stdenv, libnotify, + mailcap-fix, python-telegram, }: buildPythonApplication rec { pname = "tg"; - version = "0.19.0"; - format = "setuptools"; - disabled = pythonOlder "3.8"; + version = "0.22.0"; + pyproject = true; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "paul-nameless"; - repo = pname; - rev = "v${version}"; - hash = "sha256-apHd26XnOz5nak+Kz8PJPsonQfTWDyPz7Mi/tWf7zwM="; + repo = "tg"; + tag = "v${version}"; + hash = "sha256-qzqYkksocR86QFmP75ZE93kMSVmdel+OTxPgt9uZHLI="; }; - patches = [ - # Fix sending messages - # https://github.com/paul-nameless/tg/pull/306 - (fetchpatch { - url = "https://github.com/mindtheegab/tg/commit/13e2b266989d2d757a394b0fb8cb7fd6ccc2b70c.patch"; - hash = "sha256-Wja6xBOlPuACzhbT8Yl3F8qSh3Kd9G1lnr9VarbPrfM="; - }) - ]; - - # Fix notifications on platforms other than darwin by providing notify-send - postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core>=1.0.0,<2.0.0" "poetry-core" + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # Fix notifications on platforms other than darwin by providing notify-send sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; - propagatedBuildInputs = [ python-telegram ]; + build-system = [ poetry-core ]; + + dependencies = [ + mailcap-fix + python-telegram + ]; doCheck = false; # No tests - meta = with lib; { + meta = { description = "Terminal client for telegram"; mainProgram = "tg"; homepage = "https://github.com/paul-nameless/tg"; - license = licenses.unlicense; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ sikmir ]; }; } From 00a2c340475806d05bdc51754eec9bda114e3cb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 18:09:52 +0000 Subject: [PATCH 066/212] hifile: 0.9.11.1 -> 0.9.11.2 --- pkgs/by-name/hi/hifile/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index f3912d85bc1a..e2b6474b8fb0 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,8 +2,8 @@ lib, appimageTools, fetchurl, - version ? "0.9.11.1", - hash ? "sha256-7p09J4nyjsnprk8DZM8nKG+G7h6m9wtZPrz0DIIKa8I=", + version ? "0.9.11.2", + hash ? "sha256-Go2KGEUu93jAxwFQ/yEOvePQpSjFW+dJxQ1tWQXr2fY=", }: let From 5601b10229abb8717e656600778e48c0600bf6be Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 25 Jul 2025 22:11:50 +0400 Subject: [PATCH 067/212] tg: migrate to by-name --- .../tg/default.nix => by-name/tg/tg/package.nix} | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) rename pkgs/{applications/networking/instant-messengers/telegram/tg/default.nix => by-name/tg/tg/package.nix} (82%) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/by-name/tg/tg/package.nix similarity index 82% rename from pkgs/applications/networking/instant-messengers/telegram/tg/default.nix rename to pkgs/by-name/tg/tg/package.nix index a12db6326f4e..ad714cd23cd1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/pkgs/by-name/tg/tg/package.nix @@ -1,20 +1,16 @@ { lib, - buildPythonApplication, fetchFromGitHub, - poetry-core, - pythonOlder, + python3Packages, stdenv, libnotify, - mailcap-fix, - python-telegram, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "tg"; version = "0.22.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = python3Packages.pythonOlder "3.9"; src = fetchFromGitHub { owner = "paul-nameless"; @@ -32,9 +28,9 @@ buildPythonApplication rec { sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; - build-system = [ poetry-core ]; + build-system = [ python3Packages.poetry-core ]; - dependencies = [ + dependencies = with python3Packages; [ mailcap-fix python-telegram ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3f58c27b75..b0fa514a1450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13861,8 +13861,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; }; - tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; - termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects; From a1403957611d5fa2f64857cd23939c343ffde8af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 18:47:56 +0000 Subject: [PATCH 068/212] python3Packages.pyathena: 3.14.1 -> 3.15.0 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index ccfbde940234..d815df7d70a9 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.14.1"; + version = "3.15.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-/2KCYVlbUrwrdICcQu+JiG90vgE3FQbiif2wvE9lOZM="; + hash = "sha256-F3XquRYvwWFLqGHokxaRxsNM4pANemCweU3tVmhn0M4="; }; build-system = [ hatchling ]; From 80fc26f4b6459381bcdc23627be07a3176a4c606 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 18:52:11 +0000 Subject: [PATCH 069/212] sttr: 0.2.25 -> 0.2.26 --- pkgs/by-name/st/sttr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix index 192df215a273..66647f41abbe 100644 --- a/pkgs/by-name/st/sttr/package.nix +++ b/pkgs/by-name/st/sttr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-FVjdlheKt3WoFQnb9qrYQATSkJmuXCVrigBbnKUHUR0="; + hash = "sha256-VyO4NyiTWWQJjbhKHoIC86B4KdSowlrR6XR3HCKr0U4="; }; - vendorHash = "sha256-OQxp52v8TEgB09obp3UKOReRWB79Cwa6zbSE1V/s+JY="; + vendorHash = "sha256-g35BCThoym9awjMObMUecRkkLsQyEIviYc4rdQsIICY="; nativeBuildInputs = [ installShellFiles ]; From 1219568474d7f6d82d48466ca876b4be0be694e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 19:11:32 +0000 Subject: [PATCH 070/212] python3Packages.google-cloud-spanner: 3.55.0 -> 3.56.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index e0292cffafa2..3b46d66997aa 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.55.0"; + version = "3.56.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-spanner"; tag = "v${version}"; - hash = "sha256-0+mTBqgy8SaHjoYhQjCaypipVsJTrN2DdhcfPY3PxSc="; + hash = "sha256-yCEFVf/euu48j+0jK5QfjhdJMV4c4mEHFYE+Ukz7Rjo="; }; build-system = [ setuptools ]; From 4fce1d9b3f496a338c20010e788524891ba60198 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Jul 2025 21:29:44 +0200 Subject: [PATCH 071/212] python312Packages.tencentcloud-sdk-python: 3.0.1429 -> 3.0.1430 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1429...refs/tags/3.0.1430 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1430/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index d615bae0d72f..fadb0f84f71e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1429"; + version = "3.0.1430"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-icA5CuDkGYipXXcL1ePODBC8CMmMLLmBwD/X/nykqL8="; + hash = "sha256-8ccjMWruE+6CYVj0MnO51sDUqeC68qAqNI1sW3+KGaI="; }; build-system = [ setuptools ]; From 5d099282adcea9667a07178b771f1a4f1d1ec8d7 Mon Sep 17 00:00:00 2001 From: Timucin Besken Date: Fri, 25 Jul 2025 22:19:38 +0200 Subject: [PATCH 072/212] gnomeExtensions: remove disable-unredirect alias --- pkgs/desktops/gnome/extensions/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index da2a8b5d4c95..c952ca8d04d7 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -93,7 +93,6 @@ rec { // lib.optionalAttrs config.allowAliases { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 - disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20 icon-hider = throw "gnomeExtensions.icon-hider was removed on 2024-03-15. The extension has not received any updates since 2020/3.34."; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; From 0ef32326a9a6eccb99cc2cca98a18ed09a386727 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 25 Jul 2025 16:28:10 +0800 Subject: [PATCH 073/212] bitcomet: 2.13.2 -> 2.15.0 --- pkgs/by-name/bi/bitcomet/package.nix | 106 ++++++++++++++++++++------- 1 file changed, 79 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 32b6cda4b3c1..bd68ae671bef 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -1,44 +1,96 @@ { lib, + stdenvNoCC, + buildFHSEnv, appimageTools, fetchurl, + desktop-file-utils, + dpkg, + webkitgtk_4_0, + runScript ? "BitComet", }: let pname = "bitcomet"; - version = "2.13.2"; - - src = fetchurl { - url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; - hash = "sha256-T66hmWmjt7ZZj03IxTSYtNUBoFHgwOoAIOHMyJSAmbU="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = - pkgs: with pkgs; [ - libxml2 - libpng - webkitgtk_4_0 - ]; - - extraInstallCommands = '' - install -Dm644 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop - substituteInPlace $out/share/applications/bitcomet.desktop \ - --replace-fail "Exec=usr/bin/BitComet" "Exec=bitcomet" - cp -r ${appimageContents}/usr/share/icons $out/share/icons - ''; + version = "2.15.0"; meta = { homepage = "https://www.bitcomet.com"; description = "BitTorrent download client"; - mainProgram = "bitcomet"; + mainProgram = "BitComet"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; maintainers = with lib.maintainers; [ ]; }; + + bitcomet = stdenvNoCC.mkDerivation { + inherit pname version meta; + + src = + let + selectSystem = + attrs: + attrs.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); + arch = selectSystem { + x86_64-linux = "x86_64"; + aarch64-linux = "arm64"; + }; + in + fetchurl { + url = "https://download.bitcomet.com/linux/${arch}/BitComet-${version}-${arch}.deb"; + hash = selectSystem { + x86_64-linux = "sha256-YmcHcrqw4Ue8uyQqYcLWTYS5WYQro3kk7VLY8pfIsRQ="; + aarch64-linux = "sha256-Bfg20aKU90Ap8scn4eHtf451uxPfWcnQCrh5gWRQmsU="; + }; + }; + + nativeBuildInputs = [ + dpkg + desktop-file-utils + ]; + + installPhase = '' + runHook preInstall + + desktop-file-edit usr/share/applications/bitcomet.desktop \ + --remove-key="Version" \ + --remove-key="Comment" \ + --set-key="Exec" --set-value="BitComet" \ + --set-icon="bitcomet" + cp -r usr $out + + runHook postInstall + ''; + }; +in +buildFHSEnv { + inherit + pname + version + runScript + meta + ; + + executableName = "BitComet"; + + targetPkgs = + pkgs: + [ + bitcomet + webkitgtk_4_0 + ] + ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs; + + multiPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${bitcomet}/share/applications $out/share/applications + ln -s ${bitcomet}/share/icons $out/share/icons + ''; } From 99c9d5c79388d38e3d9d1f806e8a2cc5c4118d8d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 26 Jul 2025 01:11:25 +0400 Subject: [PATCH 074/212] =?UTF-8?q?stac-validator:=203.6.0=20=E2=86=92=203?= =?UTF-8?q?.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/st/stac-validator/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 97a6cc7dfa3c..201596f7bacb 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.6.0"; + version = "3.10.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-j29Bo8n+/85fzJtif0eWYxDP86k9n4Osl9/piWmTxSs="; + hash = "sha256-diaiF2wJyS/1DuUwPkdMyqpMfvKWvTnRo2H4O7FxYBM="; }; build-system = [ python3Packages.setuptools ]; @@ -26,6 +26,7 @@ python3Packages.buildPythonPackage rec { dependencies = with python3Packages; [ click jsonschema + pyyaml requests ]; From 3dd259f912cbd1fe9f6f942276a1a61908db2664 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 21:14:36 +0000 Subject: [PATCH 075/212] wtfis: 0.11.0 -> 0.12.0 --- pkgs/by-name/wt/wtfis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index 2f9e2f2ff0bb..ea966471f01c 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -6,12 +6,12 @@ let pname = "wtfis"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; tag = "v${version}"; - hash = "sha256-53D5ty5u5/NUEIQXYxuZOOaCrNLPKcHu/faX7S31+lU="; + hash = "sha256-LEqWfpRpxZEnlIw1bllqM27Xb3KTp7AhzU7Vpo686ak="; }; in python3.pkgs.buildPythonApplication { From b5dbe95cb2e6f3459d3f456501321d96093e5350 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 21:21:13 +0000 Subject: [PATCH 076/212] async-profiler: 4.0 -> 4.1 --- pkgs/by-name/as/async-profiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index 44737209b9af..ce1ac1d6e498 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "async-profiler"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA="; + hash = "sha256-82aZK9y1Y5PaYtIG7FqnrbYU+bQ3nNzOCn+3lFzyeCA="; }; nativeBuildInputs = [ makeWrapper ]; From 5575e163c0c70c6d9e7e406f2077b195f7ad9ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 22:40:34 +0000 Subject: [PATCH 077/212] python3Packages.django-anymail: 13.0 -> 13.0.1 --- pkgs/development/python-modules/django-anymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 3ffbd7d39494..69074db017ef 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "13.0"; + version = "13.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; tag = "v${version}"; - hash = "sha256-0KqpgS71QwTfLp4I8p1An6sCnGcvxTNB4xy4LaFFl8E="; + hash = "sha256-ozaukE6W2tq+RBVL10GV9epUMb5W6Yn4s2oeB14Skp8="; }; build-system = [ hatchling ]; From 1ca3613afc94d8f31ca8bdd50d380f35ef744b2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 00:26:42 +0000 Subject: [PATCH 078/212] terraform-providers.kubernetes: 2.37.1 -> 2.38.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7b0a8a2da750..3d8a91f69bf6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -732,11 +732,11 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "kubernetes": { - "hash": "sha256-JUlthPqYTYlsKyPAjyN9N0A0i8aMJh3tAtwH1vHjzJs=", + "hash": "sha256-QVHLGLTzr39liRcM5AKJ0unYoc/DW2elcJWisiHC2pw=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.37.1", + "rev": "v2.38.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LeMFN4pOJotTTqakEbVelHSTEb4p7CQIuKzeuX3SZUM=" }, From 8818ee3b4e32ac4520d5a4de5bfaa0a409f39e65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 00:41:12 +0000 Subject: [PATCH 079/212] decker: 1.56 -> 1.57 --- pkgs/by-name/de/decker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 2bed0cd4bc68..a222e307e220 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.56"; + version = "1.57"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-b4Z+hQ7sQf8sdFXcX4+GA9Q8gJDUeb5LuVgrd3bY6vA="; + hash = "sha256-2y/kr8kBMfHAiWO6s7rAyDYyv70NnmiKeYhYq9Zmz0Y="; }; buildInputs = [ From 44a2d6b98e2dd9840b84226a480291def71e3314 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 01:16:43 +0000 Subject: [PATCH 080/212] hebcal: 5.9.2 -> 5.9.4 --- pkgs/by-name/he/hebcal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix index 6e567c8439ca..724e588da2a3 100644 --- a/pkgs/by-name/he/hebcal/package.nix +++ b/pkgs/by-name/he/hebcal/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "hebcal"; - version = "5.9.2"; + version = "5.9.4"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; tag = "v${finalAttrs.version}"; - hash = "sha256-6iyltrnA1pLtTUg0AUIp0yciN53oeoLE88dAbTxBK6I="; + hash = "sha256-6SyK5BKVMGcqEFy3tbPBPqmZYp9/DD8A3VUNpAsihEM="; }; - vendorHash = "sha256-azKie/qJUmRSVgkfqsL04NpnePx9ToUPjz6RUOFRdUw="; + vendorHash = null; preBuild = '' make dcity.go From 6428ce7ba38debf09e74339c738fd6044bf780ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 01:35:34 +0000 Subject: [PATCH 081/212] min-ed-launcher: 0.12.1 -> 0.12.2 --- pkgs/by-name/mi/min-ed-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix index 25510bb33167..4371bc758479 100644 --- a/pkgs/by-name/mi/min-ed-launcher/package.nix +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -6,13 +6,13 @@ }: buildDotnetModule rec { pname = "min-ed-launcher"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "rfvgyhn"; repo = "min-ed-launcher"; tag = "v${version}"; - hash = "sha256-/dzcWwpg1nIrqICAQIxzwMgfrCB1G9bu2bT7Cv1khFM="; + hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM="; leaveDotGit = true; # During build the current commit is appended to the version }; From 241ccaf53274c2133b6c8fc5c92941b63949ccdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 02:20:04 +0000 Subject: [PATCH 082/212] topicctl: 1.20.1 -> 1.20.2 --- pkgs/by-name/to/topicctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index 8c3f8add607d..0f11643aa80d 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-9bp9dGpJYYgOqNcqOWWaf1ZKVewiFm02af6oZo5F6iM="; + sha256 = "sha256-OrHQVgN4wwRBdYvCdn4GCzMIhMaav7wmmHemZbQMRCc="; }; vendorHash = "sha256-M/lNhGD9zNmwkzTAjp0lbAeliNpLOCVJbOG16N76QL4="; From 46f71edf2b9824ff6b288a713fc22e657b211e45 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 26 Jul 2025 11:14:33 +0800 Subject: [PATCH 083/212] luau: 0.683 -> 0.684 --- pkgs/by-name/lu/luau/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index fad814826125..3bff322fe999 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.683"; + version = "0.684"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-FOqqAX4Fyznx95ssaJ225U5BSjQH7RkFRZFU9YgLY48="; + hash = "sha256-Z+6zB4idX56eTZE8LN5EW2SFBTqhGXVgylhggeC3EJo="; }; nativeBuildInputs = [ cmake ]; From a7b0a4e293dbe5666dd90ee30cf90093258858ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 04:09:12 +0000 Subject: [PATCH 084/212] v2rayn: 7.13.1 -> 7.13.2 --- pkgs/by-name/v2/v2rayn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index dbdfab5cced9..7e46f5d5f076 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.13.1"; + version = "7.13.2"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-4lnMT6p32uHeLd85JNWEVg1LsDr99YVsgpxG2MdpYQ0="; + hash = "sha256-go0XhZF3rEZ11MmHSx+dKqOT6IyiTqtn6hNHLwTyHOM="; fetchSubmodules = true; }; From 8547ed8f43ba063ec55fcffe432c1584b4553b05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 05:29:28 +0000 Subject: [PATCH 085/212] python3Packages.ossapi: 5.3.0 -> 5.3.1 --- pkgs/development/python-modules/ossapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix index c2da288d9687..ad0e774d3d56 100644 --- a/pkgs/development/python-modules/ossapi/default.nix +++ b/pkgs/development/python-modules/ossapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ossapi"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "tybug"; repo = "ossapi"; tag = "v${version}"; - hash = "sha256-mBR+4zpY7PprjAWy17vSRdKa8uE4VjyAIwDpr0ZJrnY="; + hash = "sha256-5a2kSdOHF0BM/ZjhtPc9O/BiZXeLuZFlXwVOJHnKYLI="; }; build-system = [ setuptools ]; From 4937b7e9d6134e5e0fe43234923b622c346b7391 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 05:32:21 +0000 Subject: [PATCH 086/212] naja: 0.1.24 -> 0.2.1 --- pkgs/by-name/na/naja/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 8e797d668a0e..d56382c003b4 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0.1.24"; + version = "0.2.1"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; tag = "v${finalAttrs.version}"; - hash = "sha256-vfP/xusfY11bk0GsIZcW38rXPMgutTDgTNjO40Uz1bU="; + hash = "sha256-eKeb6V9u4huesQV4sq9GxIcxO2SVvMrUDeQaObCCags="; fetchSubmodules = true; }; From f31b95e344ea8c08582b1a3e3ea647878ae67738 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 06:07:05 +0000 Subject: [PATCH 087/212] matrix-alertmanager-receiver: 2025.7.2 -> 2025.7.23 --- pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 653e69d6cf86..9f8fb9fcee57 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2025.7.2"; + version = "2025.7.23"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-Dz2oP3lNxO75Lqmke0WprvI1yuuQIv3HffNxMYCSJso="; + hash = "sha256-DkltZsWcCFLMDzTMxDv+amwbTVNHxpQVBtgpnTJOFsU="; }; - vendorHash = "sha256-+tkxK3h6N45XA4OvdNYrRFNbqJLGflY2v8oF36Gpwm4="; + vendorHash = "sha256-6N0G0JGFp+dIUyTFHwpp526QmVZlp071NX+H6CB0uVE="; env.CGO_ENABLED = "0"; From 2041ade243cbdfda0ca1fe68d7971c5acb641d37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 06:12:22 +0000 Subject: [PATCH 088/212] terraform-providers.oci: 7.10.0 -> 7.11.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7b0a8a2da750..1470fdcba8d3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -922,11 +922,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-4Clqd/WO2nmKHQkIf33BROnQveKAvogWdiIabYfU390=", + "hash": "sha256-xdVHJWEvap6Bp/r5hz/113kJF6SexsCROFkQgRTJgYA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.10.0", + "rev": "v7.11.0", "spdx": "MPL-2.0", "vendorHash": null }, From a04a636c3157de647d0e0222909545fae730a5ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 08:45:13 +0000 Subject: [PATCH 089/212] python3Packages.pebble: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/pebble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 471e88b912f4..6a40280f023c 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "noxdafox"; repo = "pebble"; tag = version; - hash = "sha256-x0jvqH1wSAkOgxYNcXr+TL5dqZE0Vai0ZaxdnDSqRNI="; + hash = "sha256-VQ6611HMj19Sq5IXqKNqVHEau8OZu8HEYFRe5LKivaI="; }; build-system = [ From 35fc094bf252c49ed576967d05a672ea1389aedd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 11:48:02 +0000 Subject: [PATCH 090/212] dbgate: 6.5.6 -> 6.6.0 --- pkgs/by-name/db/dbgate/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index bc3c376337b6..6fb13019a436 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,25 +8,25 @@ let pname = "dbgate"; - version = "6.5.6"; + version = "6.6.0"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-S0xlC0ht6G+RDrsMaMD4nk/vKdLvtvAtUaMaFowT/Gw="; + hash = "sha256-GFKsZ/rSMXWn2hAlRRdswDrooqUIGeIhEsMchIPEb5U="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-JBE/t/IwFe02LrK4Ci+2KEtAXlH1zr5WcTmQir6yvNc="; + hash = "sha256-2g8XsljPvn2TITC1/PtBlgdrfwVDPnjmOXeOS/iQh5Q="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-EkySGJCHAR/YCS/I6j2LZHA6/L0P8VX2WDPScj58mSg="; + hash = "sha256-ooLivNWt5IDKB779PLb4FOgk9jSU10IkB0D9OPLVKsE="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-isOrajXB+O9y3fiSulhjoSSt/7lgu4xPMXBhUcfgK2Y="; + hash = "sha256-PqgG8dGvr4S8BhxqfvYo2BiR5KoAWon9ZI8KGKT3ujI="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); From d0b787a62739657b585e9c91dfcc8352fd18f8c1 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 25 Jul 2025 12:00:00 +0000 Subject: [PATCH 091/212] pkgsStatic: fix in combination with __structuredAttrs pkgsStatic injects { NIX_CFLAGS_COMPILE = " -static"; }. When __structuredAttrs is true, it must inject { env.NIX_CFLAGS_COMPILE = " -static"; } instead, as attributes outside env are ignored. --- pkgs/stdenv/adapters.nix | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5c359014ba26..84369a269331 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -135,22 +135,24 @@ rec { else (mkDerivationSuper args).overrideAttrs ( args: - if args ? env.NIX_CFLAGS_LINK then - { - env = args.env // { - NIX_CFLAGS_LINK = toString args.env.NIX_CFLAGS_LINK + " -static"; - }; - } - else - { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; - } - // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { - configureFlags = (args.configureFlags or [ ]) ++ [ - "--disable-shared" # brrr... - ]; - cmakeFlags = (args.cmakeFlags or [ ]) ++ [ "-DCMAKE_SKIP_INSTALL_RPATH=On" ]; - } + ( + if (args.__structuredAttrs or false) || (args ? env.NIX_CFLAGS_LINK) then + { + env = (args.env or { }) // { + NIX_CFLAGS_LINK = toString (args.env.NIX_CFLAGS_LINK or "") + " -static"; + }; + } + else + { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + } + ) + // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + configureFlags = (args.configureFlags or [ ]) ++ [ + "--disable-shared" # brrr... + ]; + cmakeFlags = (args.cmakeFlags or [ ]) ++ [ "-DCMAKE_SKIP_INSTALL_RPATH=On" ]; + } ) ); } From ee828cccfa37c1ef1787655b57625994d556fbfa Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 26 Jul 2025 12:00:00 +0000 Subject: [PATCH 092/212] nixosTests.mautrix-discord: fix the test runs netstat, it needs to be installed --- nixos/tests/matrix/mautrix-discord.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/matrix/mautrix-discord.nix b/nixos/tests/matrix/mautrix-discord.nix index ebb296416fa1..2609005c0ccc 100644 --- a/nixos/tests/matrix/mautrix-discord.nix +++ b/nixos/tests/matrix/mautrix-discord.nix @@ -83,6 +83,10 @@ in 8008 8009 ]; + + environment.systemPackages = [ + pkgs.nettools + ]; }; client = From 99a6b78d2db87d2dc51ca0644833d4cf5765b200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 12:07:13 +0000 Subject: [PATCH 093/212] ssdfs-utils: 4.56 -> 4.57 --- pkgs/by-name/ss/ssdfs-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index d08eccdc0581..9558822ce516 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.56"; + version = "4.57"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "300d57aabcf7d6208ee863463e7947005efa70e9"; - hash = "sha256-X2LTt1iVyRX+Zli/KePu5Ryf6Fz2/hcDDWyaL9qp/vI="; + rev = "fab40f45663ecd03f32ccf891691798db245bd04"; + hash = "sha256-9Eha2tqEBykhlF/GUX5nH1jYQlzEW7ou7mUbTL2A2r0="; }; strictDeps = true; From 236ccc08cce3e8b1a88ce9f58f9cb35f375d6456 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 12:09:55 +0000 Subject: [PATCH 094/212] obs-studio: 31.1.1 -> 31.1.2 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 6efd68d99809..06b0b1f64d0e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "31.1.1"; + version = "31.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-FZTWuT9eANITzdCopDyr11CTyfGvMtSgaFMPSPlmrTU="; + hash = "sha256-QZoIyjliVruDPZj8hzTABaDn+nCTVs5qQCdBLtSOKvI="; fetchSubmodules = true; }; From 4a3953b483638d275ee090eb4717b0bc7b11eac9 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sat, 26 Jul 2025 12:46:09 +0000 Subject: [PATCH 095/212] flutter332: 3.32.7 -> 3.32.8 --- .../compilers/flutter/versions/3_32/data.json | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index cfbe37f9d3d5..078a4c8a8d51 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -1,17 +1,17 @@ { - "version": "3.32.7", - "engineVersion": "39d6d6e699e51b2874210e14cddf1a22fb9524b2", + "version": "3.32.8", + "engineVersion": "ef0cd000916d64fa0c5d09cc809fa7ad244a5767", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0=", - "x86_64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0=" + "aarch64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ=", + "x86_64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ=" }, "x86_64-linux": { - "aarch64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4=", - "x86_64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4=" + "aarch64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E=", + "x86_64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E=" } }, "dartVersion": "3.8.1", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=", "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c=" }, - "flutterHash": "sha256-fPCa9JHvQGP47uo6LHbGC2aMMwdX+AOEZfvIyZ3M2/U=", + "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=", - "aarch64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM=", - "x86_64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=", - "x86_64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM=" + "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", + "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=", + "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", + "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=" }, "fuchsia": { - "aarch64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "aarch64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "x86_64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "x86_64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=" + "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=" }, "ios": { - "aarch64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "aarch64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "x86_64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "x86_64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=" + "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=" }, "linux": { - "aarch64-darwin": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=", - "aarch64-linux": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=", - "x86_64-darwin": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc=", - "x86_64-linux": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc=" + "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", + "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", + "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=", + "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=" }, "macos": { - "aarch64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "aarch64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "x86_64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "x86_64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=" + "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=" }, "universal": { - "aarch64-darwin": "sha256-Z7UTqCTESwcpv0yxzTEMThkQMNfisOCnhC7sltY0dUA=", - "aarch64-linux": "sha256-VIMu52o7BIEkxt4h0u4sILcrgKg85TY+3ieQl290icM=", - "x86_64-darwin": "sha256-/jOrwEy6EWCx8cS9MyIEI4NqO2H8Rs/VV7N6RmCyPWM=", - "x86_64-linux": "sha256-mcQYpXo8E/j4j4OYIwlcx6xpiyYbnKXrwfT+rl6W4Zw=" + "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=", + "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=", + "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=", + "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY=" }, "web": { - "aarch64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "aarch64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "x86_64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "x86_64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=" + "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=" }, "windows": { - "x86_64-darwin": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4=", - "x86_64-linux": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4=" + "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=", + "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=" } }, "pubspecLock": { From 37051bfdb52e30af72de543c05a7a0cae0e11eab Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 26 Jul 2025 20:45:43 +0800 Subject: [PATCH 096/212] pantheon.switchboard-plug-bluetooth: 8.0.1 -> 8.0.2 https://github.com/elementary/settings-bluetooth/compare/8.0.1...8.0.2 --- .../apps/switchboard-plugs/bluetooth/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 44636e12b127..80853ab0cf25 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -13,19 +13,20 @@ granite7, gtk4, bluez, + elementary-bluetooth-daemon, switchboard, wingpanel-indicator-bluetooth, }: stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = "settings-bluetooth"; rev = version; - sha256 = "sha256-NefWnkI7K6I1JY3UG9wUbB/yF3R8tUdPb4tAafiTR3o="; + hash = "sha256-D2kigdGdmDtFWt/hldzHm+QqlGl6RBExhcdurLtCM1Q="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez + elementary-bluetooth-daemon # settings schema granite7 gtk4 libadwaita @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Bluetooth Plug"; - homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; + homepage = "https://github.com/elementary/settings-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; From d3d0bc95205c1c8564914254f10adcde628f535c Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 26 Jul 2025 21:03:55 +0800 Subject: [PATCH 097/212] varia: 2025.5.14 -> 2025.7.19 --- pkgs/by-name/va/varia/package.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix index 407bd7882632..37df6ecb6237 100644 --- a/pkgs/by-name/va/varia/package.nix +++ b/pkgs/by-name/va/varia/package.nix @@ -15,22 +15,16 @@ python3Packages.buildPythonApplication rec { pname = "varia"; - version = "2025.5.14"; + version = "2025.7.19"; pyproject = false; src = fetchFromGitHub { owner = "giantpinkrobots"; repo = "varia"; tag = "v${version}"; - hash = "sha256-x2612aq/8YwDT3UYKW2P3PCVjhKhZJxH3JbY3A4IGq8="; + hash = "sha256-/u6Eb9Se/Lt8Hisv24zfOgNE9ZxC3AJXbZHmukVLSRA="; }; - postPatch = '' - substituteInPlace src/varia-py.in \ - --replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"' \ - --replace-fail 'ffmpegexec = sys.argv[2]' 'ffmpegexec = "${lib.getExe ffmpeg}"' - ''; - nativeBuildInputs = [ meson ninja @@ -44,7 +38,7 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pygobject3 aria2p yt-dlp @@ -57,16 +51,22 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; + # This replaces original varia wrapper preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --add-flag "${lib.getExe aria2}" + --add-flag "${lib.getExe ffmpeg}" + --add-flag "NOSNAP" + ) ''; - meta = with lib; { + meta = { description = "Simple download manager based on aria2 and libadwaita"; homepage = "https://giantpinkrobots.github.io/varia"; - license = licenses.mpl20; + license = lib.licenses.mpl20; mainProgram = "varia"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; } From 1d9a3b1c7d1c9b3799b3e071ffa05e84c092c534 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sat, 26 Jul 2025 06:47:45 -0700 Subject: [PATCH 098/212] minecraft-server: 1.21.7 -> 1.21.8 Changes: https://feedback.minecraft.net/hc/en-us/articles/38129892058893 --- pkgs/games/minecraft-servers/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 0dc95b13ca14..c706ee3f0212 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.21": { - "sha1": "05e4b48fbc01f0385adb74bcff9751d34552486c", - "url": "https://piston-data.mojang.com/v1/objects/05e4b48fbc01f0385adb74bcff9751d34552486c/server.jar", - "version": "1.21.7", + "sha1": "6bce4ef400e4efaa63a13d5e6f6b500be969ef81", + "url": "https://piston-data.mojang.com/v1/objects/6bce4ef400e4efaa63a13d5e6f6b500be969ef81/server.jar", + "version": "1.21.8", "javaVersion": 21 }, "1.20": { From 28b10990297355e25680b8b39afc97c6cc421405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 13:59:38 +0000 Subject: [PATCH 099/212] sigslot: 1.2.2 -> 1.2.3 --- pkgs/by-name/si/sigslot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sigslot/package.nix b/pkgs/by-name/si/sigslot/package.nix index 244d56e91cc0..c1965ab37e3f 100644 --- a/pkgs/by-name/si/sigslot/package.nix +++ b/pkgs/by-name/si/sigslot/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "sigslot"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "palacaze"; repo = "sigslot"; rev = "v${version}"; - hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA="; + hash = "sha256-8JBZ6Xid/uAOfiPKgJKetpj/oBb8lRLPgjkMnrfTKaM="; }; nativeBuildInputs = [ cmake ]; From fd25b35d46dd28ab9fb5d964115525521cafe9e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 14:21:51 +0000 Subject: [PATCH 100/212] kcl: 0.11.2 -> 0.11.3 --- pkgs/by-name/kc/kcl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 5973fa7de973..74b1a8b63094 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kcl"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-9QPGQ8PfXtb37RIrfqLeezobmXSpgvYzxJOWldmgnyc="; + hash = "sha256-LJ+Mclw/dMyOeUHg6TAckSbvDGFYCf6mMGzDmiIQVZc="; }; - vendorHash = "sha256-zToyM20ykPAd+EHwSUsX+4BvBPT8iXk5suGK2ZYBjvc="; + vendorHash = "sha256-jNQ0g7BGXUoYKV5RkU/f9GrSC3ygeZv83SekAmyKLxc="; subPackages = [ "cmd/kcl" ]; From 97f53d9f3236fb4572645e6999cd6fd6f9c8b177 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 14:22:33 +0000 Subject: [PATCH 101/212] parallel-disk-usage: 0.13.1 -> 0.20.0 --- pkgs/by-name/pa/parallel-disk-usage/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index 1ad957be3729..8674d8a4c3de 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "parallel-disk-usage"; - version = "0.13.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "KSXGitHub"; repo = "parallel-disk-usage"; rev = version; - hash = "sha256-gzjNi7ujYe7OZKYyrYk1xqqo/k8yBJdIwRoNASm5Db4="; + hash = "sha256-Xzc+1cPs84o58G7n8hEN9vtaz3bw3TrwodphK45Iq2g="; }; - cargoHash = "sha256-3U61AkCicX7VNh1bf0IHPH5YX7qAtp4PvWi8FRKoBQI="; + cargoHash = "sha256-qSQpjYydpjVUP5AO2sPshP/HZzeVihwlJxyabml67js="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; From ff225c06706cdac7c09a26cdbc970689005a6f0a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Jul 2025 13:59:51 +0200 Subject: [PATCH 102/212] snis-assets: switch to unofficial snapshots The upstream does not provide a stable URL for the game assets. See https://github.com/smcameron/space-nerds-in-space/issues/419 Signed-off-by: Marcin Serwin --- pkgs/by-name/sn/snis-assets/manifest.txt | 809 ----------------------- pkgs/by-name/sn/snis-assets/package.nix | 46 +- pkgs/by-name/sn/snis/package.nix | 3 + 3 files changed, 19 insertions(+), 839 deletions(-) delete mode 100644 pkgs/by-name/sn/snis-assets/manifest.txt diff --git a/pkgs/by-name/sn/snis-assets/manifest.txt b/pkgs/by-name/sn/snis-assets/manifest.txt deleted file mode 100644 index 103d2dd231b1..000000000000 --- a/pkgs/by-name/sn/snis-assets/manifest.txt +++ /dev/null @@ -1,809 +0,0 @@ -sjOw4TTK5Z3VR3TRlKn2ZXkqYxmKgrmTet5/0Mptji4= share/snis/replacement-files/asteroid3-1.png -GJUaKbdAiIUrPOGbKEwL/Tpl5e1J3aIxwdMNrO/4oKE= share/snis/replacement-files/cargocontainer.png -5T0UY00RwSeimTTStaZhD5ZCqrGS2u5tdem6+pmo/34= share/snis/replacement-files/asteroid3-3.png -p/FXO9QCmsACU6aUU9glVBCJES1LMKhYplDBnkwrz/A= share/snis/replacement-files/default-assets.txt -aL9xwQM63RIrO67fLHnbxBhQhd3suKmUUiNzGYSpdjw= share/snis/replacement-files/asteroid3-5.png -HH53P+DTtbVpDlQdjwqdZ5pJnZadPl5KHpUD78Sc7J4= share/snis/replacement-files/Attribution.txt -uNx3bqm/YO+/g9Ry4FmUEIvvhXOJoX2C4EjunL694Dg= share/snis/replacement-files/asteroid3-2.png -NDndMpnUcvBeD/7WX3CjyqB++7lCnuRpghXQOBWM3eY= share/snis/replacement-files/asteroid3-4.png -j5TX9zHhyprGk5yVjEl2D3vBL/HOnwlLEt5PpLh9bOs= share/snis/replacement-files/asteroid3-0.png -le/Q9RBlNupL/FpO+DYDKuzH5LjSgKcUU7q46MGDF00= share/snis/replacement_assets.txt -C71kMWifWo8QtMvylnc+T0A9EPnIGik5Ir86IUziF6M= share/snis/solarsystems/tau-scorpii/image2.png -B5zg4F2MLmLUJcvemLbRq9q6QuPj5lFHJD5Srmh2olA= share/snis/solarsystems/tau-scorpii/rustywall0.png -+DdaRv3zMir6szFMjdrkW7A8DtjXtKJxchqhl1XK6B8= share/snis/solarsystems/tau-scorpii/rocky1-rgb-3.png -mre/vZjS4xPOk8JZ9zAOtDxaBvVpAgURjlx+eTsfQOU= share/snis/solarsystems/tau-scorpii/image1.png -X3UMV+tEqus+6Og289IJl9g4zxqnYIsOj8/SX9bfNeE= share/snis/solarsystems/tau-scorpii/erth-2.png -LAgRRKkMZ7/6+6ePVNBwbwaqqXU0DPBCUYPPrTwhbXw= share/snis/solarsystems/tau-scorpii/image4.png -ogJqbuhH9cHjRVCAn5m0mCJncrw/BZoSZfcfqgpXsCc= share/snis/solarsystems/tau-scorpii/sun.png -T3Dp6T0Qq6rTVXN4grHLpVfae4o1RP/x+GUhZP+WCqI= share/snis/solarsystems/tau-scorpii/bluish2.png -+f71U9Om+hi3HzBPvyyScaVU+gRNLc6oFfUim0rydSI= share/snis/solarsystems/tau-scorpii/rocky1-rgb-1.png -HahmNn6qdGxfp5kx/7FqVmSlUaJv1aH0/L0yZvRE0m4= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-1.png -8bexz5SuTFse8sUAO7viJTcNzvcf7NZyPoRiMdQY++8= share/snis/solarsystems/tau-scorpii/gasgiant-d-1.png -QzIjiiEyfsAuaU8NEzUu8TVLM6sgSqBwQXtSxSi1BKE= share/snis/solarsystems/tau-scorpii/gasgiant-d-0.png -4M9pCloqsUg0ZaKdq1K4jwZcs17I5LZ3CwSK0mpbTJ4= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-3.png -kHxbIuXVUVIjHsUFvRGwtwZxdksledJs2RifOlHotQg= share/snis/solarsystems/tau-scorpii/jungle3.png -zhxkaO+fpav5pYHvBziCG7KJqGnbxxijmoBltrFYu0M= share/snis/solarsystems/tau-scorpii/bluish5.png -UKswAtwyu7LF+nnGPh4/5RiK04ZBl4Zvc9tLleVtGRU= share/snis/solarsystems/tau-scorpii/rocky1-rgb-5.png -vXcNeFnv9ci+aDJ5s9m1qX0ymT7CoGMVQ2EdsoJo7js= share/snis/solarsystems/tau-scorpii/rustywall3.png -/Yn5syDR7RHaa+B3jLUOw+9bUMwMB5mWyE/MtwjRrPI= share/snis/solarsystems/tau-scorpii/erth-0.png -cMqsnhf7ht9uBW9DgpHBM1910jGMR33QDeONwUXMAAM= share/snis/solarsystems/tau-scorpii/rustywall1.png -EXXYG5LvzUJoIlo7v3V1pLKqOT7ZouOPaBinVVaoM2w= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-5.png -91gD8EcdcZU9KYyl+WyqmwmfzuCMp/wmF8+T+rHQlgg= share/snis/solarsystems/tau-scorpii/bluish4.png -lQANFKE3EukGDv90xIetNGtsxyEIRnk/g7b+O/A7vKc= share/snis/solarsystems/tau-scorpii/jungle5.png -QsbH7rMQzckt98ZTB/xw3C2qwcWiV1RAjyO+E3YW9pI= share/snis/solarsystems/tau-scorpii/rocky1-rgb-4.png -1SImVY09TWyqdBTbio6TsRJUsdva8+OMWIN9TjTLy5k= share/snis/solarsystems/tau-scorpii/erth-4.png -nlUGG6W5WGEO6FCqO0NA+4fa7lCi8S1KOSSiMqu/PWo= share/snis/solarsystems/tau-scorpii/Attribution.txt -0WQEbu5yLerSMJNV8po0Igt6XDGpu6dO/5VXl005iqk= share/snis/solarsystems/tau-scorpii/rocky1-rgb-2.png -4oJGgGCmiLww20eTPSx+Efs3Y+usttkH7ZrRDMKEVs8= share/snis/solarsystems/tau-scorpii/rocky1-rgb-0.png -vzHOkng55CIlKP6iUwSMMEI4p3wmEHCfsBSf4X70T0s= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-0.png -Zx4sBxQpSwrhklTHOnamnGJJYU3W8C9Gd+3pOg0kC9g= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-4.png -3VD8Fn5HXcIK9rNWRS7sSjhFKZIl62oJNvyPUn+uTXs= share/snis/solarsystems/tau-scorpii/gasgiant-d-2.png -dxm4SULnf3udF+54Q9SUBkobp/cVO+6AlBGe16RH3oA= share/snis/solarsystems/tau-scorpii/bluish0.png -2ZLk/7xX4fzs3GmTaSub8YubTyy1x6jCrHG+Tj83JSc= share/snis/solarsystems/tau-scorpii/bluish3.png -moudMzqKg+zKA2kFUP4sgbW43jsW3m70ikGFXl2Nh9I= share/snis/solarsystems/tau-scorpii/rustywall4.png -Sns8FlObo7AEqOU3f2WUxtx6c691qgv+v2jZnJTww2I= share/snis/solarsystems/tau-scorpii/assets.txt -UbYREhAf2Row2PXQPfDI77fTVqj34AeAzBZ9AU84QLc= share/snis/solarsystems/tau-scorpii/bluish1.png -i4ZCxzAAIeolg/v2x7eseNeMYuFYJZHDjJjl4XFu+wg= share/snis/solarsystems/tau-scorpii/erth-1.png -LlFGwZkV2ti5saZ8l67+30QhVxGsV8lvS+DVKpEsTRk= share/snis/solarsystems/tau-scorpii/erth-5.png -23VPjuRbYu6J0CbP04pmohsMVhl2e6NFhy5lPjhYadc= share/snis/solarsystems/tau-scorpii/image5.png -c3fiFEoGvidQeRnAblTUhwB+gyaRZaXwIvsloQ4nqh0= share/snis/solarsystems/tau-scorpii/gasgiant-d-5.png -npIg5gbJpvvVKbyl6oGPZShGAEbQ8mmM3thrzalEIKk= share/snis/solarsystems/tau-scorpii/erth-3.png -y4ZlyuY7UylLSYB2JK3YZuXoWArtCf5s2cZb4iniu3A= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-2.png -CSMsoNJaLM7DwgyftUzzt+PDzJxQp12GymSdr6dPSWE= share/snis/solarsystems/tau-scorpii/rustywall2.png -OFdhugrs+lk0hAcMe5rrUMIPpJgDVg1LiNCy209FrTc= share/snis/solarsystems/tau-scorpii/jungle2.png -gdebjVi9iZJVz/moavujdR2P4qpCI1ZpeVckiq/Zxzc= share/snis/solarsystems/tau-scorpii/gasgiant-d-3.png -Cgyv3cMNT/c9m/Fa6hM1X8U5Hc9apwAGJcGSZzI2rlo= share/snis/solarsystems/tau-scorpii/jungle0.png -Bd/juNW8ixHzrK1q4z+jRxxMOGxFEU2m8+a5j2tluL8= share/snis/solarsystems/tau-scorpii/image3.png -t0bgh90qvRbcJ7CF5Kh5Mu7fSVnlU6Tsv+GWn4l/HQE= share/snis/solarsystems/tau-scorpii/rustywall5.png -frLIT38RTxtmkPrpk4rFV/wBVQWSWWZaVVD38rC7QuA= share/snis/solarsystems/tau-scorpii/image0.png -WnBnha8YClNoGzwxY6dhLCEkESxxtcU+cGEW/IpI3r0= share/snis/solarsystems/tau-scorpii/jungle4.png -tgXWEUab+5QiqfNZtCt8ci7NZ9C3OR6vgorUDSg5oa0= share/snis/solarsystems/tau-scorpii/gasgiant-d-4.png -8XOmxpTiIZCCKFKnBah93kMLsdaztXZJ0QFr6IZxUJo= share/snis/solarsystems/tau-scorpii/jungle1.png -cjOxxQoY3ukMclMiGcVUc9Pfd/IDOrX0EMAbuPveqgc= share/snis/solarsystems/karado/maurz1.png -JA7DukfwN7EJT7rQ3I3cJUlvQyEjgHhHOHdRqeqZUfw= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-2.png -w9HP4HpW3lWlNR5+N1UeeC8PwhycteQs7EJX6cp5fek= share/snis/solarsystems/karado/ounii-normalmap-masked3.png -ZBUhZKybhHW7GweOOQHRMW76T7jEZoDNF1U3i4B8lTU= share/snis/solarsystems/karado/maurz3.png -RinAAet1RTbqfBdQ30LQG4gOYsk8zhAuYhLkH7jjXtM= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-1.png -PnZmAoT3W+uxcobndKiHkakNWLbF1Rac5mwGz9akwrA= share/snis/solarsystems/karado/maurz-normalmap0.png -RWThrArd3WTfh6cTEXM1FDY6EFzA5obEL/29fShvt4Y= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-0.png -Y5DLC48a0E8uqQwfA/eGntMD6E1A+V9thYV5OPflkrU= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-1.png -14iLpLU0s35gowiRjSACDCHwZKuDMqEt9wDHmqN9pJk= share/snis/solarsystems/karado/sun.png -yh1dkDIDuayS2SKotKB+1H3blC+F+/oA2tkWZFuXHDk= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-5.png -2M1dHDNvDjELPngfdDsH1UeOVWjcM13vo6JFBuVrQkk= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-4.png -yEFIDxnMm641GesZCRDqlF2zmaXUNeZ6FbbXzq7w+oo= share/snis/solarsystems/karado/kolaron1.png -GdlVdQ+gvvRw/0UgYVKcyvq8NNY5UYiSWNbtHpqkk5s= share/snis/solarsystems/karado/skybox-4.png -N5nykk1TRl0n5cmUaEzAJ8QNia9YS0YuuvxTlRuw+Bc= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-0.png -Iv5GAs8X8J3EinXErg24YW1akOhBC8J6Me1xxK23/VU= share/snis/solarsystems/karado/tounah-normalmap1.png -bL6WHvF2rzB0Yiqhs8eYM1NWml0PHY/2trCbY2tvn5g= share/snis/solarsystems/karado/ounii-with-clouds-0.png -9lMDCFq6Pn12CBuv5WGjlyIuEsXY+/SVIOeBdziKewM= share/snis/solarsystems/karado/tounah3.png -BjBFiOIekiDH1unfKJZwnyh4FsKa7hyDK6+tPVDk0dA= share/snis/solarsystems/karado/tounah-normalmap3.png -DgXtZtj48sxP2gMfKQ6kuisBmiiQvaiW9b9nHo0cKUE= share/snis/solarsystems/karado/skybox-0.png -JR16aeqQ28v4sgBYYPZJ2JyYpXSQ9SUxTlRQjjmMYJY= share/snis/solarsystems/karado/ounii-normalmap-masked0.png -3plkE7cBhcS2onMeBrRomwK6xGubM4toGv+h6yAznNc= share/snis/solarsystems/karado/norphi5.png -eSxWcYTH3mz5L39oJuDJLry+Q8vHpF1HrqXDvRIumgk= share/snis/solarsystems/karado/maurz5.png -jyI/fdAeKFNCm4fJlTETwZG+4VyL+CRXGboyxZQYxSo= share/snis/solarsystems/karado/norphi-normalmap4.png -8w5uI8/KKVIGcPNWv1C+SwA4xfyorL7UwcNYOzznaYs= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-5.png -u4lCbrVm3UnL8TvvnHgyMmqSwHdyA2BBSu4/Oas3KyE= share/snis/solarsystems/karado/ounii-with-clouds-4.png -sqyByb/XbSy65hWGpDWmmBEppzhYxJbPGFjz770thWI= share/snis/solarsystems/karado/kolaron3.png -HO+3JBz384geu4RyeJvvl/82n5au+Ntp7L8EmhgNdVw= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-3.png -WhRN3Ef/NsoOBzRDeiEmv8EIK1FQ9dcUR9QA8x5FCGI= share/snis/solarsystems/karado/kolaron4.png -eoKlgavlafYSnuGi4dtQaz7czPt5zC6hHpTGZeMt80g= share/snis/solarsystems/karado/maurz-normalmap3.png -NpcnSI5gr1OMWYVit8qb4V94yhuF3bomy/5LCL7aXGQ= share/snis/solarsystems/karado/maurz0.png -OeazFTVT6nNiu3o1rvY+2sKMIZpImY/lfnq7oTCaYG4= share/snis/solarsystems/karado/norphi4.png -wUgdl8IKV7Tn6WdaCQGjh0F/uxH4oS4Sxuvo5Dsaqk4= share/snis/solarsystems/karado/tounah1.png -9CNWfsodxC8om8vUByFdjyJHo+lz/qDikcQrsYR/+Uo= share/snis/solarsystems/karado/ounii-normalmap-masked1.png -NvTkAOZ5qcG311dUEHUHpNbpLFXCtK1arN9D8bh2mSk= share/snis/solarsystems/karado/kolaron5.png -7dSfrm6Lgm4H9b1xc8H13S+EjhbmvZgdICLGKM/1zBQ= share/snis/solarsystems/karado/kolaron0.png -y5DauNIPTxnWOD+AHqjgJNVpOYVSjswKs6z2YRFuDBY= share/snis/solarsystems/karado/skybox-2.png -3oClYVJc1+e4evArG4ZOJiNuytxzEHSgLUmHrBPSKFA= share/snis/solarsystems/karado/maurz-normalmap4.png -JXn4j6ZQWXj3pPOq3yGY/uOvlLSbR0ZVVwNOvijPTpc= share/snis/solarsystems/karado/maurz-normalmap5.png -BzF/YVrzb7Rv94oBhLfmA7P3RWnnN5nzBvoi2QEf1sg= share/snis/solarsystems/karado/skybox-3.png -k64xflcXPLhOV7i9LvdZvSFbks/RAy+f7bsl9REfxCE= share/snis/solarsystems/karado/ounii-with-clouds-2.png -1y6lDCz+N2omPkZ2l1t+0q0J/w14//Z/Ewq7+G0mMdM= share/snis/solarsystems/karado/ounii-with-clouds-5.png -ldSkzeahDlNZnwlgxOmSs58RZ27lCzmvVQQJS5BXQdo= share/snis/solarsystems/karado/tounah-normalmap0.png -Uu8ZseislfkYfxqmPPSHuJ+mgyj7zdQ02EDKMKDIeVc= share/snis/solarsystems/karado/skybox-1.png -eSL0yROs572/a16mT790Q+xon9AZhjWEut/loTIMU18= share/snis/solarsystems/karado/Attribution.txt -d1CWAWEAIjxiXZTSnml7/bdNzV1OCSeie/+asy+DKk0= share/snis/solarsystems/karado/ounii-normalmap-masked2.png -AYc/uhxerl++taDUCZ836cbr17VKsSI3ShzIu9HsWqc= share/snis/solarsystems/karado/norphi-normalmap5.png -1vKjxAgNcuRKBZ5Tr94ICodqpXuZX/2cGy8Sx8yqGzc= share/snis/solarsystems/karado/tounah4.png -bA5NFdtGWTkY2CMoAYEkl54FyMy3Ft4J7iUvCB28RhI= share/snis/solarsystems/karado/tounah0.png -EDwWGkYcKyoGnXkOiAFAsDNjXG7vRV6VhC16dyHLqe0= share/snis/solarsystems/karado/ounii-with-clouds-1.png -WkJ6h3j78FSu39N2K+pTC2ISC3vdyqFbFLp8y7L534o= share/snis/solarsystems/karado/skybox-5.png -/479dJqdJZedoX/k3+dJo8diAnvJNORAZeiFPNrrJZg= share/snis/solarsystems/karado/ounii-with-clouds-3.png -GPcVRzOlVGciu+MpFu3qcDfr683gmIKXL63291IEAKs= share/snis/solarsystems/karado/norphi-normalmap0.png -OCzM7Omev6AzO+wO43/NBs6oWo97wwzuet3r4cs5j1Y= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-3.png -bPyHQyescyDQfVyrqiQDqb5QDsRKA92lnrLbROs7J+8= share/snis/solarsystems/karado/tounah2.png -lXThLDuEbH3PzHv+gtEqTwpb0gTPVsoGBQKIUdMzA8Y= share/snis/solarsystems/karado/norphi-normalmap1.png -LDtnTIx/E71pDdc1PlzKDpFDdkxDZaQxYNw1+M1ZqhQ= share/snis/solarsystems/karado/assets.txt -nqN4db1OS5mMUOW89Y5qH7tx7NtsHEISq1B+SjJngg0= share/snis/solarsystems/karado/norphi0.png -NOdBbewc3kDH36OLSQzt5FK2hl6T+AtnAfMyR/gPRjk= share/snis/solarsystems/karado/maurz-normalmap2.png -0UcErE67TYJhPAm6EvueDe5AO6Jc8s/+Jty8reo8G7w= share/snis/solarsystems/karado/maurz2.png -feXt3aiJYDebd7sfijzkVQ++6mRqptxZv/P7oe8zS2I= share/snis/solarsystems/karado/maurz-normalmap1.png -Px46fgE4Da5qrxAdzLzBCMm7xmk46ULMUotU40JazL4= share/snis/solarsystems/karado/norphi1.png -LUWvUAS5XYhiLfWVKSpHaTAAuYdcctMXV2S7Y0bttHo= share/snis/solarsystems/karado/norphi-normalmap2.png -W8Du6C1jWmOM8EoIFBGvEmY33c7EPANCNhyCvcEkWv8= share/snis/solarsystems/karado/kolaron2.png -7r6POKa0wwzc8VNjzwOkQDQdl0zYN4+M60ygoESf2VE= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-2.png -LDHCSW/tkpI5cxqSi38ecuKJ2Yn1bGVJl7wClqyPIyY= share/snis/solarsystems/karado/maurz4.png -iaiMLBLN5XlLs1qiKnxmXvlF3XR5GSvIOqvC0U8Nw4I= share/snis/solarsystems/karado/tounah-normalmap4.png -kZLLzolKmFcy856LMgXzdKHvzZTParhtOP3XR2Cvuz8= share/snis/solarsystems/karado/tounah-normalmap5.png -JI9Ej0PyDTqNtvtaQwnWTBQiKujoY0cyk+UBgZEhE6Q= share/snis/solarsystems/karado/norphi2.png -9RvzLm1UA/kkoa0++cbfyaDh1OcFRwhc2tGzLQ9A8Aw= share/snis/solarsystems/karado/ounii-normalmap-masked5.png -99god8h1yAo8HY32bZXXIXrE7sbGWADBTV2U2Tj9ElY= share/snis/solarsystems/karado/norphi3.png -GHn/28itRbFZRWNrBn5fOe3w/t+2iXJSw1UME0NXDPI= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-4.png -XRFWZCP0hLkjXg+LNR6n7cffZDGGxhNfjAX2e5l9L20= share/snis/solarsystems/karado/ounii-normalmap-masked4.png -486du5aoVCgiJxrsmnqcoLekT1VHF19C8JZPSezZLzM= share/snis/solarsystems/karado/norphi-normalmap3.png -y9btB0QKqoHs4z+rDM7ujjyiA/3WTfa+K2RowRQSR1w= share/snis/solarsystems/karado/tounah5.png -0VGEbUJwf9bfJjB7G85qbC3wqPFjJ4NxXymu1+nX06M= share/snis/solarsystems/karado/tounah-normalmap2.png -pCJmzEWA/dF/F1i67N2VzQwPOkWigxKS54d+EVNRlwk= share/snis/solarsystems/zolon/p32.png -RWpBFnQCyuj1FGbA89t7b/XR433KyCxYue9WbLB8U0A= share/snis/solarsystems/zolon/e1-normalmap5.png -1CZnBW62bZTL0VonTUM6ToIMXQm7DpJQA/Lydmtk8Ek= share/snis/solarsystems/zolon/p54.png -1pHrVkyrCnKGOUzFmP1OyzUDAGLdyRDpIVBpCb886v4= share/snis/solarsystems/zolon/p3-normalmap4.png -ICmySzuzck56LI6lG8FmihWuI2eV/t38arZLlM1YV3s= share/snis/solarsystems/zolon/p3-normalmap3.png -NQxWQADuLmz0dn9tqeXVRj90qzlq+p4wF50PaCv4M8Q= share/snis/solarsystems/zolon/p60.png -QwNYP4iUGPZAD6UWn5mfPWYVkvJH+ObI2VGUEbt/AB8= share/snis/solarsystems/zolon/e14.png -qE7fCliK95DIOxtRklA3pXTxJdX1Jmzvk2bKyaUjPl8= share/snis/solarsystems/zolon/p3-normalmap0.png -orTtjzh9MBeNS7uPoEyKhXpBruTqeaHbq/VyjSQVOZ0= share/snis/solarsystems/zolon/p22.png -2A43kXfM6dUyeZFtLwzUxAlNJcdbEmX2Jtq+UQLhclQ= share/snis/solarsystems/zolon/p013.png -W2zOTkttEZMlyHowGmCcgjJGFZVUvjR9JJ0C98Glg2g= share/snis/solarsystems/zolon/e13.png -dHkumWSOWeJeXXaHq9h8kNG0l9sDfreWZSVYzJ2SbS8= share/snis/solarsystems/zolon/e11.png -AC2qXLc+ml1oNW6KmOeIZ8qSHgbK0Lk0jbXKU/U7sYU= share/snis/solarsystems/zolon/e12.png -2D+Rgrr1TUk7JrP5mdEw4XhQxQzgBrGCBF/20FFc9+c= share/snis/solarsystems/zolon/p52.png -3p/Uy1lb+I+lz7lB+b2Iicnxb0/mkgppVr3xjtroysM= share/snis/solarsystems/zolon/e1-normalmap2.png -tMc3wIiR4ula2Ouwbppgr+T082XkBBg6ak0bcOzgM9U= share/snis/solarsystems/zolon/p62.png -SCYTxGiq2VXG47tepRfyUvsUS+YSt1o90qH3Ugrnw9w= share/snis/solarsystems/zolon/skybox2.png -Y2b14W37pku1bO8YZyfRrsqYlwwJnC3FZWyeWknujW0= share/snis/solarsystems/zolon/p30.png -fcfUDI4Fhj+dFYE+oW8ktuysXWnP/2IAeYKNZwXteI0= share/snis/solarsystems/zolon/p51.png -bV9Lt6BjUUCoI8aCc7opbLJ6UgDVEbyTNQj200vbsAc= share/snis/solarsystems/zolon/skybox4.png -etW4gNw6vDKvgChi5KXIQYLIzKyE+97Ur/zVWFSAbB8= share/snis/solarsystems/zolon/p23.png -YQAkzhgMWt7M6ZtCrM5G3nDhI/nY0oRGVD81bu4878A= share/snis/solarsystems/zolon/p20.png -1fjiJG142meeinsvpo3H03i057chuOmrJLSbmgAbkSE= share/snis/solarsystems/zolon/p010.png -XmMloYE+ANsPPDyYnFoROaUGb9Ur0gRRraBLjGMKWcY= share/snis/solarsystems/zolon/e1-normalmap1.png -ntNEzKfWV7cvydVMbpjem/OPXz4WctXKlx+pqjFPxeE= share/snis/solarsystems/zolon/p31.png -rDoyk3FoxMvC1BhjFaRGRHpGz3jS7PRy/tsBu0BjeQ4= share/snis/solarsystems/zolon/p015.png -hpmBkeOV90lTELjki+jSKyODML4WysRR9Vt+ZeDJPFo= share/snis/solarsystems/zolon/redstar.png -lZQnQNNWajjDg/G7sSveKDjawdzFqPzMSY3XxWYlXp4= share/snis/solarsystems/zolon/skybox5.png -UwNEZrEaG9X8VyeE95ZmKzzHhVK9ZCo4iKZWnzMDQw4= share/snis/solarsystems/zolon/p012.png -HC1NCJaJO39nfr66mqR/k5WrtqVYAHL1lOdGzZrsF8k= share/snis/solarsystems/zolon/Attribution.txt -u3S3jNMGs7uMmNzyOhnj6bP/AIgKaHQfrgUy+JtcMzg= share/snis/solarsystems/zolon/p65.png -ZdQ0KPE61oNj2RuFR/JMIKX9FL+wmmq4GEMZzmfOwhI= share/snis/solarsystems/zolon/p64.png -hqIaSYp1nZF4K3u69O06AF+yAn5hesDbilzde3eOSIQ= share/snis/solarsystems/zolon/p24.png -AjmPDQPSCR+z+32ZvfHITVLxEhfer2V+0C+aTyMDZbY= share/snis/solarsystems/zolon/p3-normalmap5.png -QyAVTD71r5W6DFZKSMBQkV/pBfpEzB/8k1Scp04K+zY= share/snis/solarsystems/zolon/p50.png -nu3SQROyOZn744vgUefRw3Oi86qADVm4V7JqI0TmanQ= share/snis/solarsystems/zolon/e10.png -BrEm/kf5Ear4DNVvu6N3dTMFy7rHy3XTJDoaLqL8mQo= share/snis/solarsystems/zolon/p014.png -dX6zkx3PrG0apVP1CFCy4KcMyc1D2l2Fg6TxLL43OqE= share/snis/solarsystems/zolon/p011.png -eXgbTz66XXXxIZ64Z6A+HduuUZXKawjhuaMGcxl6IWQ= share/snis/solarsystems/zolon/e15.png -VSmivKXuN1Aq5cBNtZkmTcm4N53KGn2/kdj+BGFoH6M= share/snis/solarsystems/zolon/p53.png -7z8NcIHYOhIZzp6VEJ+mJPsUozlMrqdUM2t7qHKmBfk= share/snis/solarsystems/zolon/p3-normalmap2.png -L0Y8iAZoJdLejrZOgl4HPJOxRUtVpEqXKWNrfuS0J60= share/snis/solarsystems/zolon/p3-normalmap1.png -4/Xxz7rvtNX6zd7XCu2NjzZg4nQuYCgGroTJCdUXqJE= share/snis/solarsystems/zolon/e1-normalmap3.png -GxO2tUU4jf7CF3dMKDNJCJSzvFcagO9VGAy3hJ7Q2Ug= share/snis/solarsystems/zolon/assets.txt -iFCYvHqjYpl/LODnJHcFH2w8eG8lXwkTMepaaKEP/uw= share/snis/solarsystems/zolon/skybox0.png -0HR0TKmJSMndKEjWGw8jykahzwVMFXiJcQ8CvbMZZTQ= share/snis/solarsystems/zolon/p61.png -yV8kSM9mWev/Dh96Iu3jbXGQIj1NOesR+f2NSV2/Zzc= share/snis/solarsystems/zolon/p33.png -CP511Wcv68tIBiuqnNTM3wmEZHhlKNm19lyS2WkTKz8= share/snis/solarsystems/zolon/p34.png -Rh/uMBBk5RtbbB5arHlTd4ZmbbKjmzBNVFzvrvn9KMM= share/snis/solarsystems/zolon/skybox1.png -e8RPc4RZTEcczhoeRSrrjTHFzuLeJ4RHWH0/bv+7l88= share/snis/solarsystems/zolon/e1-normalmap0.png -QE6fRspyXXw5iG1j/xV+rVkya9F24sttV0bHJtda/Jk= share/snis/solarsystems/zolon/e1-normalmap4.png -CqIOPO7ELMmh5U/ulb1znkL/4qmnb6rcRjTc12rKfgU= share/snis/solarsystems/zolon/p35.png -2o86QuhI/CtDBXcCF0fm1r4CtKb+Ri/Zs7TWAbURltU= share/snis/solarsystems/zolon/p63.png -KrNWfrpklVxXqBJePdKCEioQiHMwGgOzgcptFD53ECI= share/snis/solarsystems/zolon/p25.png -gVjWgNp69yd7chjDa8y4Y1rwI5iYCieTYnYAXOlDzdg= share/snis/solarsystems/zolon/p55.png -pqR0ZfDPrwuLe6rPObo5gE74UBTXGRIXGl6rw6EzADY= share/snis/solarsystems/zolon/skybox3.png -qicxB/X/ERyWCQVAYZeP1TWCitHs6NmIVxDZouBlAGk= share/snis/solarsystems/zolon/p21.png -qUGExE3srvvIv7FQeUbX5T+IiHSBnB7kXArmg2PCv20= share/snis/solarsystems/zaurno/planetx4.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/zaurno/rustyplanet-normalmap3.png -x33aVFuYXOjZr+bj+CDTTwSVXEsjamsEQGzjJCdAqfs= share/snis/solarsystems/zaurno/rustyplanet0.png -qtRGWcoWSKQLix9KiSha6MSNr48I+s/9wxV5jLwA4oI= share/snis/solarsystems/zaurno/blueplanet21.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/zaurno/planetx-normalmap4.png -GuYtK+QiGtdsbPq1vCiX2+fzfUGarr9hs58wgayHOmk= share/snis/solarsystems/zaurno/eplanet-with-clouds-3.png -fgSUV8N5uQ/SA74U/wM/flQvPvnsTxZUb7O0PEDCgZY= share/snis/solarsystems/zaurno/blue-planet22.png -zpz/hXjC3wkDltH2uwPGULtEi/M7htTxW+8kK9zKhhM= share/snis/solarsystems/zaurno/blueplanet24.png -rIHzD0vOiLuI2GuEnVU9UELQBlt4Fy+oFzJToJNAIuI= share/snis/solarsystems/zaurno/green-planet21.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/zaurno/rustyplanet-normalmap5.png -FVmNDB6ejTWwevd23iA3PLg8ksBFW5i3jvAHzMlfNuw= share/snis/solarsystems/zaurno/rustyplanet4.png -c1V/CyfQ2+7xzsIubaSlpAD9TEihnbxTSP/iCkkRLjo= share/snis/solarsystems/zaurno/blue-planet24.png -eF+kzNCtcYuJ/ynfEF12y2qbUJZx8KLlN7YTxo1XOc8= share/snis/solarsystems/zaurno/purpleplanet22.png -QRDnG3PEBejVHRJvO2YXGQIBGq3aW1lcg6Y1/fMD9/8= share/snis/solarsystems/zaurno/eplanet-normalmap-masked3.png -mgEzfAiH8Z+jxT8JnW4DKeMU3+ry0MaSSebrV26IOTA= share/snis/solarsystems/zaurno/planetx3.png -V9mK/oH2+a+Bq4bWhh2hJSdn03pO1SX4qz4C9Shw2bw= share/snis/solarsystems/zaurno/eplanet-with-clouds-5.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/zaurno/planetx-normalmap5.png -Q/4RpA6oIdTX+cEfpDnwtriO3GTMzk0xuMM8i4Kp7+8= share/snis/solarsystems/zaurno/blueplanet23.png -W8MKskwHORQtP/UaOoT+7DLZIJDRasQs7i1m4dlWoug= share/snis/solarsystems/zaurno/skybox2.png -pwwkU8wttRHLhCNB0xQyWzsvkNrdvXJyQCBqtOASffA= share/snis/solarsystems/zaurno/blueplanet25.png -Alu9xtYT9W+HnGxcavenrd39+14pbZNkQscytg6jWKs= share/snis/solarsystems/zaurno/skybox4.png -ETZC9jOUvc5LiLQ0oQlh7gh7XFaFL0SpyppwCf5mJuk= share/snis/solarsystems/zaurno/rustyplanet2.png -OWF44jjgPIhbSkBW+ifeSiNlLU2V3+ZiZ4PKsgPjjb0= share/snis/solarsystems/zaurno/green-planet22.png -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/zaurno/planetx-normalmap2.png -fO9JRdr2ZFJtmdhDQcGQs4Jv6hEanwslFXWQD3ddYqo= share/snis/solarsystems/zaurno/planetx1.png -v4MDx2rG3FSh6fPTu2MzmlzCduDDeqY5c4d1kfZvzN0= share/snis/solarsystems/zaurno/eplanet-normalmap-masked1.png -VNL3xiEsVIUUR501DKjYIM9NCdPNL58oKahSSmJav0o= share/snis/solarsystems/zaurno/green-planet24.png -PKGIYxmb8A2/mh9Mxi5Op2Hup+5Q5/KarlQEC6Kj4UE= share/snis/solarsystems/zaurno/eplanet-with-clouds-2.png -cRxilkV9X1xXn0UmiWuVSvf7fNuXpEi/km211AB4nWI= share/snis/solarsystems/zaurno/eplanet-normalmap-masked0.png -Ay7Nn5zSsKbWbRgeqVvsMLC0vguTW3GfufFn0QP5PY4= share/snis/solarsystems/zaurno/planetx0.png -juX/RJ5L+Vr+n1L37ixC0rBDBawDWGCnnZ0D2NgSgEc= share/snis/solarsystems/zaurno/green-planet20.png -+ZMGxjBfuwGbF4rwIabZXouvN89jw2pJsoZ/JJOGBI8= share/snis/solarsystems/zaurno/skybox5.png -yqbi0dTnAIYx2d9XUWZDDrYl3sP4FcfUX1sjkQRpVxY= share/snis/solarsystems/zaurno/green-planet2.png -FuutGNlvZ7J8/6yo4imN5dPISZB0iq5mo3FxzrIFQBg= share/snis/solarsystems/zaurno/eplanet-normalmap-masked2.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/zaurno/planetx-normalmap1.png -Yr3d7WehefaFEM7YKB5TL3Sg8JuHu7abkEM4gwXZ4V4= share/snis/solarsystems/zaurno/purpleplanet23.png -NXOoyEYyfCpHo8KK933CsuSgypwUSYwNIWoe/vPx70g= share/snis/solarsystems/zaurno/blue-planet21.png -AKBqxRC0o+M28L7G3cQuib7+aQiEiUTFKerb1pHoZdU= share/snis/solarsystems/zaurno/purpleplanet20.png -CB+MvvkyDJH66fQUJCXSXmr9qWrZYO9Wm7Z4u3pImuM= share/snis/solarsystems/zaurno/blueplanet20.png -bVn0PZHqYqKH0Md7zBtYZEMP+4VWWEGYEKZ/lOI2jWw= share/snis/solarsystems/zaurno/Attribution.txt -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/zaurno/rustyplanet-normalmap2.png -zNu4ac+NJ11uZWxFUGqS1skiWIRQhSSsMYBG1xs+Eak= share/snis/solarsystems/zaurno/blue-planet23.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/zaurno/rustyplanet-normalmap0.png -VCIyMe8MW5LnxXBhLwmZBc4z2gscUjonDbYwTiA1pSQ= share/snis/solarsystems/zaurno/blue-planet25.png -G9qsbvwDqQ446m2Xl2SsLzQsJ3ppnMHbw6y/GhEXHZw= share/snis/solarsystems/zaurno/blue-planet20.png -n7dLBIYvD649WRxRbQlvZs5pSQUJLbECwYZ7U8eRnN8= share/snis/solarsystems/zaurno/eplanet-normalmap-masked4.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/zaurno/rustyplanet-normalmap1.png -Ao4cWPX1u4gARf6Ux5CEpx+rlNjzWdW3trsVfB6vLa0= share/snis/solarsystems/zaurno/eplanet-normalmap-masked5.png -3xIbtf8CqbAku0yId4OwDZDwbJFZaP/xj0qdzfngfXk= share/snis/solarsystems/zaurno/planetx2.png -pigv1/HBbULhBPZGHyCqKgFW6OLqkh5GHwsQTbRrBYE= share/snis/solarsystems/zaurno/assets.txt -8G3yQMTr2ljatAbpTSDW5Eo5biUfw8HhfxnbzYOu3Ug= share/snis/solarsystems/zaurno/skybox0.png -OTWLNbPt08nczBE+Le6LleTaqm1DY0e5yzzszPe/HI8= share/snis/solarsystems/zaurno/rustyplanet3.png -ZYrTbkHiAs7LGGtD7vlxY+/phGr1EBfIFz7AyoBrRMg= share/snis/solarsystems/zaurno/rustyplanet1.png -9sHTLZNMTSOejmvNXUeRW2I866mX2kj87uegXQsENHk= share/snis/solarsystems/zaurno/planetx5.png -n4RyZtk5J6Abr6Cf7fcRszKbG1hExxIql+O0K/LFoxU= share/snis/solarsystems/zaurno/purpleplanet24.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/zaurno/rustyplanet-normalmap4.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/zaurno/planetx-normalmap3.png -gVsulMCOnqkjzv3dxkRMXDY8G8LQwjxi0Yw5wCQaTqs= share/snis/solarsystems/zaurno/eplanet-with-clouds-4.png -KQqP0nX9PO1KM+OC8lSn8/x89JEd2OAzCXROGE9sxow= share/snis/solarsystems/zaurno/skybox1.png -d652OsBsI/l9woHkKsTJlsTT6v2LjFb7SEb3v7dWfwA= share/snis/solarsystems/zaurno/eplanet-with-clouds-0.png -8nkAtwZ/pujSppKi5ecTetsJbO3TaueoJSsisl5WR04= share/snis/solarsystems/zaurno/purpleplanet25.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/zaurno/planetx-normalmap0.png -i8nUMFG7u+wvJW3ojPjEwIndDmv8+oBBp/T9XumLzyU= share/snis/solarsystems/zaurno/blueplanet22.png -TUbTrWVJPH2gNEnOPVS0oI55TBM+nVbmfagQlOZnmcI= share/snis/solarsystems/zaurno/eplanet-with-clouds-1.png -hEn0fkaK496Zf4ubtRifJ1VYwQTVfG+8nIpTNxb3JwQ= share/snis/solarsystems/zaurno/rustyplanet5.png -gqnO96sSyoZj/p1Bl2BCvLcaGLsPPFhCrcFe89sVWzc= share/snis/solarsystems/zaurno/purpleplanet21.png -HixBGDr7SMvgvOOJ7nsdXraYaSdwe30U/VYAwuwfW9M= share/snis/solarsystems/zaurno/green-planet23.png -TyLru2RLAR6XD4w0Wyc2+1FV2RsFa+HD+zMbhjFxIUM= share/snis/solarsystems/zaurno/green-planet25.png -N01r8nUusMlrRP2kJ2ljx9wHHRnCcQARulvR8IozSxI= share/snis/solarsystems/zaurno/zaurno.png -tnAAF5HEcUYQ9ZLnQm349t6LsF3aqYpiQ8ywuyyccGk= share/snis/solarsystems/zaurno/skybox3.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/default/dorjna-normalmap1.png -sIXr0Bj4VfkmueCi99V+Cyu2DcJDX0JTjVMxHlDbRfI= share/snis/solarsystems/default/dorjna4.png -5KJIuBAE1QM6JKI5p8lL0tkZdSGzTX5OTnFdnvY2BqQ= share/snis/solarsystems/default/doobion-with-clouds-4.png -9yvHoWDCYr71kgS/JVe0dl0tTcnJHwmLcPyRXWT4m1c= share/snis/solarsystems/default/dorjna0.png -zO6CzsXEQQhnddEF+C7wWaEs8OUgU8t5vr1FFv2PjAs= share/snis/solarsystems/default/dorjna5.png -nwohqXZFyDjM4WhmYyCDHX3A7h9XrQv52o2uEfNDd+Q= share/snis/solarsystems/default/doobion-normalmap-masked5.png -k7+yV4PTzTLAgencwzTVmA+l/sH8wnpoYIQZyOlA0BE= share/snis/solarsystems/default/doobion-normalmap-masked3.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/default/dorjna-normalmap0.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/default/dorjna-normalmap3.png -zjyld77VeakgNxjsP5QMvTQRKGQW7WHvmC0n998+LLc= share/snis/solarsystems/default/dorjna2.png -c3ONINYNvRueU4fQ11YVhwuczEvnHR4ojywOjqj/sio= share/snis/solarsystems/default/Attribution.txt -7uIMMaCaxtTrcdpn7OC7b7thjVI4DcIcdMazlFULqvE= share/snis/solarsystems/default/doobion-with-clouds-3.png -xamy7rEb/miCg5YkYWq1xlrcStBTni6udNE8UEptKwM= share/snis/solarsystems/default/doobion-normalmap-masked0.png -Rw5vvnELq7zQfee0TQGH2VpwOVzLtenoVT9ce7aN2pM= share/snis/solarsystems/default/doobion-with-clouds-1.png -p6TqlUk2CQgcQ61dc2NyqvHb4musgcmeuA7TaZJ8YqY= share/snis/solarsystems/default/doobion-with-clouds-2.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/default/dorjna-normalmap5.png -6IDBbqRLs2EDcYhiyCcYAY0Qc+gbuoflCipyrIU5Zgg= share/snis/solarsystems/default/doobion-normalmap-masked1.png -tsDC31yeqLRdhwimLmfSvC+CwRxQc3xhCpKrk0vGN24= share/snis/solarsystems/default/dorjna1.png -UyBlhUkxDMo/I1U0NBMopuARzwFzeMG7H2WSu+eV6Vs= share/snis/solarsystems/default/doobion-normalmap-masked4.png -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/default/dorjna-normalmap2.png -8OSKN0W/qMsVt+WnovWMQG8PB7sizZ/bVCqZP/R/b3o= share/snis/solarsystems/default/dorjna3.png -H6Gy4m8U5jF6xUylI/9luYMSJww9T+l5xYcD0seVgY4= share/snis/solarsystems/default/doobion-with-clouds-5.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/default/dorjna-normalmap4.png -xUqXbIomxf0Aa/WBuugG8AUPSu8C0wLMXO6ula59UlQ= share/snis/solarsystems/default/doobion-normalmap-masked2.png -DSPYnoHjPQMAahf6IM0ecH+u8lA+/T3etenKBUVq050= share/snis/solarsystems/default/doobion-with-clouds-0.png -FAMy4WIyKLVcQuIIYuArdZk8E3n7Og4KwtPlUOreQT4= share/snis/solarsystems/sirius/hedas-normal1.png -HYzl8w3bgbZaGce2EWJ//6bYWT3vnFBuuCUg/N3PM/I= share/snis/solarsystems/sirius/hedas5.png -VnZDvtQTbhQ7JQHDdxXHkzVaexgoOPFQfM6++aEd1uA= share/snis/solarsystems/sirius/hedas2.png -/Vjv29yT47sXGrMrt07DMpqxjCqA2xDmhMKysQCnfdw= share/snis/solarsystems/sirius/kadar0.png -hTLzcczwDwuC6LIJriOjszzxjDdeOSZfAbmE4XiXGP8= share/snis/solarsystems/sirius/kadar4.png -LcdL7SKjZDz98Px+X7ZRJbI1qZdWY0dKNcSf4MYux40= share/snis/solarsystems/sirius/corealto0.png -aEd4aergJW9VlRvbncaLbMbyN6TsftLFLKH9yXCLCj4= share/snis/solarsystems/sirius/zukon5.png -/1hdDuZhP9BoiTYyTtRs1/h8sSBOWrYydEAnrgXvohQ= share/snis/solarsystems/sirius/sun.png -2WXEu6aMY7u7OLzTVEXTU1LRWhAB/SAlw94Vn+cKzD0= share/snis/solarsystems/sirius/ourck-with-clouds-4.png -ebF5ex1gi6+Pr3qDp76zQY0yf+F5nRdBsmmwvotKtq0= share/snis/solarsystems/sirius/greenhaze5.png -oWC/wCmxpTNP/9tohpojGDViEufcrNWZMCpGgKSXpl4= share/snis/solarsystems/sirius/hedas-normal4.png -WqMJMjwIkO0lrj8U/wlBanrFhkpGoHNtfax8P6kcQfA= share/snis/solarsystems/sirius/corealto1.png -jFxrrOLlIFvqA9RIeGM596Hflgot/UaJmwLi4HwbR90= share/snis/solarsystems/sirius/ourck-with-clouds-5.png -3Hd+/FQUzcHjXmtd4lmW5usRTuMDY5qoy9GdHJIqOZs= share/snis/solarsystems/sirius/corealto2.png -fJcSWL0wQOxovlD6cOKS/eIQ8YJVy27hr28UXK4aNaM= share/snis/solarsystems/sirius/corealto4.png -v/m3G2kd11bo/Q+KJGiXlj9BdFWH1o1LNKjTGNjhni4= share/snis/solarsystems/sirius/greenhaze3.png -2qNUcfu3rrGmouw2J021pke3CFLVRTPM+xSoiy+J0FY= share/snis/solarsystems/sirius/vorloxx1.png -bSpKmVOFBUDAcE/OEZIi2+glsLqW865UgS4xBSL8KjQ= share/snis/solarsystems/sirius/kadar3.png -VduM1PTe3LRT9oSKFoaQHMzFRKx2sHofcVW3awA7HKk= share/snis/solarsystems/sirius/greenhaze2.png -j8s01LQ5hrhqtm3OpuguusGd1iR7lB+yJHmgujEIn98= share/snis/solarsystems/sirius/corealto5.png -kVx6rVDuLywLCM8gXJRgEaFSW5ZoldJESdBVQkzbd+Q= share/snis/solarsystems/sirius/corealto3.png -ApYBrbMNPtUC5yshGeqJgGig02eGqN9DHjaUUNB0G1k= share/snis/solarsystems/sirius/ourck-with-clouds-3.png -HOrHbDAAopA3wLoQm2+Bbxub9s2dbfeB0QYVggyM3TQ= share/snis/solarsystems/sirius/hedas0.png -b7cvV9/6vK5fyHu5DWeZNR2IuyexvNZLLozioD1FKFk= share/snis/solarsystems/sirius/hedas-normal5.png -Eqm+1LPTBJYcnfCAhLw1Qo1Pje6UFHurUhYlnAtQ9rE= share/snis/solarsystems/sirius/kadar1.png -Xt7GRzMaXaTqXWLq7jtnxtowiUSER2Uft72h0h+yv7Q= share/snis/solarsystems/sirius/hedas1.png -zjGjVCQkMP0lfx3SYH2oeqNDJPGCExFSmMsrqrZC6Jc= share/snis/solarsystems/sirius/ourck-with-clouds-2.png -7pbF7oWOvkMLMughk4PDUUcrJ/UBE/1ajyVamLJ//Po= share/snis/solarsystems/sirius/vorloxx2.png -rKqNFsPmghfA6aNU/24EQACr2vq7tSgewvDY1n+V/eg= share/snis/solarsystems/sirius/Attribution.txt -u2NtWoyYZ4aDbKdqQfUawMQ4i9xhFmsL7bQJw05FBG0= share/snis/solarsystems/sirius/zukon0.png -/2B5NKM7TdpqwGLutEd4t26bzNw3aX6OZ/8/IUVjgJs= share/snis/solarsystems/sirius/zukon3.png -d2O/P1s7HZk/L33BcB1rL5w4/loz8c7mfOcLPP2JONQ= share/snis/solarsystems/sirius/greenhaze4.png -KgVhir+0buTtrUmTea48i8NaLeJ/IytovxVJFcUqJLs= share/snis/solarsystems/sirius/hedas4.png -4becAyUHYeGshvGvbeuSFOrt6jl2O9+RS7Wy92xjL64= share/snis/solarsystems/sirius/greenhaze1.png -hEI0dp/7CDIpP/JGNPy3ib1bMvF2bF/9pw0BpyxY46g= share/snis/solarsystems/sirius/assets.txt -5D0AfPTDRcgt3HqkWgE9vOVSd1KVeNTA0XcF3Hiv1Qc= share/snis/solarsystems/sirius/kadar5.png -4giKwYbDgQqAIW+wRaQm0PbfIpi2VsEMAH7qke0P5ic= share/snis/solarsystems/sirius/hedas-normal2.png -rkgVlAL6bFFbOzXsB16BrSzKc4EkcuOjv2FgvgIwIBo= share/snis/solarsystems/sirius/zukon4.png -35jmZnOzC8myHLR/tiWhaxPQqlsnpkCpT4GDJAeoYdQ= share/snis/solarsystems/sirius/zukon1.png -20GYo3frFjE1tMXNtzfAdXOZX67jDcYUk7N+CgnWxKA= share/snis/solarsystems/sirius/vorloxx3.png -ZqtblU2UEq2XVmFeQv+fx31w9ePUbc1++U8a26XaQqg= share/snis/solarsystems/sirius/ourck-with-clouds-1.png -KP31+2Wh4E1J6wSiPbvxDqG212QoYZyF/sN5pnMypRs= share/snis/solarsystems/sirius/zukon2.png -NMJA3wZh2jS+QZYpgvBGgv5vLgqbRk7cHel5/K2x/qQ= share/snis/solarsystems/sirius/hedas-normal0.png -OLZBmMS6AAuKXrvj5JqP7O+da3JazfLDDJGts6tWpu8= share/snis/solarsystems/sirius/greenhaze0.png -jvdgIwPyS187U392KjKujMfaRY7Rwf8EampqZ9COh/U= share/snis/solarsystems/sirius/ourck-with-clouds-0.png -lGvRL9acky+8DyOuMLDQ4Ilt4389ihSPlHjE34Vgw2M= share/snis/solarsystems/sirius/vorloxx0.png -+jGXPd3L1U+pTPj1TInZbMaAeomvsJlgkT+qeWZwBXg= share/snis/solarsystems/sirius/vorloxx5.png -96S107ZhXChmMJCMsU+WsVM2BBSgmEfJp9WRl/eTDqY= share/snis/solarsystems/sirius/hedas-normal3.png -GJpeF5TnySNxXeYHdjhV64MeO9FbyxxH2IfAgw1yyVA= share/snis/solarsystems/sirius/vorloxx4.png -ZZJevH4WlEaFW2K7fiHlZaOKUSDOVxzie8okz9X5r/E= share/snis/solarsystems/sirius/hedas3.png -XeBQUaNINp+mNOe96dHC9LJEwpspvA//KaTuoo2HwfE= share/snis/solarsystems/sirius/kadar2.png -45kNBDay9iflwV5ZJMidr05Z1B8Og3d6GQpyi7V1/Os= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-2.png -J+8gHsNquDS/TBHOr/tWqBLFnipaYPJeVq+jSgOGFtI= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-1.png -qTWQrRPCAj2QiKxZ8T5y77lVkBmSMvZaV840T5nIj0I= share/snis/solarsystems/varco/rocky1-rgb-3.png -aig7metG82KALgB65zs9cqr4Jf1vjtPQd4xR+abgz2Y= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-1.png -iE7g2ycanvRlGSzn8bKIZ2qw/emZyKfHwFT5dVRVxvo= share/snis/solarsystems/varco/rocky2-rgb-3.png -iCXdBH1kbTej3LSYEFgvoeT4kC5oGxnCTQc9V0MMn28= share/snis/solarsystems/varco/rocky1-rgb-1.png -OL5IpXvvudBstbfIeXf4ayoUDwzLP/1fJ20zV4dCgW4= share/snis/solarsystems/varco/rocky2-rgb-2.png -DiPXSd/PxqGiykJYTN72CwIlgU1AJAR94oS1L5UUc/0= share/snis/solarsystems/varco/rocky1-normalmap-rgb-1.png -IbwHIOoPVY50TGK89ZC4r7urFn9RK05epPjy0N7TDKk= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-5.png -EElmDoBRdnQ74CYYnjYgftBdf6+pfwuTIWdXUK/poaE= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-5.png -bPBP53VR2DWLuc6tphFv9iRyUxOu+VkKRNCOwzyH9zs= share/snis/solarsystems/varco/rocky2-rgb-4.png -ebJsQQwlTddriqbEr3HxnbQQlhXuQfd6bYZJ2hZw+DI= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-0.png -zhloJokjnL69H2P3s6KuHBIB4GukFLAtNzFHxt2IqkY= share/snis/solarsystems/varco/gasgiant2-rgb-2.png -GxyRwRguF9IzY28DKS6dYlTh/DLm5ka0Cwg/nZwzqWE= share/snis/solarsystems/varco/rocky1-normalmap-rgb-3.png -+jONm1AIkMov5YCwyhRhjazT7VCpzt/UG3fLclwiUX8= share/snis/solarsystems/varco/gasgiant2-rgb-5.png -tYNgF2nz7BXK8ePEQreK7wJ4VqB66fExCvZh6QmMbf0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-2.png -NwGEBxalgracq4y8qVohziZc/C6wup79+qFH41RDwdU= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-4.png -GDDm6l7PiTMR9oSzyAQ8RUJKIf+KSf78ZiWPoa9geUE= share/snis/solarsystems/varco/rocky2-normalmap-rgb-1.png -tmpC6S/HMDtFUkAAJupnuo/D4Rm8datqzi5brhEonC8= share/snis/solarsystems/varco/skybox2.png -JEL/QGY4XeJlWOiPnMNM70kq0RDlkUSzbYvd8/CVve4= share/snis/solarsystems/varco/rocky1-rgb-5.png -dY1xG/oJexnnnohp4jcZtHNPfVtV04M8CQ5HDWOkoHQ= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-2.png -qJGGUbEAdmsZv729EkGlio67QEBvzlpfPMUHvQireHw= share/snis/solarsystems/varco/skybox4.png -9x0mSj/Hrt58utVWTJMxrbEx13jG6G/VYLuOcjJECys= share/snis/solarsystems/varco/rocky2-normalmap-rgb-5.png -5ZuqshgZ8RUTllah/pbPeLLr5GY63am8gJqBxOQhzrE= share/snis/solarsystems/varco/gasgiant2-rgb-0.png -5WCIzB4JeSClLCYd6sj3MICNXVZ0IcIsbTqbZNC8188= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-0.png -/cX3f5Mp2JeuXgHt3Go9OlfkdZLJeeL2ImZ+sL0n4vk= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-5.png -/ZElOlR6oUJWi23MTH68pTAG4r2WQu6bmaFvlqXx4RI= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-5.png -iqdyiT4tMbzDBp0vneccU+G6lpWOKPJzjoxH8qiQxjo= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-0.png -tuCrg2Vt7VgnJlrvTwEoMSlw2vVr71aDabuaXjEjt8M= share/snis/solarsystems/varco/rocky1-normalmap-rgb-5.png -4KowrbPo46fcxXEXk4hzyB1EfuApgxTieYPCM2CaqzI= share/snis/solarsystems/varco/skybox5.png -0VD5iTGUFQuB5qShWUr4+dSatY8K8taF3yIwB/E86ew= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-2.png -FOUi83ck5URgBeYbMcVqZnQ6KoCDR9ogtlKflyV4Uqo= share/snis/solarsystems/varco/rocky1-rgb-4.png -2eJ8YB8sBTgIYOH56sOwxS09phwjjKH7q8rnmgDKv2A= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-4.png -k0M7y3TOmKF9wBa2xHmzm0+Odl5qOkJFIcq0CEw2JBo= share/snis/solarsystems/varco/cyansun.png -avIQ9AmsfvIFa+CeUAoVwMf0XVFEQEHhLcKQKaZfQq0= share/snis/solarsystems/varco/gasgiant1-rgb-2.png -ZGmm07cAWnab6YNI4804xKa1uhtanPWJhLSYUCKdnB0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-4.png -0HYgrYu4GZz1twT3MQuIFLAAX1N5MsDoDUIhygtzITs= share/snis/solarsystems/varco/Attribution.txt -+QtWehf6QEbGOdCwxoRijW0N13vMhZr5+mg/UjVQfXI= share/snis/solarsystems/varco/rocky1-rgb-2.png -tqQibk3qJ9DLFT2fommVsShJZ6ZU/In0yn/E5vEzVjg= share/snis/solarsystems/varco/rocky2-rgb-1.png -tk4v4ML5qS9PsMdBxfRkGDzl6VHeu7nqyZ9WDkRhQgM= share/snis/solarsystems/varco/rocky1-rgb-0.png -fdvOUX5NSBAC0N6UhBM80KwSq7PqT57TDXrDjGniq04= share/snis/solarsystems/varco/rocky1-normalmap-rgb-0.png -CMhKXNM86d0uxrGMkbOV/XCYhldzfJXXLkhvwZ/oRQw= share/snis/solarsystems/varco/rocky1-normalmap-rgb-4.png -B4/x5htXm734f42CY7b1w6aA4EdG86r4aAV93u1ioH0= share/snis/solarsystems/varco/gasgiant2-rgb-4.png -PE+3P2LmEJKrcfRsiS3PaHoUobPV2v/FBjCsYoTERnI= share/snis/solarsystems/varco/gasgiant1-rgb-4.png -D/Uogk3SsiSCf4PzIim5qjgOfSgW7M9w4enpRPv/PxU= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-3.png -x9E/9JHenQOXmYEDAmzxBXY0Y7MMK0hCKaKLuSlbJwA= share/snis/solarsystems/varco/rocky2-rgb-5.png -nqBawbQrLij82Y7ngpFeNAbSAr78s3kg9nqm7RcCq9U= share/snis/solarsystems/varco/assets.txt -Ho92BAcS3dnxajTd7+10N/r2i0FsPCAqik70c0JOT1c= share/snis/solarsystems/varco/skybox0.png -+WtUZCl+eRckhs1aN1+SRGyKbusip793IQMrZPSwHiw= share/snis/solarsystems/varco/gasgiant1-rgb-3.png -y25+up8Oqh7mlBGP2X3mdvZCc+8O7StgrtxO1+MFC64= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-0.png -bp1+7ihRZpoukBNHF6sAcfY3EdIXeJPYIOedSma2qU0= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-3.png -kbF82UuRkOVa7vUF3WqLJbyNNed8z//cTn/u5hz+2k0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-0.png -ROpzG2+NRxKYQvNu6oVk6/LZEhLjsqk1YabklQXD8oI= share/snis/solarsystems/varco/gasgiant2-rgb-3.png -3R4ZX8Lj152xkDnH/xTnRq5CWrv7EvRUnF2Ju7ZSJB4= share/snis/solarsystems/varco/rocky1-normalmap-rgb-2.png -Cg/yGwXLLFSeD+TjKBaDErt/vA8KH9fCLcm1/5MhsJE= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-1.png -DNqrIZym09ahYmh8lYSPZ62fqm4jXcsupOZkVp71ks8= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-2.png -BGxt7lC1xQCdF4RA308rt8BBZa1klNbIgQrE1GQ+30Q= share/snis/solarsystems/varco/skybox1.png -hiQd0EMWTTL3tqoxd1CA4WOSAAUZwIeLqLPQZ4J1NF0= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-4.png -qbjV/XbwRyz3/60c1zRGuZIJrt+W0TBkiwjjQ18g5Vo= share/snis/solarsystems/varco/gasgiant1-rgb-5.png -TFAQKo5AO089kIPgD1TC7Oq1re5kIbaugMNr1kv268k= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-3.png -+8ZY/UHbNxBYdMdNVv6dgXi4zN8onGkNeFR18rjeb6k= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-4.png -hIeMJEvU8QS62m5bZxtWDU/DGKKIBzz5XhmO7e9JzIw= share/snis/solarsystems/varco/gasgiant2-rgb-1.png -VA1xIe2MfpKlk0sq46Ku+WBBwXyzyVy7dnXWPHPRL30= share/snis/solarsystems/varco/gasgiant1-rgb-1.png -JBfcPnjAjipuvh8fmPREAoXjrLT8PUwEW8uzPy16qo4= share/snis/solarsystems/varco/gasgiant1-rgb-0.png -sLJOdLCg/WKqhYr+xP49WGVB+MzTI1VLGSMTQKbLBgw= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-3.png -1Mm3XBhOG3rwO3/zitFDXQEQp33ITKV4IgkaeSTHKqM= share/snis/solarsystems/varco/skybox3.png -vr8X76f5YDEAbfA0UgnXvEP3oAOx31h6XQnSDGV0g6w= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-1.png -yCBh2pxU+wOHaDKWzW6Elk1WDZSAALhWi2NFNyNCgU4= share/snis/solarsystems/varco/rocky2-rgb-0.png -AfjOAN/53eI1+Sl218R1jRE4CGJpvsS0XI/Im6Rxigc= share/snis/solarsystems/varco/rocky2-normalmap-rgb-3.png -iwtnl97wonMty289zCdlXtm73XFG9YYtXS+kbAk3mQA= share/snis/solarsystems/polaris/albara1.png -oDrUBGPPAKZ3ow6ZFXRsk+TkF/q5+Rip0SwllSTmXto= share/snis/solarsystems/polaris/nemalta0.png -dOOgkAgI+zUN5Nhn01POWLbfqRyQXc1FHd3XALsvzJs= share/snis/solarsystems/polaris/vedekri4.png -d57loKDnKdOkYtbbenYHY6lyB7cyuw0BBgZ0oRMD8V8= share/snis/solarsystems/polaris/violethaze4.png -caBJqZR1MZ54PWZAcT7di0suxEDws7dHc/bSdzQLOUE= share/snis/solarsystems/polaris/nemalta5.png -+9bFZQUxDuRyTTkTwK97HHeiV+Uqfx2WoyJZrmDDLHs= share/snis/solarsystems/polaris/violethaze0.png -E5KCx1ct154qS5ICUzy+AJENTGtYr+ml21ZBTdZz6BM= share/snis/solarsystems/polaris/sun.png -hLRypc7xzmUOfAm7p21qe7pQPgLyzAkywi/e69kHGWY= share/snis/solarsystems/polaris/elibon5.png -7+MamM9cC/9sYPvtZ0+MLhlxUWvqHS0gkMrNUQ0vAGA= share/snis/solarsystems/polaris/violethaze3.png -R/3vac/SJy0EVKeoWX9hSJ67T0TjLQ1VkamyG5u0auo= share/snis/solarsystems/polaris/elibon4.png -KD5J+DWwdFQSXycJtdvGXThP3zqZUboSXcM9yy8RUgc= share/snis/solarsystems/polaris/zebina-with-clouds-4.png -sYRLAnoRQWMoQWmghNq0B9eeUzWyUHTGklaKWzxIWYY= share/snis/solarsystems/polaris/aronov1.png -noCTDPnEDaBGacEuzv61ue5wkpkXLFmvSYaro8NBAPk= share/snis/solarsystems/polaris/aronov0.png -0FOWT7CRIVr4Lwu1a2Jc4ptEAVTXgdS2YkKXZ6bGMKw= share/snis/solarsystems/polaris/albara2.png -nMcEM59k5gtlH8jI5vryOqJzZ1mQZKDP4acV+goUyQ0= share/snis/solarsystems/polaris/nemalta2.png -cgmo8BensHPQ322h0ODREEPj+KkzlxutodrMM9lImTc= share/snis/solarsystems/polaris/zebina-with-clouds-5.png -mTyFx3CbbWZ2TsKS0tA4YZQcu1aqM+W7y3o1Sssx91I= share/snis/solarsystems/polaris/aronov2.png -tdA3YFJigRNgqEQtero+2sbpUGRX5mAsWqccTHK0CgI= share/snis/solarsystems/polaris/nemalta4.png -/NufHzjKjG3ouOojRmVaVDOWRh0tC1pBtrS/oBhYYwM= share/snis/solarsystems/polaris/albara5.png -uojpbLVHA/D7Ow42NKfftBQUUctOq7FaTRO1Kxh0n3g= share/snis/solarsystems/polaris/violethaze5.png -AjombVeB7jyAG4dPuo8m4OVTfJ5i+1OZW3eBCsCRViY= share/snis/solarsystems/polaris/zebina-with-clouds-3.png -q778f3nY8CAEZsaq8RhdIu9m+r0A+WDkSZtNMKvQxtU= share/snis/solarsystems/polaris/zebina-with-clouds-0.png -aO7AA3JAo6kd4gp1JeJ1E+mLG2lCQeXwh4CFoYOehHw= share/snis/solarsystems/polaris/zebina-with-clouds-1.png -2jYJdFmXYBf/qFizewZNy72of41F+U0OI/vxzXHwiO0= share/snis/solarsystems/polaris/albara4.png -HW7fALZFUtkyjONohXmESF8g+wnK4NYqWyng9DQO06I= share/snis/solarsystems/polaris/vedekri1.png -FgmF4SZdKr9PDnLsUukv5UOz5V8OPm2yrPuNz5/zWVY= share/snis/solarsystems/polaris/zebina-with-clouds-2.png -JBR3NyPGWNWWAtcd/u/ccBJUIgwLALWTTLYuDBr68w0= share/snis/solarsystems/polaris/elibon1.png -zbp2xS/oyV47vDz3UZK9Bd1p74qQf+m/CtnmHGVwUXY= share/snis/solarsystems/polaris/Attribution.txt -TynfucWGYJseinaYbRub1D9z+N5+NC4juPX31Dsmq3I= share/snis/solarsystems/polaris/vedekri2.png -cmR2DoifrhWcMn4s+JWWd8Hst7wPc1NCnPw86JFTY9o= share/snis/solarsystems/polaris/vedekri5.png -f3oNTlGd/Ywahzfkct1+3L3dlI2AVuaQGyrQh41uw+8= share/snis/solarsystems/polaris/aronov4.png -ttOCTjJ8pIBAnISlnvqfPvYHv37B/jBNjtwJABt7zvU= share/snis/solarsystems/polaris/nemalta3.png -jc2UAQJ8IJ7yAfOiXRC/9EotnP22Z+Zo9LnSgPge6Ts= share/snis/solarsystems/polaris/aronov3.png -nLIebY4F9LQQmuIdQwVvoJeZPuLHZsTunJQWQkTB1Dc= share/snis/solarsystems/polaris/violethaze2.png -ob6EARWyo5dWlgP/hTkRuUbDdXPlKxwBHAtFpEuMNvY= share/snis/solarsystems/polaris/assets.txt -0my0COe4DcS35GWF/5RFNIAXPZRSWak7Ez+fiPB3o00= share/snis/solarsystems/polaris/nemalta1.png -UaR8GWaLGCYgFmd1oTwFN3DUa1D1glwVGydF54biFmA= share/snis/solarsystems/polaris/elibon0.png -r/YdXNGNfipb/lRzRi2t28kVNZ4+izx0e/o3k8eoNNc= share/snis/solarsystems/polaris/aronov5.png -xpJ+m0heCjoEZOKC2DOcK58fQi93X5n1pKiWjDD1z10= share/snis/solarsystems/polaris/elibon2.png -VqW6BjQRVDqDLAXmE8dDzRet3RsyW8cNFcgojpyP4Es= share/snis/solarsystems/polaris/vedekri3.png -8AQw5nZnjrfSHIMbpf7buENdL8lpug7/0njLe+4AwiU= share/snis/solarsystems/polaris/albara3.png -wAnczRkVAmRwMNK4zG7z9kjMjhP+p3Sf0G2mI6/9fTs= share/snis/solarsystems/polaris/elibon3.png -Vpa1GoMtkBpMlT+ClTxQ1fBYF2OrGIlDNIQAhUuMub8= share/snis/solarsystems/polaris/albara0.png -OtAfS3JP370KbVdpwUwpS2HeFC9OCuC/am0HyVnPMEU= share/snis/solarsystems/polaris/violethaze1.png -XEGeXVOjBipOFQor77wbkSm+hQYBPaFE5s6jq8B0uVQ= share/snis/solarsystems/polaris/vedekri0.png -PLF1+3KtXYIXEccW1HLCXrKoPdBHgEJowAcnEfbZN58= share/snis/solarsystems/quidgebo/kratoria5.png -jBAyj1QG+vyVA2UgTNoYIPz96+VxxKpdgWJwp/dHgf8= share/snis/solarsystems/quidgebo/kang-with-clouds-0.png -dSlKRwxv0BAIWEwYUqe1BRTjYNnDYDKVDeqrLhoNuJc= share/snis/solarsystems/quidgebo/kratoria-normalmap3.png -MSBCWsYas6LdAmy7Yy+tE9hUiEDoIv6yKbBm3QFKGbY= share/snis/solarsystems/quidgebo/kang-normalmap-masked4.png -b9v7ffSTCB9ZFDenAAhwgLHH3jE5lHbG3+Yyd8fsom4= share/snis/solarsystems/quidgebo/lettek2.png -YsJ/StaidIAVdoHlRgGi2PlZ8GWtZQiPmVlOQl2jUSw= share/snis/solarsystems/quidgebo/sun.png -fAjzv2lBvZeQTtEzTh5G3pc5vIaYmnbitbgZB9EuxlY= share/snis/solarsystems/quidgebo/bluegreen-skybox4.png -r+EH9cPN/dbWINA3Q0pE7nO9M1GUwDSaNaynBjZ3S+E= share/snis/solarsystems/quidgebo/lettek5.png -fJ9Cvfgpjv/rNGbQVTDK/2jMNQVsXvJPEGEKltKKxaE= share/snis/solarsystems/quidgebo/kang-normalmap-masked5.png -6f/B4HFLh5d1iajseINB+C2uyd24MNOem1t+lMB7Soo= share/snis/solarsystems/quidgebo/guleldob2.png -1EWkSq7803Dzv5mRkHSrQRkRRHz0bviQu8TVrxwf44U= share/snis/solarsystems/quidgebo/lettek4.png -QjRMGnpOeRIqwd50/OfVgKziHvinWBgAxvp7UULfK3w= share/snis/solarsystems/quidgebo/kojax-normal-masked3.png -0jnYlfpRV3+jQcbyYvBPJyc7M034ttq0RY+s+//esG0= share/snis/solarsystems/quidgebo/lettek-normalmap1.png -f534Qf91Cd/5Lh0xZftuTWbZqnypU3bZgDoRgchBpy0= share/snis/solarsystems/quidgebo/kojax-normal-masked4.png -wAM1cWZbO5tGqQDLhkf4VWhLBGE9GxGTX3t9hZkz9pE= share/snis/solarsystems/quidgebo/behko2.png -Sc7YCiE8borxZr0b2MmR3SWmK3mIlOGF4p+uj8lXeLI= share/snis/solarsystems/quidgebo/behko3.png -lfOTubdM1u9ksbN0vx7sqPSDqzDstyzeCfqDICJPF1M= share/snis/solarsystems/quidgebo/behko0.png -4fDkozTa9t2rZk56GNLolw12auy0r/Wtcm5Bbit1liE= share/snis/solarsystems/quidgebo/kratoria2.png -wgFTS+fmaDJ9YKt6RXPkx/X2Oq3+fZgie3Uss6zyT+0= share/snis/solarsystems/quidgebo/lettek-normalmap0.png -kfzGVJjwqfxvNUp3uoFDmj2pYuY0kh652uH7SdfF3sQ= share/snis/solarsystems/quidgebo/lettek-normalmap4.png -UMtH4lm8Er2rbcW/a3Uoxg68vMkoY4cbwkF+QDyW7eY= share/snis/solarsystems/quidgebo/kojax-with-clouds-5.png -31gF7oRhj5RGLj7IZhZRQ1v3Rbty7NLgP933lM0FoSg= share/snis/solarsystems/quidgebo/kojax-normal-masked5.png -KJdABvovoFXOJaLDswGV6a5lKFfV2qJtf/xSdEwOcMc= share/snis/solarsystems/quidgebo/kojax-normal-masked2.png -JLGPe0LfjGvlzREaaCyw+/aVf62ZO8C/zMwcnJgGRko= share/snis/solarsystems/quidgebo/kratoria-normalmap2.png -Swi2R+JYzp4Z5RK64HSIRvXRvM93pNNtlbMRMxYruAE= share/snis/solarsystems/quidgebo/lettek-normalmap2.png -nARQLNdm090STkB37Mif6ZV7mq37WJARxc/HCez9AmE= share/snis/solarsystems/quidgebo/behko1.png -Oib/X3EV4iLmuhsYleRbofbPtx1yx/dKqbJhYUDB+UM= share/snis/solarsystems/quidgebo/kratoria1.png -osHNjGV7NDdTz7a6shoizSi/4QSZ18we3lvx3rBW5po= share/snis/solarsystems/quidgebo/kojax-normal-masked1.png -5Rru/MmfP/Pob5I80jmHLm49SXSv4AU0rIQzOKSwnUk= share/snis/solarsystems/quidgebo/bluegreen-skybox5.png -DWmRJs/21oU3nhIvLbO7U+eIDdliwtFWirxNFpJcmqo= share/snis/solarsystems/quidgebo/kojax-with-clouds-3.png -CgKZcLW7Xl4FMJzTyV7x9QhqOPOZu8Y21tPeEJNT25o= share/snis/solarsystems/quidgebo/kojax-with-clouds-2.png -9rsxpZS2At9axrGJHGgtcWwkPfupNmIdwEihvf5GzTo= share/snis/solarsystems/quidgebo/lettek3.png -qcHt3XlbJ7F6SELiaLAxLvkv2aReEnGraxzZ7xgaY6A= share/snis/solarsystems/quidgebo/kratoria4.png -DeggS/E4+5+iHKtPfvQl59+dhGLcHMvnLKgBr03a8eA= share/snis/solarsystems/quidgebo/kojax-normal-masked0.png -lso/dzDCbgQP5x9tTcU4ML2VFiYW4jeDSdebyJR98jY= share/snis/solarsystems/quidgebo/lettek0.png -BLHKiarFEmGTx4R68P75CSAOuLugon6cWLP/dXFYsCQ= share/snis/solarsystems/quidgebo/kratoria3.png -oFO5Ix91NzHmpQSmFMVLwxso2QFGVN/+GTK+8RrOd4o= share/snis/solarsystems/quidgebo/kang-with-clouds-2.png -r03/Uy3lOLY3hRJZni/OUxa0M/mr4Ond0o934CM/yUY= share/snis/solarsystems/quidgebo/guleldob3.png -OGTZEm3WBbmxdU6uwnKN1IzA6/2a+fV3v504DsVC4iM= share/snis/solarsystems/quidgebo/guleldob1.png -UNHhth48Za0zyt3XZgqaoB6q3gY5CbzBDNZNQPMQ1kE= share/snis/solarsystems/quidgebo/behko5.png -WiEdV0h+nKRVsBV3I/v1iYIWJ29Tx6Mr/LhxEug4unQ= share/snis/solarsystems/quidgebo/bluegreen-skybox3.png -uoJWB8xb0BNjsLaqpXkJOTNF/VH6ar0z5QyVvYiNRFE= share/snis/solarsystems/quidgebo/kratoria-normalmap0.png -VPGH+wECFyCTfGcAvVIvmdCpwqonMeiZtRNodtINFYw= share/snis/solarsystems/quidgebo/kang-normalmap-masked3.png -9c5qWUY2aPTm09yvnSayVCq18EFlyKCxdzpWWmZ3J9w= share/snis/solarsystems/quidgebo/kang-with-clouds-1.png -6XoVD0lBTnkge9cOQAcfq0btoo0yI5b5gOZ+yMEDRXo= share/snis/solarsystems/quidgebo/lettek1.png -veUt12SvQJSIJnLOIJe/s8vRNhe1zlg9OYo6EoLNrPI= share/snis/solarsystems/quidgebo/Attribution.txt -OJNtO63OKGJlXwu1Gnvx9NQMqWmBnHP6vfrwPzpU7UQ= share/snis/solarsystems/quidgebo/kang-with-clouds-4.png -WJLthEAZusoPiYv5fPig2ONNj/DbbuAkHNK2Neiy9jE= share/snis/solarsystems/quidgebo/guleldob0.png -yPoEl85Gu8hMdc/oWYF82lNcycLsQUgPXICcQwhWuwQ= share/snis/solarsystems/quidgebo/kang-normalmap-masked0.png -T8s9H9FvUZsBtwv33iB/wjRFb9vMXMW1iAmGB5r+KBk= share/snis/solarsystems/quidgebo/bluegreen-skybox2.png -LPV3+nFgZgRZNT+6Di0pDr7rfll8/hRJzwWB4VhSGVM= share/snis/solarsystems/quidgebo/kratoria-normalmap1.png -y1OQxl5hFLckgpi5kuCxozJIyNFSTFRUkeRtEKINzpc= share/snis/solarsystems/quidgebo/bluegreen-skybox1.png -NHfKqLAqL/MARWO4BSUnr3poFO2heQRDOrjA/zEH+io= share/snis/solarsystems/quidgebo/assets.txt -KM8qPvcPfsMGBb7IUhAOIZzDJEx/DNNaKREA9HGMaSg= share/snis/solarsystems/quidgebo/kang-normalmap-masked2.png -cz1efSK3P00vX/WXvuqZTVFbySYw+4klIteWBrjzWLI= share/snis/solarsystems/quidgebo/guleldob5.png -Pku+HjQb+blTFNjVAZFlNegZBz/ZF8gj/NvKftqr8x4= share/snis/solarsystems/quidgebo/kang-with-clouds-5.png -2cQLVBJh1hO0K84H9ZgefLbnYdLdRCMp7sZhq7eNGlI= share/snis/solarsystems/quidgebo/kratoria-normalmap4.png -lI8w7Plg2irGWlaWclRY5YqrvgHoXwDF9QYnlPY+A7Y= share/snis/solarsystems/quidgebo/guleldob4.png -jqRaqmzC6x9F/CrGkchIvcIw/ANsUc24bW+8nFbXN68= share/snis/solarsystems/quidgebo/bluegreen-skybox0.png -nLd1rP2Pt/osQa0TzvLqoiJ9oUQV6KFO/kNb0adEDHQ= share/snis/solarsystems/quidgebo/kang-with-clouds-3.png -Q18PMVjD/FMt8ZnM6aNKqwC/juYvPqdTC2VyQNr12mc= share/snis/solarsystems/quidgebo/kratoria-normalmap5.png -935dU6dDMOnsKKxIyVvwRWXnKruG2I4wpHk4WTolNhE= share/snis/solarsystems/quidgebo/kojax-with-clouds-1.png -OAMOoPAuW5lDhQI278RI+cutMQbZzCwLXgRWCXoFRI4= share/snis/solarsystems/quidgebo/behko4.png -Jfzo+iQOqlH7UXivhihqxb8ansmdx81TxF0YHbXEF1g= share/snis/solarsystems/quidgebo/lettek-normalmap3.png -3SUjwxItKA2fNc2GMN+aLbVmWmEF6hS2RA4IMWJJqBI= share/snis/solarsystems/quidgebo/kojax-with-clouds-0.png -Hz7rt0FZsMftl9c/npTgvdKma6peOTFvnlxmjSWZUa0= share/snis/solarsystems/quidgebo/lettek-normalmap5.png -WwjfojhGTX1LyujM5SYGDgr4seRM80RoYXNiFGdqPsg= share/snis/solarsystems/quidgebo/kratoria0.png -nXq3Shk5Ych83l4bgbr3Hkdx0W6scBPF0V7scnXb37E= share/snis/solarsystems/quidgebo/kang-normalmap-masked1.png -dZfp5pRqDOdn6NJ4XwLoecpj+INCp4AUmUVo8Nm7YT0= share/snis/solarsystems/quidgebo/kojax-with-clouds-4.png -kBMBUOWEc3+q93oiqnUjH456Lro6pWUYhlwN5z0Apqo= share/snis/textures/nebula4.png -bL2QLHimTgHgMcCWXjABNNWAeYZjfYcSMG69Fe8NNqk= share/snis/textures/image2.png -b7DXIzd+nWDSRWbk8DQ7//qw2MQeuPlOzyjSdbEXzK4= share/snis/textures/asteroid1-1.png -W7nfdb9VMbOKGdqV9TaTcdG4zNtSli2SSjcBSm1GDZE= share/snis/textures/shield-effect-5.png -feegihOIQG+xoKvmDVShGBw3LMKR167sRb1AxaC9UlQ= share/snis/textures/docking_port_emit.png -tsSFJS0rPmfjZ/4vVm7OMQBe2Wz0deR9R/yxBimD6SQ= share/snis/textures/test0.png -/PIgiWpw1O0OEq2QIKYrFAugwg0LcmHcmlfJ1MGVCDU= share/snis/textures/image1.png -NLvU/59v05tYPC9aRQ2BX6LzgKUNBgCOQRJ45vak2RE= share/snis/textures/SearchTex.h -2k/LQHxaE/xCvzOCE6TYLa5uWCUudkypBi7qCjO2z0M= share/snis/textures/red-laser-texture.png -5W0Rrv0uY9lHl6Iw/sEmMudao9mfHpdyjrY79Ixzjjg= share/snis/textures/image4.png -b3doaoh0jEx1/QyFLRFgywywdgZLg7bHhOoWxMOzOA8= share/snis/textures/nebula1.png -qa+GMZIFUsi0alvpPK6/x5trzi1uCh4s7XGVFyRb7l8= share/snis/textures/planet-texture2-2.png -OPgWwgxcS/1b3THaFrtNnzYt+99K9B6dWC7oUCs32Ko= share/snis/textures/spacemonster_emit.png -1fp2JpcUTe67K59cqJArUYfd92M9Y0RKkyr/GMhbhZ4= share/snis/textures/planet-texture4-2.png -wPh3eMWNFOnV0lTcukc5Q/nWYcie8psvzQKhPsmchWE= share/snis/textures/laserflash.png -wuV4OTamtbsgjwyuwGkMhfU5uo1lbeq7/kO0I4KR5II= share/snis/textures/sun.png -wAQxZvLuWOYmjcuxXItq74gXRHbiIynmimqAabkS1Y0= share/snis/textures/asteroid1-4.png -/i2k0BycH0BjQRnET8t4Xu922o32opuUaXUfCWZQbAA= share/snis/textures/planet-texture4-0.png -aa/sAw9XYjnlMWjhVa7VPsOHuRx6ZJL4v33K4+X6LSk= share/snis/textures/orange-haze1.png -JUsA8yAlIcrqPj/8uV9jje9p8/ZFfNafSuvhjK+3WTE= share/snis/textures/orange-haze4.png -uRpM1zUVx9v/BpzOzIsErChjRFWX1qGTrplbO1J2YZk= share/snis/textures/planet-texture2.png -voVPrggGISbkzaT+cRogpazpuz5Ne+lFzUwYlMYX9pE= share/snis/textures/shield-effect-1.png -owLzXsDKnWs7MzLR870qGzjLtaS1sjqyn5EyRWpdguk= share/snis/textures/planet-texture3-2.png -5YQoYXRPmMCZesHY2vOLwrKZNCGYEPXPIEdMPzSXu1s= share/snis/textures/planet-texture1-5.png -9kqPPo3QACOiODvDpMedgliJNH0AXEXhupk75xwDV2A= share/snis/textures/asteroid2-1.png -rBFPOm85oxatWFk10GqW2adMvur0e+6sH8jMaexieh0= share/snis/textures/docking_port_texture.png -NOHJklr2vy7n3gcCtZ15+wB03B/mwQl9xiWk3zsXucw= share/snis/textures/planet-texture1-0.png -ve8rIg6fQKd1bl5A0nNsy8KToA6+yQdiVhzMD4G9HNU= share/snis/textures/warpgate_emit.png -yGWnyrjkJwmM2QLLuOwzk0defPeoYntdU94b+T2rIKk= share/snis/textures/planet-texture0.png -tG/Md9d9DKqpGnBs6bxloJQ2c53TbFGPdewrLwVnxvU= share/snis/textures/warp-effect.png -WOe3mrkFNULfde8Os6CwkapWPnoYxa1nTCvAjRlaOh0= share/snis/textures/planet-texture2-1.png -SXczITkM31MVG282IGBGRBrQSiXW68GinNumxy4pKlQ= share/snis/textures/planet-texture3-4.png -9Dhmsk+ghc0tK3yeOb9+bC0W5MkBs6wcmu0F+bqMEZs= share/snis/textures/planet-texture2-5.png -t3aV9sHRKm0U6xayfyaauS8D9YSMAe/ka270tyA6JAs= share/snis/textures/asteroid1-2.png -Gn01DUplOZYicSMwnTGM/Zv0C4rFoG7iv/u9p18RJo8= share/snis/textures/shield-effect-0.png -oY2FYcveIasOV17y1VIEp/gXRhX6vsZiB8eP+ekUby0= share/snis/textures/spacemonster_tentacle_texture.png -Gg5pfg1VAhwpJihcAh2a5we5J51v0OgXUhRza1f5ljk= share/snis/textures/planet-texture1-1.png -iT0RupvQ2De8n1lZiPNH9iUbR91tDIipsukKTUT1nkY= share/snis/textures/asteroid2-3.png -XCxxYpC/SwJvRbeJcNdYxoaKzeUhe9jZJManDee/m0I= share/snis/textures/planet-texture1.png -Naq8wd8scSEYKG6cVgbvyxlHaQYBLY/VSIAsxYut9gk= share/snis/textures/planet-texture3-3.png -5m2KMC48kMJkkwE2OezWQIsjzxkCoOfjJ4Mfo9AQDgs= share/snis/textures/test3.png -Gdy3R4/Cy+6hIXdC5Vm+vNJA+6A2u0ygncA4sNdAu+c= share/snis/textures/shield-effect-3.png -JuZa9PqoVj2CDW9FQUf0URuGdNRjs0T1TUOlAJigVJg= share/snis/textures/planet-texture4-1.png -7JmkvpneenxcJTqGegRR1bpS8wVJlLf77pLX9xEkFOc= share/snis/textures/thrustyellow.png -ZtclgRtGBoVC3zFOVt9iwor62ykWDqE7Gt+xYoU7A60= share/snis/textures/orange-haze2.png -sxU2loGuXwL8sXOXoDZHZuJwlvO8OYiebE26lC7+1gY= share/snis/textures/planet-texture3-0.png -7hxqo6H36Z1Y8st5iAs76FV21jHexzrz0SfXsCFLFZE= share/snis/textures/planet-texture3.png -0yeR1oiabw34pMhqaCTAS0v9JYGo3bkfzolxy1gVBJ4= share/snis/textures/asteroid2-4.png -pwwdS8LBUqJPEQ9z9LMsv2i7UzIl1eQVosWCqeTMQk0= share/snis/textures/planet-texture0-3.png -hhr5x4ldUKGu4h/HYT/OYPAupSEAXAC3lX2xnNlHcJk= share/snis/textures/planet-texture0-2.png -CaqJmkUepAE/9XwchABVq9qw+YVAemIFtRanMaBTy4k= share/snis/textures/snis-splash.png -j5Zu+URDtGDmBMyWJCJFrCGi6yoQl6yN0poCJpjnPiw= share/snis/textures/asteroid1-3.png -ptMqPDagFV5ByB9SOhHMi8v1MYI06rrir/hpTcW/8ak= share/snis/textures/shield-effect-2.png -3t7DYfH3UFIMziOoeo1S/quImsFujuWt0yZAZlg3utU= share/snis/textures/test5.png -nA/khdo2xQUIeT/8OrJ8IsuC0QZEW0s10D/PF+igjoE= share/snis/textures/planet-texture3-5.png -CWxKTsAMnghzp9x+HvL/lUHIKUTPhs+TaKkJLMSZ4Ok= share/snis/textures/asteroid2-0.png -PSBtm8dv1Vrux9NouwJcaxyIBXo/wycjk5JBULkq0Aw= share/snis/textures/planet-texture0-1.png -ztlnzpogbeURJd+s+35g+rBU21IcZX1G/ypLUBdrkpQ= share/snis/textures/nebula0.png -LZASA8tymfnSe6yHTEKARdtFsB1ld6fNBWqIZU5yfpo= share/snis/textures/spaceplateemit.png -uwjrhAuKKOa5oI3IEdOYjgcD94eb0SIbAnb/CVx+gto= share/snis/textures/orange-haze0.png -ZiQ2WTzBnfzxlKP95jzRWp6Or8sH5GLyhzFs+DzJCHA= share/snis/textures/black_hole.png -6EibwBx7mB4hiQhdpzhDBrKcc71V1w7JH8roJWhCeek= share/snis/textures/planet-texture1-2.png -pNgkfKcRmgg+V9A4Rx9gSOm15m8w8A3r2/Dc1tHeArg= share/snis/textures/green-laser-texture.png -DR4OvjL8ufLgr/8qgByf+C2UZZ5Yu5Q/yDZegUXaRYw= share/snis/textures/space-blue-plasma.png -/Q2L1u/FdupRZ+n+atY3WFS0aS9aZ1Q9YRVzVzPZD84= share/snis/textures/test1.png -BNfw7Xu1/+c0J+yVnBwyH8iUkrKFRXiw6bYuBCD9FBM= share/snis/textures/spaceplate_small.png -SHkdQE7qE1yITbv/+IDJy0p5QdoiyGI6lzeWL7rOlIg= share/snis/textures/wormhole.png -uGbZCQTfxPcD1hH/Qvv8igPMgNWPUVTzU0pggXRkCW4= share/snis/textures/nebula2.png -6L9z71blRXrSBZ8BQ3BCNeRk+wcedBRLwf0ABzPQk7U= share/snis/textures/planet-texture2-3.png -95SsABCf3Z7i/Bk9nC/ZhG/1xyojtmS0qITXejNBvpE= share/snis/textures/missile_texture.png -gBzdRXag8Vck4/bhs3bjwVljB52r97vM6Dp6KXJiUZk= share/snis/textures/Attribution.txt -zpYzUcnGqk41Wqyqc6npGE3wxnOXBHwwJCU8O+nOoYw= share/snis/textures/warp-tunnel.png -3GFnC6NCI/IcECWu4xSAsYewu2wx+tczNxOXJCtXQYk= share/snis/textures/thrustred.png -My+PtVBAWSEcf45XOdzJcUm7P1HpM/SaAp9BDUAG/8A= share/snis/textures/orange-haze3.png -A3qz9q0y2rblriaOgzVV0vZw50SnN9M6OYDldwXJQnE= share/snis/textures/green-burst.png -VMlOSXA8axqkHvzypyqFZCLhTOWFenhcWlmFP6S3CqI= share/snis/textures/shield-effect-4.png -w58o5Iyca4xOVFWO5gQb+hFJhvntQ7P1ma/Ef+DGFsw= share/snis/textures/spacemonster_tentacle_emit.png -ilj59TckPx6ajaJYigTaF5gwEhNJFc9ArRMF7ueM3SQ= share/snis/textures/thrustgreen.png -X8pGQCpoI3L7X2CVlYFNIiS7xdq3lYmvt0b00lt/0jA= share/snis/textures/spaceplate.png -TXXk9FKF5QU350JafBDJOfzmYbg51UWY19TASNxaGFY= share/snis/textures/spaceplate_small_emit.png -4FqB9Y/+wj0QXQmbOPHuMzFKXRHlN+OAFtib+8I+gHQ= share/snis/textures/planet-texture0-0.png -JoGKUw73Pk+sLm0hkLkp+p2eDySZNhAbOgcSF/jtCOI= share/snis/textures/thrust.png -tc7uDnh4NBpAuluvVCy+E+3rG9n11RBTv0D64znMTrU= share/snis/textures/red-torpedo-texture.png -HHIQ/ad1iMCcyz6ecTKdlxBREkPFrXVnOSkjqTRr6OA= share/snis/textures/planet-texture4-4.png -45Uo93rnr/shVSubbiEEd5Apic8U11zd1SPOvrCmVpc= share/snis/textures/spacemonster_texture.png -VYYA8t08+Zf6eTWbWc+DELnqNskO12rucmWiYQQ8zDI= share/snis/textures/planet-texture0-5.png -Nm7HChSSNgv1NPoh0uOKzHapg1VZdXXv1hswKbI/eTE= share/snis/textures/image5.png -ne7cK9xjNp0TnB60xuc80HbtVjsjQGoKUKESBMwQlig= share/snis/textures/nebula3.png -Yt+H9/UlHzJH8sO7bqhogS3+fkja/l5CkD3U9meKPQU= share/snis/textures/planet-texture2-4.png -Uhfs2DKZ/hWurebH1SPdo1alVtYeFjSyNMMa/9OUtAk= share/snis/textures/test4.png -q0SvA9m1ippSHPvEvpowWXD3JJinyGDB0XSnncc56LQ= share/snis/textures/asteroid2-5.png -rtHEKMD4UjmW15AOGUToti/IQOYW+DdMRXRGNVcI7pc= share/snis/textures/thrustviolet.png -gYiz/GPlAQ0mjHAb/AWFAeqlXxf+uSlDUNWjr3Zyk0E= share/snis/textures/asteroid2-2.png -yrh5TIvvcyWUnn6pMV1HvUwpvvF2LjTDdEbO/vOOwGs= share/snis/textures/blue-tractor-texture.png -unhj+PvE4o9KrqOxrlRIlgH+p4fVKTkZVxzfiqBU+Lc= share/snis/textures/planetary-ring0.png -rx3P/9vVkyJ0Rdn0SshUpnDCIimm2aocGwYeeMBVp6w= share/snis/textures/green-spark.png -haxAJCl2GlOqmcVk4DIimSeJyI6k3QlAIwK0fCfC3BU= share/snis/textures/planet-texture3-1.png -y3Y/adrgA6lvTrH6DTd6nV2CvQVLoY4FTsqFFFchvI4= share/snis/textures/planet-texture1-3.png -1f1b6fo/pdell2aQJC4dUdHU/Nh+HUMTOyzopyObUPE= share/snis/textures/test2.png -sA2gp9PL5W8dC2dhD5pMPrxTrO+1VheCBS+GMmabjmo= share/snis/textures/thrustblue.png -6AjSTtLE/nBSuRfIV62pz1ehHTwenunC4Bmd0kB1wes= share/snis/textures/planet-texture0-4.png -7htWUMHShDuD6/2HISWkabC5DNrfK+RQ6tojClMOAso= share/snis/textures/asteroid1-5.png -JyViATMb/oIRvvsn6TuMy55hvPDZYom5tGfb1z0YwF0= share/snis/textures/planet-texture1-4.png -LPCcBs9F3JchXn/GC/Om3/lS83kGEEWXpTJ4zsoF8Bo= share/snis/textures/planet-texture4-3.png -Wh2sQl00I5MrG90MTszGg49mvUT4WPxM1CI0GcxnpLA= share/snis/textures/orange-haze5.png -8oOAQ8QdEN8I63f0TO038P4LKvK/uki3HggGuNiaQUI= share/snis/textures/AreaTex.h -+IFK3O9cCGTHz6TwI55eWXt7OqjMGlRCoYqkXIagUUg= share/snis/textures/warpgate_texture.png -tga4EBDAxQZ8s77XkwJhAxZseKcnZrI/Lv1g6HsGby0= share/snis/textures/planet-texture4-5.png -uwA6q5a5bz83tVj0y6/RmHqysXcgCwGQzhB33xIqWzg= share/snis/textures/planet-texture2-0.png -aTAJfiPS21rNKKkiuVrDj6LOkFGUaYdIY1FXhfXB/nE= share/snis/textures/spark-texture.png -IBnxZWhqS8Fj6CHlHba2yfBAXb/8J0SYo3nrO8Vc2UU= share/snis/textures/image3.png -PSZIRVnPrAMDprYiMJsB8lmEukf+QTh322sYrPO8jfM= share/snis/textures/image0.png -QJS0T/lJngrJzpUlyjyE043e/ugOZnph7bEz/k9/l3s= share/snis/textures/nebula5.png -CxYDZH5UWzGdN1EVKucT/zoKxe6vygqUdITQ4aMNCwA= share/snis/textures/asteroid1-0.png -M3w0qG8Auz2fuxzZU8HSHGHWuxbd7IlAAaBwojIvuIM= share/snis/sounds/warpdrive.ogg -62vHepCtfezI2OL5K9Tw6j1tkhuRUT1s76Lxs5jqxC4= share/snis/sounds/flak_gun_sound.ogg -aSugcnnCHsivuunEXPUYdUrdQNF0xe0BxQnwMMT/o0o= share/snis/sounds/hull-creak-8.ogg -lMSgVlq5FA54KmLsgunTT6aL0NRMMU0tt+YvCz5PRWI= share/snis/sounds/ui16.ogg -zMYjh+1jm9IvWYHo/u1Yj1VuFvMJ8Iwb7CN0+VDoJig= share/snis/sounds/dangerous-radiation.ogg -wSgcpszHLNfaxJLmNO7XYmiomLLzZ2ZtwV0TRvKOXYI= share/snis/sounds/missile_launch.ogg -XxVoCkrZgGurURqHY4sFLyPAuHQbDXSXwS+2D6cIKMY= share/snis/sounds/ui22.ogg -XcAgZrNcd+n7RgAC0dyn2t5jjaB4UCHAEzgylw6jfDw= share/snis/sounds/incoming-fire-detected.ogg -hetNQl4T013LTFC2F1j0AN7dgaWQNQN77TYTFs4mybw= share/snis/sounds/lower-shields-and-hit-lights.ogg -MpL0mRob1jPCCtSr/pPHHF6fUyTrL7GGInVeMPfLnV0= share/snis/sounds/ui21.ogg -vBfcd8VRYLyFNmXtTauqDC3C/AxwoQDe1htJcaFzJZM= share/snis/sounds/ui3.ogg -yNZ91msi1zqfg5Ula2ic4Y9xOiKuv3j/sokOFD2ivzk= share/snis/sounds/ui8.ogg -F63fHH+D0PxV8Hk+VTGUnvsGCSudlD4A+ndhUswQWFk= share/snis/sounds/ui17.ogg -JO6gnvjr4nwqJ5tjzXm5hihyk5P8lFdRQVltk7HP5Rg= share/snis/sounds/big_explosion.ogg -3fhHYOSUUbMMMAIxyL2Sl39qM+nDRw6B0z5JbS1lli0= share/snis/sounds/new-starship.ogg -VS45opPywO/V6la5E6ibPVGU3RXGrpLoKP3bPBuIeSU= share/snis/sounds/mining-bot-standing-by.ogg -37720d7H6hXQ3iDOo3aycRT+oj14XJixDi26TF+Qm90= share/snis/sounds/docking-system-engaged.ogg -OSKIkdz8+mYqju6o9X/2FRitt+xrFBuw+o3RjbY3+IU= share/snis/sounds/quindar-outro.ogg -DTBDto+t0skvJVkEnXmvqVS1WrYgEAolFIZL3zfij8w= share/snis/sounds/hull-creak-9.ogg -bB8jW2pjOmjkKmUdG10KE/zkPe9ZBkfql+ekYW5h+tU= share/snis/sounds/hull-creak-3.ogg -GbZbjqnXgZdELVpmcv6UTVHS0+mDbYac9NoMznUnIj0= share/snis/sounds/ui12.ogg -lDH3PDcYRw5vHDrr76LYjCuHvz/gvkBuUULQG5j/cJA= share/snis/sounds/ui1.ogg -UuLLgvRsgVEU/bNunir0jR4vRScyhAMtnCUXfQBxLfA= share/snis/sounds/hull-creak-2.ogg -mCVOXTLHB9QTD9nZ/lZrgSfB6wQPO91xwXtoEZ3XBoU= share/snis/sounds/admiral-thompson-msg-3.ogg -GmJXF9hiiQhEGENq0rZUAfQKRvPp1wc3BoqA+P+SfTs= share/snis/sounds/too-far-away.ogg -ZYNZkH1CCUqQNCClQs1Ql+ioUOQoxMy/kka+TLnoVME= share/snis/sounds/science-data-acquired.ogg -FbSSyqJLEmVFtZYrDM85oBcHAaW6zsS3wC2h6dXyGFY= share/snis/sounds/ui20.ogg -dFeSEAOfIyOZ9NduuIBXM9h+92nP8B/HOTKTyW2U54g= share/snis/sounds/onscreen.ogg -x+iE3J6qD2C1WrnKjdIzXjgI0yQp5x6lpWciGSoCnNE= share/snis/sounds/hull-creak-0.ogg -NVGnh4o64IrS3wwKzpAnSkkfZ1ySA9vj5t9FFH20FVE= share/snis/sounds/ui10.ogg -KOEMtSC+szli1eXEuYjuprQn2hANzLywd9E27pxCAPQ= share/snis/sounds/ui23.ogg -qHHyg8zMVHfy65ZKU4EzzHu6AyzXBQGc+y88Kyc4wy8= share/snis/sounds/bigshotlaser.ogg -wcuiI4KG+nrKt27FVvq5i9w1RlLlsB2XbYyp6xN6E6g= share/snis/sounds/entering-high-security-area.ogg -6UozVwDXgR0gLMWhke1VuyrMjYRtkT2nKZt9up+YYuA= share/snis/sounds/changescreen.ogg -cDeoyDoVEi++APEaZShuKA153BMsPvsgoMOgn7U92LA= share/snis/sounds/mining-bot-deployed.ogg -sY5H6X+BtCDNHCF0HdqtOTHrRSqbgXqxrYL0A5a1gV0= share/snis/sounds/ui25.ogg -Aa0UYl62UcXNwPS/iv0eIbMrqEdYn18wai3c0PczhLQ= share/snis/sounds/ui26.ogg -QTrI549AI9iqot3E1dOe9YnbG5uF4RXrg3YP9AM/ODQ= share/snis/sounds/ui15.ogg -rxT45RNv0iaX19dzKZ6ztbqNtC7RGXPwYzDNentgU5k= share/snis/sounds/ui9.ogg -JP1byeSOzXpeD9AcWigPMZbPO7+PKlOYaazi4zcCRbE= share/snis/sounds/tty-chatter.ogg -LlxVnlR5ZEmEjYmx9RrdrsBR6bBe+tOaUWuICX7UY6Q= share/snis/sounds/transporter-sound.ogg -hJK8wU7Ou+bKyYAtxvdt5c3naGJgk2FSlYvCsE+UmCQ= share/snis/sounds/ui24.ogg -HzO1nHFz8nFH0BQ570/R4Fb8j7V2x3Wb8QRKPUbIkNM= share/snis/sounds/admiral-thompson-msg-2.ogg -Dsw2OIM2fY77XIFee+bCYcLyjYjSHpP5sqVvSsIKfUc= share/snis/sounds/red-alert.ogg -jUcyAUHF1ZfE1Y69R4NMBirgACyI5UPABgrDXGJK6rE= share/snis/sounds/ui7.ogg -Y96lZp9UYrIs0yuwtzactjMrBc/K2sQwrtj8/LJz6fA= share/snis/sounds/wombat-clear-to-depart.ogg -M6/b5s/q85+M46C1m7I47pJiUe8TYMKfQVSBw/QvX7s= share/snis/sounds/permission-to-dock-denied.ogg -I2rpkcSnFp7E3iIiwxvOsYPYhE46yA3Tb4o+gxPpp5E= share/snis/sounds/hull-creak-5.ogg -B7C0bHJrFjVaTtvGZtARQuvGzO+wFsjL9tzxHsYjsgI= share/snis/sounds/ui27.ogg -fC3HQU+0R8pQhUOaXvEgBBh6Hqqrbx2p/tJFAWxOKdE= share/snis/sounds/atmospheric-friction.ogg -Xi99nPux36r2gs48NgvH1oXslfAMiorb/5UDCuDNWJE= share/snis/sounds/laser-fail.ogg -u6Y4Sv+K7xUeGu35Rn5Gk3yZH7PzezNaBsZ0O8uGvf8= share/snis/sounds/hull-creak-6.ogg -SI6WgFEWvhAfPXHRNXkZaJW0T4qvuaMtK/RETHJDmPM= share/snis/sounds/ui19.ogg -IO/Bnaopag3yqYqlhTDMBEqr9P62QrZfY0dHs5K/bhw= share/snis/sounds/ui28.ogg -+PoUsFmqU46EDTd9dy8Vrtuh94fH0IQ3aQWZmamVBuE= share/snis/sounds/fuel-levels-critical.ogg -S1XDYaz1S21zFlgu49VcOSw0G8f3QzgYQgB/v/mR7fg= share/snis/sounds/science-probe.ogg -jV1giKFKU6HyOkswYjxyICWJu9VgmsIUdLLucCV6OYs= share/snis/sounds/spaceship-crash.ogg -l/gs4KL7yfVhe022w/wRYZfXHq0afDIaj8JYv1ZgPvA= share/snis/sounds/hull-creak-7.ogg -m6RJLsU600W5cE62CRc3YPJXpHN3Tna6DVnQV4aKgd0= share/snis/sounds/torpedo-loading.ogg -J29bTFpvcj76HuXask4cCWUgaRVCjZi5U5KhKp2NTz8= share/snis/sounds/Attribution.txt -HKbh7frj2RRjznHtfEM52b3GvOSjyJTULWoCfyVqtPM= share/snis/sounds/permission-to-dock-granted.ogg -dtxJIatbBd0oo69QLyJXuWE8qMPmAGqsPxFeY8cofWI= share/snis/sounds/admiral-thompson-msg-1.ogg -8PKVRRE9MKjsc4XWcbzaRhdY5TXQOxnpZmGPJEqGvss= share/snis/sounds/permission-to-dock-has-expired.ogg -+UUCF4s6zcXDSk5OdnhK9tnkxO8HF1sC64S2mQSfJXw= share/snis/sounds/alarm_buzzer.ogg -TgpAlop/PjMQZ0tdVIyYM2EkFWdvWIgxg2TMsif9wTg= share/snis/sounds/slider-noise.ogg -D7nFmIgGwYBCdTFVxoUUnO26gyZVxO58GLxSpsOlgeA= share/snis/sounds/atlas_rocket_sample.ogg -wrQ8oxfGgi2CU94MxsvjH4XUvnHA2F+FqI7S4ikTTH0= share/snis/sounds/robot-remove-component.ogg -ErOZM6hPxAiQ0quCZ/qsdMx47hI9iaqrMTHWpeuM4Kk= share/snis/sounds/ui18.ogg -HFw3Y9tECsE4EIgO3EpxW0LAQb6IqKmEZmwWsJQqzHw= share/snis/sounds/crewmember-has-joined.ogg -stbsVMZbvmUXpN/UaaGiSv40poGPmIenbP9kW/jHUqk= share/snis/sounds/spacemonster_slap.ogg -AcO73sTqhfaKsDrq4sW+n3j/jaUzmPWyoNtjeAoNmC0= share/snis/sounds/ui5.ogg -O5EtUcOTKsVTwDEGyn2VD/B5vGkOxuIsDmoPQQ6aLJs= share/snis/sounds/ui13.ogg -VEF2hHz9zWUK0Go0JJn1rXzI7jcZ/yCcJly84UNWRI4= share/snis/sounds/leaving-high-security-area.ogg -95s2aGzB4eMcxVkHuSEv1RewrvthJRnFfKbtsZXAeJ0= share/snis/sounds/admiral-thompson-msg-4.ogg -ZgWbO9P0rAi1nyTEgksvXgpUA7zNuhuAOlN1BBwZmXI= share/snis/sounds/docking-system-disengaged.ogg -jdUxacVMD/2GjfdeSRTAky5lxP+DVT1SYxcnPVIgpbA= share/snis/sounds/warning-hull-breach-imminent.ogg -xF4P6tuRW5S4le1X2FUU1zY8DYgG0cAZfKHawhDe2QE= share/snis/sounds/ui29.ogg -Il128EgLTTz5QY6s+oI42DWsLtVs0W1jDzANzmjmtzk= share/snis/sounds/ui14.ogg -cA+vw8MrPNzgXNCR3i5w5hj1X7xj/Ogim+8R5uRJBOw= share/snis/sounds/warp-drive-fumble.ogg -7obOHtqTvy4EokgZyOOI2zOuVzsatyH9IyDv15LyxDU= share/snis/sounds/ui4.ogg -zIOlRvU3ipx2E+zPXvbo0+oL2W1smOmZbHIbDrurVNk= share/snis/sounds/comms-hail.ogg -YNbfTWkx18z/k7CLkYbJuB4esR16vdYNjVMMOyjnKu8= share/snis/sounds/quindar-intro.ogg -isYjrKmyfr+pIv+A64XG1s4T25i2DwC+4uKAozwyWHk= share/snis/sounds/hull-creak-4.ogg -VkSEd4RnpgCpOvP6BCeZf3fdkgNzEo9Mxt1B2dhD7ZI= share/snis/sounds/mining-bot-stowed.ogg -yjsXJuRNERzsEwys8PveeFxD9iWfp9AISHJPnm+1UG4= share/snis/sounds/ui2.ogg -AJDpU8jHPRPn+vNR070eaYKx1Firm8oPvqGBu8b6qSw= share/snis/sounds/short-warpdrive.ogg -7OxYJni0/YO0zqo3bQE3nTWuOl6FPnR7DttabqSqfcg= share/snis/sounds/ui6.ogg -LB3ii6IxRCfUOw3O/DdsluAle8OWsRvOXW5oVem7aiY= share/snis/sounds/docking-sound.ogg -+ZWq894h5qmkABEkpDZq1rF7ndzvQQyi+rm4pUaL9Pk= share/snis/sounds/offscreen.ogg -f/Eib5QZ37pZ6vn2phnthLR3eVAvZxDaHGM2eRn9NM0= share/snis/sounds/ui11.ogg -kkzmh1bGfUaBfRWTj5eu6ETOyjfRfjAbmiSSLlpl2qc= share/snis/sounds/term_ready.ogg -Nee451qKNDAhvOeN5QYEeDEDaTR4xER08yRNAy0MUPs= share/snis/sounds/maneuvering_thruster.ogg -ngeI6CXcbW/GQz0O+hAwknKOQz4djqCeLB0R4wCn92E= share/snis/sounds/reverse.ogg -JS/yUyuYwypcy00E3D0DfONyfgA2V5hw9NhZnZ+AwiA= share/snis/sounds/proximity-alert.ogg -MnRA39onaLzm2rXRKp2DS4mClIpcutmZrAOAyQw4UP0= share/snis/sounds/welcome-to-starbase.ogg -0TLz3pMG+j8snPVo3RQBx+aO9E3mlKSyoA/CHvrkqEM= share/snis/sounds/term_reboot.ogg -br+y2UEhv5wVEj6fS5Q+z07a/cHaj34jJn7nvg5boI4= share/snis/sounds/hull-creak-1.ogg -elHA3oDhlCDRW9bBhP4HE9IRZzlhUnFI4BNkZ8ggjJY= share/snis/sounds/robot-insert-component.ogg -k6nsIygzYVrngPTq4X2zpcPEsMZf6CcC9c96DNtnJR8= share/snis/sounds/flak_hit.ogg -4SM0tn49+sgBfbrEkLd/hSBp7M0G9w4R+eZj8WC02Dc= share/snis/models/destroyer.scad_params.h -aQoNlN7oYyb24vWfxbtx63tIGYr38aoS57qXAg+4DuM= share/snis/models/dreadknight/dreadknight.mtl -hQ2mYWh41srrD8fbo/T52+c66UTvhIcVZIyveYDgdf0= share/snis/models/dreadknight/dreadknight.obj -ivzypSOWxxT9CL6WwwDA0wtemGXgF2c4C1rvBdR8PZQ= share/snis/models/dreadknight/dreadknightlights.png -EVJTZPmnPbEbR0b/inMQUteTPAArQPUYLV+Z7EKvw34= share/snis/models/dreadknight/dreadknight-exhaust-plumes.h -Jbh5f3hXc8CbEvqpd8tcGxF9T9/nVkBft+/9Dbscl1o= share/snis/models/dreadknight/dreadknight.png -00EpW1J+nYarLBElWWSG08wnx6KIuwnWWSwVvGvXxso= share/snis/models/scrambler.scad_params.h -3KcLByqnDm1JBX2gOK/bN4SYOxbOkMs91C01FqyE1ls= share/snis/models/battlestar.scad_params.h -6dsu43LBlz10kSh5GF22GCzqfnnfEWJdB+ZcElIAbYI= share/snis/models/spaceship2.scad_params.h -h7+qegmO8ifXFX0HAM/qKKwbagfqNGf4hIjReih/D0I= share/snis/models/starbase5.scad_params.h -WppubL8BzxjkbBGQWRoLUECSAl/QqLfihGhBuozyx6E= share/snis/models/swordfish.scad_params.h -ClIE4b7hI3WlK4D7F3EgDIElz344DqKqSUbIU8MjXuU= share/snis/models/missile.scad_params.h -vn6y23k9Zr6Frxeglh2VFuCOYWTYK1N0LYK1f3GwHvs= share/snis/models/research-vessel.scad_params.h -0iZfzuSf2hG/wovW4mgeZWAEk3s96uqlhDfDSdnb4NE= share/snis/models/disruptor.scad_params.h -bG4MPZiUG9BAB2L2zr1WhIVg9rHGb8xwf1+zr4U8M/A= share/snis/models/disruptor/disruptor.png -i8liNlQ0IehELSMk8ClhnUevZamo1vKEd3kmVHasfnE= share/snis/models/disruptor/disruptor.mtl -gDswiLtyCHStzmvDktzxqx1FrNepqJY1zULliViiqYU= share/snis/models/disruptor/disruptorlights.png -n2EDbPD+GBstmlZQIgUmOLqucn7mVOVqTjPdMaXpfYs= share/snis/models/disruptor/disruptor.obj -iUVp2H2z5YpOGETcdM4vm4zo4Ccw3EMBJqFSaCmB83A= share/snis/models/tanker.scad_params.h -5/D+3pQ7PG0LHNs65EWhJqo1LnTCY+QTt9Z1NEokyQQ= share/snis/models/battlestar/battlestar_normal.png -Vs/+Al0B0YlHtYrt+gR9A2oaN7kRQ//isVSV0ADGWu4= share/snis/models/battlestar/license.txt -QMw9CkEvogVWuHgRcZvJdTEmcwv1kbduzfWnb/NmREs= share/snis/models/battlestar/battlestar_emission.png -SfZKS5JUjsTT6iThcBwcNFFgCZl0o/WIEOWNg4Ip/B0= share/snis/models/battlestar/battlestar.mtl -lp2voLpqU/R4QR041FCdN3h9waPkIEcc9tS9tEcNn40= share/snis/models/battlestar/battlestar_diffuse.png -r8tZGQ2QwzMXNxuH6xKGMYW/f/BjWSdyhZ5XKLtbiZ8= share/snis/models/battlestar/battlestar_specular.png -6NZk6tJfFoeocVwTf0YBsgLJZnwgNP5sMDa0fpYxAUw= share/snis/models/battlestar/battlestar.obj -eycmBh9OBER8KDIdJBzhmWvcYBbIeW88GGyCTgeC7m0= share/snis/models/carrier/carrier01_emission.png -DDd3En+pSQltDOsx1jfjO7LXIlj+4ITLqgiJsMG5n8I= share/snis/models/carrier/license.txt -/hSXxmS/jf2mXhXQhFu53Q2ZU/VS+Sar+3crW7S+hAw= share/snis/models/carrier/carrier01_diffuse.png -9fW5rC4y06mG2l64ZF1acETdha3bhTk/LyBwuXyl3lM= share/snis/models/carrier/carrier01_specular.png -q62h3qkvbsmcYLTHawlQyrodRIxZTK0qnY2XW9LfJBY= share/snis/models/carrier/carrier01.obj -phh8zTry1CxS4jzA4UZSGVTbC1ExqJw1O4t9xi+u0xg= share/snis/models/carrier/carrier01.mtl -mFgiL+aEG1fVHbsH92PbVcN70fLTRuztrbqFGwAzkbk= share/snis/models/carrier/carrier01_normal.png -4BQJdaEuaKMi0XvqtSVDyWvFXqT4E2Mi4nUAH+w/44k= share/snis/models/carrier/carrier.scad_params.h -NJHvywL4JEM6fUvbBOy6NbVz2okloHeS9t08Um4yAwc= share/snis/models/wombat.scad_params.h -0/6Z2JGKVfj5wJr6VDcNQIK03NgbmHq0b5tJRCflKHM= share/snis/models/enforcer.scad_params.h -fQqYCjFWIGXW3YIxzWPOxdb8/YGJONXz7iPehhBSNbA= share/snis/models/conqueror/conquerorlights.png -8/1xXyxXPDP/WF15y5+kogGOMYL3nC8xl6EtJljnRhM= share/snis/models/conqueror/conqueror.obj -N8REjR+jbR7pptHQw0n2YJoeeigPnADzQ0KJF8iczJ0= share/snis/models/conqueror/conqueror.png -TSk0BX5uZ+KKkgfiINd86TiNSuHL9yD/QbkP4nao3do= share/snis/models/conqueror/conqueror.mtl -dt8dkwhHdrY17VE4HZxpZ0PK4K3lf0t13WgQirPouFI= share/snis/models/asteroid-miner.scad_params.h -sQqvPcJPsYoGMc14nuQQ5JC2dSZxWGaWelOYFXPGIf8= share/snis/models/starbase2/starbase2-lighting.png -SfA3vzZjJTqhfpMmd2P7FTQtbeb8Nl0aOK8Ahi72Ja8= share/snis/models/starbase2/starbase2.obj -6VJrGLd9e2xbRF/QylQDP3fMufOaE9OoxStT+fUUEDg= share/snis/models/starbase2/starbase2.mtl -JERd1e/04vxOzguRo6wxRVE2lA8dd/fRFpw3bP5y4Wk= share/snis/models/starbase2/starbase2.png -SPpdavzu1mIYBWZ7k8MurOKqomrLudQ/w+hpEywQGlA= share/snis/models/transport.scad_params.h -IvQB5JfGu72JyMY/VCuWCbb5prN4l50is2D0XCJJuyQ= share/snis/models/spaceship3.scad_params.h -1llp0sIB0j/bMcS6TLPd2GuHh4tFMdwKQ1JFGwXn4BU= share/snis/models/spaceship.scad_params.h -vExK3t9dNZyApXb9dpWU32KoTCbGh+YBjZ/6fv45/Cg= share/snis/models/freighter.scad_params.h -V9OtwxUEU/d1akq6lNjWqWXc2/NyJQUIilsxR7CH3vc= share/snis/models/skorpio.scad_params.h -pj2rSZW73/ByWCcd3oPlUtqw3iTwgpalJGeFairE9WY= share/snis/models/cargocontainer/cargocontainer.png -g79l4GF9d6RoSUK6tgGhDw63axXfQD5g4dTJF/am6VM= share/snis/models/cargocontainer/cargocontainer.mtl -ejOEV9+f8ZifoxttJAHBsfdgUccADVgNJTeQkfJjpC4= share/snis/models/cargocontainer/cargocontainer.obj -laEqDNPt8s+1AP29Mja2nA5G9pG7pn0KezfuJKUFRZM= share/snis/models/cargocontainer/LICENSE -YnH/ahz38kZ4QnpuwsSwzeQI9fY40AooMM2autwFSr4= share/snis/models/wombat/snis3006lights.png -J2ITCLPl//7kBY19LAfA6vXNQ6C7bMz7jSa1lNHjWh0= share/snis/models/wombat/snis3006.obj -IVeO66j21TOqPNvr4UISTcfs9IoJz0VREBKpelurkzk= share/snis/models/wombat/snis3006.mtl -T2xvBU+qbg7gSuR06HbGPfuaEwaRfDhwI9Q/+aeYWLI= share/snis/models/wombat/snis3006.png -tZUd0fg7gzU8Yg3Oc2KR/oSpogeeQe1Hj6fTddHyTT0= share/snis/models/cruiser.scad_params.h -FK641cM9Cn3HrzxDzz+0+MBA9NMsiEaVpL7PkKpY+10= share/snis/models/vanquisher.scad_params.h -iSxkdU2+fCDobdSaH+65ZaN1XOx9nv9Pv01eN9JbqP0= share/snis/models/mantis.scad_params.h -+gyWpxtCPZDK4SjKAMBYnXgwvktwOtEK0GCNWPi4/OM= share/snis/models/enforcer/enforcer.png -037Rxd7G89RRYD/sKy+1K6LVQbhNzm4PxmR2xmZOqxY= share/snis/models/enforcer/enforcer.mtl -0iqatsYJNqoLONjqz4QrFY71lPUjm5l+uIiPdTDZ8qE= share/snis/models/enforcer/enforcer.obj -qI8pk3yex9c9NCNZCFzok4jdokRUe9awP49XCnY/vTE= share/snis/models/research-vessel/research-vessel.mtl -o+lB6nXxZcmrr6GoswoUv8ULY3pbkL/tc3n7dDuf8iA= share/snis/models/research-vessel/research-vessel.obj -xqwZ1a6qJ2JYQwjzP6IJuMWafdvVWMcKqrxvl8YfJzk= share/snis/models/research-vessel/research-vessel.png -Rn6FK2QXFzJrzTJ/4XTSZ9/shg4eAqwEeuqav6ktkTM= share/snis/models/starbase/starbase.mtl -saHGlegSC8YLUq/9LFBU+jh4vkxKiO8m0eqdOA+SiYY= share/snis/models/starbase/starbase-lighting.png -xHYqm7W/f3lHTbjcEslxna3JUTr/lASichFar5JkF6A= share/snis/models/starbase/starbase.png -GxlsExc94q4j/CG9a02TrQBxtf2zFWMxt6qdYb4T0tk= share/snis/models/starbase/starbase.obj -8Ql80Ex6EPNYG924uh4MLJFFt81pRdBopqocbyxufwM= share/snis/models/conqueror.scad_params.h -YB1UcmKP0SN0qYfJZH21+jZ+Ih/Z3B2KMmWGW/lkcRU= share/snis/models/dragonhawk.scad_params.h -zbRK2eGImSTOiyKnntKfLxCT1bN3NBhKSRLV01OQYMo= share/snis/models/escapepod.scad_params.h diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix index 7820553da77a..402ba229d172 100644 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ b/pkgs/by-name/sn/snis-assets/package.nix @@ -1,42 +1,28 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: - -let - # Original manifest file at https://spacenerdsinspace.com/snis-assets/manifest.txt transformed using - # awk '{print $2}' manifest.txt | grep -v -E '\.stl$' | xargs cksum -a sha256 --base64 --untagged - manifest = ./manifest.txt; - assets = lib.lists.init (lib.strings.splitString "\n" (builtins.readFile manifest)); - ASSET_URL = "https://spacenerdsinspace.com/snis-assets"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "snis_assets"; - version = "2024-08-02"; + version = "2025-07-26"; - srcs = map ( - line: - let - asset = lib.strings.splitString " " line; - in - fetchurl { - url = "${ASSET_URL}/${builtins.elemAt asset 1}"; - hash = "sha256-${builtins.elemAt asset 0}"; - } - ) assets; + src = fetchFromGitHub { + owner = "marcin-serwin"; + repo = "snis-assets-snapshotter"; + tag = finalAttrs.version; + hash = "sha256-K/X66txXKpGtWPRtWXvKiVMYb6vGJtrv2CdHVuXbT8M="; + }; - dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; installPhase = '' + runHook preInstall mkdir -p $out - read -r -a store_paths <<< "$srcs" - mapfile -t out_paths < <(awk '{print $2}' ${manifest}) - - for i in ''${!store_paths[@]} - do - install -m 444 -D ''${store_paths[$i]} $out/''${out_paths[$i]} - done + cp -r share $out + runHook postInstall ''; meta = with lib; { @@ -52,4 +38,4 @@ stdenv.mkDerivation { platforms = platforms.linux; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/sn/snis/package.nix b/pkgs/by-name/sn/snis/package.nix index 9da764aa1d32..846786ed8145 100644 --- a/pkgs/by-name/sn/snis/package.nix +++ b/pkgs/by-name/sn/snis/package.nix @@ -14,6 +14,9 @@ buildEnv { snis-assets ]; + # Basic assets are also distributed in the main repo + ignoreCollisions = true; + pathsToLink = [ "/" "/bin" From 2c241f1277767d87a391386445e7d05a9d7892fd Mon Sep 17 00:00:00 2001 From: Daniel Toubul Date: Sat, 26 Jul 2025 03:16:26 +0200 Subject: [PATCH 103/212] lmstudio: 0.3.18-3 -> 0.3.20-4 fixed formatting with treefmt --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 5b09ad492418..8c453ff66944 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.18-3"; - hash_aarch64-darwin = "sha256-U720DYnywuqzZuYewzDSIqKoA5+AV7IsupmQwxOG84k="; - version_x86_64-linux = "0.3.18-3"; - hash_x86_64-linux = "sha256-KnOu1fUcx1HIaijnq5K5jfALWXuU4PISPT2bF4xP9NA="; + version_aarch64-darwin = "0.3.20-4"; + hash_aarch64-darwin = "sha256-7ku8lzg031f9rClKlu5e2xQEpQHrtroT0XH3doT8eGc="; + version_x86_64-linux = "0.3.20-4"; + hash_x86_64-linux = "sha256-2IqNlUWqxEsQOjUE9wIJb3whXmaIvpW9ZvEAuGWYn1U="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From baa62500e9bd11a0da04c4dd91d1804a34018687 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Jul 2025 16:33:09 +0200 Subject: [PATCH 104/212] snis-assets: update meta Signed-off-by: Marcin Serwin --- pkgs/by-name/sn/snis-assets/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix index 402ba229d172..67e64aed9db0 100644 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ b/pkgs/by-name/sn/snis-assets/package.nix @@ -25,17 +25,21 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Assets for Space Nerds In Space, a multi-player spaceship bridge simulator"; homepage = "https://smcameron.github.io/space-nerds-in-space/"; - license = [ - licenses.cc-by-sa-30 - licenses.cc-by-30 - licenses.cc0 - licenses.publicDomain + downloadPage = "https://github.com/marcin-serwin/snis-assets-snapshotter"; + license = with lib.licenses; [ + gpl2Plus + cc-by-sa-30 + cc-by-40 + cc-by-30 + cc0 + publicDomain + free ]; - maintainers = with maintainers; [ pentane ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ pentane ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; }) From c425398c3fe51fdb66c060d89b3f0f72e25f57ce Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Jul 2025 17:24:59 +0200 Subject: [PATCH 105/212] snis-assets: add update script Signed-off-by: Marcin Serwin --- pkgs/by-name/sn/snis-assets/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix index 67e64aed9db0..72740cd99414 100644 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ b/pkgs/by-name/sn/snis-assets/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "snis_assets"; @@ -25,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Assets for Space Nerds In Space, a multi-player spaceship bridge simulator"; homepage = "https://smcameron.github.io/space-nerds-in-space/"; From 8ae8bace3d12709f06451f5009ea45c74397533a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 15:33:02 +0000 Subject: [PATCH 106/212] signalbackup-tools: 20250718 -> 20250726 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 863535406a9f..0c90f0083589 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250718"; + version = "20250726"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-weUqp77bK8svM5Pj0z6E1agAw1bTfELcaWTeW+XlfY0="; + hash = "sha256-BDrz2AHscjJdlnHW52TWaMGaz8TKVMRLGXs1rn2TQVI="; }; nativeBuildInputs = [ From 6f1bdec00310e58786a751b3b6b8f13902b33e5e Mon Sep 17 00:00:00 2001 From: dramforever Date: Thu, 24 Jul 2025 02:39:26 +0800 Subject: [PATCH 107/212] wayback-x11: 0-unstable-2025-07-20 -> 0.2 --- pkgs/by-name/wa/wayback-x11/package.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wa/wayback-x11/package.nix b/pkgs/by-name/wa/wayback-x11/package.nix index 2c3423f0a952..620bf263357d 100644 --- a/pkgs/by-name/wa/wayback-x11/package.nix +++ b/pkgs/by-name/wa/wayback-x11/package.nix @@ -2,13 +2,14 @@ fetchFromGitLab, lib, libxkbcommon, + makeWrapper, meson, ninja, + nix-update-script, pixman, pkg-config, scdoc, stdenv, - unstableGitUpdater, wayland, wayland-protocols, wayland-scanner, @@ -16,16 +17,16 @@ xwayland, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wayback"; - version = "0-unstable-2025-07-20"; + version = "0.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wayback"; repo = "wayback"; - rev = "4b1b4c59f67a2639e960d6b19e1282cf03fc3660"; - hash = "sha256-+4fPMVVPoUAYbt0jgfl+dmt0ZNyGGWF7xuF1UzZ2uiU="; + tag = "${finalAttrs.version}"; + hash = "sha256-8pfW1tu7OI6dLSR9iiVuJDdK76fRgpQmesW5wJUVN/0="; }; strictDeps = true; @@ -35,6 +36,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config @@ -51,14 +53,20 @@ stdenv.mkDerivation { xwayland ]; - passthru.updateScript = unstableGitUpdater { }; + postInstall = '' + wrapProgram "$out/bin/wayback-session" \ + --set XWAYBACK_PATH "$out/bin/Xwayback" + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "X11 compatibility layer leveraging wlroots and Xwayland"; homepage = "https://wayback.freedesktop.org"; + changelog = "https://gitlab.freedesktop.org/wayback/wayback/-/releases/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - mainProgram = "wayback-session"; + mainProgram = "Xwayback"; maintainers = with lib.maintainers; [ dramforever ]; }; -} +}) From 6d3efca0ebfd23eadd0dc232b08deafd9f35dbea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 15:38:41 +0000 Subject: [PATCH 108/212] clj-kondo: 2025.06.05 -> 2025.07.26 --- pkgs/by-name/cl/clj-kondo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index de4c204c81e8..32955942097a 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "clj-kondo"; - version = "2025.06.05"; + version = "2025.07.26"; src = fetchurl { url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar"; - sha256 = "sha256-jmQFiL8MFIuMrHPSxW27E7yZIGf+k8J5nFVXgNGIKoM="; + sha256 = "sha256-jo8iY8vEtrGTQTV98y89i2OLWW4M3u6hsXZebd7cnUw="; }; extraNativeImageBuildArgs = [ From 61204f00820396365c1b3570b4b8d0f96dac5998 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Jul 2025 17:59:36 +0200 Subject: [PATCH 109/212] snis-assets: add marcin-serwin to maintainers Signed-off-by: Marcin Serwin --- pkgs/by-name/sn/snis-assets/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix index 72740cd99414..dc0ee2fe280e 100644 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ b/pkgs/by-name/sn/snis-assets/package.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { publicDomain free ]; - maintainers = with lib.maintainers; [ pentane ]; + maintainers = with lib.maintainers; [ + pentane + marcin-serwin + ]; platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; From 23e313d34116ef5e94166c51dd793d29e8c7631c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 16:49:12 +0000 Subject: [PATCH 110/212] walker: 0.12.39 -> 0.13.13 --- pkgs/by-name/wa/walker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index efe2a3afc248..35ebbb3ce95b 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "walker"; - version = "0.12.39"; + version = "0.13.13"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-HLQ2hYZhXcrA9V0kshV1GxxgI1CGXtTeI7dKelrIz6w="; + hash = "sha256-/4XKb2nU76EvUeuvhaTQr2CeLA5k20D0/XXYdX4n9cs="; }; - vendorHash = "sha256-250HPwSkcT7pOulhqAtmuoWOJUakF0S1bpZ8FMsp7bU="; + vendorHash = "sha256-N7lNxO/l3E1BlSSbSiQjrDPy2sWwk4G4JYlUArmMJxs="; subPackages = [ "cmd/walker.go" ]; passthru.updateScript = nix-update-script { }; From 6a60bf06bcb543c4b2d2e1ceee89ad3e780e920f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 17:18:25 +0000 Subject: [PATCH 111/212] heptabase: 1.64.0 -> 1.66.0 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index eb907cd64468..a3ebe695e7be 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.64.0"; + version = "1.66.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-VBoQgSVpEshmGjEGzSe1sG8nDcrl8nJ+m7+s/7LlAMg="; + hash = "sha256-8kkY+Tp8RuE+REcCT/gj8CA6CqTLk6eVeAEsOKv+axA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 86d387d6ed07837ed8708608f1de05c2a7aebb07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 18:01:24 +0000 Subject: [PATCH 112/212] tinfoil-cli: 0.1.1 -> 0.1.3 --- pkgs/by-name/ti/tinfoil-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index 16ad589dc5ab..9421172e7981 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-u7ELBS2WKet+MhTlUL+ID6f3AeNjE6aUj+PJY1rXb+8="; + hash = "sha256-yOFlQxMRxrdC1w8r8D9b0qrwGLjEflgcvLX5Q8ntMJY="; }; - vendorHash = "sha256-Dn1hhWE18UConE1a1RfLty3NWQ859Axt0LFBSC9i1uc="; + vendorHash = "sha256-L4wdnxm5fOtGymIZfr/YYTDnXpREgZmEthcZV1ploI4="; # The attestation test requires internet access checkFlags = [ "-skip=TestAttestationVerifySEV" ]; From 66127599a7ac21c26195d5bcc7be90cab95c3af9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 18:10:20 +0000 Subject: [PATCH 113/212] python3Packages.osc-sdk-python: 0.34.0 -> 0.35.0 --- pkgs/development/python-modules/osc-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index fff6eb0c864b..d7ee910f3e36 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.34.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; tag = "v${version}"; - hash = "sha256-RVcpwLJ/95dAfQNTvhuKg3DFsXVhJsGshVWqiQUgTvk="; + hash = "sha256-/UYxleKMFN42EKxXuGSb1FtY8QoVkKCqzJUqocLjeFg="; fetchSubmodules = true; }; From 31401425333f0a9c4ac94f48c958721e980bdd85 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Sat, 26 Jul 2025 15:11:08 -0300 Subject: [PATCH 114/212] python313Packages.chromadb: remove pulsar-client dependency --- pkgs/development/python-modules/chromadb/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 04a3ea2cf783..ac363b290e78 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -33,7 +33,6 @@ orjson, overrides, posthog, - pulsar-client, pydantic, pypika, pyyaml, @@ -139,7 +138,6 @@ buildPythonPackage rec { orjson overrides posthog - pulsar-client pydantic pypika pyyaml From 5ffd8d3440a26f153a812f25b1ab6a6e3105c7f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 18:37:05 +0000 Subject: [PATCH 115/212] spacer: 0.4.1 -> 0.4.5 --- pkgs/by-name/sp/spacer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index a0eb2e9e58d5..16b5af06e42a 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-3+1YWx+o1sDWXsG3qZCrtshRxVJgh5D9XJ5qVo+sL0M="; + hash = "sha256-GG9v6N7bJN7kYEQRqRIDgPPT0gGJ6LSSr8NWBDKsajo="; }; - cargoHash = "sha256-ERMP+gG2zCmkiB5GWM0s2dPo8JevWyjfMDUA8NxH3dc="; + cargoHash = "sha256-sWE0nFFVAUcCgW6R3BWBdSqn1QMRI8tKnuxX4gpRdvA="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; From 2dd01df27a3da4b155469c96d019f5fdda885615 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 25 Jul 2025 00:10:49 +0200 Subject: [PATCH 116/212] ccid: fix installCheckPhase on darwin --- pkgs/by-name/cc/ccid/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix index f46499111ae3..b0a6702a1cd0 100644 --- a/pkgs/by-name/cc/ccid/package.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -69,17 +69,21 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/rousseau/CCID.git"; }; - installCheckPhase = '' - runHook preInstallCheck + installCheckPhase = + let + platform = if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"; + in + lib.optionalString (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) '' + runHook preInstallCheck - [ -f $out/etc/reader.conf.d/libccidtwin ] - [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ] - [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ] - [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ] - [ -f $out/pcsc/drivers/serial/libccidtwin.so ] + [ -f $out/etc/reader.conf.d/libccidtwin ] + [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/${platform}/libccid${stdenv.hostPlatform.extensions.sharedLibrary} ] + [ -f $out/pcsc/drivers/serial/libccidtwin${stdenv.hostPlatform.extensions.sharedLibrary} ] - runHook preInstallCheck - ''; + runHook postInstallCheck + ''; meta = with lib; { description = "PC/SC driver for USB CCID smart card readers"; From 744bb9139aab9e81915eedcd0df47a8c14b63a7c Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 26 Jul 2025 20:59:38 +0200 Subject: [PATCH 117/212] ccid: use fetchFromGitHub --- pkgs/by-name/cc/ccid/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix index b0a6702a1cd0..c18ad31b92d2 100644 --- a/pkgs/by-name/cc/ccid/package.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, flex, - gitUpdater, libusb1, meson, ninja, + nix-update-script, pcsclite, perl, pkg-config, @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { pname = "ccid"; version = "1.6.2"; - src = fetchurl { - url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz"; - hash = "sha256-QZWEEJUBV+Yi+dkcnnjHtwjbdOIvcRkMWB0k0gVk1Ek="; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "CCID"; + tag = version; + hash = "sha256-n7rOjnLZH4RLmddtBycr3FK2Bi/OLR+9IjWBRbWjnUw="; }; postPatch = '' @@ -65,9 +67,7 @@ stdenv.mkDerivation rec { # usually getting stripped. stripDebugList = [ "pcsc" ]; - passthru.updateScript = gitUpdater { - url = "https://salsa.debian.org/rousseau/CCID.git"; - }; + passthru.updateScript = nix-update-script { }; installCheckPhase = let From 5a109032927aa0d378b55feec218b80151147077 Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:20:09 +0100 Subject: [PATCH 118/212] stalwart-mail: 0.12.4 -> 0.13.1 --- pkgs/by-name/st/stalwart-mail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 74392a503eca..efce3a65c4ed 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.12.4"; + version = "0.13.1"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-MUbWGBbb8+b5cp+M5w27A/cHHkMcoEtkN13++FyBvbM="; + hash = "sha256-6zoI+yvE1Ep5jh9XthDqphm2zBA4UzhfK7VCKRWIH8g="; }; - cargoHash = "sha256-G1c7hh0nScc4Cx7A1UUXv6slA6pP0fC6h00zR71BJIo="; + cargoHash = "sha256-t4BLko8vIVHZ44yeQoAhss3OxOlxJCErHm9h+FGG+28="; nativeBuildInputs = [ pkg-config From 0c5b2b081f40fcffdb4a359e4d8d70230a2bdf70 Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:20:59 +0100 Subject: [PATCH 119/212] stalwart-mail-webadmin: 0.1.28 -> 0.1.31 --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index af550fa5b3b8..881942373b62 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "webadmin"; - version = "0.1.28"; + version = "0.1.31"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${finalAttrs.version}"; - hash = "sha256-OgZ2qs84zVM2zNmBQSPnb9Uy4mahzNC81vbWM9wmrn4="; + hash = "sha256-4+R7QQT0cbKYe6WzgvzreOFULBnWdNcbPC27f4r+M0g="; }; npmDeps = fetchNpmDeps { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-rcgeSdCGIRvpz2xZPw0I753+D3zm9AYbtuUdMSp2I94="; + cargoHash = "sha256-Q05+wH9+NfkfmEDJFLuWVQ7wuDeEu9h1XmOMN6SYdyU="; postPatch = '' # Using local tailwindcss for compilation From 6506f07897287e6b0e1fbb457c36ece02ff76bbe Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 26 Jul 2025 22:24:51 +0300 Subject: [PATCH 120/212] python313Packages.lmfit: change maintainers Per https://github.com/NixOS/nixpkgs/pull/426868#discussion_r2232923302 --- pkgs/development/python-modules/lmfit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 9825021c6e2e..42fd29d3c2b6 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://lmfit.github.io/lmfit-py/"; changelog = "https://github.com/lmfit/lmfit-py/releases/tag/${version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nomeata ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From 9c4d48a3364b63a0573b0d25701623470c86a8d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 19:33:25 +0000 Subject: [PATCH 121/212] emmet-language-server: 2.6.1 -> 2.7.0 --- pkgs/by-name/em/emmet-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix index 0a1c7bd9d69e..e62b1fd2df90 100644 --- a/pkgs/by-name/em/emmet-language-server/package.nix +++ b/pkgs/by-name/em/emmet-language-server/package.nix @@ -9,19 +9,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "emmet-language-server"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "olrtg"; repo = "emmet-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-2ptIdZPGLjKsdFJKjt5LZ8JQNNBU5KR62Yw78qzfRxg="; + hash = "sha256-Lojy7y7RnPZPV9x0Mb4Rjm18RHwx6ejEpCo8wmXIOMw="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE="; + hash = "sha256-sMOC5MQmJKwXZoUZnOmBy2I83SNMdrPc6WQKmeVGiCc="; }; nativeBuildInputs = [ From 8976bd2e4a50a0d6d256a95b05bb5b594de7e46f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 19:34:40 +0000 Subject: [PATCH 122/212] mrtrix: 3.0.6 -> 3.0.7 --- pkgs/by-name/mr/mrtrix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mr/mrtrix/package.nix b/pkgs/by-name/mr/mrtrix/package.nix index 0fe0b96ca8ef..9a9e864ed011 100644 --- a/pkgs/by-name/mr/mrtrix/package.nix +++ b/pkgs/by-name/mr/mrtrix/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mrtrix"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = finalAttrs.version; - hash = "sha256-5GcQVZaRV7A6aA/ES6qR0dNBrToJiUXt/LyLYmnpvlQ="; + hash = "sha256-cPI6Ac1Yp5yb07zv9r5O7ZbsHpjrv5BkzbAW1qgj3gQ="; fetchSubmodules = true; }; From a704d3ec26e34ec222b832c420ed66fbf2e1b9de Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 26 Jul 2025 22:38:39 +0300 Subject: [PATCH 123/212] openmpi: Remove outdated (but harmless) moveToOutput calls --- pkgs/by-name/op/openmpi/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index d3ef5d0fcad1..bf102c526991 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -241,12 +241,9 @@ stdenv.mkDerivation (finalAttrs: { )) (lib.concatStringsSep "\n") ]} - # A symlink to $\{lib.getDev pmix}/bin/pmixcc upstreeam puts here as well - # from some reason. - moveToOutput "bin/pcc" "''${!outputDev}" # Handle informative binaries about the compilation - for i in {prte,ompi,oshmem}_info; do + for i in {ompi,oshmem}_info; do moveToOutput "bin/$i" "''${!outputDev}" done ''; From 636fbad696dccbfd0fc32c36ff29f21e3951291d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 26 Jul 2025 22:40:34 +0300 Subject: [PATCH 124/212] openmpi: join osh & shmem binaries in fileNamesToIterate A fixup to https://github.com/NixOS/nixpkgs/pull/427890 Co-Authored-By: qbisi --- pkgs/by-name/op/openmpi/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index bf102c526991..e137d9654099 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -157,8 +157,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform ucx) [ "shmem" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "osh" ]; s = [ From cf468896d4632f6d603ea7e31abeb4a52bc17e5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 19:41:26 +0000 Subject: [PATCH 125/212] terraform-providers.scaleway: 2.57.0 -> 2.58.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7b0a8a2da750..cdfabc6da1b6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1156,13 +1156,13 @@ "vendorHash": "sha256-HKmIl/GjGJZmhWLrK3lMjYo1F5nmo+U9ZpvBo5hDH/0=" }, "scaleway": { - "hash": "sha256-rSchMweT5Hxz2tpX6V7cBzntJzIeFB46bjV9lkaIWAQ=", + "hash": "sha256-/LyxYC+x6e5SQ12iZLxtbgFkF9MvotUlBYdK3/BiiAo=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.57.0", + "rev": "v2.58.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p9rESR1A1SEYlvjf8du2j2yAlI39LsMRcPvyyJIwWdg=" + "vendorHash": "sha256-Fsa4I8aYHiK9V8arwd64piASA8qAPmGZRqDPK5ec3uk=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From f06f77027b299ab73b395b07afad1596bcdaca48 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 26 Jul 2025 22:44:14 +0300 Subject: [PATCH 126/212] openmpi: use wrapperDataFileNames.part1 in _info moveToOutput calls Makes that part more consistent for platforms that don't support ucx. Another fixup for #427890. Co-Authored-By: qbisi --- pkgs/by-name/op/openmpi/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index e137d9654099..3e39d13d8a51 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -241,9 +241,12 @@ stdenv.mkDerivation (finalAttrs: { ]} # Handle informative binaries about the compilation - for i in {ompi,oshmem}_info; do - moveToOutput "bin/$i" "''${!outputDev}" - done + ${lib.pipe wrapperDataFileNames.part1 [ + (map (name: '' + moveToOutput "bin/o${name}_info" "''${!outputDev}" + '')) + (lib.concatStringsSep "\n") + ]} ''; postFixup = '' From f767ed7fee19c17742e9b2340367add452110def Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 26 Jul 2025 21:43:36 +0200 Subject: [PATCH 127/212] build-support/php: avoid code duplication in variables expansion --- .../builders/v2/hooks/composer-vendor-hook.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 9fccc90d014a..53503194cfa4 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -5,6 +5,14 @@ source @phpScriptUtils@ declare -g out declare -g composerLock +declare -g composerNoDev +declare -g composerNoPlugins +declare -g composerNoScripts + +declare -ga composerFlags=() +[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev) +[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins) +[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts) preConfigureHooks+=(composerVendorConfigureHook) preBuildHooks+=(composerVendorBuildHook) @@ -32,9 +40,7 @@ composerVendorConfigureHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ update if [[ -f "composer.lock" ]]; then @@ -76,9 +82,7 @@ composerVendorBuildHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ install echo "Finished composerVendorBuildHook" From a0ca301cf191ba437eed9c55f99b41c6aea1ca86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 19:47:23 +0000 Subject: [PATCH 128/212] testkube: 2.1.163 -> 2.1.164 --- pkgs/by-name/te/testkube/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 9a616b7f0fba..64f677448fbb 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.163"; + version = "2.1.164"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-g9m3Uyrc8dXeDm5mjmWhcSrlVAqP0/4OCvuZQwW6Pf8="; + hash = "sha256-GBQDVzloAWROD7xM26gt0+cko8hbquHf5kvxVjjFeA0="; }; vendorHash = "sha256-i7GjhW9w6TEHg+PBVsQ8bOuToejiPpuOcSbXO5ffAMs="; From 90eb73217a066834177cf998be2cebf8ee4b5352 Mon Sep 17 00:00:00 2001 From: Curious Date: Sun, 27 Jul 2025 03:45:47 +0800 Subject: [PATCH 129/212] openscad-lsp: 1.2.5 -> 2.0.1 --- pkgs/by-name/op/openscad-lsp/package.nix | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix index 8f5b422a9897..2bdefa2e49c3 100644 --- a/pkgs/by-name/op/openscad-lsp/package.nix +++ b/pkgs/by-name/op/openscad-lsp/package.nix @@ -2,29 +2,38 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, + + # native check inputs + versionCheckHook, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "openscad-lsp"; - version = "1.2.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Leathong"; repo = "openscad-LSP"; - rev = "dc1283df080b981f8da620744b0fb53b22f2eb84"; - hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ACxsXGeVYmB13x/n+molCoScSOe6Zh2PYiaGGHnd4DQ="; }; - cargoHash = "sha256-qHwtLZUM9FrzDmg9prVtSf19KtEp8cZO/7XoXtZb5IQ="; + cargoHash = "sha256-Q4NrRVSic7M1CFq24ffUv3d835PmaHus4Z0lLnUQ7Ts="; - # no tests exist - doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "LSP (Language Server Protocol) server for OpenSCAD"; mainProgram = "openscad-lsp"; homepage = "https://github.com/Leathong/openscad-LSP"; + changelog = "https://github.com/Leathong/openscad-LSP/releases/tag/${finalAttrs.src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ c-h-johnson ]; }; -} +}) From f9e36988f2e9766622d38ed1444854beb70590c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 20:12:04 +0000 Subject: [PATCH 130/212] litellm: 1.74.3 -> 1.74.7 --- pkgs/development/python-modules/litellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index bfecda475adb..625a7dd7c47f 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.74.3"; + version = "1.74.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; tag = "v${version}-stable"; - hash = "sha256-wxj9zkaUo5SKbPd2KqEq5r9qPk2ipHr19bIX13/hnGY="; + hash = "sha256-PKBT2Yhn5SprToMGyB2i35Iy+97FNVpyAo/wAwxuBoc="; }; build-system = [ poetry-core ]; From 930df4ccac21b2f509790a5f52e7e4657b6382ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 21:05:22 +0000 Subject: [PATCH 131/212] python3Packages.reolink-aio: 0.14.2 -> 0.14.3 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index f95d848d5f6c..c63bcc948e10 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-DsxYkXRxEZ1DJRBpDUNd6b/3XiyUoetSSXfNUO+jVCY="; + hash = "sha256-RH6elFdv51OqFvJjTGG+ZEuQNI3tpWj6gYU7XsfOUiU="; }; build-system = [ setuptools ]; From 7198c1241d492c0f9d32de0d09bf20b80a040359 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 26 Jul 2025 23:08:50 +0200 Subject: [PATCH 132/212] ustreamer: 6.31 -> 6.39 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/us/ustreamer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix index 7fd8bba30a71..10aa23247573 100644 --- a/pkgs/by-name/us/ustreamer/package.nix +++ b/pkgs/by-name/us/ustreamer/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation rec { pname = "ustreamer"; - version = "6.31"; + version = "6.39"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; - rev = "v${version}"; - hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ="; + tag = "v${version}"; + hash = "sha256-Lc0cwzt7rGfbJSLdZTDVdmkub6Z2KnTz5PRpEvtHsKM="; }; buildInputs = [ From fd2c65eb8fa56c8324fdab0d9709c9cf2cf181f5 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 26 Jul 2025 23:43:23 +0200 Subject: [PATCH 133/212] markdown-oxide: 0.25.4 -> 0.25.5 Changelog: https://github.com/Feel-ix-343/markdown-oxide/releases/tag/v0.25.5 Diff: https://github.com/Feel-ix-343/markdown-oxide/compare/v0.25.4...v0.25.5 --- pkgs/by-name/ma/markdown-oxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index 88be5814d204..9bef874b7789 100644 --- a/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/pkgs/by-name/ma/markdown-oxide/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "markdown-oxide"; - version = "0.25.4"; + version = "0.25.5"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-wS75Etj6NAMt/wlWB1yLGetM+OsgyeCo0dqHkrjUsQI="; + hash = "sha256-4K69eBHp1RGv0b7BUwGTErDc2M+XOh5ZIly+XvR1Aa4="; }; - cargoHash = "sha256-W+4WmWfqNuh3kmqE9X6CQ5/kTqMoUqyuIFCRiZa6Kc4="; + cargoHash = "sha256-7peel81Yf//MLIoXXCY3lklkykY9XxY/dfIxuNQyQ64="; meta = { description = "Markdown LSP server inspired by Obsidian"; From 627141ef0c38fed6213b3d1731f44abc1357ba04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 22:01:08 +0000 Subject: [PATCH 134/212] python3Packages.gaphas: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/gaphas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 2911711d09df..f9ae6c26140b 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "5.1.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-89KGjrA5ncwxK5gVayfhlTddRZj2912L5G4L4ov4YhA="; + hash = "sha256-ifr1Ul9/IaIvZ6b2SU08o110lRXlZ6RoqkH3CRYcH5A="; }; nativeBuildInputs = [ From c0a221be37b1bda6b3131db309f6f15e74a78e06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 22:29:30 +0000 Subject: [PATCH 135/212] libretro.puae: 0-unstable-2025-07-10 -> 0-unstable-2025-07-20 --- pkgs/applications/emulators/libretro/cores/puae.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index e24b389d1c35..e8981db6296f 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-07-20"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "c59492b07f7c586064692110e8138c83ed8bc7c7"; - hash = "sha256-ijcajte446DSjD2vJ7PNdD6Zr9Wj39kEw844g1VARJw="; + rev = "3fc66ee4b562910a17e2e2f3bad74572a8bcc134"; + hash = "sha256-rCdrM4511Q0OFwCsHZpYtg/4J1A4hwDc5WjwY0HDj8k="; }; makefile = "Makefile"; From 124c3f4850e97a03db39bdf61331eea150ea0676 Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:33:12 +0100 Subject: [PATCH 136/212] stalwart-mail: add v0.13.x breaking change notice --- doc/release-notes/rl-2511.section.md | 2 ++ nixos/modules/services/mail/stalwart-mail.nix | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c7cfe224b1a5..26a4ff2e5f0f 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -33,6 +33,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/). +- `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). + - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project. diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 9975bcc56672..d9d6e119d9f3 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -71,6 +71,23 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + !( + (lib.hasAttrByPath [ "settings" "queue" ] cfg) + && (builtins.any (lib.hasAttrByPath [ + "value" + "next-hop" + ]) (lib.attrsToList cfg.settings.queue)) + ); + message = '' + Stalwart deprecated `next-hop` in favor of "virtual queues" `queue.strategy.route` \ + with v0.13.0 see [Outbound Strategy](https://stalw.art/docs/mta/outbound/strategy/#configuration) \ + and [release announcement](https://github.com/stalwartlabs/stalwart/blob/main/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). + ''; + } + ]; # Default config: all local services.stalwart-mail.settings = { From b1247d635a5b1fab02e90c5d8c824c7f72157f17 Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:58:45 +0100 Subject: [PATCH 137/212] stalwart-mail: 0.12.4 -> 0.13.1 migrate tests --- nixos/tests/stalwart/stalwart-mail-config.nix | 2 +- pkgs/by-name/st/stalwart-mail/package.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/stalwart/stalwart-mail-config.nix b/nixos/tests/stalwart/stalwart-mail-config.nix index 800090ab5949..cb2989033763 100644 --- a/nixos/tests/stalwart/stalwart-mail-config.nix +++ b/nixos/tests/stalwart/stalwart-mail-config.nix @@ -50,7 +50,7 @@ in storage.lookup = "rocksdb"; session.rcpt.directory = "'in-memory'"; - queue.outbound.next-hop = "'local'"; + queue.strategy.route = "'local'"; store."rocksdb" = { type = "rocksdb"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index efce3a65c4ed..d91548954927 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -113,6 +113,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # left: [1, 2, 2] # right: [1, 2, 3] "--skip=smtp::queue::retry::queue_retry" + # thread 'smtp::queue::virtualq::virtual_queue' panicked at /build/source/crates/store/src/dispatch/store.rs:548:14: + # called `Result::unwrap()` on an `Err` value: Error(Event { inner: Store(MysqlError), keys: [(Reason, String("Input/output error: Input/output error: Connection refused (os error 111)")), (CausedBy, String("crates/store/src/dispatch/store.rs:301"))] }) + "--skip=smtp::queue::virtualq::virtual_queue" # Missing store type. Try running `STORE= cargo test`: NotPresent "--skip=store::store_tests" # Missing store type. Try running `STORE= cargo test`: NotPresent From bf2c573a869f0c4fb2a0aa7587a1b2b44a47a80d Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Sat, 26 Jul 2025 23:50:05 +0100 Subject: [PATCH 138/212] stalwart-mail: chore DRY code a bit --- pkgs/by-name/st/stalwart-mail/package.nix | 68 +++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index d91548954927..f22a683eefc3 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -75,86 +75,86 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace "__PATH__" "$out" ''; - checkFlags = [ + checkFlags = lib.forEach [ # Require running mysql, postgresql daemon - "--skip=directory::imap::imap_directory" - "--skip=directory::internal::internal_directory" - "--skip=directory::ldap::ldap_directory" - "--skip=directory::sql::sql_directory" - "--skip=directory::oidc::oidc_directory" - "--skip=store::blob::blob_tests" - "--skip=store::lookup::lookup_tests" - "--skip=smtp::lookup::sql::lookup_sql" + "directory::imap::imap_directory" + "directory::internal::internal_directory" + "directory::ldap::ldap_directory" + "directory::sql::sql_directory" + "directory::oidc::oidc_directory" + "store::blob::blob_tests" + "store::lookup::lookup_tests" + "smtp::lookup::sql::lookup_sql" # thread 'directory::smtp::lmtp_directory' panicked at tests/src/store/mod.rs:122:44: # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } - "--skip=directory::smtp::lmtp_directory" + "directory::smtp::lmtp_directory" # thread 'imap::imap_tests' panicked at tests/src/imap/mod.rs:436:14: # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=imap::imap_tests" + "imap::imap_tests" # thread 'jmap::jmap_tests' panicked at tests/src/jmap/mod.rs:303:14: # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=jmap::jmap_tests" + "jmap::jmap_tests" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::data::data" + "smtp::inbound::data::data" # Expected "X-My-Header: true" but got Received: from foobar.net (unknown [10.0.0.123]) - "--skip=smtp::inbound::scripts::sieve_scripts" + "smtp::inbound::scripts::sieve_scripts" # thread 'smtp::outbound::lmtp::lmtp_delivery' panicked at tests/src/smtp/session.rs:313:13: # Expected " (failed to lookup" but got From: "Mail Delivery Subsystem" - "--skip=smtp::outbound::lmtp::lmtp_delivery" + "smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::outbound::extensions::extensions' panicked at tests/src/smtp/inbound/mod.rs:45:23: # No queue event received. - "--skip=smtp::outbound::extensions::extensions" + "smtp::outbound::extensions::extensions" # panicked at tests/src/smtp/outbound/smtp.rs:173:5: - "--skip=smtp::outbound::smtp::smtp_delivery" + "smtp::outbound::smtp::smtp_delivery" # panicked at tests/src/smtp/outbound/lmtp.rs - "--skip=smtp::outbound::lmtp::lmtp_delivery" + "smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::queue::retry::queue_retry' panicked at tests/src/smtp/queue/retry.rs:119:5: # assertion `left == right` failed # left: [1, 2, 2] # right: [1, 2, 3] - "--skip=smtp::queue::retry::queue_retry" + "smtp::queue::retry::queue_retry" # thread 'smtp::queue::virtualq::virtual_queue' panicked at /build/source/crates/store/src/dispatch/store.rs:548:14: # called `Result::unwrap()` on an `Err` value: Error(Event { inner: Store(MysqlError), keys: [(Reason, String("Input/output error: Input/output error: Connection refused (os error 111)")), (CausedBy, String("crates/store/src/dispatch/store.rs:301"))] }) - "--skip=smtp::queue::virtualq::virtual_queue" + "smtp::queue::virtualq::virtual_queue" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=store::store_tests" + "store::store_tests" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=cluster::cluster_tests" + "cluster::cluster_tests" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=webdav::webdav_tests" + "webdav::webdav_tests" # thread 'config::parser::tests::toml_parse' panicked at crates/utils/src/config/parser.rs:463:58: # called `Result::unwrap()` on an `Err` value: "Expected ['\\n'] but found '!' in value at line 70." - "--skip=config::parser::tests::toml_parse" + "config::parser::tests::toml_parse" # error[E0432]: unresolved import `r2d2_sqlite` # use of undeclared crate or module `r2d2_sqlite` - "--skip=backend::sqlite::pool::SqliteConnectionManager::with_init" + "backend::sqlite::pool::SqliteConnectionManager::with_init" # thread 'smtp::reporting::analyze::report_analyze' panicked at tests/src/smtp/reporting/analyze.rs:88:5: # assertion `left == right` failed # left: 0 # right: 12 - "--skip=smtp::reporting::analyze::report_analyze" + "smtp::reporting::analyze::report_analyze" # thread 'smtp::inbound::dmarc::dmarc' panicked at tests/src/smtp/inbound/mod.rs:59:26: # Expected empty queue but got Reload - "--skip=smtp::inbound::dmarc::dmarc" + "smtp::inbound::dmarc::dmarc" # thread 'smtp::queue::concurrent::concurrent_queue' panicked at tests/src/smtp/inbound/mod.rs:65:9: # assertion `left == right` failed - "--skip=smtp::queue::concurrent::concurrent_queue" + "smtp::queue::concurrent::concurrent_queue" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::auth::auth" + "smtp::inbound::auth::auth" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::antispam::antispam" + "smtp::inbound::antispam::antispam" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::vrfy::vrfy_expn" + "smtp::inbound::vrfy::vrfy_expn" # thread 'smtp::management::queue::manage_queue' panicked at tests/src/smtp/inbound/mod.rs:45:23: # No queue event received. # NOTE: Test unreliable on high load systems - "--skip=smtp::management::queue::manage_queue" + "smtp::management::queue::manage_queue" # thread 'responses::tests::parse_responses' panicked at crates/dav-proto/src/responses/mod.rs:671:17: # assertion `left == right` failed: failed for 008.xml # left: ElementEnd # right: Bytes([...]) - "--skip=responses::tests::parse_responses" - ]; + "responses::tests::parse_responses" + ] (test: "--skip=${test}"); doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); From 5a9817ea6b28f76082921fe19f715a722bceb974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 22:53:44 +0000 Subject: [PATCH 139/212] python3Packages.model-checker: 0.9.28 -> 0.9.31 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 3341cd7559eb..bfd4163caaa0 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.28"; + version = "0.9.31"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-mRJpkJkSA8wNTCs3YhNm+W3OQnRVUXhCYz5CJhmqpmA="; + hash = "sha256-mg964kVjZD4XnfDV93sC1NRhThnI8mlYQ3iYBzB92IU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 551d78b90b93022f7a3afcb6725d9a6d56c73273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 23:22:28 +0000 Subject: [PATCH 140/212] python3Packages.whool: 1.2 -> 1.3 --- pkgs/development/python-modules/whool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix index 50e860e89b51..2d040d4dcf72 100644 --- a/pkgs/development/python-modules/whool/default.nix +++ b/pkgs/development/python-modules/whool/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "whool"; - version = "1.2"; + version = "1.3"; pyproject = true; src = fetchFromGitHub { owner = "sbidoul"; repo = "whool"; tag = "v${version}"; - hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc="; + hash = "sha256-vY7MPTBjNy3LY29k0MjMDnPiU7l9lUvPvTCrji8A5Cw="; }; build-system = [ hatch-vcs ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Standards-compliant Python build backend to package Odoo addons"; homepage = "https://github.com/sbidoul/whool"; - changelog = "https://github.com/sbidoul/whool/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/sbidoul/whool/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.yajo ]; }; From 58d95fc2227eb45194e9eac86b9657291a1cf8d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 23:30:40 +0000 Subject: [PATCH 141/212] python3Packages.nats-py: 2.10.0 -> 2.11.0 --- pkgs/development/python-modules/nats-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 1e620f9493bb..73746749cfcb 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.10.0"; + version = "2.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; tag = "v${version}"; - hash = "sha256-cgcoxDTfXeP2w1k8Miw8zY1Bln0XpTdtUY13SSvrHXw="; + hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg="; }; build-system = [ setuptools ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for NATS.io"; homepage = "https://github.com/nats-io/nats.py"; - changelog = "https://github.com/nats-io/nats.py/releases/tag/v${version}"; + changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From c45cb8c064bd438a147213dbf1e8c669646d928e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 23:46:23 +0000 Subject: [PATCH 142/212] nvrh: 0.1.17 -> 0.1.19 --- pkgs/by-name/nv/nvrh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index b30d4631de2c..d8044b7c2fe2 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "nvrh"; - version = "0.1.17"; + version = "0.1.19"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; tag = "v${finalAttrs.version}"; - hash = "sha256-5LkDbLKz4phSOsKqdzC/tMHqdXy+c5chBsXwWso/Wsk="; + hash = "sha256-oLCHuU2KZypMnW+KOuc3RhSP/mO4hQUN3Pi1W8uhoJA="; }; postPatch = '' From fd76e709f62de07729d8c5fa8c3041aac5b13dbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:00:34 +0000 Subject: [PATCH 143/212] python3Packages.python-linkplay: 0.2.13 -> 0.2.14 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 78a1bd3638d0..c96258aa49cd 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.2.13"; + version = "0.2.14"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; tag = "v${version}"; - hash = "sha256-E9KuIHLaA7XQC2XH8a1oeTuQh7Q4YxmswoaVKEJU4VE="; + hash = "sha256-UGYvaprqwEDxLQZUqyl0NXaDvwx1pDRoTjpRRS1KJPc="; }; build-system = [ setuptools ]; From f6d747ea34218ab34fc85745e250b2daf09e4a3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:06:21 +0000 Subject: [PATCH 144/212] python3Packages.craft-application: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 6f2a8db2a4b6..3d3578ef13d0 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "craft-application"; - version = "5.5.0"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-eNca9+CBAGTQe6URMUYRaJR7TXFJA+dWcYIJdKyB3bw="; + hash = "sha256-d1uptYLndXvJrnA42vXoZTVkX1WxgKGfZX6SXYSffSo="; }; postPatch = '' From d7fd0b13b8c83cfa85231bbe54a31420cb2b8b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:29:57 +0000 Subject: [PATCH 145/212] pv: 1.9.31 -> 1.9.34 --- pkgs/by-name/pv/pv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index 6214ca136a88..f5d2cdbf18ee 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.9.31"; + version = "1.9.34"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-o16S7ErA6POA6OhACIFnrgEBS/oAijqdZQa4SAedrt8="; + hash = "sha256-wGJr7Wy+9QBrU9MoHo465LKDhylGKyHszygUDu/va7E="; }; meta = { From 1f60cc63ab7f80177da31fdb1634946b06abd038 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:43:19 +0000 Subject: [PATCH 146/212] pscale: 0.247.0 -> 0.248.0 --- pkgs/by-name/ps/pscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index a3b9034d80ae..0349cf6c3df8 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.247.0"; + version = "0.248.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/ZBGeZTrtRUCqoS1cgDHglogpVOzOLroOWgJC3j9Zxg="; + sha256 = "sha256-Vp9qS8Od+OVV/kVMH8CsD/Ltx9aFykU7E8w+o91J2gY="; }; - vendorHash = "sha256-w1abfm7wSywu+KXIACfYtHZoW/uSzW/2M0vR9gXrj34="; + vendorHash = "sha256-eGF44NEW8dIm2neJmGnYiafvRISIAUgA5jKV9EzsJj0="; ldflags = [ "-s" From 54a289d97cffd4b03964f8975014f3b46d3a6711 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 08:54:32 +0800 Subject: [PATCH 147/212] saber: 0.25.9 -> 0.26.0 --- pkgs/by-name/sa/saber/package.nix | 17 ++- pkgs/by-name/sa/saber/pubspec.lock.json | 174 +++++++++++++++++------- 2 files changed, 138 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index d9bf624e9db4..0790d0de3076 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -17,21 +17,18 @@ flutter332.buildFlutterApplication rec { pname = "saber"; - version = "0.25.9"; + version = "0.26.0"; src = fetchFromGitHub { owner = "saber-notes"; repo = "saber"; tag = "v${version}"; - hash = "sha256-l1TPk6JiT/o0Pl67Vqv4NE2n/FrZKy/SqwhW58A3c6w="; + hash = "sha256-5N4HojdDysLgCPq614ZzJXx/dx3s4F++W35fjYdevRk="; }; gitHashes = { receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="; flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY="; - irondash_engine_context = "sha256-/ohreOZDsVqfPoJ6wK7ylTQAgWw23v0b31bDQw5L2Hw="; - super_native_extensions = "sha256-0WZ5+imtLJE8GhbAgLyCC502vvlDl5QG3xtG2nCAnQI="; - yaru = "sha256-j0aPyHx79kzT/eLf0Y3cq4qQkQ4c76GdpjLaVNp8MuI="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -47,13 +44,21 @@ flutter332.buildFlutterApplication rec { xorg.libXmu ]; + postPatch = '' + patchShebangs patches/remove_proprietary_dependencies.sh + patches/remove_proprietary_dependencies.sh + ''; + + flutterBuildFlags = [ "--dart-define=DIRTY=false" ]; + postInstall = '' install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg + install -Dm0644 flatpak/com.adilhanney.saber.metainfo.xml -t $out/share/metainfo ''; + # Remove libpdfrx.so's reference to the /build/ directory preFixup = '' - # Remove libpdfrx.so's reference to the /build/ directory patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so ''; diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json index 029df05923bf..80ebb7d5b6d9 100644 --- a/pkgs/by-name/sa/saber/pubspec.lock.json +++ b/pkgs/by-name/sa/saber/pubspec.lock.json @@ -64,11 +64,11 @@ "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623", + "sha256": "9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.4" + "version": "1.6.5" }, "assorted_layout_widgets": { "dependency": "transitive", @@ -94,71 +94,71 @@ "dependency": "direct main", "description": { "name": "audioplayers", - "sha256": "a5341380a4f1d3a10a4edde5bb75de5127fe31e0faa8c4d860e64d2f91ad84c7", + "sha256": "e653f162ddfcec1da2040ba2d8553fff1662b5c2a5c636f4c21a3b11bee497de", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.0" + "version": "6.5.0" }, "audioplayers_android": { "dependency": "transitive", "description": { "name": "audioplayers_android", - "sha256": "f8c90823a45b475d2c129f85bbda9c029c8d4450b172f62e066564c6e170f69a", + "sha256": "60a6728277228413a85755bd3ffd6fab98f6555608923813ce383b190a360605", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.0" + "version": "5.2.1" }, "audioplayers_darwin": { "dependency": "transitive", "description": { "name": "audioplayers_darwin", - "sha256": "405cdbd53ebdb4623f1c5af69f275dad4f930ce895512d5261c07cd95d23e778", + "sha256": "0811d6924904ca13f9ef90d19081e4a87f7297ddc19fc3d31f60af1aaafee333", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.3.0" }, "audioplayers_linux": { "dependency": "transitive", "description": { "name": "audioplayers_linux", - "sha256": "7e0d081a6a527c53aef9539691258a08ff69a7dc15ef6335fbea1b4b03ebbef0", + "sha256": "f75bce1ce864170ef5e6a2c6a61cd3339e1a17ce11e99a25bae4474ea491d001", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.2.1" }, "audioplayers_platform_interface": { "dependency": "transitive", "description": { "name": "audioplayers_platform_interface", - "sha256": "77e5fa20fb4a64709158391c75c1cca69a481d35dc879b519e350a05ff520373", + "sha256": "0e2f6a919ab56d0fec272e801abc07b26ae7f31980f912f24af4748763e5a656", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.0" + "version": "7.1.1" }, "audioplayers_web": { "dependency": "transitive", "description": { "name": "audioplayers_web", - "sha256": "bd99d8821114747682a2be0adcdb70233d4697af989b549d3a20a0f49f6c9b13", + "sha256": "1c0f17cec68455556775f1e50ca85c40c05c714a99c5eb1d2d57cc17ba5522d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.1.1" }, "audioplayers_windows": { "dependency": "transitive", "description": { "name": "audioplayers_windows", - "sha256": "871d3831c25cd2408ddc552600fd4b32fba675943e319a41284704ee038ad563", + "sha256": "4048797865105b26d47628e6abb49231ea5de84884160229251f37dfcbe52fd7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.2.1" }, "barcode": { "dependency": "transitive", @@ -350,6 +350,16 @@ "source": "hosted", "version": "1.0.8" }, + "dart_pubspec_licenses": { + "dependency": "transitive", + "description": { + "name": "dart_pubspec_licenses", + "sha256": "23ddb78ff9204d08e3109ced67cd3c6c6a066f581b0edf5ee092fc3e1127f4ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.4" + }, "dart_quill_delta": { "dependency": "transitive", "description": { @@ -374,11 +384,11 @@ "dependency": "transitive", "description": { "name": "decimal", - "sha256": "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3", + "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.4" }, "defer_pointer": { "dependency": "direct main", @@ -404,21 +414,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" }, "diff_match_patch": { "dependency": "transitive", @@ -783,11 +793,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", @@ -851,11 +861,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175", + "sha256": "c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.1.3" + "version": "16.0.0" }, "golden_screenshot": { "dependency": "direct dev", @@ -1396,11 +1406,11 @@ "dependency": "direct main", "description": { "name": "pdfrx", - "sha256": "4640c561aa31598c9c8ff9042675f7c1ecb2ca2b1190dff6e2ecaa677d1bc416", + "sha256": "c7f80eac77b38a66f2dc49e5cbfd38ed522da77d42ac6d5552872a17f7262a67", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.35" + "version": "1.3.3" }, "perfect_freehand": { "dependency": "direct main", @@ -1416,11 +1426,11 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f", + "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.0+1" + "version": "12.0.1" }, "permission_handler_android": { "dependency": "transitive", @@ -1506,11 +1516,11 @@ "dependency": "transitive", "description": { "name": "platform_linux", - "sha256": "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8", + "sha256": "907b7c6da6ee6eea61cd1266b7bd72e2d5bbf7e85160221e8ac5583a44e7a1c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "0.1.2+1" }, "plugin_platform_interface": { "dependency": "transitive", @@ -1536,11 +1546,11 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.0.3" }, "power_extensions": { "dependency": "transitive", @@ -1626,11 +1636,11 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge_linux", - "sha256": "5fcc60cab2ab9079e0746941f05c5ca5fec85cc050b738c8c8b9da7c09da17eb", + "sha256": "388aaa62017dbd746742ce0bfae99f4ffe1dda2462e8a866df630c67b63c54fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.2" }, "quill_native_bridge_macos": { "dependency": "transitive", @@ -1666,11 +1676,11 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge_windows", - "sha256": "60e50d74238f22ceb43113d9a42b6627451dab9fc27f527b979a32051cf1da45", + "sha256": "3f96ced19e3206ddf4f6f7dde3eb16bdd05e10294964009ea3a806d995aa7caa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.2" }, "quiver": { "dependency": "transitive", @@ -1903,11 +1913,11 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "6668a08355b370d5cb5446fc869c4492ed23c6433934fe88228876460fedac22", + "sha256": "bc9488b19acbc4756aa60a9de19720045f9d49a4a7524d56475e0a6965bcd8bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.2" + "version": "4.7.3" }, "slang_flutter": { "dependency": "direct main", @@ -1949,6 +1959,46 @@ "source": "hosted", "version": "1.12.1" }, + "stow": { + "dependency": "direct main", + "description": { + "name": "stow", + "sha256": "94707ed29bfe08a92d7ff6e7849cf1a0d43a106a8bd514e1f6a86ce0e7347efe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "stow_codecs": { + "dependency": "direct main", + "description": { + "name": "stow_codecs", + "sha256": "edfaee5b03d6b23df277889ec80e587e66d48fbbf7f7ef925a9d1046d08a3ec0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0+1" + }, + "stow_plain": { + "dependency": "direct main", + "description": { + "name": "stow_plain", + "sha256": "be2496088876a6a3c51e24de0230a3c7626c8bc47c4edb8761ce69dcddbedca3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "stow_secure": { + "dependency": "direct main", + "description": { + "name": "stow_secure", + "sha256": "8f5e724e0f94ab052b18ffa4c3e24d32f28efdd6b069c7494552759f1aa55504", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, "stream_channel": { "dependency": "transitive", "description": { @@ -2003,11 +2053,11 @@ "dependency": "transitive", "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", @@ -2073,11 +2123,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", @@ -2303,11 +2353,41 @@ "dependency": "direct main", "description": { "name": "workmanager", - "sha256": "f3c3ce6d79cce53eee4a29dd2e8328c25db5ba5d9062fcc5e8f3c71e0af9b7e4", + "sha256": "dffcbbfd99af17271ca52d8a3767ba8a1000b357f2774db8ed5d58879cb9783a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.8.0" + }, + "workmanager_android": { + "dependency": "transitive", + "description": { + "name": "workmanager_android", + "sha256": "a6447816c41aa0ad8f6fa29b62d09a528891cf0737296397e1caae2523ced7dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "workmanager_apple": { + "dependency": "transitive", + "description": { + "name": "workmanager_apple", + "sha256": "9c99003682a8423bdc122ff4bae891e24574d1e676ea302d2ef0493266228461", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "workmanager_platform_interface": { + "dependency": "transitive", + "description": { + "name": "workmanager_platform_interface", + "sha256": "b1f0a868f1117511a23b0eb4220f08134152433b51a83eed479b1d68bbe23789", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" }, "xdg_directories": { "dependency": "transitive", @@ -2412,6 +2492,6 @@ }, "sdks": { "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.32.0" + "flutter": ">=3.32.7" } } From e18af041f8d21df2f974996b58b3852a818db85e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:56:09 +0000 Subject: [PATCH 148/212] mcp-grafana: 0.6.1 -> 0.6.2 --- pkgs/by-name/mc/mcp-grafana/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 93b7dbdba473..9a005213d546 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y5uzHLekC756dpMmhPXggLRO5bIawCdzSSoJjrwr4Qo="; + hash = "sha256-huJt0UtaKs/F4v7FJXb0fILqBd+OaTL9X0MUb9KZsX8="; }; - vendorHash = "sha256-PsfjKkdhgblo3ksjP1tewoJQCQmWuWoSAO5Pfn9iMVM="; + vendorHash = "sha256-4TqbAUZQNwlfP44rRlmx+6ZaiOPEKcJ+K7qYja3pL/4="; ldflags = [ "-s" From d508ccbabcc357331cdb95a220255571563876b1 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 08:57:01 +0800 Subject: [PATCH 149/212] saber: refactor --- pkgs/by-name/sa/saber/gitHashes.json | 4 ++ pkgs/by-name/sa/saber/package.nix | 9 ++-- pkgs/by-name/sa/saber/update-gitHashes.py | 51 +++++++++++++++++++++++ 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/sa/saber/gitHashes.json create mode 100755 pkgs/by-name/sa/saber/update-gitHashes.py diff --git a/pkgs/by-name/sa/saber/gitHashes.json b/pkgs/by-name/sa/saber/gitHashes.json new file mode 100644 index 000000000000..3ee14f88f491 --- /dev/null +++ b/pkgs/by-name/sa/saber/gitHashes.json @@ -0,0 +1,4 @@ +{ + "flutter_secure_storage_linux": "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=", + "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=" +} diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 0790d0de3076..08cf4f15b430 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -26,10 +26,7 @@ flutter332.buildFlutterApplication rec { hash = "sha256-5N4HojdDysLgCPq614ZzJXx/dx3s4F++W35fjYdevRk="; }; - gitHashes = { - receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="; - flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY="; - }; + gitHashes = lib.importJSON ./gitHashes.json; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -75,6 +72,10 @@ flutter332.buildFlutterApplication rec { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) (_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json) + { + command = [ ./update-gitHashes.py ]; + supportedFeatures = [ "silent" ]; + } ]; }; diff --git a/pkgs/by-name/sa/saber/update-gitHashes.py b/pkgs/by-name/sa/saber/update-gitHashes.py new file mode 100755 index 000000000000..ffa6feb66653 --- /dev/null +++ b/pkgs/by-name/sa/saber/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 fd6a3cbd9594025f428df8894df2a538f3f0971c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 01:08:38 +0000 Subject: [PATCH 150/212] libretro.fbneo: 0-unstable-2025-07-18 -> 0-unstable-2025-07-24 --- pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 1842612f23c4..bc9abb5316b0 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-07-18"; + version = "0-unstable-2025-07-24"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "9491dab32de7d70c51a3d9fec6e17d1ea7e52a3f"; - hash = "sha256-x0gBSSjbM/neIwjA7qmi5gvSGmeyaRNmDs2z9awakXY="; + rev = "ae41c16e10a1996e71ac7dd9a5484b725b8d1a51"; + hash = "sha256-mBlk4tjMd67dOw/+oYC0ly7u2Soqva4MxiODGXPjBrM="; }; makefile = "Makefile"; From 9c9f467d4931dcc577221d847e108458936179f8 Mon Sep 17 00:00:00 2001 From: NullCube Date: Sat, 19 Jul 2025 21:28:15 -0700 Subject: [PATCH 151/212] installer/nixos-generate-config: remove broadcom_sta Resolves the installer failing on devices that include this hardware, as broadcom_sta was marked as insecure due to being unmaintained and having active CVE's. This commit be reverted when/if the installer has a mechanism for allowing insecure packages. --- .../installer/tools/nixos-generate-config.pl | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 1799ba2c5d97..3302fdce80ac 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -171,21 +171,6 @@ sub pciCheck { } } - # broadcom STA driver (wl.ko) - # list taken from http://www.broadcom.com/docs/linux_sta/README.txt - if ($vendor eq "0x14e4" && - ($device eq "0x4311" || $device eq "0x4312" || $device eq "0x4313" || - $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" || - $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" || - $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" || - $device eq "0x4357" || $device eq "0x4358" || $device eq "0x4359" || - $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1" - ) ) - { - push @modulePackages, "config.boot.kernelPackages.broadcom_sta"; - push @kernelModules, "wl"; - } - # broadcom FullMac driver # list taken from # https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#brcmfmac From c944da85cdf29baa19a5226fdbf6ae009b688ad2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 12 Jul 2023 12:50:43 +0300 Subject: [PATCH 152/212] python3Packages.libretranslate: create static gzip and brotli files --- .../python-modules/libretranslate/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index adf8f2040fb9..76a45841718b 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -1,8 +1,10 @@ { lib, + pkgs, buildPythonPackage, fetchFromGitHub, pytestCheckHook, + runCommand, hatchling, argostranslate, flask, @@ -15,6 +17,7 @@ expiringdict, langdetect, lexilang, + libretranslate, ltpycld2, morfessor, appdirs, @@ -26,6 +29,7 @@ prometheus-client, polib, python, + xorg, }: buildPythonPackage rec { @@ -85,6 +89,26 @@ buildPythonPackage rec { pythonImportsCheck = [ "libretranslate" ]; + passthru = { + static-compressed = + runCommand "libretranslate-data-compressed" + { + nativeBuildInputs = [ + pkgs.brotli + xorg.lndir + ]; + } + '' + mkdir -p $out/share/libretranslate/static + lndir ${libretranslate}/share/libretranslate/static $out/share/libretranslate/static + + # Create static gzip and brotli files + find -L $out -type f -regextype posix-extended -iregex '.*\.(css|ico|js|svg|ttf)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep --no-copy-stat {} ';' + ''; + }; + meta = with lib; { description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services"; homepage = "https://libretranslate.com"; From cbec672b38a4cab25b6d7e1db3cc7758740146c7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 12 Jul 2023 14:06:55 +0300 Subject: [PATCH 153/212] nixos/libretranslate: init --- .../manual/release-notes/rl-2511.section.md | 4 +- nixos/modules/module-list.nix | 1 + .../services/web-apps/libretranslate.nix | 233 ++++++++++++++++++ 3 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/web-apps/libretranslate.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index d3cff7b638e7..b03412275d90 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -34,7 +34,9 @@ - Auto-scrub support for Bcachefs filesystems can now be enabled through [services.bcachefs.autoScrub.enable](#opt-services.bcachefs.autoScrub.enable) to periodically check for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks. -- [tlsrpt-reporter], an application suite to generate and deliver TLSRPT reports. Available as [services.tlsrpt](#opt-services.tlsrpt.enable). +- [LibreTranslate](https://libretranslate.com), a free and open source machine translation API. Available as [services.libretranslate](#opt-services.libretranslate.enable). + +- [tlsrpt-reporter](https://github.com/sys4/tlsrpt-reporter), an application suite to generate and deliver TLSRPT reports. Available as [services.tlsrpt](#opt-services.tlsrpt.enable). - [Chhoto URL](https://github.com/SinTan1729/chhoto-url), a simple, blazingly fast, selfhosted URL shortener with no unnecessary features, written in Rust. Available as [services.chhoto-url](#opt-services.chhoto-url.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fc6c4678dbea..916b87d3ffab 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1611,6 +1611,7 @@ ./services/web-apps/lasuite-docs.nix ./services/web-apps/lasuite-meet.nix ./services/web-apps/lemmy.nix + ./services/web-apps/libretranslate.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mainsail.nix ./services/web-apps/mastodon.nix diff --git a/nixos/modules/services/web-apps/libretranslate.nix b/nixos/modules/services/web-apps/libretranslate.nix new file mode 100644 index 000000000000..1664b9ef4581 --- /dev/null +++ b/nixos/modules/services/web-apps/libretranslate.nix @@ -0,0 +1,233 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.libretranslate; + ltmanageKeysCli = pkgs.writeShellScriptBin "ltmanage-keys" '' + set -a + export HOME="/var/lib/libretranslate" + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env' + fi + $sudo ${cfg.package}/bin/ltmanage keys --api-keys-db-path ${cfg.dataDir}/db/api_keys.db "$@" + ''; + +in +{ + options = { + services.libretranslate = { + enable = lib.mkEnableOption "LibreTranslate service"; + + package = lib.mkPackageOption pkgs "libretranslate" { }; + + user = lib.mkOption { + type = lib.types.str; + default = "libretranslate"; + description = "User account under which libretranslate runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "libretranslate"; + description = "Group account under which libretranslate runs."; + }; + + host = lib.mkOption { + description = "The address the application should listen on."; + type = lib.types.str; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 5000; + description = "The the application should listen on."; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/libretranslate"; + example = "/srv/data/libretranslate"; + description = "The data directory."; + }; + + threads = lib.mkOption { + type = lib.types.nullOr lib.types.ints.positive; + default = null; + example = 8; + description = "Set number of threads."; + }; + + enableApiKeys = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Whether to enable the API keys database."; + }; + + disableWebUI = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Whether to disable the Web UI."; + }; + + updateModels = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Update language models at startup"; + }; + + domain = lib.mkOption { + type = lib.types.str; + default = ""; + example = "libretranslate.example.com"; + description = '' + The domain serving your LibreTranslate instance. + Required for configure nginx as a reverse proxy. + ''; + }; + + configureNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Configure nginx as a reverse proxy for LibreTranslate."; + }; + + extraArgs = lib.mkOption { + type = + with lib.types; + attrsOf ( + nullOr (oneOf [ + bool + str + int + (listOf (oneOf [ + bool + str + int + ])) + ]) + ); + default = { }; + example = { + debug = true; + disable-files-translation = true; + url-prefix = "translate"; + }; + description = "Extra arguments passed to the LibreTranslate."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = lib.mkIf cfg.enableApiKeys [ ltmanageKeysCli ]; + + systemd.tmpfiles.rules = lib.mkIf (cfg.dataDir != "/var/lib/libretranslate") [ + "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -" + ]; + + systemd.services.libretranslate = { + description = "LibreTranslate service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + HOME = cfg.dataDir; + }; + serviceConfig = lib.mkMerge [ + { + Type = "simple"; + ExecStart = '' + ${cfg.package}/bin/libretranslate ${ + lib.cli.toGNUCommandLineShell { } ( + cfg.extraArgs + // { + inherit (cfg) host port threads; + api-keys = cfg.enableApiKeys; + disable-web-ui = cfg.disableWebUI; + update-models = cfg.updateModels; + } + ) + } + ''; + WorkingDirectory = cfg.dataDir; + User = cfg.user; + Group = cfg.group; + ProcSubset = "all"; + ProtectProc = "invisible"; + UMask = "0027"; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = false; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ]; + } + (lib.mkIf (cfg.dataDir == "/var/lib/libretranslate") { + StateDirectory = "libretranslate"; + StateDirectoryMode = "0750"; + }) + (lib.mkIf (cfg.dataDir != "/var/lib/libretranslate") { + ReadWritePaths = cfg.dataDir; + }) + ]; + }; + + services.nginx = lib.mkIf cfg.configureNginx { + enable = true; + virtualHosts."${cfg.domain}" = { + root = "/var/empty"; + + locations."/" = { + proxyPass = "http://127.0.0.1:${toString cfg.port}"; + }; + + locations."= /favicon.ico" = { + alias = "${cfg.package.static-compressed}/share/libretranslate/static/favicon.ico"; + }; + + locations."^~ /static/" = { + alias = "${cfg.package.static-compressed}/share/libretranslate/static/"; + }; + }; + }; + + users.users = lib.optionalAttrs (cfg.user == "libretranslate") { + libretranslate = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = lib.optionalAttrs (cfg.group == "libretranslate") { + libretranslate = { }; + }; + }; +} From 0671ce3e0139d2ef1d04a3545d3d4a5ce363bf5b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 25 Jul 2025 13:36:34 +0800 Subject: [PATCH 154/212] wine: move gettext to nativeBuildInputs --- pkgs/applications/emulators/wine/base.nix | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 6c3467b6e990..5323b2e0a88a 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -13,6 +13,7 @@ bison, flex, fontforge, + gettext, makeWrapper, pkg-config, nixosTests, @@ -92,16 +93,19 @@ stdenv.mkDerivation ( # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; - nativeBuildInputs = [ - bison - flex - fontforge - makeWrapper - pkg-config - ] - ++ lib.optionals supportFlags.mingwSupport ( - mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin - ); + nativeBuildInputs = + with supportFlags; + [ + bison + flex + fontforge + makeWrapper + pkg-config + ] + ++ lib.optional gettextSupport gettext + ++ lib.optionals mingwSupport ( + mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin + ); buildInputs = toBuildInputs pkgArches ( with supportFlags; @@ -115,7 +119,6 @@ stdenv.mkDerivation ( ++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups - ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional odbcSupport pkgs.unixODBC From b556fac3fb814c2d305d63a036c0376735ad6b53 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 27 Jul 2025 10:35:46 +0800 Subject: [PATCH 155/212] pantheon-tweaks: 2.3.0 -> 2.4.0 https://github.com/pantheon-tweaks/pantheon-tweaks/compare/2.3.0...2.4.0 --- pkgs/by-name/pa/pantheon-tweaks/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix index cb14ba5c5451..b18666199594 100644 --- a/pkgs/by-name/pa/pantheon-tweaks/package.nix +++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix @@ -11,20 +11,19 @@ wrapGAppsHook4, gnome-settings-daemon, gtk4, - libgee, pango, pantheon, }: stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = "pantheon-tweaks"; rev = version; - hash = "sha256-+dkjmeY4WJfXwgNR8HlRaVfvS/2icbi8eSAkiB9x7uI="; + hash = "sha256-/fHhVErLIQMSRkri6vqc11yZr0YaLeQTUh986If8mVg="; }; nativeBuildInputs = [ @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ gnome-settings-daemon # org.gnome.settings-daemon.plugins.xsettings gtk4 - libgee pango ] ++ (with pantheon; [ From 1692fdd9481da9f30b01f6a7cb7cc48a787a35a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 03:09:16 +0000 Subject: [PATCH 156/212] oelint-adv: 8.1.4 -> 8.2.0 --- pkgs/by-name/oe/oelint-adv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index b21067ed3726..16714558cdf2 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "8.1.4"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-Ld8PwAWKH1BQTvmIev5e6ZI1xOaaopunKJkTgAFUipI="; + hash = "sha256-K1MUf9QDDBuIuVovyXYkHPK4eoth4wdFnzjuFpZFBLc="; }; postPatch = '' From 27c1adde5cafd22da1efe2c23cc33a44d76a92c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 03:13:48 +0000 Subject: [PATCH 157/212] fzf: 0.64.0 -> 0.65.0 --- pkgs/by-name/fz/fzf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 92cb2d875cce..ab375fc01106 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.64.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-OqA4eMwVtOR8nBg8kyVZQzaAh/7eeMG9SGrqTT7j2vw="; + hash = "sha256-8I6NpZsnqGw8eOoKM5PmRQzahsss01WQFjjDJ5e7pTE="; }; vendorHash = "sha256-1wxi+wfTSSgJQLNbCdoFTz9G4XLgEX7PpzqpuVjEYL8="; From f70cb4d3bd7357c92d4ac21d04e585c4916a6659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 03:48:50 +0000 Subject: [PATCH 158/212] python3Packages.coiled: 1.110.0 -> 1.113.0 --- pkgs/development/python-modules/coiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index 0a669deed4b3..c4ef5c6bdd6f 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.110.0"; + version = "1.113.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-g+c9PQ4CpDlGjBAW1qb+l/80Dnsd6xL1h30H9s/cjJw="; + hash = "sha256-1AIE06pssYFaiYBTv7gY4/Kw2jwKntvU/AMy2I77nsY="; }; build-system = [ From e7ca046e6a8e5f530b0d7a1e3f208c3ad667c7de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 03:51:28 +0000 Subject: [PATCH 159/212] gorched: 1.6 -> 1.7 --- pkgs/by-name/go/gorched/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gorched/package.nix b/pkgs/by-name/go/gorched/package.nix index 2ac768a5fa9b..ef499d1b8179 100644 --- a/pkgs/by-name/go/gorched/package.nix +++ b/pkgs/by-name/go/gorched/package.nix @@ -6,15 +6,15 @@ }: buildGoModule (finalAttrs: { pname = "gorched"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "zladovan"; repo = "gorched"; tag = "v${finalAttrs.version}"; - hash = "sha256-cT6wkWUlz3ixv7Mu5143I5NxjfwhKQ6bLwrW3BwTtTQ="; + hash = "sha256-n4MKZqhgAIsgK9XPv2pF8mK0I4suSN02JkqY7Aj+LG0="; }; - vendorHash = "sha256-9fucarQKltIxV8j8L+yQ6Fa7IRIhoQCNxcG21KYOpuw="; + vendorHash = "sha256-ohFj0jEHt0SV3pC9+mz+XAjOJ6MIBFY7CJf+G++r72U="; postPatch = '' mkdir ./cmd/gorched From 9fc4a80895c35db45fd65c3a7026402c7cb39f8a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 26 Jul 2025 21:13:55 -0700 Subject: [PATCH 160/212] python313Packages.py-schluter: init at 0.1.7 --- .../python-modules/py-schluter/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/py-schluter/default.nix diff --git a/pkgs/development/python-modules/py-schluter/default.nix b/pkgs/development/python-modules/py-schluter/default.nix new file mode 100644 index 000000000000..329d34603cb7 --- /dev/null +++ b/pkgs/development/python-modules/py-schluter/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-schluter"; + version = "0.1.7"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FS6aflpRDoIHsE4XIf93Q6MsO9ApRbU+efm7zWpw/dY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Package has no tests + doCheck = false; + + pythonImportsCheck = [ "schluter" ]; + + meta = { + description = "Python API for Schluter DITRA-HEAT thermostat"; + homepage = "https://github.com/prairieapps/py-schluter"; + 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 29db1042e5a6..e8e2ab7a5347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12247,6 +12247,8 @@ self: super: with self; { py-rust-stemmers = callPackage ../development/python-modules/py-rust-stemmers { }; + py-schluter = callPackage ../development/python-modules/py-schluter { }; + py-scrypt = callPackage ../development/python-modules/py-scrypt { }; py-serializable = callPackage ../development/python-modules/py-serializable { }; From 375252023cb0e7303a77ce3b8c32f8e94e4e5cc2 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 26 Jul 2025 21:14:06 -0700 Subject: [PATCH 161/212] 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 8e1af9be886f..a1a5824877c2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5093,7 +5093,8 @@ ]; "schluter" = ps: with ps; [ - ]; # missing inputs: py-schluter + py-schluter + ]; "scl" = ps: with ps; [ ]; From b991abf9a8b611e7bd928063e0b47addc6d5e2dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 04:37:03 +0000 Subject: [PATCH 162/212] nelm: 1.7.2 -> 1.8.0 --- pkgs/by-name/ne/nelm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 888543299060..2de54723275d 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-EmsA9ppuAZnrYtJE96vg3s+QGlsl4gXcQj2A0Buur4g="; + hash = "sha256-IZO+uMWa2dxvfRhxeVy6JRIzRC1CduZxUHPrA8lqxi8="; }; - vendorHash = "sha256-q7+/OdYt/mdf/oZfFh3/vU8uOKaUpX+lLAFAOHgy6mk="; + vendorHash = "sha256-wrZe0YmsMOHD3NOOXRKM0ZLnnOvasFyPq26JIAqyXTQ="; subPackages = [ "cmd/nelm" ]; From 690f9f9b033a79059a4b338dd0ebccfe140605de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 04:37:57 +0000 Subject: [PATCH 163/212] gqlgen: 0.17.76 -> 0.17.77 --- pkgs/by-name/gq/gqlgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index 16a7efad6fc1..dd4aafe9a251 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.76"; + version = "0.17.77"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-b226pRpO693e48OlzVwSaDlPM5RAivIoX/KHXESVEJI="; + hash = "sha256-3feo0wpRHDK3Vx9R6YoQuc2NU+4F+trkaNTvA3AV2NE="; }; - vendorHash = "sha256-cqNRfKPneq4BxVA+kGAxSalwfeNI/hFxsrOgVhkUbLs="; + vendorHash = "sha256-qDPJKGQmZz5Taj/gXakx3t/4bDaMrNR+HehV19HvdCI="; subPackages = [ "." ]; From 895a7bd8425722d095e02017cf1231a608b4d839 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:08:33 +1000 Subject: [PATCH 164/212] nixVersions.nix_2_30: 2.30.1 -> 2.30.2 Diff: https://github.com/NixOS/nix/compare/refs/tags/2.30.1...refs/tags/2.30.2 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4af9ac7f772b..66cb191ed063 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -204,14 +204,14 @@ lib.makeExtensible ( nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything; nixComponents_2_30 = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.30.1"; + version = "2.30.2"; inherit (self.nix_2_24.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_30"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; - hash = "sha256-4+xPVJBeYLlIn+fOS5F0iq/DclpCXnmh4Y7VzAIr/a8="; + hash = "sha256-U46fAs+j2PfWWqP1zNi1odhnV4030SQ0RoEC8Eah1OQ="; }; }; From 62d7be2954faec9004731d65db5832b278abfb4b Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Jul 2025 07:32:56 +0200 Subject: [PATCH 165/212] nixos/netdata: fix module when `withSystemdJournal = false` --- nixos/modules/services/monitoring/netdata.nix | 17 +++++++++-------- pkgs/tools/system/netdata/default.nix | 7 ++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 50ef82f8cbf2..b7c8f4b42ba9 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -447,14 +447,6 @@ in permissions = "u+rx,g+x,o-rwx"; }; - "systemd-journal.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; - capabilities = "cap_dac_read_search,cap_syslog+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; - "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; @@ -490,6 +482,15 @@ in group = cfg.group; permissions = "u+rx,g+x,o-rwx"; }; + } + // lib.optionalAttrs (cfg.package.withSystemdJournal) { + "systemd-journal.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; + capabilities = "cap_dac_read_search,cap_syslog+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; }; security.pam.loginLimits = [ diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d795ce8c6076..321ecd2a4924 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -276,7 +276,12 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; }; }).goModules; - inherit withIpmi withNetworkViewer withNdsudo; + inherit + withIpmi + withNdsudo + withNetworkViewer + withSystemdJournal + ; tests.netdata = nixosTests.netdata; }; From eb072448cc32a15c4a33e0f2127bf4a1ecd4a04c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 05:35:55 +0000 Subject: [PATCH 166/212] sillytavern: 1.13.1 -> 1.13.2 --- pkgs/by-name/si/sillytavern/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index 79bbd55a1d0b..0f75fefdbf89 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -7,15 +7,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-rWDJBuGzgG34jpsBPdLqIegcOfV3bRyOdulRsMS2mhg="; + hash = "sha256-tTBpSXkXzQjp3TW9hksqUpA3sagR2GSY42bHLHEd9oI="; }; - npmDepsHash = "sha256-DyqAaaeSCAdsKXWUo1t4FpUuqu1n4TfZBLg23URuNUM="; + npmDepsHash = "sha256-hayhsEZN857V6bsWPXupLeqxcOr1sgKs0uWN2pSQD+k="; nativeBuildInputs = [ makeBinaryWrapper ]; From 2bbde7d60cf8f4a4c2975b1774b4c4c39fd6eaec Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 27 Jul 2025 07:41:33 +0200 Subject: [PATCH 167/212] bashunit: 0.22.2 -> 0.22.3 --- pkgs/by-name/ba/bashunit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index f7bb37bf26de..d101e66e91a2 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.22.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-neQ7/euCGn0u9ph4Z3vGsptayZ47cY0iG6FFRkwBFG0="; + hash = "sha256-CN3BmsAFRQSkcS97XkKsL9+lChxb7V05iw8xoq0QVZE="; forceFetchGit = true; # needed to include the tests directory for the check phase }; From ec879dd25119c3fb33a9a147f6b525ddec4eb604 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 05:47:27 +0000 Subject: [PATCH 168/212] phrase-cli: 2.43.0 -> 2.44.0 --- pkgs/by-name/ph/phrase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 49a89e42e19b..1579ff23cb65 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-myG+V7piegEvjqLYeGg8Q3YgcNeLSZmB+5qwUhZRUik="; + sha256 = "sha256-tMWjk+cqgVcmtFSXqWhvOTc6y/85hJ8ds8OVukLbtzQ="; }; - vendorHash = "sha256-ycjpZBa/6yYChQh+gHrq0V76GR38TnEU73QKJQBlr5o="; + vendorHash = "sha256-Eb/rkXvih7CDEgxZ15BD62zE5/TRYWNTTZzQU+uxtXg="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From 4dc554d4731719f382a40fa144ac716d7d894027 Mon Sep 17 00:00:00 2001 From: mivorasu <221005165+mivorasu@users.noreply.github.com> Date: Sat, 26 Jul 2025 23:26:03 +0000 Subject: [PATCH 169/212] treewide: normalize unstable version strings --- pkgs/by-name/an/android-backup-extractor/package.nix | 2 +- pkgs/by-name/ar/arubaotp-seed-extractor/package.nix | 2 +- pkgs/by-name/bo/bounty/package.nix | 2 +- pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix | 2 +- pkgs/by-name/ce/ceptre/package.nix | 2 +- pkgs/by-name/fo/foma/package.nix | 2 +- pkgs/by-name/is/iso-flags/package.nix | 2 +- pkgs/by-name/nz/nzportable/assets.nix | 2 +- pkgs/by-name/nz/nzportable/fteqw.nix | 2 +- pkgs/by-name/nz/nzportable/quakec.nix | 2 +- pkgs/by-name/pa/pam_ussh/package.nix | 2 +- pkgs/by-name/pe/peergos/package.nix | 2 +- pkgs/by-name/sp/speech-denoiser/package.nix | 4 ++-- pkgs/by-name/su/subdl/package.nix | 2 +- pkgs/by-name/vi/viw/package.nix | 2 +- pkgs/by-name/zt/zthrottle/package.nix | 2 +- pkgs/development/python-modules/rmrl/default.nix | 2 +- pkgs/development/rocm-modules/6/composable_kernel/base.nix | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/an/android-backup-extractor/package.nix b/pkgs/by-name/an/android-backup-extractor/package.nix index 99cb71e60bd0..37a9877f8dfb 100644 --- a/pkgs/by-name/an/android-backup-extractor/package.nix +++ b/pkgs/by-name/an/android-backup-extractor/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "android-backup-extractor"; - version = "0-unstable-2025-01-15-62310d4"; + version = "0-unstable-2025-01-15"; src = fetchurl { url = "https://github.com/nelenkov/android-backup-extractor/releases/download/latest/abe-62310d4.jar"; diff --git a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix index 8a63ba867b58..798168639aac 100644 --- a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix +++ b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication { pname = "arubaotp-seed-extractor"; - version = "0-unstable-22-12-2022"; + version = "0-unstable-2022-12-22"; src = fetchFromGitHub { owner = "andry08"; diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix index d77c8b46ef65..3f2a43d4e5ad 100644 --- a/pkgs/by-name/bo/bounty/package.nix +++ b/pkgs/by-name/bo/bounty/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage { pname = "bounty"; - version = "0.1.0-unstable-25-01-29"; + version = "0.1.0-unstable-2025-02-15"; src = fetchFromGitHub { owner = "ghbountybot"; diff --git a/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix b/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix index a4aa6ef8d3c1..f05e0a788ed9 100644 --- a/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix +++ b/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation { pname = "breeze-hacked-cursor-theme"; - version = "0-unstable-2024-1-28"; + version = "0-unstable-2024-01-28"; src = fetchFromGitHub { owner = "clayrisser"; diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix index a2623e73757e..db0654d16cd8 100644 --- a/pkgs/by-name/ce/ceptre/package.nix +++ b/pkgs/by-name/ce/ceptre/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "ceptre"; - version = "0-unstable-2024-8-26"; + version = "0-unstable-2024-08-26"; src = fetchFromGitHub { owner = "chrisamaphone"; diff --git a/pkgs/by-name/fo/foma/package.nix b/pkgs/by-name/fo/foma/package.nix index 3110f745672e..54a756a21b5e 100644 --- a/pkgs/by-name/fo/foma/package.nix +++ b/pkgs/by-name/fo/foma/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "foma"; - version = "0.10.0alpha-unstable-03-13-2024"; + version = "0.10.0alpha-unstable-2024-03-13"; src = fetchFromGitHub { owner = "mhulden"; diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix index cfe53345f427..298074c3310b 100644 --- a/pkgs/by-name/is/iso-flags/package.nix +++ b/pkgs/by-name/is/iso-flags/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation { pname = "iso-flags"; - version = "0-unstable-18012020"; + version = "0-unstable-2020-01-18"; src = fetchFromGitHub { owner = "joielechong"; diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix index c002f5c12151..2f3bc507bead 100644 --- a/pkgs/by-name/nz/nzportable/assets.nix +++ b/pkgs/by-name/nz/nzportable/assets.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation { pname = "nzp-assets"; - version = "0-unstable-2024-09-28-13-34-48"; + version = "0-unstable-2024-09-28"; src = fetchFromGitHub { owner = "nzp-team"; diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix index d81cabef1c42..be8173db02b2 100644 --- a/pkgs/by-name/nz/nzportable/fteqw.nix +++ b/pkgs/by-name/nz/nzportable/fteqw.nix @@ -41,7 +41,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nzp-fteqw"; - version = "0-unstable-2024-09-11-20-07-31"; + version = "0-unstable-2024-09-11"; src = fetchFromGitHub { owner = "nzp-team"; diff --git a/pkgs/by-name/nz/nzportable/quakec.nix b/pkgs/by-name/nz/nzportable/quakec.nix index 32fb863d7508..7b219dac08f7 100644 --- a/pkgs/by-name/nz/nzportable/quakec.nix +++ b/pkgs/by-name/nz/nzportable/quakec.nix @@ -7,7 +7,7 @@ }: stdenvNoCC.mkDerivation { pname = "nzp-quakec"; - version = "0-unstable-2024-10-12-12-03-59"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "nzp-team"; diff --git a/pkgs/by-name/pa/pam_ussh/package.nix b/pkgs/by-name/pa/pam_ussh/package.nix index a562c55a8d3e..9ef4b1d117a1 100644 --- a/pkgs/by-name/pa/pam_ussh/package.nix +++ b/pkgs/by-name/pa/pam_ussh/package.nix @@ -8,7 +8,7 @@ buildGoModule { pname = "pam_ussh"; - version = "0-unstable-20210615"; + version = "0-unstable-2021-06-15"; src = fetchFromGitHub { owner = "uber"; diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 191f3e1907df..e4df32ff6f70 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -14,7 +14,7 @@ let tweetnacl = stdenv.mkDerivation { pname = "tweetnacl"; - version = "0-unstable-12-02-2020"; + version = "0-unstable-2020-02-12"; src = fetchFromGitHub { owner = "ianopolous"; diff --git a/pkgs/by-name/sp/speech-denoiser/package.nix b/pkgs/by-name/sp/speech-denoiser/package.nix index 2a726587ef9a..859318e5fe13 100644 --- a/pkgs/by-name/sp/speech-denoiser/package.nix +++ b/pkgs/by-name/sp/speech-denoiser/package.nix @@ -19,7 +19,7 @@ let rnnoise-nu = stdenv.mkDerivation { pname = "rnnoise-nu"; - version = "0-unstable-07-10-2019"; + version = "0-unstable-2018-10-08"; src = speech-denoiser-src; sourceRoot = "${speech-denoiser-src.name}/rnnoise"; nativeBuildInputs = [ autoreconfHook ]; @@ -34,7 +34,7 @@ let in stdenv.mkDerivation { pname = "speech-denoiser"; - version = "unstable-07-10-2019"; + version = "0-unstable-2018-10-08"; src = speech-denoiser-src; diff --git a/pkgs/by-name/su/subdl/package.nix b/pkgs/by-name/su/subdl/package.nix index 9e29fa674afd..e70f6c703a4d 100644 --- a/pkgs/by-name/su/subdl/package.nix +++ b/pkgs/by-name/su/subdl/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "subdl"; - version = "0-unstable-2017-11.06"; + version = "0-unstable-2017-11-06"; src = fetchFromGitHub { owner = "alexanderwink"; diff --git a/pkgs/by-name/vi/viw/package.nix b/pkgs/by-name/vi/viw/package.nix index 00de324b2da3..4ca8595f844e 100644 --- a/pkgs/by-name/vi/viw/package.nix +++ b/pkgs/by-name/vi/viw/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "viw"; - version = "0-unstable-20171029"; + version = "0-unstable-2017-10-29"; src = fetchFromGitHub { owner = "lpan"; diff --git a/pkgs/by-name/zt/zthrottle/package.nix b/pkgs/by-name/zt/zthrottle/package.nix index a2cd4bda38dd..5c3a583bbc4b 100644 --- a/pkgs/by-name/zt/zthrottle/package.nix +++ b/pkgs/by-name/zt/zthrottle/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "zthrottle"; - version = "0-unstable-2017-7-24"; + version = "0-unstable-2017-07-24"; src = fetchFromGitHub { owner = "anko"; diff --git a/pkgs/development/python-modules/rmrl/default.nix b/pkgs/development/python-modules/rmrl/default.nix index 27bad1461010..25ab4201ffbf 100644 --- a/pkgs/development/python-modules/rmrl/default.nix +++ b/pkgs/development/python-modules/rmrl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "rmrl"; - version = "0.2.1-unstable-2023-06-1"; + version = "0.2.1-unstable-2023-06-01"; disabled = pythonOlder "3.10"; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix index 53b933fab0d2..251efb63946d 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel_base"; # Picked this version over 6.3 because much easier to get to build # and it matches the version torch 2.6 wants - version = "6.4.0-unstable-20241220"; + version = "6.4.0-unstable-2024-12-20"; outputs = [ "out" From caf6ec936191546cace233652f852a843c6ee2be Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Sat, 26 Jul 2025 23:30:40 -0700 Subject: [PATCH 170/212] quickshell: 0.1.0 -> 0.2.0 --- pkgs/by-name/qu/quickshell/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qu/quickshell/package.nix b/pkgs/by-name/qu/quickshell/package.nix index d0a63207e014..caffa9179cb3 100644 --- a/pkgs/by-name/qu/quickshell/package.nix +++ b/pkgs/by-name/qu/quickshell/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "quickshell"; - version = "0.1.0"; + version = "0.2.0"; # github mirror: https://github.com/quickshell-mirror/quickshell src = fetchFromGitea { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "quickshell"; repo = "quickshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-DdE50ZJN/mKsSF/vc9hrMboOeJ7BST5DD6GNEXgVbWg="; + hash = "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k="; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = false; meta = { - homepage = "https://quickshell.outfoxxed.me"; + homepage = "https://quickshell.org"; description = "Flexbile QtQuick based desktop shell toolkit"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.linux; From cdd9c28b16fe2a5a3902db76307136ea3af1003e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 06:45:31 +0000 Subject: [PATCH 171/212] kubeone: 1.11.0 -> 1.11.1 --- pkgs/by-name/ku/kubeone/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 44ff3ce47f5e..98ee73ca4afa 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-K33KKvGw4iF7aq/eumSFzYk3ij8pE8mUh4wN9TA9Q/4="; + hash = "sha256-K3Xo2tvtmkGbXl2yJjd8Q1xzdLSap8p824ommi+r8dY="; }; vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk="; From 7096ad75f33c7f45373cd85e6b3f82ddbdc50a94 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 15:34:39 +0800 Subject: [PATCH 172/212] lnav: 0.12.4 -> 0.13.0 --- pkgs/by-name/ln/lnav/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index f063eadd7f79..79022793ff38 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchFromGitHub, pcre2, sqlite, @@ -25,25 +24,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lnav"; - version = "0.12.4"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; tag = "v${finalAttrs.version}"; - hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI="; + hash = "sha256-1TS954ysXqSuMEGdzc2b9HTJ+ic0qfyc35j8RFzjLWA="; }; - patches = [ - # fixes lnav in tmux by patching vendored dependency notcurses - # https://github.com/tstack/lnav/issues/1390 - # remove on next release - (fetchpatch { - url = "https://github.com/tstack/lnav/commit/5e0bfa483714f05397265a690960d23ae22e1838.patch"; - hash = "sha256-dArPJik9KVI0KQjGw8W11oqGrbsBCNOr93gaH3yDPpo="; - }) - ]; - enableParallelBuilding = true; separateDebugInfo = true; @@ -89,7 +78,9 @@ stdenv.mkDerivation (finalAttrs: { ./autogen.sh ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v(\\d+(?:\\.\\d+)*)$" ]; + }; meta = { homepage = "https://github.com/tstack/lnav"; From f66b2432034f15a7580f4d69aa086d248c8179af Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 15:58:35 +0800 Subject: [PATCH 173/212] dae: use finalAttrs --- pkgs/by-name/da/dae/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 1d73bd57a9cc..5145554d73e8 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -6,14 +6,15 @@ nixosTests, nix-update-script, }: -buildGoModule rec { + +buildGoModule (finalAttrs: { pname = "dae"; version = "1.0.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; fetchSubmodules = true; }; @@ -33,7 +34,7 @@ buildGoModule rec { make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \ NOSTRIP=y \ - VERSION=${version} \ + VERSION=${finalAttrs.version} \ OUTPUT=$out/bin/dae runHook postBuild @@ -66,4 +67,4 @@ buildGoModule rec { platforms = platforms.linux; mainProgram = "dae"; }; -} +}) From 3d0db7f0f9998203ed927708fdf43dd8450c155a Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 15:59:56 +0800 Subject: [PATCH 174/212] dae: rev -> tag --- pkgs/by-name/da/dae/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 5145554d73e8..1086b4506532 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; fetchSubmodules = true; }; From 5d5dc61819caaf6c9cd1827e2860b064c51c2f75 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:00:44 +0800 Subject: [PATCH 175/212] dae: replace -> replace-fail --- pkgs/by-name/da/dae/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 1086b4506532..f22309b66d87 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { postInstall = '' install -Dm444 install/dae.service $out/lib/systemd/system/dae.service substituteInPlace $out/lib/systemd/system/dae.service \ - --replace /usr/bin/dae $out/bin/dae + --replace-fail "/usr/bin/dae" "$out/bin/dae" ''; passthru.tests = { From f1eea15a950c0936d15f9dc749e169fc9cac6c68 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:01:12 +0800 Subject: [PATCH 176/212] dae: remove with lib --- pkgs/by-name/da/dae/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index f22309b66d87..3944819a984d 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -55,16 +55,16 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ oluceps pokon548 luochen1990 ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "dae"; }; }) From 16d7306623080dd117f27004b2776ac39eae6fc4 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 22 Jul 2025 17:50:13 +0200 Subject: [PATCH 177/212] readest: 0.9.66 -> 0.9.67 Changelog: https://github.com/readest/readest/releases/tag/v0.9.67 Diff: https://github.com/readest/readest/compare/v0.9.66...v0.9.67 --- pkgs/by-name/re/readest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index f30a917be012..734db5102332 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.66"; + version = "0.9.67"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-0KIqPB41sS0rX5IBao+0ThPz4EttpZxSb5mL4Spuoho="; + hash = "sha256-gcysscFxNg5OOPhO9i3Flo6/ajBJ3lVEfHDlw0632Yg="; fetchSubmodules = true; }; @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-o0R5b+cE680RgdBT+4uiCtec3y3dGxYkBmnKzT/7JOg="; + hash = "sha256-VOqFo06HV+XFjzR3l3klmR8vLXrG6KgD8UF9mQVf9uA="; }; pnpmRoot = "../.."; - cargoHash = "sha256-ReRCzKbdmjPr9rQwCI7mLEs/MjV2yCp7FFZAlib1xIs="; + cargoHash = "sha256-Pf5jxPZY2NZXvWFzBhISrprJ8GpF5olwnlGabcWKf1U="; cargoRoot = "../.."; From e20629c39ff9bc60ab1653fc024f0a1c4a3b755d Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:10:37 +0800 Subject: [PATCH 178/212] dae: add versionCheckHook --- pkgs/by-name/da/dae/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 3944819a984d..826d1e265be1 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -3,6 +3,7 @@ clang, fetchFromGitHub, buildGoModule, + versionCheckHook, nixosTests, nix-update-script, }: @@ -49,6 +50,12 @@ buildGoModule (finalAttrs: { --replace-fail "/usr/bin/dae" "$out/bin/dae" ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + passthru.tests = { inherit (nixosTests) dae; }; From ac2d3a0eee92d31ca0f0258058d9001e50608e76 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:11:34 +0800 Subject: [PATCH 179/212] dae: merge passthru --- pkgs/by-name/da/dae/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 826d1e265be1..67e802908d7a 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -56,12 +56,13 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "--version"; - passthru.tests = { - inherit (nixosTests) dae; + passthru = { + tests = { + inherit (nixosTests) dae; + }; + updateScript = nix-update-script { }; }; - passthru.updateScript = nix-update-script { }; - meta = { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; From eb84f37cdda863d2396f3a6c25398578c40b04da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 08:47:19 +0000 Subject: [PATCH 180/212] do-agent: 3.18.0 -> 3.18.2 --- pkgs/by-name/do/do-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix index 9da041ee75b6..b0a6fc087218 100644 --- a/pkgs/by-name/do/do-agent/package.nix +++ b/pkgs/by-name/do/do-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.18.0"; + version = "3.18.2"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-sS6aBJVrF9NrAzizSBBXKM3iMAHa+j9rDw7hZSHgRFg="; + sha256 = "sha256-+UoQhJkwxazfe6LwqNF4zn4jnc3ZQia0ZOL3GX27r3w="; }; ldflags = [ From 2ad3a9394075fe1b2679c39c6fd2902d3bd3f8b1 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 27 Jul 2025 12:04:00 +0300 Subject: [PATCH 181/212] libmpdclient: fix cross compilation --- pkgs/by-name/li/libmpdclient/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index 7aec1677d894..27d18d8412d1 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { check ]; - mesonFlags = lib.optional finalAttrs.doCheck (lib.strings.mesonBool "test" true); + mesonFlags = [ (lib.strings.mesonBool "test" finalAttrs.finalPackage.doCheck) ]; doCheck = true; From bdcf452409f2d6b9edb43596f71814a16d88e33b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 09:15:40 +0000 Subject: [PATCH 182/212] check50: 3.3.11 -> 3.4.0 --- pkgs/by-name/ch/check50/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/check50/package.nix b/pkgs/by-name/ch/check50/package.nix index 4651da8a8150..f82720beca02 100644 --- a/pkgs/by-name/ch/check50/package.nix +++ b/pkgs/by-name/ch/check50/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "check50"; - version = "3.3.11"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "cs50"; repo = "check50"; tag = "v${version}"; - hash = "sha256-+qyEMzAJG/fyIqj+0mk0HTxTlQk6sHZhvmfd9Hgj/aw="; + hash = "sha256-3WxFdXECIjbTxHK65BFnxOroEYzu7iOJwm15gIjitLA="; }; build-system = [ @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { description = "Testing tool for checking student CS50 code"; homepage = "https://cs50.readthedocs.io/projects/check50/en/latest/"; downloadPage = "https://github.com/cs50/check50"; - changelog = "https://github.com/cs50/check50/releases/tag/v${version}"; + changelog = "https://github.com/cs50/check50/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; From 4698a46f56d57bae0aba4f9b40c6e4e1570bc566 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 13:34:54 +0000 Subject: [PATCH 183/212] ocamlPackages.ca-certs-nss: 3.113.1 -> 3.114 --- pkgs/development/ocaml-modules/ca-certs-nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index a63c39c5e0a6..75e3408ecb5b 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.113.1"; + version = "3.114"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-N70Gl7o5ac5grGKZhk8TQymIo/2TNWmh5MISwOikKg8="; + hash = "sha256-FvoT5uEZDFlUJcgg+0vjylSYd/HPXbaQ/oXaFRUveSo="; }; propagatedBuildInputs = [ From 0833dfa4cab446e29b29284ee5630efa6c118567 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Fri, 25 Jul 2025 18:27:38 +0200 Subject: [PATCH 184/212] python3Packages.discord-webhook: init at 1.4.1 --- .../discord-webhook/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/discord-webhook/default.nix diff --git a/pkgs/development/python-modules/discord-webhook/default.nix b/pkgs/development/python-modules/discord-webhook/default.nix new file mode 100644 index 000000000000..901f5d12a631 --- /dev/null +++ b/pkgs/development/python-modules/discord-webhook/default.nix @@ -0,0 +1,46 @@ +{ + buildPythonPackage, + fetchFromGitHub, + httpx, + lib, + nix-update-script, + poetry-core, + pytestCheckHook, + requests, +}: + +buildPythonPackage rec { + pname = "discord-webhook"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lovvskillz"; + repo = "python-discord-webhook"; + tag = "${version}"; + hash = "sha256-7nVvtXo1XjQExZSCF9VaYSCeEByJY2jn5KbVGTi33f0="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + requests + httpx # Optional, required for async support. + ]; + + pythonImportsCheck = [ + "discord_webhook" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Execute discord webhooks"; + homepage = "https://github.com/lovvskillz/python-discord-webhook"; + changelog = "https://github.com/lovvskillz/python-discord-webhook/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ polyfloyd ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29db1042e5a6..3ba4d002f364 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3625,6 +3625,8 @@ self: super: with self; { discogs-client = callPackage ../development/python-modules/discogs-client { }; + discord-webhook = callPackage ../development/python-modules/discord-webhook { }; + discordpy = callPackage ../development/python-modules/discordpy { }; discovery30303 = callPackage ../development/python-modules/discovery30303 { }; From b3d4d7017021c4c52122d627a4257214405b1f83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 10:18:53 +0000 Subject: [PATCH 185/212] kopia-ui: 0.21.0 -> 0.21.1 --- pkgs/by-name/ko/kopia-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 7957563a8c65..754bc9e9d1b9 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -10,12 +10,12 @@ kopia, }: let - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-M4qI8CzIIeoUqCvi8wc7s2CItPFN+1scHdwACy9vw/4="; + hash = "sha256-0i8bKah3a7MrgzATysgFCsmDZxK9qH+4hmBMW+GR9/4="; }; in buildNpmPackage { From 9490dc0ac1cb0c2a328f7589b8474fc6b1c88a36 Mon Sep 17 00:00:00 2001 From: VuiMuich Date: Thu, 10 Jul 2025 11:09:07 +0200 Subject: [PATCH 186/212] systemd-manager-tui: init at 1.1.0 --- .../sy/systemd-manager-tui/package.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/sy/systemd-manager-tui/package.nix diff --git a/pkgs/by-name/sy/systemd-manager-tui/package.nix b/pkgs/by-name/sy/systemd-manager-tui/package.nix new file mode 100644 index 000000000000..7c17039a64f8 --- /dev/null +++ b/pkgs/by-name/sy/systemd-manager-tui/package.nix @@ -0,0 +1,28 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "systemd-manager-tui"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Matheus-git"; + repo = "systemd-manager-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SFzqjd9qxXxuadSxNaCM0eGEWIiGJdXqoyXYqWqKOAc="; + }; + + cargoHash = "sha256-wMuEh2m07gsOj52Bhd5BnvVRu1uZqOiQurqmcpDylXM="; + + meta = { + homepage = "https://github.com/Matheus-git/systemd-manager-tui"; + description = "Program for managing systemd services through a TUI"; + mainProgram = "systemd-manager-tui"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vuimuich ]; + }; +}) From 8adae681212c7d2e473493544468a9b0374f20ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:30:15 +0000 Subject: [PATCH 187/212] vouch-proxy: 0.41.0 -> 0.45.1 --- pkgs/by-name/vo/vouch-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix index 0eb9aeb3072b..02df91a3d6aa 100644 --- a/pkgs/by-name/vo/vouch-proxy/package.nix +++ b/pkgs/by-name/vo/vouch-proxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.41.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; tag = "v${version}"; - hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s="; + hash = "sha256-xI9xucRb2D2a1Fvp5DetB4ln3C020qSGEVnuIpy1TMI="; }; - vendorHash = "sha256-1k9YFdackF10iJWJ22XlaENlOfRkZMs+IedDWnd/h8E="; + vendorHash = "sha256-hieN3RJA0eBqlYxJj6hKgpQhq8s3vg/fPzxW0XSrlPA="; ldflags = [ "-s" From e8fb58a774884370811f85a8d6b166c20da5f132 Mon Sep 17 00:00:00 2001 From: yapxuan Date: Sun, 27 Jul 2025 02:45:17 +0800 Subject: [PATCH 188/212] rustfinity: 0.2.13 -> 0.2.14 Upstream does not provide tags or a changelog. Changes between versions can be viewed at: https://github.com/rustfinity/rustfinity/compare/ea9aa4a4ba14e5111e6da9ef4f0d5dda9bb95341...59d180703ed1cb23123ddf8afeb8992e8c8a0509 --- pkgs/by-name/ru/rustfinity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index e19318429fd6..dd2b1d262070 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "rustfinity"; - version = "0.2.13"; + version = "0.2.14"; src = fetchCrate { inherit pname version; - hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8="; + hash = "sha256-Oh+AEgmBhlOQaCFECheuHCXT6hndpUnZH/l+tWMp2RQ="; }; - cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE="; + cargoHash = "sha256-e1RnPqfgeyeEh8Av81RTuaMgYc6zoBZcygbc29DNKqE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; From 961254af0386e4d13c7ea11a5166fd558b6e666a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 11:15:41 +0000 Subject: [PATCH 189/212] forgejo-runner: 7.0.0 -> 8.0.0 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index f6ca0045f5e7..530dd6000e5b 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-vt0uPGJdydy4cM1AEBeXQu4aNRggqaITS3eAmimVPRU="; + hash = "sha256-ORFmCvKFbNQ1MGHifNhPmrPDep+WE603+xkIqMF/w6g="; }; - vendorHash = "sha256-hE03QkXSPyl7IVEnXi/wWwQZOVcdyyGdEmGiOwLK6Zg="; + vendorHash = "sha256-4TX1ol2WwvZ4WYIzLFfVlYkcT5eLduESc+jg4Ysas2o="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile From 14d6af58416b9f72d3ecda1aa010a919c150d4d4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 27 Jul 2025 13:27:24 +0200 Subject: [PATCH 190/212] aritim-dark: fix typo in name --- pkgs/by-name/ar/{artim-dark => aritim-dark}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/ar/{artim-dark => aritim-dark}/package.nix (97%) diff --git a/pkgs/by-name/ar/artim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix similarity index 97% rename from pkgs/by-name/ar/artim-dark/package.nix rename to pkgs/by-name/ar/aritim-dark/package.nix index 28ddbd58212c..e57692cddc64 100644 --- a/pkgs/by-name/ar/artim-dark/package.nix +++ b/pkgs/by-name/ar/aritim-dark/package.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation { - pname = "artim-dark"; + pname = "aritim-dark"; version = "unstable-2021-12-29"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18301d2969b1..1ae05201e429 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -304,6 +304,7 @@ mapAliases { archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15 argo = argo-workflows; # Added 2025-02-01 aria = aria2; # Added 2024-03-26 + artim-dark = aritim-dark; # Added 2025-07-27 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility From 34eeec0f374d0472595329a7c794d1ec411ade67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 11:45:26 +0000 Subject: [PATCH 191/212] just: 1.42.3 -> 1.42.4 --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 01a38404aa07..f1fede42a821 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.42.3"; + version = "1.42.4"; outputs = [ "out" ] @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-SinL3sdSTtE3oGHe54P4n1jWarJIwYXWp1kPNXGwKIA="; + hash = "sha256-MLGtHMNCyhYq9OTquCc9zKmear1ts5vNAvlLxNQaOqk="; }; - cargoHash = "sha256-byE2ssjEy6etHzkbeYCuW69TC8ErkYhU7oTt0U107Ac="; + cargoHash = "sha256-udNHlPEwTb5S1ZypIqng7JLZ6Yl1vbYwASn+DT2SOLY="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] From 8bdeb8c5bcf441ce57d357aa7910c3bd832b2bd6 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 20:14:27 +0800 Subject: [PATCH 192/212] auto-cpufreq: set pyproject and refactor --- pkgs/by-name/au/auto-cpufreq/package.nix | 107 ++++++++++++----------- 1 file changed, 57 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index 71899abad4ed..8f26f63605e5 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -9,10 +9,11 @@ getent, nixosTests, }: + python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; version = "2.6.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "AdnanHodzic"; @@ -21,35 +22,6 @@ python3Packages.buildPythonPackage rec { hash = "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA="; }; - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - python3Packages.poetry-core - ]; - - propagatedBuildInputs = - with python3Packages; - [ - click - distro - psutil - pygobject3 - poetry-dynamic-versioning - setuptools - pyinotify - urwid - pyasyncore - requests - ] - ++ [ getent ]; - - doCheck = false; - pythonImportsCheck = [ "auto_cpufreq" ]; - patches = [ # hardcodes version output (replaceVars ./fix-version-output.patch { @@ -64,38 +36,73 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace auto_cpufreq/core.py \ - --replace-fail '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle + --replace-fail "/opt/auto-cpufreq/override.pickle" "/var/run/override.pickle" substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \ - --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq + --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" "$out/bin/auto-cpufreq" substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \ - --replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" $out/share/pixmaps/auto-cpufreq.png + --replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" "$out/share/icons/hicolor/512x512/apps/auto-cpufreq.png" substituteInPlace auto_cpufreq/gui/app.py \ - --replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" $out/share/auto-cpufreq/scripts/style.css + --replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" "$out/share/auto-cpufreq/scripts/style.css" ''; - postInstall = '' + build-system = with python3Packages; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python3Packages; [ + click + distro + psutil + pygobject3 + poetry-dynamic-versioning + setuptools + pyinotify + urwid + pyasyncore + requests + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ getent ]; + + postInstall = # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq - + '' + install -Dm 0755 scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq + '' # copy css file - mkdir -p $out/share/auto-cpufreq/scripts - cp scripts/style.css $out/share/auto-cpufreq/scripts/style.css - + + '' + install -Dm 0644 scripts/style.css $out/share/auto-cpufreq/scripts/style.css + '' # systemd service - mkdir -p $out/lib/systemd/system - cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system - + + '' + install -Dm 0644 scripts/auto-cpufreq.service -t $out/lib/systemd/system + '' # desktop icon - mkdir -p $out/share/applications - mkdir $out/share/pixmaps - cp scripts/auto-cpufreq-gtk.desktop $out/share/applications - cp images/icon.png $out/share/pixmaps/auto-cpufreq.png - + + '' + install -Dm 0644 scripts/auto-cpufreq-gtk.desktop -t $out/share/applications + install -Dm 0644 images/icon.png $out/share/icons/hicolor/512x512/apps/auto-cpufreq.png + '' # polkit policy - mkdir -p $out/share/polkit-1/actions - cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions + + '' + install -Dm 0644 scripts/org.auto-cpufreq.pkexec.policy -t $out/share/polkit-1/actions + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + pythonImportsCheck = [ "auto_cpufreq" ]; + passthru.tests = { inherit (nixosTests) auto-cpufreq; }; From 18941d32957fb5ba48f80fa7ffb55b4dccd1c6d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 27 Jul 2025 14:17:36 +0200 Subject: [PATCH 193/212] python3Packages.css-inline: 0.15.0 -> 0.17.0 https://github.com/Stranger6667/css-inline/blob/python-v0.17.0/CHANGELOG.md --- .../python-modules/css-inline/Cargo.lock | 117 +++++++++++------- .../python-modules/css-inline/default.nix | 6 +- 2 files changed, 77 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index 3f23fc989016..d3758752bdca 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.27" +version = "1.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" dependencies = [ "shlex", ] @@ -177,7 +177,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "css-inline" -version = "0.15.0" +version = "0.17.0" dependencies = [ "cssparser", "html5ever", @@ -193,7 +193,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.15.0" +version = "0.17.0" dependencies = [ "built", "css-inline", @@ -228,9 +228,18 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.20" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "proc-macro2", "quote", @@ -417,12 +426,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "html5ever" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c" +checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" dependencies = [ "log", - "mac", "markup5ever", "match_token", ] @@ -505,9 +513,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" dependencies = [ "base64", "bytes", @@ -521,7 +529,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -674,6 +682,17 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -736,9 +755,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lru" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" +checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" dependencies = [ "hashbrown", ] @@ -757,9 +776,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.16.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4cd8c02f18a011991a039855480c64d74291c5792fcc160d55d77dc4de4a39" +checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" dependencies = [ "log", "tendril", @@ -768,9 +787,9 @@ dependencies = [ [[package]] name = "match_token" -version = "0.1.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" dependencies = [ "proc-macro2", "quote", @@ -1055,7 +1074,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", + "socket2 0.5.10", "thiserror", "tokio", "tracing", @@ -1071,7 +1090,7 @@ dependencies = [ "bytes", "getrandom 0.3.3", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", "rustc-hash", "rustls", @@ -1092,7 +1111,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.10", "tracing", "windows-sys 0.59.0", ] @@ -1123,9 +1142,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha", "rand_core 0.9.3", @@ -1178,18 +1197,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792" dependencies = [ "bitflags", ] [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64", "bytes", @@ -1253,9 +1272,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ "once_cell", "ring", @@ -1277,9 +1296,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ "ring", "rustls-pki-types", @@ -1306,9 +1325,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3079aef7a4383aff1e60eca2818995d3de8168e85ae4b6ea8fb2804b182c54" +checksum = "3df44ba8a7ca7a4d28c589e04f526266ed76b6cc556e33fe69fa25de31939a65" dependencies = [ "bitflags", "cssparser", @@ -1354,9 +1373,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", "memchr", @@ -1428,6 +1447,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1560,17 +1589,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", - "socket2", - "windows-sys 0.52.0", + "slab", + "socket2 0.6.0", + "windows-sys 0.59.0", ] [[package]] @@ -1864,9 +1895,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ "rustls-pki-types", ] @@ -2014,9 +2045,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 13c0b52aafd3..cb58bb88517a 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.15.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-js9n+m5xDlzxMbXtN74klS0rjTCsHL3LhVAp0tx48b0="; + hash = "sha256-RclMgVJpK2dOtuFKearRMK8rpa6vFTa8T3Z+A7mk7Zs="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - hash = "sha256-4DVLcJrK2at1vlThey0N97IWFHd1NM2MEXXA74BYfZs="; + hash = "sha256-WvUlumpXVLiu9htY07wfGyibro2StWgYF7XVW411ePw="; }; nativeBuildInputs = [ From 3c0ff7e40f58f7d9766dcbfb41ff60b7e7857d6f Mon Sep 17 00:00:00 2001 From: mivorasu <221005165+mivorasu@users.noreply.github.com> Date: Sun, 27 Jul 2025 12:21:19 +0000 Subject: [PATCH 194/212] treewide: add preConfigure and postConfigure for configurePhase --- pkgs/by-name/ab/abcde/package.nix | 4 ++++ pkgs/by-name/ai/aiger/package.nix | 4 ++++ pkgs/by-name/ca/caps/package.nix | 4 ++++ pkgs/by-name/cg/cgui/package.nix | 4 ++++ pkgs/by-name/cn/cnijfilter_4_00/package.nix | 4 ++++ pkgs/by-name/da/daemontools/package.nix | 4 ++++ pkgs/by-name/dl/dl-poly-classic-mpi/package.nix | 4 ++++ pkgs/by-name/do/dorion/package.nix | 4 ++++ pkgs/by-name/ec/ecdsatool/package.nix | 4 ++++ pkgs/by-name/ed/edid-generator/package.nix | 4 ++++ pkgs/by-name/fa/fast-downward/package.nix | 4 ++++ pkgs/by-name/fr/fricas/package.nix | 4 ++++ pkgs/by-name/ga/gatling/package.nix | 4 ++++ pkgs/by-name/gi/gildas/package.nix | 4 ++++ pkgs/by-name/gx/gxplugins-lv2/package.nix | 4 ++++ pkgs/by-name/hd/hdr10plus/package.nix | 4 ++++ pkgs/by-name/ht/httperf/package.nix | 4 ++++ pkgs/by-name/il/illum/package.nix | 4 ++++ pkgs/by-name/ki/kissat/package.nix | 4 ++++ pkgs/by-name/la/latex2html/package.nix | 4 ++++ pkgs/by-name/li/lingeling/package.nix | 4 ++++ pkgs/by-name/li/liquidfun/package.nix | 4 ++++ pkgs/by-name/mi/minivmac/package.nix | 4 ++++ pkgs/by-name/nc/ncpamixer/package.nix | 4 ++++ pkgs/by-name/ne/netevent/package.nix | 4 ++++ pkgs/by-name/ne/netsniff-ng/package.nix | 4 ++++ pkgs/by-name/pa/parmetis/package.nix | 4 ++++ pkgs/by-name/pm/pmccabe/package.nix | 4 ++++ pkgs/by-name/pn/pngcrush/package.nix | 4 ++++ pkgs/by-name/pn/pngtoico/package.nix | 4 ++++ pkgs/by-name/re/retrofe/package.nix | 4 ++++ pkgs/by-name/sb/sbsigntool/package.nix | 4 ++++ pkgs/by-name/sp/spectrojack/package.nix | 4 ++++ pkgs/by-name/su/subread/package.nix | 4 ++++ pkgs/by-name/te/teetertorture/package.nix | 4 ++++ pkgs/by-name/te/tennix/package.nix | 4 ++++ pkgs/by-name/uq/uqm/package.nix | 4 ++++ pkgs/by-name/ve/vep/package.nix | 4 ++++ pkgs/by-name/vk/vkeybd/package.nix | 4 ++++ pkgs/by-name/wa/wannier90/package.nix | 4 ++++ pkgs/by-name/wi/wiggle/package.nix | 4 ++++ pkgs/by-name/xf/xfractint/package.nix | 4 ++++ pkgs/by-name/xp/xprintidle-ng/package.nix | 4 ++++ pkgs/by-name/ze/zeroad-unwrapped/package.nix | 4 ++++ .../zigbee2mqtt-networkmap/package.nix | 4 ++++ 45 files changed, 180 insertions(+) diff --git a/pkgs/by-name/ab/abcde/package.nix b/pkgs/by-name/ab/abcde/package.nix index 517ddd6539e3..1b64dcbb07e7 100644 --- a/pkgs/by-name/ab/abcde/package.nix +++ b/pkgs/by-name/ab/abcde/package.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: This package does not support `distmp3', `eject', etc. configurePhase = '' + runHook preConfigure + sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ @@ -37,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + + runHook postConfigure ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ai/aiger/package.nix b/pkgs/by-name/ai/aiger/package.nix index 00cdde0997ce..0c79ee9c9575 100644 --- a/pkgs/by-name/ai/aiger/package.nix +++ b/pkgs/by-name/ai/aiger/package.nix @@ -46,12 +46,16 @@ stdenv.mkDerivation rec { }; configurePhase = '' + runHook preConfigure + # Set up picosat, so we can build 'aigbmc' mkdir ../picosat ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o ln -s ${picosat}/share/picosat.version ../picosat/VERSION ./configure.sh + + runHook postConfigure ''; postBuild = '' diff --git a/pkgs/by-name/ca/caps/package.nix b/pkgs/by-name/ca/caps/package.nix index 1e37af40dbac..5f12ee25b738 100644 --- a/pkgs/by-name/ca/caps/package.nix +++ b/pkgs/by-name/ca/caps/package.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { }; configurePhase = '' + runHook preConfigure + echo "PREFIX = $out" > defines.make + + runHook postConfigure ''; meta = { diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix index 3e416d14f73b..ed6425d2290b 100644 --- a/pkgs/by-name/cg/cgui/package.nix +++ b/pkgs/by-name/cg/cgui/package.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sh fix.sh unix + + runHook postConfigure ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/cn/cnijfilter_4_00/package.nix b/pkgs/by-name/cn/cnijfilter_4_00/package.nix index 16ff7195b2fd..614e1fc126df 100644 --- a/pkgs/by-name/cn/cnijfilter_4_00/package.nix +++ b/pkgs/by-name/cn/cnijfilter_4_00/package.nix @@ -87,6 +87,8 @@ stdenv.mkDerivation { ''; configurePhase = '' + runHook preConfigure + cd libs ./autogen.sh --prefix=$out @@ -127,6 +129,8 @@ stdenv.mkDerivation { sed -e "s,cnijlgmon2_LDADD =,cnijlgmon2_LDADD = -L../../com/libs_bin${arch}," \ -i lgmon2/src/Makefile.am || die + + runHook postConfigure ''; preInstall = '' diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix index e137079280e7..ff4b1597c869 100644 --- a/pkgs/by-name/da/daemontools/package.nix +++ b/pkgs/by-name/da/daemontools/package.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; configurePhase = '' + runHook preConfigure + cd daemontools-${version} sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc @@ -48,6 +50,8 @@ stdenv.mkDerivation rec { sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests cat ${glibc.dev}/include/errno.h + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix index 0c6972e1d9be..412c6d57b568 100644 --- a/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix +++ b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix @@ -20,8 +20,12 @@ stdenv.mkDerivation { buildInputs = [ mpi ]; configurePhase = '' + runHook preConfigure + cd source cp -v ../build/MakePAR Makefile + + runHook postConfigure ''; # https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c2c4ad54681b..60c4b348a09a 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -122,8 +122,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; configurePhase = '' + runHook preConfigure + cmakeConfigurePhase pnpmConfigHook + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix index f0ffe858c202..e06e549358ca 100644 --- a/pkgs/by-name/ec/ecdsatool/package.nix +++ b/pkgs/by-name/ec/ecdsatool/package.nix @@ -16,8 +16,12 @@ stdenv.mkDerivation { }; configurePhase = '' + runHook preConfigure + ./autogen.sh ./configure --prefix=$out + + runHook postConfigure ''; patches = [ diff --git a/pkgs/by-name/ed/edid-generator/package.nix b/pkgs/by-name/ed/edid-generator/package.nix index 30f74cb253e2..6eb7f2f594da 100644 --- a/pkgs/by-name/ed/edid-generator/package.nix +++ b/pkgs/by-name/ed/edid-generator/package.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation { modelines = ""; configurePhase = '' + runHook preConfigure + test "$clean" != 1 || rm *x*.S ./modeline2edid - <"$modelinesPath" @@ -56,6 +58,8 @@ stdenv.mkDerivation { cat "$file" done make clean + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix index 500aa339baa4..644e75080674 100644 --- a/pkgs/by-name/fa/fast-downward/package.nix +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; configurePhase = '' + runHook preConfigure + python build.py release + + runHook postConfigure ''; postPatch = '' diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index f2ed21c7205f..95bb1e5ee3a6 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -36,7 +36,11 @@ stdenv.mkDerivation rec { # Remove when updating to next version configurePhase = '' + runHook preConfigure + ./configure --prefix=$out --with-lisp='sbcl --dynamic-space-size 3072' + + runHook postConfigure ''; dontStrip = true; diff --git a/pkgs/by-name/ga/gatling/package.nix b/pkgs/by-name/ga/gatling/package.nix index bf457905254c..72edeea83727 100644 --- a/pkgs/by-name/ga/gatling/package.nix +++ b/pkgs/by-name/ga/gatling/package.nix @@ -30,10 +30,14 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + substituteInPlace Makefile --replace-fail "/usr/local" "$out" substituteInPlace GNUmakefile --replace-fail "/opt/diet" "$out" substituteInPlace tryalloca.c --replace-fail "main() {" "int main() {" substituteInPlace trysocket.c --replace-fail "main() {" "int main() {" + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 9956ddef9fb6..bcebb23da297 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -68,11 +68,15 @@ stdenv.mkDerivation rec { env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; configurePhase = '' + runHook preConfigure + substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env} substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl + + runHook postConfigure ''; userExec = "astro class greg mapping sic"; diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix index 7ed2538bc6ac..70a474006607 100644 --- a/pkgs/by-name/gx/gxplugins-lv2/package.nix +++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix @@ -32,9 +32,13 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; configurePhase = '' + runHook preConfigure + for i in GxBoobTube GxValveCaster; do substituteInPlace $i.lv2/Makefile --replace "\$(shell which echo) -e" "echo -e" done + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index ee57905180f1..9358179afd41 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -73,10 +73,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; configurePhase = '' + runHook preConfigure + # let stdenv handle stripping export "CARGO_PROFILE_''${cargoBuildType@U}_STRIP"=false prependToVar cargoCFlags -j "$NIX_BUILD_CORES" + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ht/httperf/package.nix b/pkgs/by-name/ht/httperf/package.nix index 64a47ff2e76a..46bc4c6a643c 100644 --- a/pkgs/by-name/ht/httperf/package.nix +++ b/pkgs/by-name/ht/httperf/package.nix @@ -21,10 +21,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ openssl ]; configurePhase = '' + runHook preConfigure + autoreconf -i mkdir -pv build cd build ../configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix index 57e0d2568a17..889e0e9a7bca 100644 --- a/pkgs/by-name/il/illum/package.nix +++ b/pkgs/by-name/il/illum/package.nix @@ -39,7 +39,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + bash ./configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix index b40359ca01e6..29d4520c31db 100644 --- a/pkgs/by-name/ki/kissat/package.nix +++ b/pkgs/by-name/ki/kissat/package.nix @@ -59,7 +59,11 @@ stdenv.mkDerivation rec { setOutputFlags = false; configurePhase = '' + runHook preConfigure + ./configure + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix index e3a8847e2d35..ca0bd75fe666 100644 --- a/pkgs/by-name/la/latex2html/package.nix +++ b/pkgs/by-name/la/latex2html/package.nix @@ -29,10 +29,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; configurePhase = '' + runHook preConfigure + ./configure \ --prefix="$out" \ --without-mktexlsr \ --with-texpath=$out/share/texmf/tex/latex/html + + runHook postConfigure ''; postInstall = '' diff --git a/pkgs/by-name/li/lingeling/package.nix b/pkgs/by-name/li/lingeling/package.nix index ba9ba673027b..6ca0b1fad952 100644 --- a/pkgs/by-name/li/lingeling/package.nix +++ b/pkgs/by-name/li/lingeling/package.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { }; configurePhase = '' + runHook preConfigure + ./configure.sh # Rather than patch ./configure, just sneak in use of aiger here, since it @@ -28,6 +30,8 @@ stdenv.mkDerivation { --replace-fail '$(AIGER)/aiger.o' '${aiger.lib}/lib/libaiger.a' \ --replace-fail '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \ --replace-fail '-I$(AIGER)' '-I${aiger.dev}/include' + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/li/liquidfun/package.nix b/pkgs/by-name/li/liquidfun/package.nix index 84974f233890..210b61295e3b 100644 --- a/pkgs/by-name/li/liquidfun/package.nix +++ b/pkgs/by-name/li/liquidfun/package.nix @@ -37,9 +37,13 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + mkdir Build cd Build; cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index a143585f5280..a754854fc187 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; configurePhase = '' + runHook preConfigure + ${lib.getExe' buildPackages.stdenv.cc "cc"} setup/tool.c -o setup_t ./setup_t -t lx64 > setup.sh @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { substituteInPlace setup.sh --replace 'strip --strip-unneeded' '${stdenv.cc.targetPrefix}strip --strip-unneeded' sh < ./setup.sh + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index 88b0ad65c22c..30e616118a02 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -49,7 +49,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/ne/netevent/package.nix b/pkgs/by-name/ne/netevent/package.nix index 19e87147f28d..989943a062fa 100644 --- a/pkgs/by-name/ne/netevent/package.nix +++ b/pkgs/by-name/ne/netevent/package.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation { ]; configurePhase = '' + runHook preConfigure + export RST2MAN=rst2man ./configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 8489627e329c..791ea0ed4df2 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -53,9 +53,13 @@ stdenv.mkDerivation rec { # ./configure is not autoGNU but some home-brewn magic configurePhase = '' + runHook preConfigure + patchShebangs configure substituteInPlace configure --replace "which" "command -v" NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure + + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/pa/parmetis/package.nix b/pkgs/by-name/pa/parmetis/package.nix index 8419e81b19f5..bb5832ae3b6a 100644 --- a/pkgs/by-name/pa/parmetis/package.nix +++ b/pkgs/by-name/pa/parmetis/package.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation { buildInputs = [ mpi ]; configurePhase = '' + runHook preConfigure + tar xf ${metis.src} mv metis-* metis make config metis_path=metis gklib_path=metis/GKlib prefix=$out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/pm/pmccabe/package.nix b/pkgs/by-name/pm/pmccabe/package.nix index 4c740db6e2aa..a1d7bacca210 100644 --- a/pkgs/by-name/pm/pmccabe/package.nix +++ b/pkgs/by-name/pm/pmccabe/package.nix @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; configurePhase = '' + runHook preConfigure + sed -i -r Makefile \ -e 's,/usr/,/,g' \ -e "s,^DESTDIR =.*$,DESTDIR = $out," \ -e "s,^INSTALL = install.*$,INSTALL = install," \ -e "s,^all:.*$,all: \$(PROGS)," + + runHook postConfigure ''; checkPhase = "make test"; diff --git a/pkgs/by-name/pn/pngcrush/package.nix b/pkgs/by-name/pn/pngcrush/package.nix index 0fac3e2168d6..703d941d6f1f 100644 --- a/pkgs/by-name/pn/pngcrush/package.nix +++ b/pkgs/by-name/pn/pngcrush/package.nix @@ -28,7 +28,11 @@ stdenv.mkDerivation rec { ]; # gcc and/or clang compat configurePhase = '' + runHook preConfigure + sed -i s,/usr,$out, Makefile + + runHook postConfigure ''; buildInputs = [ libpng ]; diff --git a/pkgs/by-name/pn/pngtoico/package.nix b/pkgs/by-name/pn/pngtoico/package.nix index fc429a35f642..f4a21fc58e6e 100644 --- a/pkgs/by-name/pn/pngtoico/package.nix +++ b/pkgs/by-name/pn/pngtoico/package.nix @@ -23,7 +23,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -i s,/usr/local,$out, Makefile + + runHook postConfigure ''; buildInputs = [ libpng ]; diff --git a/pkgs/by-name/re/retrofe/package.nix b/pkgs/by-name/re/retrofe/package.nix index ff44ea04755e..d3ec51c5ca25 100644 --- a/pkgs/by-name/re/retrofe/package.nix +++ b/pkgs/by-name/re/retrofe/package.nix @@ -52,8 +52,12 @@ stdenv.mkDerivation { ]); configurePhase = '' + runHook preConfigure + cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \ -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \ + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/sb/sbsigntool/package.nix b/pkgs/by-name/sb/sbsigntool/package.nix index 0064476b7036..b0e1abf98df4 100644 --- a/pkgs/by-name/sb/sbsigntool/package.nix +++ b/pkgs/by-name/sb/sbsigntool/package.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}" lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size endian" @@ -54,6 +56,8 @@ stdenv.mkDerivation rec { automake --add-missing -Wno-portability ./configure --prefix=$out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/sp/spectrojack/package.nix b/pkgs/by-name/sp/spectrojack/package.nix index c3346f675d40..f31420ac81eb 100644 --- a/pkgs/by-name/sp/spectrojack/package.nix +++ b/pkgs/by-name/sp/spectrojack/package.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { gtk2 ]; configurePhase = '' + runHook preConfigure + sed -i 's/.*home.*/#&/' ./Makefile substituteInPlace ./Makefile \ --replace "/usr/share" "$out/usr/share" + + runHook postConfigure ''; installPhase = '' install -Dm755 spectrojack $out/bin/spectrojack diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index fb3ee4ecacd4..164defc6deee 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -19,8 +19,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + cd src cp Makefile.${if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"} Makefile + + runHook postConfigure ''; makeFlags = [ "CC_EXEC=cc" ]; diff --git a/pkgs/by-name/te/teetertorture/package.nix b/pkgs/by-name/te/teetertorture/package.nix index b5d8051142a2..a9852baed320 100644 --- a/pkgs/by-name/te/teetertorture/package.nix +++ b/pkgs/by-name/te/teetertorture/package.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -i s,data/,$out/share/teetertorture/, src/teetertorture.c + + runHook postConfigure ''; patchPhase = '' diff --git a/pkgs/by-name/te/tennix/package.nix b/pkgs/by-name/te/tennix/package.nix index ab6e4596aaef..11bdb0bc78c0 100644 --- a/pkgs/by-name/te/tennix/package.nix +++ b/pkgs/by-name/te/tennix/package.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + ./configure --prefix $out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/uq/uqm/package.nix b/pkgs/by-name/uq/uqm/package.nix index c9e47cd2bb99..773c0ad9d1e2 100644 --- a/pkgs/by-name/uq/uqm/package.nix +++ b/pkgs/by-name/uq/uqm/package.nix @@ -113,11 +113,15 @@ stdenv.mkDerivation rec { # uqm has a 'unique' build system with a root script incidentally called # 'build.sh'. configurePhase = '' + runHook preConfigure + echo "INPUT_install_prefix_VALUE='$out'" >> config.state echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state PREFIX=$out ./build.sh uqm config + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix index 576b4c9b35fb..97d4f9e63592 100644 --- a/pkgs/by-name/ve/vep/package.nix +++ b/pkgs/by-name/ve/vep/package.nix @@ -58,7 +58,11 @@ let }; # PREFIX is important configurePhase = '' + runHook preConfigure + perl Makefile.PL PREFIX=$out INSTALLDIRS=site + + runHook postConfigure ''; # Test do not work -- wrong include path doCheck = false; diff --git a/pkgs/by-name/vk/vkeybd/package.nix b/pkgs/by-name/vk/vkeybd/package.nix index faf940bfc062..b37b4c943439 100644 --- a/pkgs/by-name/vk/vkeybd/package.nix +++ b/pkgs/by-name/vk/vkeybd/package.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile + + runHook postConfigure ''; makeFlags = [ diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix index d21ff8146a3e..5c76e480009a 100644 --- a/pkgs/by-name/wa/wannier90/package.nix +++ b/pkgs/by-name/wa/wannier90/package.nix @@ -45,7 +45,11 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + cp config/make.inc.gfort make.inc + + runHook postConfigure ''; buildFlags = [ diff --git a/pkgs/by-name/wi/wiggle/package.nix b/pkgs/by-name/wi/wiggle/package.nix index f1c97794c714..582c99f068e2 100644 --- a/pkgs/by-name/wi/wiggle/package.nix +++ b/pkgs/by-name/wi/wiggle/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + makeFlagsArray=( CFLAGS="-I. -O3" STRIP="-s" INSTALL="install" @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { MANDIR="$out/share/man" ) patchShebangs . + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/xf/xfractint/package.nix b/pkgs/by-name/xf/xfractint/package.nix index bd3c45d299b2..1c29c8b6bccd 100644 --- a/pkgs/by-name/xf/xfractint/package.nix +++ b/pkgs/by-name/xf/xfractint/package.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -e 's@/usr/bin/@@' -i Makefile + + runHook postConfigure ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/xp/xprintidle-ng/package.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix index a7e920d32d62..28644d574a7e 100644 --- a/pkgs/by-name/xp/xprintidle-ng/package.nix +++ b/pkgs/by-name/xp/xprintidle-ng/package.nix @@ -51,8 +51,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + ./bootstrap --gnulib-srcdir=${gnulib} ./configure --prefix="$out" + + runHook postConfigure ''; buildInputs = [ diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index f58ffb457b77..d26f986ddc08 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + # Delete shipped libraries which we don't need. rm -rf libraries/source/{cxxtest-4.4,nvtt,premake-core,spidermonkey,spirv-reflect} @@ -138,6 +140,8 @@ stdenv.mkDerivation rec { # Move to the build directory. pushd build/workspaces/gcc + + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix index b93b44ae96b5..2a16391ef221 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix @@ -24,8 +24,12 @@ mkYarnPackage rec { }; configurePhase = '' + runHook preConfigure + cp -r $node_modules node_modules chmod +w node_modules + + runHook postConfigure ''; buildPhase = '' From 2272a4cda69b612f8b0a54e61b646012e9c38b62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 27 Jul 2025 14:27:25 +0200 Subject: [PATCH 195/212] pretix: relax css-inline constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 6ddcc6fad71a..1e4e68027e61 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -83,6 +83,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "beautifulsoup4" "celery" + "css-inline" "django-bootstrap3" "django-localflavor" "django-phonenumber-field" From 274b8936a78fd48958ec811071f743ae73e3778a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 00:14:41 +0000 Subject: [PATCH 196/212] steampipePackages.steampipe-plugin-github: 1.4.0 -> 1.5.0 --- .../steampipe-packages/steampipe-plugin-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix index 67ae7810541b..b5c9def30c3a 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "steampipe-plugin-github"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-github"; tag = "v${version}"; - hash = "sha256-Xz8sUCfxKDEN14bVBzPLO7OVAZjXrdreeCK0IOtuA20="; + hash = "sha256-+RHYPeVY19zRWhI4U4dWuHJseBO9r7hms7XsLrknA2I="; }; vendorHash = "sha256-vZDXLfo9EtPKSLE8hHA5lR/RgJtWESdOqOjpFywXKbs="; From 18ca15c57f778120c79be521b62bb6e0bd5bd0b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 08:52:48 +0000 Subject: [PATCH 197/212] gnu-efi: 4.0.0 -> 4.0.2 --- pkgs/by-name/gn/gnu-efi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gnu-efi/package.nix b/pkgs/by-name/gn/gnu-efi/package.nix index 455c7e0f4a36..2100fc8343c8 100644 --- a/pkgs/by-name/gn/gnu-efi/package.nix +++ b/pkgs/by-name/gn/gnu-efi/package.nix @@ -14,13 +14,13 @@ assert lib.assertMsg stdenv.hostPlatform.isEfi "gnu-efi may only be built for EF stdenv.mkDerivation (finalAttrs: { pname = "gnu-efi"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "ncroxon"; repo = "gnu-efi"; tag = finalAttrs.version; - hash = "sha256-vVtJkAPe5tPDLAFZibnJRC7G7WtOg11JT5QipdO+FIk="; + hash = "sha256-oIj0aNY4xU5OcO69TTjh5FcWzzkFd6jbenwzVvTXjqo="; }; buildInputs = [ pciutils ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ # This is a mess, upstream is aware. # The source for these is Fedora's SPDX identifier for this package. - # Fedora also has gpl2Only here, but 4.0.0 doesn't have gpl2Only code. + # Fedora also has gpl2Only here, but 4.0.2 doesn't have gpl2Only code. # However, both upstream and Fedora seems to have missed # bsdAxisNoDisclaimerUnmodified and MIT. bsd2 From a5bf5da8971c5714265bda5f92b55144027d34b8 Mon Sep 17 00:00:00 2001 From: sirburpalot <1429516+sirburpalot@users.noreply.github.com> Date: Sun, 27 Jul 2025 16:41:22 +0300 Subject: [PATCH 198/212] far2l: 2.6.3 -> 2.6.5, fix improper wrapping (#419004) * far2l: 2.6.3 -> 2.6.5, fix symlinked executables not working due to improper wrapping Update far2l to 2.6.5 Also fix the wrapper breaking symlinked executables (far2ledit, far2l_sudoapp, etc). These symlinks rely on argv[0] to determine which command to run, but the wrapper was clobbering it. Now it preserves the original argv[0]. * far2l: replace xercesc with libxml2 in dependencies due to changes in 2.6.5 --- pkgs/by-name/fa/far2l/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index 5ad12479f2ef..22c4ee27f6fa 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -27,7 +27,7 @@ # Plugins withColorer ? true, spdlog, - xercesc, + libxml2, withMultiArc ? true, libarchive, pcre, @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; + sha256 = "sha256-a/k36O19z/lHnETOGIbTJ7BNAI5zOQxVUSp+nIM08i4="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog - xercesc + libxml2 ] ++ lib.optionals withMultiArc [ libarchive @@ -121,7 +121,6 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/far2l \ - --argv0 $out/bin/far2l \ --prefix PATH : ${lib.makeBinPath runtimeDeps} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; From 5469534f54dbf179256bda7061e8ceb05b26f2e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 13:58:17 +0000 Subject: [PATCH 199/212] terraform-providers.digitalocean: 2.60.0 -> 2.61.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7b0a8a2da750..d9df7d1379d7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-+JX1EJBRJee6nvn5srwGWSE++LagHw+n1bgfZTBXzKU=", + "hash": "sha256-tR4qN0N+tJu1fmiFIwTTIQyOTsqrVi2DSWJjU6oVdwE=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.60.0", + "rev": "v2.61.0", "spdx": "MPL-2.0", "vendorHash": null }, From d7f8de903939e0ffe2a969781db35863f6e42844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 14:05:29 +0000 Subject: [PATCH 200/212] git-cliff: 2.9.1 -> 2.10.0 --- pkgs/by-name/gi/git-cliff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix index 19f485e20402..6fd5c403079d 100644 --- a/pkgs/by-name/gi/git-cliff/package.nix +++ b/pkgs/by-name/gi/git-cliff/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-J3KjVPH7shMupogLSfA5HV1FyA+cFSOWP9gMBU6txww="; + hash = "sha256-Kv17U2/1mM+c1356oo2730AihgYUDGULOoZVlqW5tZY="; }; - cargoHash = "sha256-16ouBn6GQlE1ZVr4g/TicEL0cTiewegGkuhGcJPicrc="; + cargoHash = "sha256-nsE4yDXVA7h82LekaKMPLEG0cRfR4UmxoCzF/wecMcQ="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 9baa67c2e2e48c87b3e71c950ad76d4388c5791a Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Fri, 25 Jul 2025 09:51:17 +0200 Subject: [PATCH 201/212] cfonts: 1.2.0 -> 1.3.0 --- pkgs/by-name/cf/cfonts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index 287d54ed9f75..226aa06b9f45 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "cfonts"; - version = "1.2.0"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-W5hN+b4R50tNfYb3WrM0z5Etm6ixa11pZWnzGC9bjSs="; + hash = "sha256-rgdqQzJyb1/bYB3S1MD/53vdQ+GaxOvGHuPE6dxMRB0="; }; - cargoHash = "sha256-MXUUvk7R1JdjNlZ7h3ymUAPOT/A0I8TOW3saBB4C94o="; + cargoHash = "sha256-Gf4W7ACyyVSCXV2RmpAfrE7Xircjk34Llk2j58cWXtU="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; From 3a2fb07b0feae291679be336da4d6bb2ae06ba26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 14:35:26 +0000 Subject: [PATCH 202/212] chirp: 0.4.0-unstable-2025-07-17 -> 0.4.0-unstable-2025-07-25 --- pkgs/by-name/ch/chirp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 0cc988b8c02f..c7eacf5d33e4 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-07-17"; + version = "0.4.0-unstable-2025-07-25"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "c28ea5e8a7d8036ccc76ec38a050fd30b84c65e4"; - hash = "sha256-hr8Q8BUanM64CktbrCazs8uvt/ssf+JBdevAMuDj6G4="; + rev = "85e0655382b2c1564c387aa2fa5e21a444887ea1"; + hash = "sha256-IrwKTJt8RXJKzZFQjrEYndQ5WmG52IiJnB+hrw89tfU="; }; nativeBuildInputs = [ From c2ac8b81112cc25d5b8cdcad84bde917f3153844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 14:45:51 +0000 Subject: [PATCH 203/212] stac-validator: 3.10.0 -> 3.10.1 --- pkgs/by-name/st/stac-validator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 201596f7bacb..621ced71b1d1 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-diaiF2wJyS/1DuUwPkdMyqpMfvKWvTnRo2H4O7FxYBM="; + hash = "sha256-tqguaptVRo6k6QALOOOL8dysMGDZx07eRJoHG24JirQ="; }; build-system = [ python3Packages.setuptools ]; From 80b0f466651634ee94292d7d5d8f7431f272bffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 15:50:39 +0000 Subject: [PATCH 204/212] vscode-extensions.illixion.vscode-vibrancy-continued: 1.1.58 -> 1.1.59 --- 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 b96a66c0a4fc..405e0bdf7e55 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2365,8 +2365,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.58"; - hash = "sha256-oBm2j7fZBYALkstk1WMgC+o1sq2HY7tX+zLfo5PBMiM="; + version = "1.1.59"; + hash = "sha256-ClzUxKdiYZqAlmXJ3W54kJddLRov5XKo0t8PPWA/Qq8="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; From 15ad26705be8bcb7a8b1af6078e71a1de399b83b Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Thu, 24 Jul 2025 14:08:33 +0200 Subject: [PATCH 205/212] nixos/hardware.fw-fanctrl: add package option and refactor using lib.attrsets.recursiveUpdate Typically services have a `package` option, so it can be set externally if users are running the stable version but want the package from unstable, or devs want to test a package from their flake in production. Really useful in many situations! Also, the previous implementation was using `pkgs.runCommand` which is discouraged due to [IFD](https://nix.dev/manual/nix/2.26/language/import-from-derivation) (import from derivation) leading to potential slowdowns during evaluation. I opted for reading the json file and using [lib.attrsets.recursiveUpdate](https://ryantm.github.io/nixpkgs/functions/library/attrsets/#function-library-lib.attrsets.recursiveUpdate) to update the default values with the user provided ones. --- nixos/modules/hardware/fw-fanctrl.nix | 59 ++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/nixos/modules/hardware/fw-fanctrl.nix b/nixos/modules/hardware/fw-fanctrl.nix index 6cb7aa307bd3..7c4413cdc05c 100644 --- a/nixos/modules/hardware/fw-fanctrl.nix +++ b/nixos/modules/hardware/fw-fanctrl.nix @@ -4,21 +4,18 @@ pkgs, ... }: - let - cfg = config.hardware.fw-fanctrl; - configFormat = pkgs.formats.json { }; - configOption = configFormat.generate "config.json" cfg.config; - - configFile = pkgs.runCommand "configFile" { } '' - ${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${pkgs.fw-fanctrl}/share/fw-fanctrl/config.json ${configOption} > $out - ''; + cfg = config.hardware.fw-fanctrl; in { options.hardware.fw-fanctrl = { enable = lib.mkEnableOption "the fw-fanctrl systemd service and install the needed packages"; + package = lib.mkPackageOption pkgs "fw-fanctrl" { }; + + ectoolPackage = lib.mkPackageOption pkgs "fw-ectool" { }; + disableBatteryTempCheck = lib.mkOption { type = lib.types.bool; default = false; @@ -98,30 +95,36 @@ in }; }; - config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - fw-fanctrl - fw-ectool - ]; + config = + let + defaultConfig = builtins.fromJSON (builtins.readFile "${cfg.package}/share/fw-fanctrl/config.json"); + finalConfig = lib.attrsets.recursiveUpdate defaultConfig cfg.config; + configFile = configFormat.generate "custom.json" finalConfig; + in + lib.mkIf cfg.enable { + environment.systemPackages = [ + cfg.package + cfg.ectoolPackage + ]; - systemd.services.fw-fanctrl = { - description = "Framework Fan Controller"; - after = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - Restart = "always"; - ExecStart = "${lib.getExe pkgs.fw-fanctrl} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}"; - ExecStopPost = "${lib.getExe pkgs.fw-ectool} autofanctrl"; + systemd.services.fw-fanctrl = { + description = "Framework Fan Controller"; + after = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${lib.getExe cfg.package} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}"; + ExecStopPost = "${lib.getExe cfg.ectoolPackage} autofanctrl"; + }; + wantedBy = [ "multi-user.target" ]; }; - wantedBy = [ "multi-user.target" ]; + + # Create suspend config + environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source = + "${cfg.package}/share/fw-fanctrl/fw-fanctrl-suspend"; }; - # Create suspend config - environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source = - "${pkgs.fw-fanctrl}/share/fw-fanctrl/fw-fanctrl-suspend"; - }; - meta = { - maintainers = pkgs.fw-fanctrl.meta.maintainers; + maintainers = [ lib.maintainers.Svenum ]; }; } From 6a11d2fbc4348c83304a79a7bb2d8ec0ef7105c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 17:25:36 +0000 Subject: [PATCH 206/212] tootik: 0.17.1 -> 0.18.0 --- pkgs/by-name/to/tootik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 647d7a48d30f..6083d60a618c 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = version; - hash = "sha256-C3jljz1ftpSlgmwY5ktTJSiZ2DVxbctFT7LZXBow73s="; + hash = "sha256-j+1oMfeuE4gZjhWsDORsDhF+EUcNeCv0EDz6Q7DNPzQ="; }; - vendorHash = "sha256-Imnh/f+6pybALRnefxaTyZ95orhAQfLWdMsIIkOOurc="; + vendorHash = "sha256-dQcmpYaSWvgF3B/rMs36+Snxh24JTPmkKGamkzcqqeM="; nativeBuildInputs = [ openssl ]; From 29ea9737f601eafbe9998a5976c7d33832c7cf2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 17:41:55 +0000 Subject: [PATCH 207/212] amazon-q-cli: 1.12.6 -> 1.12.7 --- pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index d9191596f2ef..7130ecabf49f 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli-autocomplete"; tag = "v${finalAttrs.version}"; - hash = "sha256-IjM9eFoFfy/WV6lPJB1mnRZYoXLIiVozjzmnXEnU2MA="; + hash = "sha256-K9OwA7qEv+yPYL4vv/ZhDK2mhW/jYmGFLEQ9oX2pjUE="; }; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-XZX8EisHQ1vqbrV8VnXrah3o1h3iKCxzPsKk6Z+aKzU="; + cargoHash = "sha256-C8uc9/g70fBpEeSagNcSfv/KHpW2zJdRvWe2bpTzHRU="; cargoBuildFlags = [ "-p" From a8707a2a8b4309213970d00ab9e71d577841e828 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 18:24:20 +0000 Subject: [PATCH 208/212] lux-cli: 0.9.1 -> 0.11.1 --- pkgs/by-name/lu/lux-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 97567370f171..cd1da90d7dd6 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.9.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-RbJ/jR/LrOIn4R4In21Rj5QNr3GrPwPp+6Wy/GPlAM4="; + hash = "sha256-yjd8nqrypgdS2UtAANv1TtuGtZPaWm7LhVrHPghf5hg="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-rQ4zJQSlIUC63a4UdkA6+Y63vvkZ7TyXV0EWXzXmjPM="; + cargoHash = "sha256-iKZ4FJ0IL1lnKuYTmFvx8umoB0z8M8xnvgb/GMfGKkI="; nativeInstallCheckInputs = [ versionCheckHook From 0fedde966c921527cea476c36962d6dab8847908 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 14 Jul 2025 16:47:29 -0400 Subject: [PATCH 209/212] xwin: init at 0.6.6 --- pkgs/by-name/xw/xwin/package.nix | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/xw/xwin/package.nix diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix new file mode 100644 index 000000000000..f7d206647c0d --- /dev/null +++ b/pkgs/by-name/xw/xwin/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "xwin"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "Jake-Shadle"; + repo = "xwin"; + tag = finalAttrs.version; + hash = "sha256-bow/TJ6aIXoNZDqCTlQYAMxEUiolby1axsKiLMk/jiA="; + }; + + cargoHash = "sha256-S/3EjlG0Dr/KKAYSFaX/aFh/CIc19Bv+rKYzKPWC+MI="; + + doCheck = true; + # Requires network access + checkFlags = [ + "--skip verify_compiles" + "--skip verify_deterministic" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = placeholder "out" + "/bin/xwin"; + + meta = { + description = "Utility for downloading the Microsoft CRT & Windows SDK libraries"; + homepage = "https://github.com/Jake-Shadle/xwin"; + changelog = "https://github.com/Jake-Shadle/xwin/releases/tag/" + finalAttrs.version; + mainProgram = "xwin"; + license = [ + lib.licenses.mit + lib.licenses.asl20 + ]; + maintainers = with lib.maintainers; [ RossSmyth ]; + platforms = with lib.platforms; linux ++ darwin ++ windows; + }; +}) From 52c4dd0a4a4f001dba91c2aa9672ef6355889fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sun, 27 Jul 2025 18:19:02 +0100 Subject: [PATCH 210/212] xdg-desktop-portal-hyprland: 1.3.9 -> 1.3.10 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 544f4f627efd..f8391e555cb0 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -28,13 +28,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; tag = "v${finalAttrs.version}"; - hash = "sha256-sAObJHBZjJHzYR62g+BLNBNq19cqb5LTw73H8m57K0w="; + hash = "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0="; }; depsBuildBuild = [ From 0df4905d50197a97c699d318b8afd86aae44fde1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 13:48:12 +0000 Subject: [PATCH 211/212] warp-terminal: 0.2025.07.09.08.11.stable_01 -> 0.2025.07.23.08.12.stable_02 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 69be747e2ba6..b13d1af8fca2 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-nRI0xtLFyFqqNCZjIH07Dxut4OdZMO3KHHyPeNT3XKo=", - "version": "0.2025.07.09.08.11.stable_01" + "hash": "sha256-JAqWQ3dfk4B+CNV5knj4HCnpVu3Q5STnyriqaeLPQD0=", + "version": "0.2025.07.23.08.12.stable_02" }, "linux_x86_64": { - "hash": "sha256-zk3yHo3aimdmgA9bxbQrrZXXWYzNjJRB619PB/MRIG4=", - "version": "0.2025.07.09.08.11.stable_01" + "hash": "sha256-C9p95LRS/ma5FEIq6ZQqda+dQhgbVT8dhDJIDpCilWI=", + "version": "0.2025.07.23.08.12.stable_02" }, "linux_aarch64": { - "hash": "sha256-b208xahTJ0e0wABB2m2M7x6CAyHKr/7uHMF/cY4LVfM=", - "version": "0.2025.07.09.08.11.stable_01" + "hash": "sha256-KGmkuL/4I+oN99ubjtGMrEt6Ijlak9yv39LksPAo8/U=", + "version": "0.2025.07.23.08.12.stable_02" } } From dffe614d45adc71a788915c4944734995abd6e64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 20:28:05 +0000 Subject: [PATCH 212/212] vscode-extensions.github.vscode-pull-request-github: 0.114.2 -> 0.114.3 --- 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 b96a66c0a4fc..1bb85583d631 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2033,8 +2033,8 @@ let mktplcRef = { publisher = "github"; name = "vscode-pull-request-github"; - version = "0.114.2"; - hash = "sha256-TLsvewvmqwKEBPsuzrlMhlsjdi3jbA7E1xz9B8aU1LA="; + version = "0.114.3"; + hash = "sha256-ZrutAYL0HphkSDh2BRA4wZUA/s1Uf6IvPWs4dfqfEDk="; }; meta = { license = lib.licenses.mit;