diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml new file mode 100644 index 000000000000..95423cbf2d40 --- /dev/null +++ b/.github/labeler-no-sync.yml @@ -0,0 +1,29 @@ +# This file is used by .github/workflows/labels.yml +# This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label + +"backport: release-24.11": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/workflows/* + - ci/**/* + - "!ci/OWNERS" + +"6.topic: policy discussion": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/**/* + - CONTRIBUTING.md + - pkgs/README.md + - nixos/README.md + - maintainers/README.md + - lib/README.md + - doc/README.md + +"8.has: documentation": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/**/* + - nixos/doc/**/* diff --git a/.github/labeler.yml b/.github/labeler.yml index cf00b6e3e4b6..90b46911e74a 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,6 @@ +# This file is used by .github/workflows/labels.yml +# This version uses `sync-labels: true`, meaning that a non-match will remove the label + # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": - any: @@ -387,18 +390,6 @@ - pkgs/test/php/default.nix - pkgs/top-level/php-packages.nix -"6.topic: policy discussion": - - any: - - changed-files: - - any-glob-to-any-file: - - .github/**/* - - CONTRIBUTING.md - - pkgs/README.md - - nixos/README.md - - maintainers/README.md - - lib/README.md - - doc/README.md - "6.topic: printing": - any: - changed-files: @@ -572,13 +563,6 @@ - any-glob-to-any-file: - nixos/doc/manual/release-notes/**/* -"8.has: documentation": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/**/* - - nixos/doc/**/* - "8.has: module (update)": - any: - changed-files: diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index dcb664c6fa8e..79384daa6b3e 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -2,6 +2,7 @@ name: Eval on: pull_request_target: + types: [opened, ready_for_review, synchronize, reopened] push: # Keep this synced with ci/request-reviews/dev-branches.txt branches: @@ -334,3 +335,5 @@ jobs: REPOSITORY: ${{ github.repository }} NUMBER: ${{ github.event.number }} AUTHOR: ${{ github.event.pull_request.user.login }} + # Don't request reviewers on draft PRs + DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }} diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 80a186bbfa62..0ae4ee09d5ca 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -22,4 +22,10 @@ jobs: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/labeler.yml # default sync-labels: true + - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/labeler-no-sync.yml + sync-labels: false diff --git a/ci/OWNERS b/ci/OWNERS index 119e5c4393c0..01800603a759 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -15,11 +15,11 @@ # CI /.github/*_TEMPLATE* @SigmaSquadron -/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis -/.github/workflows/check-nix-format.yml @infinisil -/.github/workflows/codeowners-v2.yml @infinisil -/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron -/ci @infinisil @philiptaron @NixOS/Security +/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther +/.github/workflows/check-nix-format.yml @infinisil @wolfgangwalther +/.github/workflows/codeowners-v2.yml @infinisil @wolfgangwalther +/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron @wolfgangwalther +/ci @infinisil @philiptaron @NixOS/Security @wolfgangwalther /ci/OWNERS @infinisil @philiptaron # Development support diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 3f89df818281..f2211738db2b 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -248,7 +248,7 @@ let ethtool -s enp1s0 speed 1000 duplex full ethtool -s enp2s0 speed 1000 duplex full ''; - wantedBy = [ "network.target" ]; + wantedBy = [ "network-pre.target" ]; }; }; in @@ -264,11 +264,11 @@ let client2.wait_for_unit("network.target") with subtest("Test bonding"): - client1.wait_until_succeeds("ping -c 2 192.168.1.1") - client1.wait_until_succeeds("ping -c 2 192.168.1.2") + client1.wait_until_succeeds("ping -c2 -w2 192.168.1.1") + client1.wait_until_succeeds("ping -c2 -w2 192.168.1.2") - client2.wait_until_succeeds("ping -c 2 192.168.1.1") - client2.wait_until_succeeds("ping -c 2 192.168.1.2") + client2.wait_until_succeeds("ping -c2 -w2 192.168.1.1") + client2.wait_until_succeeds("ping -c2 -w2 192.168.1.2") with subtest("Verify bonding mode"): for client in client1, client2: diff --git a/pkgs/by-name/cl/cloc/package.nix b/pkgs/by-name/cl/cloc/package.nix index 4841e86bba87..ab6d1639a9ca 100644 --- a/pkgs/by-name/cl/cloc/package.nix +++ b/pkgs/by-name/cl/cloc/package.nix @@ -7,7 +7,7 @@ }: let - version = "2.02"; + version = "2.04"; in stdenv.mkDerivation { pname = "cloc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-qTrBCCC2J8Ewt6GvYlnXU8F1iB31A1xTFXdkee8L0Os="; + sha256 = "sha256-x02TEm+VYSqj0gSF/Eg+4LkSd2/LapHHSBlZziTKBDQ="; }; setSourceRoot = '' diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix index 3651cb3dff2f..5d87e72aa9c2 100644 --- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix +++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.20"; + version = "0.20.1"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "sha256-k7Bs+IyA+hHR5j17gzeL5PHlRxyKFc0wGH/MjJLDrjk="; + hash = "sha256-4Q3e6w0XqtsXZVnlHNf84CFO6ITwqlgB69D7iqJ2YO8="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Elementary icons for Xfce and other GTK desktops like GNOME"; homepage = "https://github.com/shimmerproject/elementary-xfce"; - license = licenses.gpl2; + license = licenses.gpl3Plus; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index c34c432d37aa..4b732fa496d5 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gh"; - version = "2.66.0"; + version = "2.66.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-6IxXbi0vWb/AT64q5aZiV1wuz5viksXdxonLfJlu3y0="; + hash = "sha256-+aXA7/UHkiwMAUBsMzbk2NPN8Yoku0vO2IObJIFSM1o="; }; vendorHash = "sha256-gLFPr6b9zkkvmhcljnuB23MAMa9xELsUHtcP8xTfWFE="; diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix index b2687696f1eb..f7dd20e07688 100644 --- a/pkgs/by-name/gl/globalarrays/package.nix +++ b/pkgs/by-name/gl/globalarrays/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.8.2"; + version = "5.9"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY="; + sha256 = "sha256-p4BNwj269FdNXY2rHfJiv5AbB3YB4v+YHXQRXTNnFnE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 11315b9517a3..2f68e3301a39 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -42,7 +42,7 @@ let { } ); in -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "movim"; version = "0.29"; @@ -98,7 +98,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-uma3evj/81qz/+1+poIl0FJqWe1e2Ay0Jm446CKOGP0="; + vendorHash = "sha256-+twzmUayrAj65ixEsweHM6886nN/6PYUCTSLMc+EmVE="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index a0b3f1bf1ee0..d62bdc861971 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.27.2"; + version = "1.29.0"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-HVKQuqYonK5kPibpXe5LSzXTiP07tpTsyFJwD/xnARI="; + hash = "sha256-aLDu1XTVMjEPxoJm3Stm9qDHjsoVlS4IWClS9+WLrXU="; }; dontConfigure = true; diff --git a/pkgs/by-name/rc/rc-9front/package.nix b/pkgs/by-name/rc/rc-9front/package.nix index 9b921013babd..a88159cf72a6 100644 --- a/pkgs/by-name/rc/rc-9front/package.nix +++ b/pkgs/by-name/rc/rc-9front/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "0-unstable-2022-11-01"; + version = "0-unstable-2025-01-19"; src = fetchFrom9Front { domain = "shithub.us"; owner = "cinap_lenrek"; repo = "rc"; - rev = "69041639483e16392e3013491fcb382efd2b9374"; - hash = "sha256-xc+EfC4bc9ZA97jCQ6CGCzeLGf+Hx3/syl090/x4ew4="; + rev = "a827beee910cb143f916cf3657c45c29d904800c"; + hash = "sha256-FPHKGuJn1xs6yex64knplr6hteFy2xVsUOAgMxQbGXs="; }; strictDeps = true; diff --git a/pkgs/by-name/sb/sbom2dot/package.nix b/pkgs/by-name/sb/sbom2dot/package.nix new file mode 100644 index 000000000000..f7f95abe2661 --- /dev/null +++ b/pkgs/by-name/sb/sbom2dot/package.nix @@ -0,0 +1,7 @@ +{ + python3Packages, +}: + +(python3Packages.toPythonApplication python3Packages.sbom2dot).overrideAttrs (previousAttrs: { + meta.mainProgram = "sbom2dot"; +}) diff --git a/pkgs/by-name/sb/sbom4files/package.nix b/pkgs/by-name/sb/sbom4files/package.nix new file mode 100644 index 000000000000..e02ab1880926 --- /dev/null +++ b/pkgs/by-name/sb/sbom4files/package.nix @@ -0,0 +1,7 @@ +{ + python3Packages, +}: + +(python3Packages.toPythonApplication python3Packages.sbom4files).overrideAttrs (previousAttrs: { + meta.mainProgram = "sbom4files"; +}) diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix new file mode 100644 index 000000000000..75c25a1b4ac3 --- /dev/null +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -0,0 +1,53 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + sbom2dot, + sbom4files, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "sbom4python"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = "sbom4python"; + tag = "v${version}"; + hash = "sha256-tp5sg3Z3tczWxfYQcpeKMlin1s7PGUqjG3h4ZsAfKHs="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + importlib-metadata + lib4package + lib4sbom + sbom2dot + sbom4files + setuptools # for pkg_resources + toml + ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + pythonImportsCheck = [ + "sbom4python" + ]; + + meta = { + changelog = "https://github.com/anthonyharrison/sbom4python/releases/tag/v${version}"; + description = "A tool to generate a SBOM (Software Bill of Materials) for an installed Python module"; + homepage = "https://github.com/anthonyharrison/sbom4python"; + license = lib.licenses.asl20; + mainProgram = "sbom4python"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 2e2645e304f4..db9d807a0894 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.138"; + version = "9.2.139"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-EFynGM265FNUgBrofp0nFhamom26yse9sMDympXM1rk="; + hash = "sha256-VFW/PMUELijG+vrs6rtmXE340wcVtIwTMpyJ6Of/lIU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e514838c4d6a..215e17b1f913 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.138"; + version = "9.2.139"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-zJH54+IoMhYNpJE8CJF/Eq2Re152QO1K0JEN2JlFg5c="; + hash = "sha256-zhLeBJeJpoW4JAX77EfXyvfIUL3ZBHALoVJkzSrKMP0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix index 85f6716354a3..20d8ab4ab5be 100644 --- a/pkgs/development/python-modules/angrcli/default.nix +++ b/pkgs/development/python-modules/angrcli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "angrcli"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fmagin"; repo = "angr-cli"; tag = "v${version}"; - hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s="; + hash = "sha256-egu7jlEk8/i36qQMHztGr959sBt9d5crW8mj6+sKaHI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e30c41f015d5..1eecc60a7d25 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.138"; + version = "9.2.139"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-BnmYUvXji+YFBGXyJ0P1y+OIREsT2RYa/hdxwpUacT0="; + hash = "sha256-YxA/wrNkVUHFfNNDRV9ciAACbMGZ3n/nLoyN+oj3Du8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 09c00fea692a..2821c3bead1a 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.138"; + version = "9.2.139"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-1nIREzUeUzfMu7gqrbAMJvKNnboavQRL8c2GDhH0Xs0="; + hash = "sha256-v8mwBTnPnYWVhY79HAdpxqwxIhz/9VdVYwkQbmHpuKc="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index aa9c703f1313..7676cd7edb16 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.138"; + version = "9.2.139"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-Dfo8JTTjq4JsMx3OjFn8G/3PBlLCRVRkEjJdEroSp/c="; + hash = "sha256-kd2IY/sIGUShzVfcIj/5QLVqygHH2zBtxe+Su6Q3bWw="; }; in buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-NVDLKA2BMgCB0k0LNPqYVIVWyiqdOHssIT/7Vx2/oWo="; + hash = "sha256-+ROjdm2SE65mtsTlwyS7scPD99KbizW/OtUvPnbe/VM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 80b03160ad6f..4e9ef9358791 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -12,6 +12,7 @@ pkg-config, pycountry, pytest-asyncio, + pytest-codspeed, pytestCheckHook, pythonOlder, rustPlatform, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "11.0.0"; + version = "11.1.0b2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,12 +32,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-G8NLirz81+b2YJBvxmfCEPpy2M9MMvs3n6JmdXR+3oc="; + hash = "sha256-nvuIjVf7r2CcuHWyIox1P8nuBB4DReV6jrwr4SLJhHA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-mpm5TYYWb8hENhRPAiE9KbprdtdlKZx12cLZQ+UbziE="; + hash = "sha256-oSvosZsGM0R5DRc43KvCNcqNIh4gbvzqgnrIJjAN+/k="; }; pythonRelaxDeps = [ @@ -49,13 +50,9 @@ buildPythonPackage rec { maturinBuildHook ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xz - ]; + buildInputs = [ xz ]; dependencies = [ aiohttp @@ -71,6 +68,7 @@ buildPythonPackage rec { docker pycountry pytest-asyncio + pytest-codspeed pytestCheckHook testfixtures ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 3a2bdd3b850e..c10248b5f7d5 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.11.3"; + version = "3.11.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_logging"; inherit version; - hash = "sha256-CnPNlBGIdTh9RTU3HZ6UJoYe3vjkT7oSYehngtW41U8="; + hash = "sha256-MjBdmJMj88WGAwROKsXZzyPpRl7eURu+kLQwknDTGVw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lib4package/default.nix b/pkgs/development/python-modules/lib4package/default.nix new file mode 100644 index 000000000000..f0682f272979 --- /dev/null +++ b/pkgs/development/python-modules/lib4package/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, +}: + +buildPythonPackage rec { + pname = "lib4package"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = "lib4package"; + tag = "v${version}"; + hash = "sha256-ZU5Lne2/xBgaFrTumWpZsuL9ckqdACrb0iRraWo+Rk0="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "lib4package" + ]; + + meta = { + changelog = "https://github.com/anthonyharrison/lib4package/releases/tag/v${version}"; + description = "Utility for handling package metadata to include in Software Bill of Materials (SBOMs"; + homepage = "https://github.com/anthonyharrison/lib4package"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 02bfc83bca24..61f13945c114 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.5"; + version = "4.1.1.116.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-4ALRG0yKCRwztQ9A6fMVaht6c8tDrMSh+CfsLRZbdcw="; + hash = "sha256-0TZHH/EXemsSysgfCzg66x5QhAEDUqRyg+qoK/3YuQA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 5b05258f3acf..65a7db44da3a 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250124"; + version = "1.0.2.20250127"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bl/ziwDSG6VmLqNo6TEhv7G+//veKNDa6nFSs4MMV5g="; + hash = "sha256-a2G64r752rlLiUjJQsdLut2CqaLZZB4A5HJlAp6gi5g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 8568f1d41452..4288e33b4263 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.64"; + version = "0.2.65"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-Os5Sj8zsPCCPxGTdLfiGLJ/tknkDnp9uowWquO31aRQ="; + hash = "sha256-XltJfqmYqY8wXNOBBav+atCjnx0+53Mrsld4yvadgr4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 161c85a1f833..f017712a3df0 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.55.4"; + version = "0.56.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-On/FKfdiqx28MCx1kCcstb90iT1e20c84hHxdQSIark="; + hash = "sha256-ZsxBFb92TqcwndhSTXiY0eGG8nQtoK0RIBuiq9/fzL0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index af7113835a74..9e2ceb2cda9c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.138"; + version = "9.2.139"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-2cO6uTlD2IuufCSBpoyP7JsK+0ON06yn2tuV004NjaU="; + hash = "sha256-nzU1UgBXvAMlpgtV+RVqqaJ7RoZLBC7MZva0PJ7UlUA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix new file mode 100644 index 000000000000..e03d3801b0c0 --- /dev/null +++ b/pkgs/development/python-modules/sbom2dot/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + lib4sbom, +}: + +buildPythonPackage rec { + pname = "sbom2dot"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = "sbom2dot"; + tag = "v${version}"; + hash = "sha256-xrphhTbIyqe0CqQOpJSyzTWbGYFFOKdyWJTTAlURkoo="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + lib4sbom + ]; + + pythonImportsCheck = [ + "sbom2dot" + ]; + + meta = { + changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/v${version}"; + description = "Create a dependency graph of the components within a SBOM"; + homepage = "https://github.com/anthonyharrison/sbom2dot"; + license = lib.licenses.asl20; + mainProgram = "sbom2dot"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/sbom4files/default.nix b/pkgs/development/python-modules/sbom4files/default.nix new file mode 100644 index 000000000000..b6639fec5065 --- /dev/null +++ b/pkgs/development/python-modules/sbom4files/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + lib4sbom, + python-magic, +}: + +buildPythonPackage rec { + pname = "sbom4files"; + version = "0.4.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = "sbom4files"; + tag = "v${version}"; + hash = "sha256-2J3JNFtau7U5mNkqxU8Y8wIg2JR7CUZUVX0A4F9tMLs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + lib4sbom + python-magic + ]; + + pythonImportsCheck = [ + "sbom4files" + ]; + + meta = { + changelog = "https://github.com/anthonyharrison/sbom4files/releases/tag/v${version}"; + description = "SBOM generator for files within a directory"; + homepage = "https://github.com/anthonyharrison/sbom4files"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 94a41d93c613..c7964b4e0c50 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.9"; + version = "3.3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; tag = version; - hash = "sha256-HrJraiETYC7U2IB9ykjGUOg3khA4lBIH18r7btvXRH8="; + hash = "sha256-BiLxILHbq5Q8iIE2yMBNlnqqFMoRe9z+Bn/FMaA7gtI="; }; build-system = [ diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index a9dbccf3140c..a4f645135b12 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.11"; + version = "0.18.12"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = "whirlpool-sixth-sense"; tag = version; - hash = "sha256-dXLMyvNmVrc5kCozBwAIM5DKqjdiiqwwNLkhMGnH0fA="; + hash = "sha256-KfWMHMudUClt4xc2QZgrYP0/7boWKLDDNUhmhk0w2aA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 870f3e48bf25..ba4fb3a6b2bc 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; tag = version; - hash = "sha256-nCFIP4ZeO4pRmyh2BdE86Dg/0zKYR3izcc2MOzVC4/g="; + hash = "sha256-kpGT1UcpKL8LJvFkw3RYZcbXcLla95QB4exG7kA8+BQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 096f077ae7b2..f7c8af22db8e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.357"; + version = "3.2.360"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-hWCYkzFKL60r1k2u9TUwuSRA2R+hHr4ooKGtctko41o="; + hash = "sha256-kFLtEVbj0XTa19MOS0di6bHBMHeHH4b9+H/iHqV39kU="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 8e5f554b512a..290ee1da2b00 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -129,9 +129,10 @@ installPhase() { fi # Install libraries needed by Proton to support DLSS - if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then - install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll - fi + for winelib in $(find . -name '*nvngx*.dll') + do + install -Dm644 -t $i/lib/nvidia/wine/ "$winelib" + done done diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 12ee477f6868..d87a45fa6e7b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -95,13 +95,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "565.57.01"; - sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo="; - sha256_aarch64 = "sha256-aDVc3sNTG4O3y+vKW87mw+i9AqXCY29GVqEIUlsvYfE="; - openSha256 = "sha256-/tM3n9huz1MTE6KKtTCBglBMBGGL/GOHi5ZSUag4zXA="; - settingsSha256 = "sha256-H7uEe34LdmUFcMcS6bz7sbpYhg9zPCb/5AmZZFTx1QA="; - persistencedSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; - patchesOpen = [ drm_fop_flags_linux_612_patch ]; + version = "570.86.16"; + sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U="; + sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA="; + openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE="; + settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8="; + persistencedSha256 = "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w="; }); # Vulkan developer beta driver diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18405b13b52f..2d97289e5ccf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7286,6 +7286,8 @@ self: super: with self; { inherit python; }); + lib4package = callPackage ../development/python-modules/lib4package { }; + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; @@ -14544,6 +14546,10 @@ self: super: with self; { sasmodels = callPackage ../development/python-modules/sasmodels { }; + sbom2dot = callPackage ../development/python-modules/sbom2dot { }; + + sbom4files = callPackage ../development/python-modules/sbom4files { }; + scalene = callPackage ../development/python-modules/scalene { }; scales = callPackage ../development/python-modules/scales { };