From e7daaa7001981d76ecc5c8ce67491f442d08c21b Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 30 Jan 2024 23:06:16 +0100 Subject: [PATCH 01/69] bandwhich: add shell completions and man page Pre v0.22.0, shell completions and the man page were static and heavily outdated. v0.22.0 then removed those entirely. v0.22.2 then re-added shell completions and the man page, but this time natively generated on build time (assuming $BANDWHICH_GEN_DIR is set). Technically, shell completions for PowerShell and Elvish are generated as well, but we don't install those, since our installShellCompletions does not support those shells. --- pkgs/tools/networking/bandwhich/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 240fa3e86f8a..958cb6364785 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bandwhich"; @@ -23,11 +23,25 @@ rustPlatform.buildRustPackage rec { "--skip=tests::cases::ui::layout_under_50_width_under_50_height" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.isDarwin; + preConfigure = '' + export BANDWHICH_GEN_DIR=_shell-files + mkdir -p $BANDWHICH_GEN_DIR + ''; + + postInstall = '' + installManPage $BANDWHICH_GEN_DIR/bandwhich.1 + + installShellCompletion $BANDWHICH_GEN_DIR/bandwhich.{bash,fish} \ + --zsh $BANDWHICH_GEN_DIR/_bandwhich + ''; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' From 8535f629910b12778fa875e9e8a1c45d439e5d46 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 31 Jan 2024 02:21:44 +0100 Subject: [PATCH 02/69] bandwhich: add `meta.changelog` bandwhich has two different changelogs: 1. the in-tree CHANGELOG.md 2. git tags/GitHub Releases Unfortunately, the CHANGELOG.md contains fewer information from time to time. One example would be https://github.com/imsnif/bandwhich/blob/v0.22.0/CHANGELOG.md vs https://github.com/imsnif/bandwhich/releases/tag/v0.22.0 In this case, the GitHub Release contains a lot more noise due to various chore(deps) entries. This is due to https://github.com/imsnif/bandwhich/blob/b5e48ba9bb466c5e1192755b0235b6b43d1d4966/.github/workflows/require-changelog-for-PRs.yml#L10-L11 I'd argue, the CHANGELOG.md should be preferred here, but in the end this isn't my package and not my call. --- pkgs/tools/networking/bandwhich/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 958cb6364785..eea66c329f84 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec { the background using reverse DNS on a best effort basis. ''; homepage = "https://github.com/imsnif/bandwhich"; + changelog = "https://github.com/imsnif/bandwhich/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne figsoda ]; platforms = platforms.unix; From 1f9cef9379b58d641af7a0b6e26046ccef218047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Feb 2024 18:20:56 +0000 Subject: [PATCH 03/69] python311Packages.python-engineio: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 59cd210a0a04..952893fec269 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-btXwx9GRLBcjtcGdgckb2Y/MxC0E/rKTWKgkP8olezo="; + hash = "sha256-FpPGIK5HVtTzDOpORo+WPhS1860P3dm1nJkvakpzsjE="; }; nativeBuildInputs = [ From 22ffaa5c624f018d00a55196d7e197edb54a8e6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Feb 2024 21:20:03 +0000 Subject: [PATCH 04/69] python311Packages.python-socketio: 5.10.0 -> 5.11.1 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f8e189f4bd8c..bf6ce265e016 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.10.0"; + version = "5.11.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-nlzTzIswMRjvJ9l9TOtVvRvbKlQPvNH0/P1NIbQCmy8="; + hash = "sha256-miIl/+3JtjtoQaS6Jy0M9lPQJQp3VlpvrO5Hqlrq5JM="; }; nativeBuildInputs = [ From 7e0b9f767d79b89c4477a1cacb872d09d5878ada Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Feb 2024 05:05:06 +0000 Subject: [PATCH 05/69] homebank: 5.7.3 -> 5.7.4 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 4a3272a4e599..e8616cfef80f 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU="; + hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; From 352a41f7ce0146a3aeac8bc71dba96a32e35ff62 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 1 Feb 2024 14:37:27 +0100 Subject: [PATCH 06/69] python311Packages.essentials: init at 0.1.5 --- .../python-modules/essentials/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/essentials/default.nix diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix new file mode 100644 index 000000000000..69a494a0eb5d --- /dev/null +++ b/pkgs/development/python-modules/essentials/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pythonImportsCheckHook, + lib, +}: +buildPythonPackage rec { + pname = "essentials"; + version = "1.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials"; + rev = "v${version}"; + hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "essentials" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials"; + description = "General purpose classes and functions"; + changelog = "https://github.com/Neoteroi/essentials/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c483e790da8..763de818712c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3745,6 +3745,8 @@ self: super: with self; { escapism = callPackage ../development/python-modules/escapism { }; + essentials = callPackage ../development/python-modules/essentials { }; + etcd = callPackage ../development/python-modules/etcd { }; etcd3 = callPackage ../development/python-modules/etcd3 { From 7782d26fb9aad17c5413146316b0a8503a865f5a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 1 Feb 2024 16:06:07 +0100 Subject: [PATCH 07/69] python311Packages.essentials-openapi: init at 1.0.9 --- .../essentials-openapi/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/essentials-openapi/default.nix diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix new file mode 100644 index 000000000000..52824049c6c1 --- /dev/null +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -0,0 +1,65 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials, + flask, + hatchling, + httpx, + jinja2, + markupsafe, + pydantic, + pytestCheckHook, + pythonImportsCheckHook, + pyyaml, + rich, + setuptools +}: +buildPythonPackage rec { + pname = "essentials-openapi"; + version = "1.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials-openapi"; + rev = "v${version}"; + hash = "sha256-j0vEMNXZ9TrcFx8iIyTFQIwF49LEincLmnAt+qodYmA="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + flask + httpx + pydantic + pytestCheckHook + rich + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + essentials + markupsafe + ]; + + passthru.optional-dependencies = { + full = [ click jinja2 rich httpx ]; + }; + + pythonImportsCheck = [ + "openapidocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials-openapi"; + description = "Functions to handle OpenAPI Documentation"; + changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 763de818712c..474b7f2b1de6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3747,6 +3747,8 @@ self: super: with self; { essentials = callPackage ../development/python-modules/essentials { }; + essentials-openapi = callPackage ../development/python-modules/essentials-openapi { }; + etcd = callPackage ../development/python-modules/etcd { }; etcd3 = callPackage ../development/python-modules/etcd3 { From 64cb577ff11cfb754ef7bf981ef7865e712687dc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 1 Feb 2024 16:12:34 +0100 Subject: [PATCH 08/69] python311Packages.neoteroi-mkdocs: init at 1.0.4 --- .../neoteroi-mkdocs/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/neoteroi-mkdocs/default.nix diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix new file mode 100644 index 000000000000..30b226c6d5bb --- /dev/null +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -0,0 +1,63 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials-openapi, + flask, + hatchling, + httpx, + jinja2, + mkdocs, + pytestCheckHook, + pythonImportsCheckHook, + rich, + setuptools, +}: +buildPythonPackage rec { + pname = "neoteroi-mkdocs"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "mkdocs-plugins"; + rev = "v${version}"; + hash = "sha256-UyTlgKWdBWckI9sBL4GRQtgNHYpHpZlWVOdmdQ+7lss="; + }; + + buildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + setuptools + ]; + + propagatedBuildInputs = [ + essentials-openapi + click + jinja2 + httpx + mkdocs + rich + ]; + + disabledTests = [ + "test_contribs" # checks against its own git repository + ]; + + pythonImportsCheck = [ + "neoteroi.mkdocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/mkdocs-plugins"; + description = "Plugins for MkDocs"; + changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 474b7f2b1de6..03f1442951a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8303,6 +8303,8 @@ self: super: with self; { neo4j = callPackage ../development/python-modules/neo4j { }; + neoteroi-mkdocs = callPackage ../development/python-modules/neoteroi-mkdocs { }; + nessclient = callPackage ../development/python-modules/nessclient { }; nest = toPythonModule(pkgs.nest-mpi.override { withPython = true; python3 = python; }); From cad95ac98ed8fb4367c5ab53b71d7b42e2d041c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Feb 2024 21:47:10 +0000 Subject: [PATCH 09/69] qcad: 3.29.3.1 -> 3.29.4.1 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 9ab33ad29492..ea54dc325885 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.3.1"; + version = "3.29.4.1"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-QPBiEoOseNUzAWQHPEBq6O0jg8ed5dH+8xlyRCct0g4="; + sha256 = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; }; patches = [ From 9aa2c781aa6e486aba9bbc39cf62edbde7bb01a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Feb 2024 14:18:28 +0100 Subject: [PATCH 10/69] python311Packages.fakeredis: 2.20.1 -> 2.21.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.20.1...v2.21.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.21.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b39241bc9058..97849371f0cd 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.20.1"; + version = "2.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws="; + hash = "sha256-A+XOCWeXVt8SUkKM+TKra8xODuCD0QE9+/8FefUt4OY="; }; nativeBuildInputs = [ From e4ae4e18a8abad505de699127675a38cad52f6a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 09:41:46 +0100 Subject: [PATCH 11/69] python311Packages.python-technove: init at 1.2.2 Python library to interact with TechnoVE local device API https://github.com/Moustachauve/pytechnove --- .../python-technove/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/python-technove/default.nix diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix new file mode 100644 index 000000000000..795ddf5b1236 --- /dev/null +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiohttp +, aresponses +, awesomeversion +, backoff +, buildPythonPackage +, cachetools +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "python-technove"; + version = "1.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "Moustachauve"; + repo = "pytechnove"; + rev = "refs/tags/v${version}"; + hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + awesomeversion + backoff + cachetools + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "technove" + ]; + + meta = with lib; { + description = "Python library to interact with TechnoVE local device API"; + homepage = "https://github.com/Moustachauve/pytechnove"; + changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f16bf7acf9dd..825abd3d6656 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12000,6 +12000,8 @@ self: super: with self; { python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + python-technove = callPackage ../development/python-modules/python-technove { }; + python-telegram = callPackage ../development/python-modules/python-telegram { }; python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; From c7c6d1f0aaef4c5e267b7f5b0e2282a8bcad1c95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Feb 2024 19:03:17 +0000 Subject: [PATCH 12/69] cfripper: 1.15.3 -> 1.15.4 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index c597f2e85602..aac55cf46b74 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -12,14 +12,14 @@ let }; in python.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.3"; + version = "1.15.4"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; rev = "refs/tags/v${version}"; - hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I="; + hash = "sha256-heVFum+Eaofd9L0dNHqD9GgHP+ckGwJi+NfeFci+ESc="; }; postPatch = '' From 67e841c29e9a04c742fba429da0014ba692a241b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Feb 2024 23:15:37 +0100 Subject: [PATCH 13/69] python311Packages.py-serializable: 1.0.0 -> 1.0.1 Diff: https://github.com/madpah/serializable/compare/refs/tags/v1.0.0...v1.0.1 Changelog: https://github.com/madpah/serializable/blob/v1.0.1/CHANGELOG.md --- pkgs/development/python-modules/py-serializable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 12bdef693e20..0954993ccd1f 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE="; + hash = "sha256-OsgFzT5qGyszO4jFYWIAgGY41s0ZBEMwCbWZeY189h4="; }; nativeBuildInputs = [ From 99137a4da1254bdfdcda9f051c3eb67bb71a82da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 04:24:37 +0000 Subject: [PATCH 14/69] minio: 2024-02-04T22-36-13Z -> 2024-02-14T21-36-02Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index cd498ba55533..4c92c65c7a48 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-02-04T22-36-13Z"; + version = "2024-02-14T21-36-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-vA1xrwvHyhqrdWjEXqs0MUaPq8S3J2r1uE0IndpwdjQ="; + hash = "sha256-tXLdK5+akZ1ChUqs8i7Qb32E7ZoMfHk1kgDS+8RiRH4="; }; - vendorHash = "sha256-eE8F/cG7SdSHrFW4qg+MBdS/rxoz4xB0JbCQ3vi38ok="; + vendorHash = "sha256-4/fW2mKzgwcRHigksAsk7bXS0Leak8rZdzoQ6mK2ksA="; doCheck = false; From 4c2bd62904c5a39593f7c7ce4558aaadf1568c75 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Thu, 15 Feb 2024 22:11:53 +1300 Subject: [PATCH 15/69] opensubdiv: Add a static output --- pkgs/development/libraries/opensubdiv/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 9c485949a5c0..e3bf614d9886 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "static" ]; nativeBuildInputs = [ cmake @@ -65,7 +65,9 @@ stdenv.mkDerivation rec { NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) ''; - postInstall = "rm $out/lib/*.a"; + postInstall = '' + moveToOutput "lib/*.a" $static + ''; meta = { description = "An Open-Source subdivision surface library"; From ba53276760eaba1884d19a590000de893b02a032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 10:36:16 +0100 Subject: [PATCH 16/69] python311Packages.awsiotpythonsdk: refactor --- .../python-modules/awsiotpythonsdk/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 5907b74ba220..50a9d9506edd 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "AWSIoTPythonSDK"; + pname = "awsiotpythonsdk"; version = "1.5.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; @@ -28,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for connecting to AWS IoT"; homepage = "https://github.com/aws/aws-iot-device-sdk-python"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 24bb9cf8ea3ac0d752c9839bd7ddb950a6a1dc28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 10:36:41 +0100 Subject: [PATCH 17/69] python311Packages.awsiotpythonsdk: 1.5.2 -> 1.5.4 Diff: https://github.com/aws/aws-iot-device-sdk-python/compare/refs/tags/v1.5.2...v1.5.4 Changelog: https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v1.5.4 --- pkgs/development/python-modules/awsiotpythonsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 50a9d9506edd..20da74babff2 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "awsiotpythonsdk"; - version = "1.5.2"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; + hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM="; }; nativeBuildInputs = [ From bba3bb3237c1891122f4a16e7b4c98c155070005 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 14 Feb 2024 18:09:13 +0100 Subject: [PATCH 18/69] pdns-recursor: 4.9.3 -> 5.0.2 https://doc.powerdns.com/recursor/changelog/5.0.html#change-5.0.2 --- pkgs/servers/dns/pdns-recursor/default.nix | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 95dc64156f42..e691336d52a9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,26 +1,46 @@ { lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf +, libsodium +, curl +, rustPlatform, cargo, rustc , enableProtoBuf ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "4.9.3"; + version = "5.0.2"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - hash = "sha256-FmBFMFFJ3s3pWCH3bwabZl9rISLf99RquVLVDZ8B7Us="; + url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; + hash = "sha256-qQ6LYf3BgbWWFEw1kgEYynHDuV9GZYzOfoIidQ3kXKk="; }; - nativeBuildInputs = [ pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; + hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA="; + }; + + cargoRoot = "settings/rust"; + + nativeBuildInputs = [ + cargo + rustc + + rustPlatform.cargoSetupHook + pkg-config + ]; buildInputs = [ boost openssl systemd lua luajit + libsodium + curl ] ++ lib.optional enableProtoBuf protobuf; configureFlags = [ "--enable-reproducible" "--enable-systemd" + "--enable-dns-over-tls" "sysconfdir=/etc/pdns-recursor" ]; @@ -42,4 +62,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; }; -} +}) From 78151d077c58502a6e143c058ac71163a47a8f6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 13:02:41 +0100 Subject: [PATCH 19/69] python311Packages.google-cloud-videointelligence: 2.13.0 -> 2.13.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-videointelligence-v2.13.1/packages/google-cloud-videointelligence/CHANGELOG.md --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index e8ac6fa628f5..8f96255e5e64 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ODRF08xxjUrj6PMzfTlcYLqGrgV71OA0VHT44ktQZ4k="; + hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw="; }; propagatedBuildInputs = [ From 1c205f888aec50392c8e68b59b236c2c47900b53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 13:04:18 +0100 Subject: [PATCH 20/69] python311Packages.google-cloud-videointelligence: refactor --- .../google-cloud-videointelligence/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 8f96255e5e64..b020e1201fcd 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; version = "2.13.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus From b386fe7ca83da30a092500d2da9f22e54b24cff4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 12:33:28 +0000 Subject: [PATCH 21/69] cxxopts: 3.1.1 -> 3.2.0 --- pkgs/development/libraries/cxxopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index e4d1df23b7e5..f587cf33308d 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cxxopts"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; rev = "v${version}"; - sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ="; + sha256 = "sha256-tOO0YCIG3MxSJZhurNcDR1pWIUEO/Har9mrCrZs3iVk="; }; buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; From 0472d5e800bfe45e8a5856d09011e49dc210179f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:29:06 +0100 Subject: [PATCH 22/69] python311Packages.google-cloud-bigquery-datatransfer: 3.14.0 -> 3.14.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v3.14.1/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c975700ce1ef..50346213b253 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.14.0"; + version = "3.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0="; + hash = "sha256-v9gBSb9TYvaqF1/g7dJshSkJ2RlCAWXGdf7yPlne0I4="; }; propagatedBuildInputs = [ From a00ae5e38d9730bf677a0f81dd58a49fcc846f06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:32:11 +0100 Subject: [PATCH 23/69] python311Packages.google-cloud-iam-logging: 1.3.0 -> 1.3.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-logging-v1.3.1/packages/google-cloud-iam-logging/CHANGELOG.md --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index aac30f35757d..cac4ce91de6b 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oLqRmxNPbb+nUMN70kGlAtBCji4wXrbRv2DhNMcZV5c="; + hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ="; }; propagatedBuildInputs = [ From ae2dea9c1aaed17595b8cd3a0bb600d2a98039d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:34:50 +0100 Subject: [PATCH 24/69] python311Packages.google-cloud-iam-logging: refactor --- .../python-modules/google-cloud-iam-logging/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index cac4ce91de6b..1a3c2c96b44f 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 From b21b2a37281222ef95887367fcd659a3436b7361 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:38:44 +0100 Subject: [PATCH 25/69] python311Packages.google-cloud-automl: 2.12.0 -> 2.13.1 Changelog: https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v2.13.1/packages/google-cloud-automl --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 2768a79005a8..0cb6f8350dd4 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.12.0"; + version = "2.13.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U="; + hash = "sha256-AhZ5KdSpxJS8jHfwJfLztMtyGZOnCwhb/lalrPZ9jog="; }; nativeBuildInputs = [ From 1d0cdb83620f9e8b1ec93631bf1feb7eb3783bc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:42:34 +0100 Subject: [PATCH 26/69] python311Packages.google-cloud-vision: 3.6.0 -> 3.7.0 Changelog: https://github.com/googleapis/python-vision/blob/v3.7.0/CHANGELOG.md --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 071543ae3caf..ea56c08b3057 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q="; + hash = "sha256-uHIhWpihTxcV28zv3OZrGf4mj26aBaR2isycRMtMeNM="; }; nativeBuildInputs = [ From 36f1e9b22b2259bb13525375713faa80df47d152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:43:55 +0100 Subject: [PATCH 27/69] python311Packages.google-cloud-pubsub: 2.19.1 -> 2.19.4 Changelog: https://github.com/googleapis/python-pubsub/blob/v2.19.4/CHANGELOG.md --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 47e0373d65df..c9be11ab058f 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.1"; + version = "2.19.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU="; + hash = "sha256-pfkoBZjwxKWBm7YwpQxF3IrNoMlK/srgoYNovMv6JlE="; }; propagatedBuildInputs = [ From 26833fb302430b9ef2d8f732a1a760b0cd7a6ad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:45:07 +0100 Subject: [PATCH 28/69] python311Packages.google-cloud-language: 2.12.0 -> 2.13.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v2.13.1/packages/google-cloud-language/CHANGELOG.md --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index e04591791d3c..953dc4b353d5 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.12.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-efuO/hWDM+aMBXR+nqhrWYsvQpoS83FJ2DrG+hhFlio="; + hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU="; }; propagatedBuildInputs = [ From 8577e19dd8781ea163227f81b6124a587393eeec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 14:48:22 +0100 Subject: [PATCH 29/69] python311Packages.google-cloud-language: refactor --- .../python-modules/google-cloud-language/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 953dc4b353d5..66b032e856c3 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,12 +7,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-language"; version = "2.13.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus From f5f56791e9c37c7c480e6d90a11eeff573b25297 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 15:29:04 +0000 Subject: [PATCH 30/69] elvish: 0.20.0 -> 0.20.1 --- pkgs/by-name/el/elvish/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix index 408923b50cb0..bd3e746377a3 100644 --- a/pkgs/by-name/el/elvish/package.nix +++ b/pkgs/by-name/el/elvish/package.nix @@ -6,7 +6,7 @@ let pname = "elvish"; - version = "0.20.0"; + version = "0.20.1"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "elves"; repo = "elvish"; rev = "v${version}"; - hash = "sha256-aaj2P1V31FnRehrUh+aqpPa8QwRrUezKwAa8WBa4X0w="; + hash = "sha256-lKrX38gVUhYwwuNF25LcZ+TytP4vx/GO7ay6Au4BBZA="; }; vendorHash = "sha256-sgVGqpncV7Ylok5FRcV01a3MCX6UdZvTt3nfVh5L2so="; From 13723aa276910e26a5be816663b16a21a8b8be47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Dec 2023 11:47:32 +0100 Subject: [PATCH 31/69] python311Packages.google-cloud-dlp: 3.13.0 -> 3.14.0 Changelog: https://github.com/googleapis/python-dlp/blob/v3.14.0/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 4fe3dddd3001..87064a578bf1 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.13.0"; + version = "3.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo="; + hash = "sha256-Gf4IzpHE+WxwNque6LJOJ7Atjybi4rVhFgBfBblaI78="; }; propagatedBuildInputs = [ From 9c766c9dd56f082fbffe4f9ba1413e64d2719d72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 16:46:42 +0100 Subject: [PATCH 32/69] python311Packages.google-cloud-dlp: 3.14.0 -> 3.15.1 Changelog: https://github.com/googleapis/python-dlp/blob/v3.15.1/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 87064a578bf1..e3b52d62c820 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.14.0"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Gf4IzpHE+WxwNque6LJOJ7Atjybi4rVhFgBfBblaI78="; + hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE="; }; propagatedBuildInputs = [ From b2a78b314159fed295e907f31ed7eccec18a455a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 16:48:24 +0100 Subject: [PATCH 33/69] python311Packages.google-cloud-dlp: refactor --- .../python-modules/google-cloud-dlp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index e3b52d62c820..90e28d3e65a1 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-dlp"; version = "3.15.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus From 46b585297c454ad55c568809317e0c9bda4ef834 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 16:50:08 +0100 Subject: [PATCH 34/69] python311Packages.google-cloud-secret-manager: 2.18.0 -> 2.18.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v2.18.1/packages/google-cloud-secret-manager/CHANGELOG.md --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6901c9dc3107..db8a33800a7f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tkmb0z/3rv8nG9Z0h+IdVAQpeobcSHPuhh1jewGzC04="; + hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ="; }; propagatedBuildInputs = [ From dfceb22d285559b21c2a6af22d5bab5821bfb251 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 16:51:12 +0100 Subject: [PATCH 35/69] python311Packages.google-cloud-secret-manager: refactor --- .../python-modules/google-cloud-secret-manager/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index db8a33800a7f..32304fad221f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -8,12 +8,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; version = "2.18.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 From 4777975e1105de45d6ba8d0d6930609893927399 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 16:57:01 +0100 Subject: [PATCH 36/69] python311Packages.google-cloud-speech: 2.24.0 -> 2.24.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v2.24.1/packages/google-cloud-speech/CHANGELOG.md --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index a4f2ab9ae4b3..016b569492bf 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.24.0"; + version = "2.24.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z7x4xfCbeRPoCbinCrTwIAp9JIvfavFvA1c4/a5UbHQ="; + hash = "sha256-aPW5m1cZNXpbiWCUQs104QH+/rVueanW0yE5TCdgWoQ="; }; nativeBuildInputs = [ From 827527eccfe4b2ea2cf7e6dd4a0a401d5a9b9bec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 17:26:10 +0100 Subject: [PATCH 37/69] python311Packages.plugwise: 0.37.0 -> 0.37.1 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.37.0...v0.37.1 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.37.1 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 97b42974993a..7d8b5f666515 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.0"; + version = "0.37.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-a/8GVHhVZsK2DD3+mM8UvwkgjMC403Mc9UJSO19AlXs="; + hash = "sha256-6o0g3il4GV6E8avp9V2YrkaVPf2z37asdJOxf6Phbmc="; }; postPatch = '' From 41bee92efd12f06efe6d07c73637300b87417f38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 16:33:51 +0000 Subject: [PATCH 38/69] qovery-cli: 0.84.0 -> 0.84.1 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 2605930e3519..8db9f115c4d8 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.84.0"; + version = "0.84.1"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-2cG/aG1WXNmXqoJ+N2vmq2SBfIeCI1hac8y2vLy7Dyk="; + hash = "sha256-Dq62LXa0hZrpfQ7WQuCelLxWS7Lhn6SH61cNTsYI/mw="; }; vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o="; From 7a3976e5bdf55f6db34f3a7547a2026e82cfedc1 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 15 Feb 2024 16:39:10 +0000 Subject: [PATCH 39/69] cppcheck: 2.13.3 -> 2.13.4 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0582c1d6e89a..ebccc3b2008d 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.13.3"; + version = "2.13.4"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-JTasjK9EkdGCTGL5Qx9uU3UBFlQzVdpTJ/v1IfzXCLE="; + hash = "sha256-YCE4TAi5eNUosQMsTn0kEcUh1AVw4rssrj+xB+ef4bE="; }; nativeBuildInputs = [ From 006dea002a7c520d7445fa2f8ff9060f567cb733 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:09:42 +0100 Subject: [PATCH 40/69] python311Packages.types-aiobotocore-accessanalyzer: 2.8.0 -> 2.11.2 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index da7941347421..196680ba9fa4 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -44,7 +44,7 @@ let }; in rec { - types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.8.0" "sha256-7TmekyZVc2l2er1TIJURP7Qy0n7xRYnXt44FJr5XBWA="; + types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.11.2" "sha256-hUS1ZTj9CbC74Aiinmeh2BEQ2KymcqxuYVSeD12s5xg"; types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y="; From 92bc8e1d3812319c066782c845ae3423c5bcbc40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:14:51 +0100 Subject: [PATCH 41/69] python311Packages.types-aiobotocore-account: 2.8.0 -> 2.11.2 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 196680ba9fa4..b3b3fa744588 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -46,7 +46,7 @@ in rec { types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.11.2" "sha256-hUS1ZTj9CbC74Aiinmeh2BEQ2KymcqxuYVSeD12s5xg"; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y="; + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.11.2" "sha256-XtL7R0UrgI/9rSxfNYbA0Lez+DiVyB7R+rhn49Nxerc="; types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y="; From b843b757db606f6c09079e56b06b56c1067541ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:16:46 +0100 Subject: [PATCH 42/69] python311Packages.types-aiobotocore-acm: 2.8.0 -> 2.11.2 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index b3b3fa744588..12828d307ec4 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -48,7 +48,7 @@ rec { types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.11.2" "sha256-XtL7R0UrgI/9rSxfNYbA0Lez+DiVyB7R+rhn49Nxerc="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y="; + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.11.2" "sha256-vpE1GuvKFPsBf3rTk5V6B4ujFGaHE3wk9yN3j0sM0bo="; types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; From ed82d9b980eab011042cf24985bf35bf02480ac8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:19:19 +0100 Subject: [PATCH 43/69] python311Packages.types-aiobotocore-acm-pca: 2.8.0 -> 2.11.2 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 12828d307ec4..16ce97d48b85 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -50,7 +50,7 @@ rec { types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.11.2" "sha256-vpE1GuvKFPsBf3rTk5V6B4ujFGaHE3wk9yN3j0sM0bo="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.11.2" "sha256-g9a2ad5hZonlKWGnLQchfT5CAgwqsvseeQBQemCSCQw="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.2" "sha256-XUzsO3dJmVEyAkwGcZ9BxNb8CceJALCNRIfs6/lFa8M="; From 3fa3351b518a6b89489454efda48cbe4bf25c1a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:22:05 +0100 Subject: [PATCH 44/69] python311Packages.types-aiobotocore-gamesparks: 2.6.0 -> 2.7.0 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 16ce97d48b85..be51829af3a3 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -308,7 +308,7 @@ rec { types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.2" "sha256-AgZvipboBZnhSlC7K0JRFpH8Z4pNPT2UfdXYjshxF8Y="; - types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M="; + types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.2" "sha256-qDj9RSbqHPpJ5yU+AXPeA+umbbSrf2Ssu1g0aiLvnMw="; From 44e65a4aa1e1d13ff8e67afc40fe294a9369a62c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:25:29 +0100 Subject: [PATCH 45/69] python311Packages.types-aiobotocore-macie: 2.6.0 -> 2.7.0 --- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index be51829af3a3..c80a349f6e7c 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -448,7 +448,7 @@ rec { types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.2" "sha256-CKCC7W5h6qKv3Zya/e+WcVoWdOtCqoWKRlJFHSTdxaI="; - types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw="; + types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.2" "sha256-zg/QhW+4Chugyg6rG5HtrE1GAhbWUaveJpaJFemoN94="; From 11abdddc81f5e8c37ea0d82d3a3f2ea97b93a5f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 18:28:12 +0100 Subject: [PATCH 46/69] python311Packages.types-aiobotocore: refactor --- .../types-aiobotocore-packages/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index c80a349f6e7c..47f06b4741fe 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,10 +1,11 @@ { lib -, buildPythonPackage -, pythonOlder , aiobotocore , botocore -, typing-extensions +, buildPythonPackage , fetchPypi +, pythonOlder +, setuptools +, typing-extensions }: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; @@ -13,7 +14,7 @@ let buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ let inherit pname version hash; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiobotocore botocore From 5d1feba5406ffcebb72894661e9da73507587af8 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 15 Feb 2024 09:41:26 -0800 Subject: [PATCH 47/69] nixos/systemd.oomd: set the memory pressure thresholds as mkDefault These should be defaults as they're pretty reasonable to want to override as a user. Unsure how to change the slice defaults to be overridable, that should probably be a later conversation. --- nixos/modules/system/boot/systemd/oomd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 000b18c01609..edc25784367a 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -49,15 +49,15 @@ in { systemd.slices."-".sliceConfig = lib.mkIf cfg.enableRootSlice { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.slices."system".sliceConfig = lib.mkIf cfg.enableSystemSlice { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices { text = '' From 61046902b55b161c72295ff61a816cc8f372da99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 19:29:46 +0000 Subject: [PATCH 48/69] sudo-rs: 0.2.1 -> 0.2.2 --- pkgs/tools/security/sudo-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sudo-rs/default.nix b/pkgs/tools/security/sudo-rs/default.nix index d0e547dc2d23..a1e46c6ee708 100644 --- a/pkgs/tools/security/sudo-rs/default.nix +++ b/pkgs/tools/security/sudo-rs/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "sudo-rs"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "memorysafety"; repo = "sudo-rs"; rev = "v${version}"; - hash = "sha256-EQEdNDUXEMMiFZKuu9LR9ywjvKWyM5bWcRHHUB9+gp4="; + hash = "sha256-Fc9NgKo8Be8AqB1YcH/oH514f3pOjFtqNBIC+3xwagY="; }; - cargoHash = "sha256-Zs9/A7u4yMLKY4cAUCnsqRHgkxI8R3w1JwkAd2lw0eo="; + cargoHash = "sha256-1XhdMHGZZOmSFuVW3Oa1Xwjy3dzkgJOE7h24Ly2F3ps="; nativeBuildInputs = [ installShellFiles pandoc ]; From 1d286d588b59a2fcfa84b226a09323addb850014 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 15 Feb 2024 21:14:21 +0000 Subject: [PATCH 49/69] graylog-5_0: remove --- pkgs/tools/misc/graylog/5.0.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 pkgs/tools/misc/graylog/5.0.nix diff --git a/pkgs/tools/misc/graylog/5.0.nix b/pkgs/tools/misc/graylog/5.0.nix deleted file mode 100644 index 40b296010cd4..000000000000 --- a/pkgs/tools/misc/graylog/5.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib, ...}: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "5.0.8"; - sha256 = "sha256-TGJm2PGoXaLhlzyfSWKScEJxEGObTVttpEEaczsXHiA="; - maintainers = [ lib.maintainers.f2k1de ]; - license = lib.licenses.sspl; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6ad4c9c49f9..e3fcea594749 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -401,6 +401,7 @@ mapAliases ({ graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 + graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6a2482f149e..260aceddec51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8824,8 +8824,6 @@ with pkgs; grails = callPackage ../development/web/grails { jdk = null; }; - graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; - graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { }; From 4dfb2b2405bb5f179dafbab9eedfbc2f7187c38c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 15 Feb 2024 22:26:18 +0100 Subject: [PATCH 50/69] build-support/php: replace `preCheckInstall`, `postCheckInstall` with `preInstallCheck`, `postInstallCheck` --- pkgs/build-support/php/build-composer-project.nix | 4 ++-- pkgs/build-support/php/build-composer-repository.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 778aa35fa6a5..80c63bcde71b 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -57,9 +57,9 @@ let doInstallCheck = previousAttrs.doInstallCheck or false; installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preCheckInstall + runHook preInstallCheck - runHook postCheckInstall + runHook postInstallCheck ''; composerRepository = phpDrv.mkComposerRepository { diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 5b31f86e61cf..e359c0829aaf 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -78,9 +78,9 @@ let doInstallCheck = previousAttrs.doInstallCheck or false; installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preCheckInstall + runHook preInstallCheck - runHook postCheckInstall + runHook postInstallCheck ''; COMPOSER_CACHE_DIR = "/dev/null"; From 18ff9047fd3520169eac4df688c8f9ae7ce21044 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 15 Feb 2024 22:26:38 +0100 Subject: [PATCH 51/69] phel: replace `postCheckInstall` with `postInstallCheck` --- pkgs/by-name/ph/phel/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 2c6431da2887..209f7bd8bbd4 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject (finalAttrs: { vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; doInstallCheck = true; - postCheckInstall = '' + postInstallCheck = '' $out/bin/phel --version ''; From 43b802fded8c06f2f2228c582d231211a50e2019 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 16 Feb 2024 00:37:09 +0100 Subject: [PATCH 52/69] nss_latest: 3.97 -> 3.98 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/Tsq5_Ot9Ay4 Fixes CVE-2023-5388 --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 43cb876fa884..dfc8a21e206c 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.97"; - hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw="; + version = "3.98"; + hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; } From e5c0985730dd7c9484c0d7db11bcd9396745e8b0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 10 Feb 2024 15:41:53 +0000 Subject: [PATCH 53/69] libretro: improve update_cores.py script - Add support for multiple fetchers (for now `fetchFromGitHub` is still the only supported one) - Use `--meta` from `nix-prefetch-github` to extract the date - Show errors in `nix-prefetch-github` if they occur --- .../emulators/retroarch/cores.nix | 16 +++-- .../emulators/retroarch/update_cores.py | 68 +++++++------------ 2 files changed, 35 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5f0585401235..c981f07114ab 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -48,13 +48,15 @@ let getCore = repo: (lib.getAttr repo hashesFile); getCoreSrc = repo: - (lib.pipe repo [ - getCore - (x: builtins.removeAttrs x [ "date" ]) - fetchFromGitHub - ]); + let + inherit (getCore repo) src fetcher; + fetcherFn = { + inherit fetchFromGitHub; + }.${fetcher} or (throw "Unknown fetcher: ${fetcher}"); + in + fetcherFn src; - getCoreDate = repo: (getCore repo).date or "unstable-1970-01-01"; + getCoreVersion = repo: (getCore repo).version; mkLibretroCore = # Sometimes core name != repo name, so you may need to set them differently @@ -67,7 +69,7 @@ let { core , repo ? core , src ? (getCoreSrc repo) - , version ? (getCoreDate repo) + , version ? (getCoreVersion repo) , ... }@args: import ./mkLibretroCore.nix ({ diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 981fe5377c5d..1795c0f70edc 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" -p git -p nix-prefetch-github +#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts import json import os @@ -8,8 +8,6 @@ import sys from concurrent.futures import ThreadPoolExecutor from pathlib import Path -import requests - SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) @@ -19,10 +17,13 @@ GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) # You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to # `True` and they're similar to `fetchgit` options. Also if for some reason you # need to pin a specific revision, set `rev` to a commit. -# To generate the hash file for your new core, you can run `update_cores.py -# `. The script needs to be run from the root of your `nixpkgs` clone. -# Do not forget to add your core to `cores.nix` file with the proper overrides -# so the core can be build. +# There is also a `fetcher` option that for now only supports `fetchFromGitHub` +# (see `get_repo_hash()`), but it may be extended in the future if there is a +# need to support fetchers from other source hubs. +# To generate the hash file for your new core, you can run +# `/pkgs/applications/emulators/retroarch/update_cores.py `. Do +# not forget to add your core to `cores.nix` file with the proper overrides so +# the core can be build. CORES = { "2048": {"repo": "libretro-2048"}, "atari800": {"repo": "libretro-atari800"}, @@ -128,30 +129,6 @@ def info(*msg): print(*msg, file=sys.stderr) -def get_rev_date_fetchFromGitHub(repo, owner, rev): - # https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#get-a-commit - url = f"https://api.github.com/repos/{owner}/{repo}/commits/{rev}" - headers = { - "Accept": "application/vnd.github+json", - "X-GitHub-Api-Version": "2022-11-28", - } - if token := os.environ.get("GITHUB_TOKEN"): - headers["Authorization"] = f"Bearer {token}" - r = requests.get(url, headers=headers) - - try: - j = r.json() - except requests.exceptions.JSONDecodeError: - return None - - date = j.get("commit", {}).get("committer", {}).get("date") - if date: - # Date format returned by API: 2023-01-30T06:29:13Z - return f"unstable-{date[:10]}" - else: - return None - - def get_repo_hash_fetchFromGitHub( repo, owner="libretro", @@ -176,18 +153,24 @@ def get_repo_hash_fetchFromGitHub( if rev: extra_args.append("--rev") extra_args.append(rev) - result = subprocess.run( - ["nix-prefetch-github", owner, repo, *extra_args], - check=True, - capture_output=True, - text=True, - ) + try: + result = subprocess.run( + ["nix-prefetch-github", owner, repo, "--meta", *extra_args], + check=True, + capture_output=True, + text=True, + ) + except subprocess.CalledProcessError as ex: + info(f"Error while updating {owner}/{repo}:", ex.stderr) + raise ex + j = json.loads(result.stdout) - date = get_rev_date_fetchFromGitHub(repo, owner, j["rev"]) - if date: - j["date"] = date - # Remove False values - return {k: v for k, v in j.items() if v} + return { + "fetcher": "fetchFromGitHub", + # Remove False values + "src": {k: v for k, v in j["src"].items() if v}, + "version": f"unstable-{j['meta']['commitDate']}", + } def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): @@ -229,6 +212,7 @@ def main(): cores = {core: repo for core, repo in CORES.items() if core in cores_to_update} repo_hashes = get_repo_hashes(cores) + repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!" info(f"Generating '{HASHES_PATH}'...") with open(HASHES_PATH, "w") as f: f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) From 5fb29ed40fb64349497724205de597c9fc8fee65 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 14 Feb 2024 21:09:15 +0000 Subject: [PATCH 54/69] libretro: update cores --- .../emulators/retroarch/hashes.json | 1161 ++++++++++------- 1 file changed, 713 insertions(+), 448 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 7f66bccd8f81..11837906d735 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -1,626 +1,891 @@ { + "!comment": "Generated with update_cores.py script, do not edit!", "2048": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + }, + "version": "unstable-2023-02-20" }, "atari800": { - "owner": "libretro", - "repo": "libretro-atari800", - "rev": "410d7bf0c215f3444793a9cec51c129e7b67c400", - "hash": "sha256-mUhAraZrmElB6rxQziQG6I2sCdkiX5wYBJhkZgpMSa0=", - "date": "unstable-2023-11-14" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-atari800", + "rev": "410d7bf0c215f3444793a9cec51c129e7b67c400", + "hash": "sha256-mUhAraZrmElB6rxQziQG6I2sCdkiX5wYBJhkZgpMSa0=" + }, + "version": "unstable-2023-11-14" }, "beetle-gba": { - "owner": "libretro", - "repo": "beetle-gba-libretro", - "rev": "38182572571a48cb58057cde64b915237c4e2d58", - "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=", - "date": "unstable-2021-09-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-gba-libretro", + "rev": "38182572571a48cb58057cde64b915237c4e2d58", + "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=" + }, + "version": "unstable-2021-09-18" }, "beetle-lynx": { - "owner": "libretro", - "repo": "beetle-lynx-libretro", - "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", - "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-lynx-libretro", + "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", + "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=" + }, + "version": "unstable-2023-11-01" }, "beetle-ngp": { - "owner": "libretro", - "repo": "beetle-ngp-libretro", - "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", - "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-ngp-libretro", + "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", + "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=" + }, + "version": "unstable-2023-11-01" }, "beetle-pce": { - "owner": "libretro", - "repo": "beetle-pce-libretro", - "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", - "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pce-libretro", + "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", + "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=" + }, + "version": "unstable-2024-02-09" }, "beetle-pce-fast": { - "owner": "libretro", - "repo": "beetle-pce-fast-libretro", - "rev": "86a80e1ba551f9a4627b8394901db0ee365c1442", - "hash": "sha256-aIDc4jzliVLpI2Xetcd5tG74/xvIlqRdVEb72yHrsCo=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pce-fast-libretro", + "rev": "86a80e1ba551f9a4627b8394901db0ee365c1442", + "hash": "sha256-aIDc4jzliVLpI2Xetcd5tG74/xvIlqRdVEb72yHrsCo=" + }, + "version": "unstable-2024-02-09" }, "beetle-pcfx": { - "owner": "libretro", - "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pcfx-libretro", + "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", + "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + }, + "version": "unstable-2023-05-28" }, "beetle-psx": { - "owner": "libretro", - "repo": "beetle-psx-libretro", - "rev": "3adff889b9b8251526ca7dae963be46bf8401e2e", - "hash": "sha256-DaDzoAQJLuer/c+V1bJGbejnyGYB2RYdebZ1YIoVRKw=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-psx-libretro", + "rev": "3adff889b9b8251526ca7dae963be46bf8401e2e", + "hash": "sha256-DaDzoAQJLuer/c+V1bJGbejnyGYB2RYdebZ1YIoVRKw=" + }, + "version": "unstable-2024-02-09" }, "beetle-saturn": { - "owner": "libretro", - "repo": "beetle-saturn-libretro", - "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", - "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-saturn-libretro", + "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", + "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=" + }, + "version": "unstable-2023-05-28" }, "beetle-supafaust": { - "owner": "libretro", - "repo": "supafaust", - "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", - "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=", - "date": "unstable-2023-06-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "supafaust", + "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", + "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=" + }, + "version": "unstable-2023-06-19" }, "beetle-supergrafx": { - "owner": "libretro", - "repo": "beetle-supergrafx-libretro", - "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", - "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-supergrafx-libretro", + "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", + "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=" + }, + "version": "unstable-2024-02-09" }, "beetle-vb": { - "owner": "libretro", - "repo": "beetle-vb-libretro", - "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", - "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-vb-libretro", + "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", + "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=" + }, + "version": "unstable-2023-11-01" }, "beetle-wswan": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "32bf70a3032a138baa969c22445f4b7821632c30", - "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-wswan-libretro", + "rev": "32bf70a3032a138baa969c22445f4b7821632c30", + "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=" + }, + "version": "unstable-2023-11-01" }, "blastem": { - "owner": "libretro", - "repo": "blastem", - "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", - "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=", - "date": "unstable-2022-07-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "blastem", + "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", + "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" + }, + "version": "unstable-2022-07-26" }, "bluemsx": { - "owner": "libretro", - "repo": "bluemsx-libretro", - "rev": "e8a4280bcbd149d1e020adcd9469ad9d8bd67412", - "hash": "sha256-uh4lMOCN1WXKVJybFkkGxIRWAlde74yPH5eaB1/1qsk=", - "date": "unstable-2023-11-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bluemsx-libretro", + "rev": "e8a4280bcbd149d1e020adcd9469ad9d8bd67412", + "hash": "sha256-uh4lMOCN1WXKVJybFkkGxIRWAlde74yPH5eaB1/1qsk=" + }, + "version": "unstable-2023-11-10" }, "bsnes": { - "owner": "libretro", - "repo": "bsnes-libretro", - "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", - "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bsnes-libretro", + "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", + "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=" + }, + "version": "unstable-2024-02-09" }, "bsnes-hd": { - "owner": "DerKoun", - "repo": "bsnes-hd", - "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", - "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=", - "date": "unstable-2023-04-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "DerKoun", + "repo": "bsnes-hd", + "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", + "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=" + }, + "version": "unstable-2023-04-26" }, "bsnes-mercury": { - "owner": "libretro", - "repo": "bsnes-mercury", - "rev": "60c204ca17941704110885a815a65c740572326f", - "hash": "sha256-eJ0lac1I7E4YdsVVrIuXx31UL9w3OR6QTVHq5YBgnJU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bsnes-mercury", + "rev": "60c204ca17941704110885a815a65c740572326f", + "hash": "sha256-eJ0lac1I7E4YdsVVrIuXx31UL9w3OR6QTVHq5YBgnJU=" + }, + "version": "unstable-2023-11-01" }, "citra": { - "owner": "libretro", - "repo": "citra", - "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", - "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", - "fetchSubmodules": true, - "date": "unstable-2024-01-24" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "citra", + "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", + "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-24" }, "desmume": { - "owner": "libretro", - "repo": "desmume", - "rev": "b518fec54b79f2f71a7536715efcdcd7f60638a8", - "hash": "sha256-X6ZL+XdsrdPoOU5zqNsUraMrlPU/HmKWUolrWjFcbDQ=", - "date": "unstable-2024-01-11" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "desmume", + "rev": "b518fec54b79f2f71a7536715efcdcd7f60638a8", + "hash": "sha256-X6ZL+XdsrdPoOU5zqNsUraMrlPU/HmKWUolrWjFcbDQ=" + }, + "version": "unstable-2024-01-11" }, "desmume2015": { - "owner": "libretro", - "repo": "desmume2015", - "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", - "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=", - "date": "unstable-2022-04-05" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "desmume2015", + "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", + "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" + }, + "version": "unstable-2022-04-05" }, "dolphin": { - "owner": "libretro", - "repo": "dolphin", - "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=", - "date": "unstable-2022-12-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "dolphin", + "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", + "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + }, + "version": "unstable-2022-12-17" }, "dosbox": { - "owner": "libretro", - "repo": "dosbox-libretro", - "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", - "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=", - "date": "unstable-2022-07-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "dosbox-libretro", + "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", + "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" + }, + "version": "unstable-2022-07-18" }, "dosbox-pure": { - "owner": "schellingb", - "repo": "dosbox-pure", - "rev": "87bf6365158325b76ff238c1ad8daf16a859bbe8", - "hash": "sha256-IU5AnOEuwZm/bJ9NuxhTQ8Tb5ngmjysLj/om/6P730s=", - "date": "unstable-2023-12-29" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "schellingb", + "repo": "dosbox-pure", + "rev": "87bf6365158325b76ff238c1ad8daf16a859bbe8", + "hash": "sha256-IU5AnOEuwZm/bJ9NuxhTQ8Tb5ngmjysLj/om/6P730s=" + }, + "version": "unstable-2023-12-29" }, "eightyone": { - "owner": "libretro", - "repo": "81-libretro", - "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", - "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "81-libretro", + "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", + "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=" + }, + "version": "unstable-2023-11-01" }, "fbalpha2012": { - "owner": "libretro", - "repo": "fbalpha2012", - "rev": "b7ac554c53561d41640372f23dab15cd6fc4f0c4", - "hash": "sha256-BaeMLej2MLc4uipqTD2z2sHUeOsc50Q1c+PEiPD1cks=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fbalpha2012", + "rev": "b7ac554c53561d41640372f23dab15cd6fc4f0c4", + "hash": "sha256-BaeMLej2MLc4uipqTD2z2sHUeOsc50Q1c+PEiPD1cks=" + }, + "version": "unstable-2023-11-01" }, "fbneo": { - "owner": "libretro", - "repo": "fbneo", - "rev": "bb7aa7ea1e3a9a293fcf4e2b15994afde2e52899", - "hash": "sha256-XTOZGKq02obnzbtUEAEs99Kxhd8hFqLjI/smwtNAU8Q=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fbneo", + "rev": "dacb63782bda34d6ac3cb8dd0e071695b8092483", + "hash": "sha256-Jnp9QmXAz/q31baJ5jCi0ZH/B2a4ErtDe+e2P1iYLeU=" + }, + "version": "unstable-2024-02-14" }, "fceumm": { - "owner": "libretro", - "repo": "libretro-fceumm", - "rev": "63643ba02c8eaea15dbe167ef907f3da7a3e6fd7", - "hash": "sha256-xy8hzZ7nt2hHjRJmsty/w/cPzEtdlSkmNAsog3+h5YU=", - "date": "unstable-2024-01-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-fceumm", + "rev": "63643ba02c8eaea15dbe167ef907f3da7a3e6fd7", + "hash": "sha256-xy8hzZ7nt2hHjRJmsty/w/cPzEtdlSkmNAsog3+h5YU=" + }, + "version": "unstable-2024-01-25" }, "flycast": { - "owner": "flyinghead", - "repo": "flycast", - "rev": "44fa364f36c43bed19b055096600f075c656f78c", - "hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=", - "fetchSubmodules": true, - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "flyinghead", + "repo": "flycast", + "rev": "44fa364f36c43bed19b055096600f075c656f78c", + "hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-09" }, "fmsx": { - "owner": "libretro", - "repo": "fmsx-libretro", - "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", - "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fmsx-libretro", + "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", + "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=" + }, + "version": "unstable-2024-02-08" }, "freeintv": { - "owner": "libretro", - "repo": "freeintv", - "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", - "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=", - "date": "unstable-2023-04-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "freeintv", + "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", + "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" + }, + "version": "unstable-2023-04-17" }, "fuse": { - "owner": "libretro", - "repo": "fuse-libretro", - "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=", - "date": "unstable-2023-06-23" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fuse-libretro", + "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", + "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + }, + "version": "unstable-2023-06-23" }, "gambatte": { - "owner": "libretro", - "repo": "gambatte-libretro", - "rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103", - "hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gambatte-libretro", + "rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103", + "hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU=" + }, + "version": "unstable-2024-02-09" }, "genesis-plus-gx": { - "owner": "libretro", - "repo": "Genesis-Plus-GX", - "rev": "ecb956d914d6bc4e5deb49384bc929939e9a19e5", - "hash": "sha256-Fk+Ldjav+yQl6fkYESR6t1JEOKiCZYCW386QL4ozE68=", - "date": "unstable-2024-02-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "Genesis-Plus-GX", + "rev": "ecb956d914d6bc4e5deb49384bc929939e9a19e5", + "hash": "sha256-Fk+Ldjav+yQl6fkYESR6t1JEOKiCZYCW386QL4ozE68=" + }, + "version": "unstable-2024-02-06" }, "gpsp": { - "owner": "libretro", - "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=", - "date": "unstable-2024-02-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gpsp", + "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", + "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + }, + "version": "unstable-2024-02-10" }, "gw": { - "owner": "libretro", - "repo": "gw-libretro", - "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", - "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gw-libretro", + "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", + "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" + }, + "version": "unstable-2023-05-28" }, "handy": { - "owner": "libretro", - "repo": "libretro-handy", - "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", - "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=", - "date": "unstable-2024-01-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-handy", + "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", + "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=" + }, + "version": "unstable-2024-01-01" }, "hatari": { - "owner": "libretro", - "repo": "hatari", - "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", - "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=", - "date": "unstable-2023-09-29" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "hatari", + "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", + "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=" + }, + "version": "unstable-2023-09-29" }, "mame": { - "owner": "libretro", - "repo": "mame", - "rev": "8ebaec4073703f5050dac3f6c8da408943e15938", - "hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame", + "rev": "8ebaec4073703f5050dac3f6c8da408943e15938", + "hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=" + }, + "version": "unstable-2024-02-13" }, "mame2000": { - "owner": "libretro", - "repo": "mame2000-libretro", - "rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8", - "hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8=", - "date": "unstable-2023-10-31" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2000-libretro", + "rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8", + "hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8=" + }, + "version": "unstable-2023-10-31" }, "mame2003": { - "owner": "libretro", - "repo": "mame2003-libretro", - "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", - "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2003-libretro", + "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", + "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=" + }, + "version": "unstable-2024-02-08" }, "mame2003-plus": { - "owner": "libretro", - "repo": "mame2003-plus-libretro", - "rev": "a4d62997d332acc709c9644641863c5498e01eb0", - "hash": "sha256-9+pxx/fhNsvAMYDqalkkdljaR8/XxuMMSrrz7KeJtDU=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2003-plus-libretro", + "rev": "a4d62997d332acc709c9644641863c5498e01eb0", + "hash": "sha256-9+pxx/fhNsvAMYDqalkkdljaR8/XxuMMSrrz7KeJtDU=" + }, + "version": "unstable-2024-02-13" }, "mame2010": { - "owner": "libretro", - "repo": "mame2010-libretro", - "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", - "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=", - "date": "unstable-2022-06-14" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2010-libretro", + "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", + "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" + }, + "version": "unstable-2022-06-14" }, "mame2015": { - "owner": "libretro", - "repo": "mame2015-libretro", - "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", - "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2015-libretro", + "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", + "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=" + }, + "version": "unstable-2023-11-01" }, "mame2016": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=", - "date": "unstable-2022-04-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2016-libretro", + "rev": "01058613a0109424c4e7211e49ed83ac950d3993", + "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" + }, + "version": "unstable-2022-04-06" }, "melonds": { - "owner": "libretro", - "repo": "melonds", - "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", - "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=", - "date": "unstable-2023-04-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "melonds", + "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", + "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=" + }, + "version": "unstable-2023-04-13" }, "mesen": { - "owner": "libretro", - "repo": "mesen", - "rev": "d6f2f1797694f87e698c737b068f621889e96fa9", - "hash": "sha256-iLX9UvrjYjGjyaLD4sC10gntWUvgZrwiUqTS7S7YDdc=", - "date": "unstable-2024-01-30" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mesen", + "rev": "d6f2f1797694f87e698c737b068f621889e96fa9", + "hash": "sha256-iLX9UvrjYjGjyaLD4sC10gntWUvgZrwiUqTS7S7YDdc=" + }, + "version": "unstable-2024-01-30" }, "mesen-s": { - "owner": "libretro", - "repo": "mesen-s", - "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", - "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=", - "date": "unstable-2022-07-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mesen-s", + "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", + "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" + }, + "version": "unstable-2022-07-25" }, "meteor": { - "owner": "libretro", - "repo": "meteor-libretro", - "rev": "e533d300d0561564451bde55a2b73119c768453c", - "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=", - "date": "unstable-2020-12-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "meteor-libretro", + "rev": "e533d300d0561564451bde55a2b73119c768453c", + "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" + }, + "version": "unstable-2020-12-28" }, "mgba": { - "owner": "libretro", - "repo": "mgba", - "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", - "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mgba", + "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", + "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=" + }, + "version": "unstable-2023-05-28" }, "mrboom": { - "owner": "Javanaise", - "repo": "mrboom-libretro", - "rev": "f688664f024723e00c0d2926e51b45754a25e2da", - "hash": "sha256-t6ArMkyGvHJ9hLc+FFoH2wTk0wRFn5etzdLipTQnGyc=", - "fetchSubmodules": true, - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "Javanaise", + "repo": "mrboom-libretro", + "rev": "f688664f024723e00c0d2926e51b45754a25e2da", + "hash": "sha256-t6ArMkyGvHJ9hLc+FFoH2wTk0wRFn5etzdLipTQnGyc=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-09" }, "mupen64plus": { - "owner": "libretro", - "repo": "mupen64plus-libretro-nx", - "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", - "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=", - "date": "unstable-2024-02-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mupen64plus-libretro-nx", + "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", + "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=" + }, + "version": "unstable-2024-02-06" }, "neocd": { - "owner": "libretro", - "repo": "neocd_libretro", - "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", - "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=", - "date": "unstable-2024-02-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "neocd_libretro", + "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", + "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=" + }, + "version": "unstable-2024-02-01" }, "nestopia": { - "owner": "libretro", - "repo": "nestopia", - "rev": "407df997b65cddbff9b25abae0510e6645205677", - "hash": "sha256-Vlz69ZpXwawdE+bfjlKNrQNmFHhB53FOKhfMgq4viE0=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "nestopia", + "rev": "407df997b65cddbff9b25abae0510e6645205677", + "hash": "sha256-Vlz69ZpXwawdE+bfjlKNrQNmFHhB53FOKhfMgq4viE0=" + }, + "version": "unstable-2024-02-13" }, "np2kai": { - "owner": "AZO234", - "repo": "NP2kai", - "rev": "c2ca4046860264cb307e768f529f180caee5e224", - "hash": "sha256-RizN+NpVp0paXvdt7OudX9/5GJms1YvJ+NVe9iV3nnw=", - "fetchSubmodules": true, - "date": "unstable-2024-01-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "AZO234", + "repo": "NP2kai", + "rev": "c2ca4046860264cb307e768f529f180caee5e224", + "hash": "sha256-RizN+NpVp0paXvdt7OudX9/5GJms1YvJ+NVe9iV3nnw=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-10" }, "nxengine": { - "owner": "libretro", - "repo": "nxengine-libretro", - "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=", - "date": "unstable-2023-02-21" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "nxengine-libretro", + "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", + "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + }, + "version": "unstable-2023-02-21" }, "o2em": { - "owner": "libretro", - "repo": "libretro-o2em", - "rev": "44fe5f306033242f7d74144105e19a7d4939477e", - "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=", - "date": "unstable-2023-10-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-o2em", + "rev": "44fe5f306033242f7d74144105e19a7d4939477e", + "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=" + }, + "version": "unstable-2023-10-19" }, "opera": { - "owner": "libretro", - "repo": "opera-libretro", - "rev": "35e16483be900ea8aa20e87d2710b677437f73ce", - "hash": "sha256-ZNHSxI8l0KGJ6uAvOsEhNpB0IkBxtb9Imj3tA/LiOto=", - "date": "unstable-2024-01-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "opera-libretro", + "rev": "35e16483be900ea8aa20e87d2710b677437f73ce", + "hash": "sha256-ZNHSxI8l0KGJ6uAvOsEhNpB0IkBxtb9Imj3tA/LiOto=" + }, + "version": "unstable-2024-01-13" }, "parallel-n64": { - "owner": "libretro", - "repo": "parallel-n64", - "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", - "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=", - "date": "unstable-2024-01-15" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "parallel-n64", + "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", + "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=" + }, + "version": "unstable-2024-01-15" }, "pcsx2": { - "owner": "libretro", - "repo": "lrps2", - "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", - "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=", - "date": "unstable-2023-01-30" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "lrps2", + "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", + "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" + }, + "version": "unstable-2023-01-30" }, "pcsx_rearmed": { - "owner": "libretro", - "repo": "pcsx_rearmed", - "rev": "016c6e93f6db684211f5c8b05433cb500715ba50", - "hash": "sha256-uYzL0uuQbxa4N0uQT8YEBiCgwkIcigvjeNU600WqSDQ=", - "date": "unstable-2024-02-07" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "pcsx_rearmed", + "rev": "016c6e93f6db684211f5c8b05433cb500715ba50", + "hash": "sha256-uYzL0uuQbxa4N0uQT8YEBiCgwkIcigvjeNU600WqSDQ=" + }, + "version": "unstable-2024-02-07" }, "picodrive": { - "owner": "libretro", - "repo": "picodrive", - "rev": "d907d65692a45e126d0c7d6685cc8792b52bc577", - "hash": "sha256-CJJcWVueg3dbBT4r6W1y8Qj7iRwH7PupvFp+CKEII7o=", - "fetchSubmodules": true, - "date": "unstable-2024-01-23" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "picodrive", + "rev": "d907d65692a45e126d0c7d6685cc8792b52bc577", + "hash": "sha256-CJJcWVueg3dbBT4r6W1y8Qj7iRwH7PupvFp+CKEII7o=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-23" }, "play": { - "owner": "jpd002", - "repo": "Play-", - "rev": "34c4c74fbd0ca2223c203bffc23f57157769074b", - "hash": "sha256-Nn2VsZOuwyBQxFBGGLVfD5BvvqJBI7g8HoShmH0hch8=", - "fetchSubmodules": true, - "date": "unstable-2024-02-05" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "jpd002", + "repo": "Play-", + "rev": "691a893400ef3ca515cb39c7552a8f04bb2d55fa", + "hash": "sha256-42d++0R+LcFuFT9T1+9/0eot+IdBDbqoA/axeHTWZfk=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-14" }, "ppsspp": { - "owner": "hrydgard", - "repo": "ppsspp", - "rev": "d832f96010fa378ef0a7f7980524a61803110ad7", - "hash": "sha256-LkngiwjRoYw+N+DCdbbWnTokDAYXbqOMJX+DQGAUl2g=", - "fetchSubmodules": true, - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "hrydgard", + "repo": "ppsspp", + "rev": "d832f96010fa378ef0a7f7980524a61803110ad7", + "hash": "sha256-LkngiwjRoYw+N+DCdbbWnTokDAYXbqOMJX+DQGAUl2g=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-13" }, "prboom": { - "owner": "libretro", - "repo": "libretro-prboom", - "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", - "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-prboom", + "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", + "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=" + }, + "version": "unstable-2023-05-28" }, "prosystem": { - "owner": "libretro", - "repo": "prosystem-libretro", - "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", - "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=", - "date": "unstable-2023-08-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "prosystem-libretro", + "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", + "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" + }, + "version": "unstable-2023-08-17" }, "puae": { - "owner": "libretro", - "repo": "libretro-uae", - "rev": "2cad13f98aa4df272decf2ab99d95aa582cd4cfb", - "hash": "sha256-8iGsQJcImL7hUK14X+u2BSq4W9BkosiLImCmzf63o4Q=", - "date": "unstable-2024-02-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-uae", + "rev": "2cad13f98aa4df272decf2ab99d95aa582cd4cfb", + "hash": "sha256-8iGsQJcImL7hUK14X+u2BSq4W9BkosiLImCmzf63o4Q=" + }, + "version": "unstable-2024-02-03" }, "quicknes": { - "owner": "libretro", - "repo": "QuickNES_Core", - "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", - "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=", - "date": "unstable-2024-02-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "QuickNES_Core", + "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", + "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=" + }, + "version": "unstable-2024-02-01" }, "same_cdi": { - "owner": "libretro", - "repo": "same_cdi", - "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", - "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=", - "date": "unstable-2023-02-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "same_cdi", + "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", + "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" + }, + "version": "unstable-2023-02-28" }, "sameboy": { - "owner": "libretro", - "repo": "sameboy", - "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=", - "date": "unstable-2022-08-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "sameboy", + "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", + "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + }, + "version": "unstable-2022-08-19" }, "scummvm": { - "owner": "libretro-mirrors", - "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=", - "date": "unstable-2022-04-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro-mirrors", + "repo": "scummvm", + "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", + "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" + }, + "version": "unstable-2022-04-06" }, "smsplus-gx": { - "owner": "libretro", - "repo": "smsplus-gx", - "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", - "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=", - "date": "unstable-2023-10-31" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "smsplus-gx", + "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", + "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=" + }, + "version": "unstable-2023-10-31" }, "snes9x": { - "owner": "snes9xgit", - "repo": "snes9x", - "rev": "be6372c0345c82a87b880c791703fb1929ecf72c", - "hash": "sha256-JzUXxTJZG3LdWC+FCM/3/ynGclQ11rCj7q5fs45r5Bw=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "snes9xgit", + "repo": "snes9x", + "rev": "1e1c45be07bf5760e73414d9ed0253d6dedb8605", + "hash": "sha256-gGAsKsI5e9jU6Zo2f72TBsHWdR6Bl+3Y1Om1zsbIjqs=" + }, + "version": "unstable-2024-02-14" }, "snes9x2002": { - "owner": "libretro", - "repo": "snes9x2002", - "rev": "540baad622d9833bba7e0696193cb06f5f02f564", - "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=", - "date": "unstable-2022-08-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2002", + "rev": "540baad622d9833bba7e0696193cb06f5f02f564", + "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" + }, + "version": "unstable-2022-08-06" }, "snes9x2005": { - "owner": "libretro", - "repo": "snes9x2005", - "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=", - "date": "unstable-2022-07-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2005", + "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", + "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + }, + "version": "unstable-2022-07-25" }, "snes9x2010": { - "owner": "libretro", - "repo": "snes9x2010", - "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", - "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2010", + "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", + "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" + }, + "version": "unstable-2023-02-20" }, "stella": { - "owner": "stella-emu", - "repo": "stella", - "rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048", - "hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c=", - "date": "unstable-2024-02-02" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "stella-emu", + "repo": "stella", + "rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048", + "hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c=" + }, + "version": "unstable-2024-02-02" }, "stella2014": { - "owner": "libretro", - "repo": "stella2014-libretro", - "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", - "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "stella2014-libretro", + "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", + "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" + }, + "version": "unstable-2023-02-20" }, "swanstation": { - "owner": "libretro", - "repo": "swanstation", - "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", - "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=", - "date": "unstable-2024-01-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "swanstation", + "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", + "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=" + }, + "version": "unstable-2024-01-26" }, "tgbdual": { - "owner": "libretro", - "repo": "tgbdual-libretro", - "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", - "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=", - "date": "unstable-2022-08-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "tgbdual-libretro", + "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", + "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" + }, + "version": "unstable-2022-08-06" }, "thepowdertoy": { - "owner": "libretro", - "repo": "ThePowderToy", - "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", - "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=", - "date": "unstable-2023-01-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "ThePowderToy", + "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", + "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" + }, + "version": "unstable-2023-01-17" }, "tic80": { - "owner": "libretro", - "repo": "tic-80", - "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", - "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", - "fetchSubmodules": true, - "date": "unstable-2022-06-11" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "tic-80", + "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", + "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", + "fetchSubmodules": true + }, + "version": "unstable-2022-06-11" }, "vba-m": { - "owner": "libretro", - "repo": "vbam-libretro", - "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", - "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=", - "date": "unstable-2023-08-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "vbam-libretro", + "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", + "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" + }, + "version": "unstable-2023-08-18" }, "vba-next": { - "owner": "libretro", - "repo": "vba-next", - "rev": "ee92625d2f1666496be4f5662508a2430e846b00", - "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=", - "date": "unstable-2023-06-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "vba-next", + "rev": "ee92625d2f1666496be4f5662508a2430e846b00", + "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" + }, + "version": "unstable-2023-06-03" }, "vecx": { - "owner": "libretro", - "repo": "libretro-vecx", - "rev": "56a99fa08a7601b304d752188ca573febf26faeb", - "hash": "sha256-9/d6qzsUJZYZewAbFI4LU2FVpv09uby/5mxCZU7rVzo=", - "date": "unstable-2024-02-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-vecx", + "rev": "56a99fa08a7601b304d752188ca573febf26faeb", + "hash": "sha256-9/d6qzsUJZYZewAbFI4LU2FVpv09uby/5mxCZU7rVzo=" + }, + "version": "unstable-2024-02-10" }, "virtualjaguar": { - "owner": "libretro", - "repo": "virtualjaguar-libretro", - "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", - "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=", - "date": "unstable-2023-06-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "virtualjaguar-libretro", + "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", + "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=" + }, + "version": "unstable-2023-06-01" }, "yabause": { - "owner": "libretro", - "repo": "yabause", - "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", - "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=", - "date": "unstable-2023-01-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "yabause", + "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", + "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" + }, + "version": "unstable-2023-01-03" } } From 5f1b1a60c49f4ea6b5637ad34b9d5b6ef2971d04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 00:16:44 +0000 Subject: [PATCH 55/69] python311Packages.pyformlang: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/pyformlang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index 63bf98a0ea5f..9a76ec2a1dfa 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I="; + hash = "sha256-i4ib18Ktyc9pRu4P+tQIHoZ/IbAOk8Dn0MXJoxw8gAA="; }; nativeBuildInputs = [ From ac0579e7c9bf5e949fb06c6b7010cceacfd786be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 01:36:49 +0000 Subject: [PATCH 56/69] clingo: 5.6.2 -> 5.7.0 --- pkgs/applications/science/logic/potassco/clingo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index a3c324d0dbb8..32497d2b32f9 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.6.2"; + version = "5.7.0"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-2vOscD5jengY3z9gHoY9y9y6RLfdzUj7BNKLyppNRac="; + sha256 = "sha256-mXexFRPC/+5mNRVZqzsLJKiRkKA009OQrEhOAg8M38k="; }; nativeBuildInputs = [ cmake ]; From c4c3aae1db3bdf4237c2c56948fbf9f0bb0ff9ec Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 15 Feb 2024 14:22:24 +0800 Subject: [PATCH 57/69] wire: 0.5.0 -> 0.6.0 --- pkgs/development/tools/wire/default.nix | 14 +++- pkgs/development/tools/wire/go-modules.patch | 79 ++++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/wire/go-modules.patch diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix index 50e57d07d413..601c7fa8df7c 100644 --- a/pkgs/development/tools/wire/default.nix +++ b/pkgs/development/tools/wire/default.nix @@ -2,19 +2,27 @@ buildGoModule rec { pname = "wire"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; + hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko="; }; - vendorHash = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + patches = [ + # Bump the minimum version of Go required to compile packages in this module, + # as `golang.org/x/tools` requires go1.18 or later. + ./go-modules.patch + ]; + + vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY="; subPackages = [ "cmd/wire" ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/google/wire"; description = "A code generation tool that automates connecting components using dependency injection"; diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/development/tools/wire/go-modules.patch new file mode 100644 index 000000000000..cc6facd4d2d0 --- /dev/null +++ b/pkgs/development/tools/wire/go-modules.patch @@ -0,0 +1,79 @@ +diff --git a/go.mod b/go.mod +index 944aef0..ee579ff 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/google/wire + +-go 1.12 ++go 1.18 + + require ( + github.com/google/go-cmp v0.2.0 +@@ -8,3 +8,5 @@ require ( + github.com/pmezard/go-difflib v1.0.0 + golang.org/x/tools v0.17.0 + ) ++ ++require golang.org/x/mod v0.14.0 // indirect +diff --git a/go.sum b/go.sum +index 8da3aae..fbca3c1 100644 +--- a/go.sum ++++ b/go.sum +@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN + github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= + golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= + golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= + golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= + golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 44d2030ecb389eb8e3fc0fd927b783e0d3e9ac1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 02:38:40 +0000 Subject: [PATCH 58/69] yq-go: 4.40.7 -> 4.41.1 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index fb627f52e011..effd541660ea 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.40.7"; + version = "4.41.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-VvA6PYJYRejGlYDb/gyHDQSNOwDWSE7vXPqYGrVLtko="; + hash = "sha256-1zYem/cvvndyrWaE8wYoxouDDnQyT+VeupFF1VkuC2w="; }; vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0="; From 3ccba805f7cb8d83b362a22fcc3adf5c04bae20d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 03:53:49 +0000 Subject: [PATCH 59/69] haproxy: 2.9.4 -> 2.9.5 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index ce275eca6783..675c7d19b65a 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -29,11 +29,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-nDiSzDwISsTwASXvIqFRzxgUFthKqKN69q9qoDmQlrw="; + hash = "sha256-MreFsSiDj0IYuNVGkMhsSHlNA/gXy7Yn+0h2n3nv1Zs="; }; buildInputs = [ sslPkg zlib libxcrypt ] From 26493178e34c259f07b7ef97b16af56aa0bedd06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 06:14:14 +0000 Subject: [PATCH 60/69] python312Packages.uqbar: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/uqbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 36fe7e0eb1f8..54fe8f192c02 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uqbar"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pZ2sNs9uK49PK8qxRRqpGMEI1Xr6Fn+fxptlEVv3GSk="; + hash = "sha256-8tjqPlS9Yo3pOFmpfe/sxgW0e1iqLRYhmPJCh5rKKEE="; }; postPatch = '' From 7070404b96bfdadbd872ae22eb9949ef557221f0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Feb 2024 07:51:39 +0100 Subject: [PATCH 61/69] uv: 0.1.0 -> 0.1.2 Diff: https://github.com/astral-sh/uv/compare/0.1.0...0.1.2 --- pkgs/by-name/uv/uv/Cargo.lock | 2 +- pkgs/by-name/uv/uv/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 2f3920f9ab34..a4ba755139fb 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4062,7 +4062,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uv" -version = "0.1.0" +version = "0.1.2" dependencies = [ "anstream", "anyhow", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 0c18beae3d4d..6c3257d9eb6a 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "uv"; - version = "0.1.0"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-FlrBanX6ioLRUVEUGYUrJgt6elKg5nr8/sMAUQ/LljM="; + hash = "sha256-ZrXWipg3m5T3PiUF7IgAxtw1GGnzVZTZdodFwNCu054="; }; cargoDeps = rustPlatform.importCargoLock { From 07538cfddf00780802f0780f1fae6e805deeccfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 08:52:22 +0100 Subject: [PATCH 62/69] python311Packages.pyprobables: init at 0.6.0 Probabilistic data structures https://github.com/barrust/pyprobables --- .../python-modules/pyprobables/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pyprobables/default.nix diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix new file mode 100644 index 000000000000..be4410cce276 --- /dev/null +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyprobables"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyprobables"; + rev = "refs/tags/v${version}"; + hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "probables" + ]; + + meta = with lib; { + description = "Probabilistic data structures"; + homepage = "https://github.com/barrust/pyprobables"; + changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71d7fc931e7b..6d27dd918abf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9327,6 +9327,8 @@ self: super: with self; { pyprecice = callPackage ../development/python-modules/pyprecice { }; + pyprobables = callPackage ../development/python-modules/pyprobables { }; + pyproject-api = callPackage ../development/python-modules/pyproject-api { }; pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; From 59cc65262f66dd00faaaf1f5d141fe4f775aacf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 08:57:04 +0100 Subject: [PATCH 63/69] python311Packages.fakeredis: refactor - fix license (is BSD 3-Clause not MIT) - add more extra --- .../python-modules/fakeredis/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 97849371f0cd..df8e34dafffe 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -6,19 +6,19 @@ , lupa , poetry-core , pybloom-live +, pyprobables , pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder , redis -, six , sortedcontainers }: buildPythonPackage rec { pname = "fakeredis"; version = "2.21.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - six sortedcontainers ]; @@ -54,7 +53,13 @@ buildPythonPackage rec { aioredis ]; bf = [ - pybloom-live + pyprobables + ]; + cf = [ + pyprobables + ]; + probabilistic = [ + pyprobables ]; }; @@ -66,7 +71,7 @@ buildPythonPackage rec { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; } From 8398a209b65c4bba20c17e51d20f048b527f2ab8 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Fri, 16 Feb 2024 07:59:26 +0000 Subject: [PATCH 64/69] coqPackages.{serapi,coq-lsp}: {8.18.0+0.18.0,0.1.8+8.18.0} -> {8.19.0+0.19.0,0.1.8+8.19.0} (#288185) * coqPackages.serapi: 8.18.0+0.18.0 -> 8.19.0+0.19.0 * coqPackages.coq-lsp: 0.1.8+8.18 -> 0.1.8+8.19 Signed-off-by: Ali Caglayan --- pkgs/development/coq-modules/coq-lsp/default.nix | 2 ++ pkgs/development/coq-modules/serapi/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index 7ca44f39e0e8..790c264d28bd 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -10,12 +10,14 @@ mkCoqDerivation rec { release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; + release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } { case = isEq "8.17"; out = "0.1.8+8.17"; } { case = isEq "8.18"; out = "0.1.8+8.18"; } + { case = isEq "8.19"; out = "0.1.8+8.19"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index ca50f35646b0..f48cce55d4dc 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y="; "8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo="; "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; @@ -20,6 +21,7 @@ in defaultVersion = with versions; lib.switch coq.version [ + { case = isEq "8.19"; out = "8.19.0+0.19.0"; } { case = isEq "8.18"; out = "8.18.0+0.18.0"; } { case = isEq "8.17"; out = "8.17.0+0.17.0"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } From a9c165296baa748abd48d4a02e3dd84b8078d5b7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Feb 2024 09:15:01 +0100 Subject: [PATCH 65/69] qcad: minor syntax refactoring --- pkgs/applications/misc/qcad/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ea54dc325885..c733cb608388 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; + hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; }; patches = [ @@ -67,21 +67,20 @@ mkDerivation rec { "BOOST_DIR=${boost.dev}" ]; - qtWrapperArgs = - lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" ] - ++ - lib.optionals stdenv.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" + ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad '' + lib.optionalString stdenv.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib - '' + - '' + '' + '' install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary} @@ -121,11 +120,12 @@ mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "2D CAD package based on Qt"; homepage = "https://qcad.org"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ yvesf ]; + license = lib.licenses.gpl3Only; + mainProgram = "qcad"; + maintainers = with lib.maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; }; } From 833beecd8b1b730ff517a7dc6edbc5623e18e51c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Feb 2024 09:15:29 +0100 Subject: [PATCH 66/69] qcad: fix builds on Darwin --- pkgs/applications/misc/qcad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c733cb608388..e67a96fe7cd3 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { "MUPARSER_DIR=${muparser}" "INSTALLROOT=$(out)" "BOOST_DIR=${boost.dev}" + "QMAKE_CXXFLAGS=-std=c++14" ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ From 9621e4e0eaec78a71f2d0cce9fbef3e0e159c748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 10:19:57 +0000 Subject: [PATCH 67/69] python311Packages.optimum: 1.16.2 -> 1.17.0 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index ad542017d1f0..21c987c6d33a 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.16.2"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-bEwCUPZJT1UTD8mQJKg+Nwag6kpn4076uyKocKI/+/M="; + hash = "sha256-101QW6MgCcmSeQ0AefPZKmg5O6+2JlrekYN3fIkukuw="; }; propagatedBuildInputs = [ From b92ea571aa00dff6b2680ce1ce9276904027a98a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 28 Jan 2024 19:36:34 +0100 Subject: [PATCH 68/69] eris-go: 20231219 -> 20240128 --- pkgs/by-name/er/eris-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix index 50a37c008ffd..5823756e301d 100644 --- a/pkgs/by-name/er/eris-go/package.nix +++ b/pkgs/by-name/er/eris-go/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "eris-go"; - version = "20231219"; + version = "20240128"; outputs = [ "out" "man" ]; src = fetchFromGitea { @@ -10,7 +10,7 @@ buildGoModule rec { owner = "eris"; repo = "eris-go"; rev = version; - hash = "sha256-eXLfBkJgG51ZjR1qXRE2BgTrIpQsPW5SKeMlGd3J1NE="; + hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc="; }; vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M="; @@ -23,10 +23,10 @@ buildGoModule rec { ''; postBuild = "tupBuild"; postInstall = '' - install -D *.1.man -t $man/share/man/man1 + install -D *.1.gz -t $man/share/man/man1 ''; - skipNetworkTests = true; + env.skipNetworkTests = true; passthru.tests = { inherit (nixosTests) eris-server; }; From e910a0bc4d225736a71b391514a096a9eb9a837d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 12:55:03 +0000 Subject: [PATCH 69/69] koka: 3.0.4 -> 3.1.0 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index e3462c826c76..4057ec157eba 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -31,12 +31,12 @@ }: let - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k="; + sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation {