From 9400bcd0814fa6b7fac9c0859a3c5c8c9df2781d Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 1 Jun 2025 03:45:32 -0300 Subject: [PATCH 1/8] marge-bot: 0.10.1 -> 0.15.3 --- pkgs/by-name/ma/marge-bot/package.nix | 58 ++++++++++++--------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index e958ea990bd6..a05005622895 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -2,55 +2,49 @@ lib, python3, fetchFromGitLab, + git, + openssh, }: python3.pkgs.buildPythonApplication rec { pname = "marge-bot"; - version = "0.10.1"; + version = "0.15.3"; pyproject = true; src = fetchFromGitLab { owner = "marge-org"; repo = "marge-bot"; rev = version; - hash = "sha256-2L7c/NEKyjscwpyf/5GtWXr7Ig14IQlRR5IbDYxp8jA="; + hash = "sha256-i/hnfoBxgP1mo4RV4F10+QOOkPP/fkcwqaLKBlOuP0I="; }; - postPatch = '' - substituteInPlace setup.cfg --replace-fail "--flake8 --pylint" "" - ''; - nativeBuildInputs = [ python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ - configargparse - maya - pyyaml - requests - ]; + propagatedBuildInputs = + (with python3.pkgs; [ + configargparse + maya + pyyaml + requests + python-gitlab + hatchling + ]) + ++ [ + git + openssh + ]; - nativeCheckInputs = with python3.pkgs; [ - pytest-cov-stub - pytestCheckHook - pendulum - ]; - - disabledTests = [ - # test broken when run under Nix: - # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." - "test_get_mr_ci_status" - # broken because of an incorrect assertion: - # "AttributeError: 'has_calls' is not a valid assertion." - "test_reapprove" - ]; - - disabledTestPaths = [ - # test errors due to API mismatch in test setup: - # "ImportError: cannot import name 'set_test_now' from 'pendulum.helpers'" - "tests/test_interval.py" - ]; + nativeCheckInputs = + (with python3.pkgs; [ + pytest-cov-stub + pytestCheckHook + pendulum + ]) + ++ [ + git + ]; pythonImportsCheck = [ "marge" ]; From 4db34059a341493677ed3e73154d7b6a70c04380 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 1 Jun 2025 03:49:34 -0300 Subject: [PATCH 2/8] marge-bot: add updateScript --- pkgs/by-name/ma/marge-bot/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index a05005622895..bb2b13f01457 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -4,6 +4,7 @@ fetchFromGitLab, git, openssh, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { @@ -48,6 +49,8 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "marge" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Merge bot for GitLab"; homepage = "https://gitlab.com/marge-org/marge-bot"; From 3133e081629ee6c3604479fa5d2b6e43969a8d45 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 1 Jun 2025 03:49:57 -0300 Subject: [PATCH 3/8] marge-bot: add lelgenio as maintainer --- pkgs/by-name/ma/marge-bot/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index bb2b13f01457..c914bd8a2ffa 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -56,7 +56,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://gitlab.com/marge-org/marge-bot"; changelog = "https://gitlab.com/marge-org/marge-bot/-/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ + bcdarwin + lelgenio + ]; mainProgram = "marge.app"; }; } From 11a9e69cdbb58f931e674ef0079c1e30805b1b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jun 2025 03:51:47 +0000 Subject: [PATCH 4/8] vscode-extensions.ms-ceintl.vscode-language-pack-fr: 1.100.2025051409 -> 1.101.2025061109 --- .../vscode/extensions/language-packs.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index 50fe8ff60c6b..04ab08d8dfac 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -13,7 +13,7 @@ let buildVscodeLanguagePack = { language, - version ? "1.100.2025051409", + version ? "1.101.2025061109", hash, }: buildVscodeMarketplaceExtension { @@ -41,71 +41,71 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - hash = "sha256-W0yM1vg+g7JbCoPmyzx3xSDvq1RoQq2lc6BkDtOkF3M="; + hash = "sha256-DeloielNVsZk+1/rGlyfT49Hst+Xh/jk7BYvqNwMQuU="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - hash = "sha256-Lg6XS3VOzfIYTVCfE7wxzhXLFLug5hcTMrxp8BBKzk4="; + hash = "sha256-tc5G3O6KYP9+CI7t+B2jP9saKSbjoK7jceqrAT1lbZ8="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - hash = "sha256-rgAKQd5gztaVQnqAHOY9BjPhM6CZ1NKkqI+oveJRo0E="; + hash = "sha256-5fLQkZj3U175NUY2uMwrpUg3KWSb+FYV69XT995tgko="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - hash = "sha256-5XEqcAxBlKGSmet12M1EAa7TiEzN5XyAaa9Tc/3smUM="; + hash = "sha256-OSpFOZc33jfcHWYiskqj5TIHjicdSAotXLeM9YnVycs="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - hash = "sha256-EnzMlQoW9zqJHXwpCcYUu/vN+SHIoluVpij8lF44RJg="; + hash = "sha256-aqpBo19NvDYFWP1a6HnNvwuS6iEUhkn4lTihqy2EQqc="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - hash = "sha256-2oKthoWgXGsWsVco2bjkOyOEE5A4Tzhr+8n525Vkujk="; + hash = "sha256-mykSRH3v7uW1iu4RmNf7SnL9q1ZPLkRZwY3sv5IfNt0="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - hash = "sha256-oh3EuyFzWNf+JfALlIqauUIpuDEbU9Gr2Q+/0fkCguw="; + hash = "sha256-4AXpiJfFd4PpMR89IQWTnzeU+n3ROwmM1waI+h0odro="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - hash = "sha256-KRDS9q8jF9pHd8WiUxXUY6LLRUD95uVNWc78RA9rHo4="; + hash = "sha256-TGDBrATWlIDiCyOqxuGL5IHRObLRkEpwX8yo1HnvEvE="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - hash = "sha256-eF4M59rQG+8sz5h4zL766D/rgbcXSep/C3GdJwwRx10="; + hash = "sha256-QKnA/5/J8nwnc91BEwAxOCHHlSG8nYyDGdiwAf9A4kM="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - hash = "sha256-dDWWlEkU4pX9AdBOnCI/VPACXI1xq7EjeUjn7zgr8vU="; + hash = "sha256-XXQ5zXPZA9l/7QJVTtMZB7kLsM5/92anG+Mvpxq81RE="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - hash = "sha256-PZR9SOHXHmyiqbaTBETDUTZkjuk2XvF5MiH/laNMCLs="; + hash = "sha256-KYRt6KXkVthDXOZ2TLNJJFjDPvpknxRSi3Fo/T37KoA="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - hash = "sha256-AKO04+S9wHap7yhvCyWMT6QT7zC0Rb8XRZvrg9ROjV4="; + hash = "sha256-4qCRDHTQD1jZ/pugAfSDdWeYU0GpM9PvRWXYNcncSUA="; }; # Polish vscode-language-pack-pl = buildVscodeLanguagePack { language = "pl"; - hash = "sha256-VR7WrI4lnr3hN2GoS/ZxAZ3kEHdd+S0ZmLfOhHHkYWM="; + hash = "sha256-Cg+VpwX78HmyOHB9OGPPjSmJFHAZ4HpQ+HceFJw/FgE="; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - hash = "sha256-nWqw3Og0VMyDM7YgUX4xrd4dgXBDXUdk4AWqaapu3EA="; + hash = "sha256-Z2qrwgziEupCEqHVGyY1WnZO3ZGM1LVDeSxmVgkEd3o="; }; } From c71ea1a059d7e5af3b5f2f858957eafca5363054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jun 2025 14:12:45 +0000 Subject: [PATCH 5/8] iosevka: 33.2.4 -> 33.2.5 --- pkgs/by-name/io/iosevka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 612124426426..a7e34e3d1720 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.2.4"; + version = "33.2.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-1QxM9PWZirAKIdd/kzHLDStXbkxTGr0q8GQSER2NEXc="; + hash = "sha256-2yIkANG5hnath2EHiRXSKEflFoler9syz4e3AU5jxgU="; }; - npmDepsHash = "sha256-1XRbwd1x7ofQGnEth7U8QAHX92QDHMm4OmQAQgZZLTw="; + npmDepsHash = "sha256-n6vd2ed4OCUIz3YyOO8Yt/wQJCznrwYCZlg3MRJEX6o="; nativeBuildInputs = [ From e98029e0d8cebd42bf4ba6fcbebfcbf3f5fa994c Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:11 -0400 Subject: [PATCH 6/8] maintainers: add mdaniels5757 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d70b31081b98..e0b3a51a960d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15892,6 +15892,12 @@ githubId = 1377571; name = "Matthew S. Daiter"; }; + mdaniels5757 = { + email = "nix@mdaniels.me"; + github = "mdaniels5757"; + githubId = 8762511; + name = "Michael Daniels"; + }; mdarocha = { email = "marek@mdarocha.pl"; github = "mdarocha"; From dcb742ed4a57869091e456adad72adc480aeb6af Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:16 -0400 Subject: [PATCH 7/8] which: add passthru.updateScript, switch to finalAttrs --- pkgs/by-name/wh/which/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index a739a54f474d..b58c7fa85ae7 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -2,20 +2,26 @@ lib, stdenv, fetchurl, + directoryListingUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "which"; version = "2.23"; src = fetchurl { - url = "mirror://gnu/which/which-${version}.tar.gz"; + url = "mirror://gnu/which/which-${finalAttrs.version}.tar.gz"; hash = "sha256-osVYIm/E2eTOMxvS/Tw/F/lVEV0sAORHYYpO+ZeKKnM="; }; strictDeps = true; enableParallelBuilding = true; + passthru.updateScript = directoryListingUpdater { + inherit (finalAttrs) pname version; + url = "https://ftp.gnu.org/gnu/which/"; + }; + meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; @@ -23,4 +29,4 @@ stdenv.mkDerivation rec { mainProgram = "which"; platforms = lib.platforms.all; }; -} +}) From 91e5b8158cda97bfda7850039b4e8e643a548016 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:21 -0400 Subject: [PATCH 8/8] which: add mdaniels5757 as maintainer --- pkgs/by-name/wh/which/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index b58c7fa85ae7..c03d7a711da9 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mdaniels5757 ]; mainProgram = "which"; platforms = lib.platforms.all; };