diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 372cb78f76656b..64969dc2b42646 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -295,20 +295,6 @@ jobs: REPOSITORY: ${{ github.repository }} NUMBER: ${{ github.event.number }} - - name: Requesting maintainer reviews - run: | - # maintainers.json contains GitHub IDs. Look up handles to request reviews from. - # There appears to be no API to request reviews based on GitHub IDs - jq -r 'keys[]' comparison/maintainers.json \ - | while read -r id; do gh api /user/"$id" --jq .login; done \ - | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" - - env: - GH_TOKEN: ${{ github.token }} - REPOSITORY: ${{ github.repository }} - NUMBER: ${{ github.event.number }} - AUTHOR: ${{ github.event.pull_request.user.login }} - - name: Add eval summary to commit statuses if: ${{ github.event_name == 'pull_request_target' }} run: | @@ -328,3 +314,17 @@ jobs: GH_TOKEN: ${{ github.token }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} NUMBER: ${{ github.event.number }} + + - name: Requesting maintainer reviews + run: | + # maintainers.json contains GitHub IDs. Look up handles to request reviews from. + # There appears to be no API to request reviews based on GitHub IDs + jq -r 'keys[]' comparison/maintainers.json \ + | while read -r id; do gh api /user/"$id" --jq .login; done \ + | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" + + env: + GH_TOKEN: ${{ github.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + AUTHOR: ${{ github.event.pull_request.user.login }} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2f4450045b612..3e1a1e1cbcfece 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2129,6 +2129,7 @@ github = "asymmetric"; githubId = 101816; name = "Lorenzo Manacorda"; + matrix = "@asymmetric:matrix.dapp.org.uk"; }; aszlig = { email = "aszlig@nix.build"; @@ -3314,6 +3315,13 @@ github = "brendanreis"; githubId = 10686906; }; + bretek = { + email = "josephmadden999@gmail.com"; + github = "bretek"; + githubId = 79257746; + name = "Joseph Madden"; + keys = [ { fingerprint = "3CF8 E983 2219 AB4B 0E19 158E 6112 1921 C9F8 117C"; } ]; + }; brettlyons = { email = "blyons@fastmail.com"; github = "brettlyons"; @@ -7359,7 +7367,7 @@ github = "FedX-sudo"; githubId = 66258975; name = "Fedx sudo"; - matrix = "fedx:matrix.org"; + matrix = "@fedx:matrix.org"; }; fee1-dead = { email = "ent3rm4n@gmail.com"; @@ -12803,7 +12811,7 @@ }; lenny = { name = "Lenny."; - matrix = "lenny@flipdot.org"; + matrix = "@lenny:flipdot.org"; keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD C7ED 738F C800 6E9E A634"; } ]; }; leo248 = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3e6174cfc79c5a..be529602d6759f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1133,6 +1133,7 @@ ./services/networking/lxd-image-server.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix + ./services/networking/mptcpd.nix ./services/networking/microsocks.nix ./services/networking/mihomo.nix ./services/networking/minidlna.nix diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 612a88ed48b530..35908488f487cc 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -240,7 +240,7 @@ in environment = { HOMEPAGE_CONFIG_DIR = configDir; - HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; + NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; PORT = toString cfg.listenPort; LOG_TARGETS = lib.mkIf managedConfig "stdout"; }; @@ -254,6 +254,14 @@ in ExecStart = lib.getExe cfg.package; Restart = "on-failure"; }; + + preStart = '' + # Related: + # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade") + # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state") + # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir") + rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/* + ''; }; networking.firewall = lib.mkIf cfg.openFirewall { diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 310a1f3d1c5528..4e3f21c0f3e44a 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -303,6 +303,18 @@ in /run/current-system/systemd/bin/systemctl reload dhcpcd.service ''; + security.polkit.extraConfig = lib.mkIf config.services.resolved.enable '' + polkit.addRule(function(action, subject) { + if (action.id == 'org.freedesktop.resolve1.revert' || + action.id == 'org.freedesktop.resolve1.set-dns-servers' || + action.id == 'org.freedesktop.resolve1.set-domains') { + if (subject.user == '${config.systemd.services.dhcpcd.serviceConfig.User}') { + return polkit.Result.YES; + } + } + }); + ''; + }; } diff --git a/nixos/modules/services/networking/mptcpd.nix b/nixos/modules/services/networking/mptcpd.nix new file mode 100644 index 00000000000000..04279388d9de74 --- /dev/null +++ b/nixos/modules/services/networking/mptcpd.nix @@ -0,0 +1,36 @@ +{ + config, + lib, + pkgs, + ... +}: +let + + cfg = config.services.mptcpd; + +in + +{ + + options = { + + services.mptcpd = { + + enable = lib.mkEnableOption "the Multipath TCP path management daemon"; + + package = lib.mkPackageOption pkgs "mptcpd" { }; + + }; + + }; + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + systemd.packages = [ cfg.package ]; + + }; + + meta.maintainers = with lib.maintainers; [ nim65s ]; +} diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 622c5a6e0d1a5a..7fb30d473e000b 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -15,7 +15,7 @@ import ./make-test-python.nix ( { services.homepage-dashboard = { enable = true; - settings.title = "custom"; + settings.title = "test title rodUsEagid"; # something random/unique }; }; @@ -38,6 +38,12 @@ import ./make-test-python.nix ( # Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't. managed_conf.succeed("test -d /etc/homepage-dashboard") managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml") + + # Ensure that we see the custom title *only in the managed config* + page = managed_conf.succeed("curl --fail http://localhost:8082/") + assert "test title rodUsEagid" in page, "Custom title not found" + page = unmanaged_conf.succeed("curl --fail http://localhost:8082/") + assert "test title rodUsEagid" not in page, "Custom title found where it shouldn't be" ''; } ) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index bb66cc78d9ee56..55329f181da8e6 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.9.1"; + version = "0.10.3"; pyproject = true; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; - rev = "v${version}"; - hash = "sha256-wGlnldS2p92NAYAyRPqKjSneIlbdsOiJ0N42n/mMGFI="; + tag = "v${version}"; + hash = "sha256-VhM782mFWITA0VlKw0sBIu/UxUqlFLgq5XVdCpQggCw="; }; nativeBuildInputs = [ @@ -78,15 +78,19 @@ python3Packages.buildPythonApplication rec { export QT_QPA_PLATFORM=offscreen ''; - disabledTestPaths = [ - # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*) - "tests/test_excludes.py" - "tests/integration" - "tests/unit" - ]; + disabledTestPaths = + [ + # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*) "tests/test_excludes.py" + "tests/integration" + "tests/unit" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Darwin-only test + "tests/network_manager/test_darwin.py" + ]; - meta = { - changelog = "https://github.com/borgbase/vorta/releases/tag/${src.rev}"; + meta = with lib; { + changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}"; description = "Desktop Backup Client for Borg"; homepage = "https://vorta.borgbase.com/"; license = lib.licenses.gpl3Only; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 79b1e07ae5b776..c9d6a47ffdd9b1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11290,6 +11290,18 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + rzls-nvim = buildVimPlugin { + pname = "rzls.nvim"; + version = "2024-12-24"; + src = fetchFromGitHub { + owner = "tris203"; + repo = "rzls.nvim"; + rev = "494a0a377d84f7424fc95d5f04f57027e24dedd7"; + sha256 = "0fb8r1csdqiggbb68p22a0q3624ck9752z9ay9iarqkkap0z9z7c"; + }; + meta.homepage = "https://github.com/tris203/rzls.nvim/"; + }; + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ecf6b940302933..f30e6dbb72bdb1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2656,6 +2656,10 @@ in dependencies = [ self.nvim-lspconfig ]; }; + rzls-nvim = super.rzls-nvim.overrideAttrs { + dependencies = [ self.roslyn-nvim ]; + }; + samodostal-image-nvim = super.samodostal-image-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 78a30fca8af205..c21f5536c49b86 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -935,6 +935,7 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, +https://github.com/tris203/rzls.nvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 74d2e35ce43ced..fa2419bb831c0e 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -21,17 +21,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.220"; + version = "1.5.250"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-XNLX5LDbL29Ko0zstgo+O5V0oe37dSChk8iJeVrYlLA="; + hash = "sha256-+avaHICyaNbNCaOWb+AgpEq4SONacFJ//AZx+2Aa7SY="; fetchSubmodules = true; }; - vendorHash = "sha256-tDQKU/1fKDPCrUHfFi79u4d2XwOqjvTuIlsUAB74e4c="; + vendorHash = "sha256-mDVpxPkRGbpAtZ0jCKd3uOxwUdBqjd0kISg22JdpLpE="; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/am/amazon-ec2-utils/package.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix index 5433a9f0c9cdaa..c0450676a02092 100644 --- a/pkgs/by-name/am/amazon-ec2-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix @@ -1,12 +1,18 @@ { - stdenv, lib, bash, + coreutils, curl, fetchFromGitHub, gawk, + gnugrep, + gnused, installShellFiles, + makeWrapper, + nix-update-script, python3, + stdenv, + util-linux, }: stdenv.mkDerivation rec { @@ -20,15 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; }; - outputs = [ - "out" - "man" - ]; - strictDeps = true; nativeBuildInputs = [ installShellFiles + makeWrapper ]; buildInputs = [ @@ -36,51 +38,77 @@ stdenv.mkDerivation rec { python3 ]; - postInstall = '' - install -Dm755 -t $out/bin/ ebsnvme-id - install -Dm755 -t $out/bin/ ec2-metadata - install -Dm755 -t $out/bin/ ec2nvme-nsid - install -Dm755 -t $out/bin/ ec2udev-vbd + installPhase = '' + mkdir $out - install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules - install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules + for file in {ebsnvme-id,ec2-metadata,ec2nvme-nsid,ec2udev-vbd}; do + install -D -m 755 -t $out/bin "$file" + done - installManPage doc/*.8 - ''; + wrapProgram $out/bin/ec2-metadata \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + curl + util-linux + ] + } + + wrapProgram $out/bin/ec2nvme-nsid \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + ] + } + + wrapProgram $out/bin/ec2udev-vbd \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + gnused + ] + } + + for file in *.rules; do + install -D -m 644 -t $out/lib/udev/rules.d "$file" + done - postFixup = '' substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \ - --replace-fail '/usr/sbin' "$out/bin" + --replace-fail /usr/sbin $out/bin substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \ - --replace-fail '/bin/awk' '${gawk}/bin/awk' + --replace-fail /bin/awk ${gawk}/bin/awk - substituteInPlace "$out/bin/ec2-metadata" \ - --replace-fail 'curl' '${curl}/bin/curl' + installManPage doc/*.8 ''; + outputs = [ + "out" + "man" + ]; + doInstallCheck = true; - # We cannot run - # ec2-metadata --help - # because it actually checks EC2 metadata even if --help is given - # so it won't work in the test sandbox. + # We can't run `ec2-metadata` since it calls IMDS even with `--help`. installCheckPhase = '' $out/bin/ebsnvme-id --help ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { - changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; description = "Contains a set of utilities and settings for Linux deployments in EC2"; homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; license = lib.licenses.mit; + changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; maintainers = with lib.maintainers; [ + anthonyroussel + arianvp ketzacoatl thefloweringash - anthonyroussel ]; }; } diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index 266ae4b0d5b077..ba46f7d97944c3 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -5,6 +5,8 @@ installShellFiles, rustPlatform, nixosTests, + jq, + moreutils, }: rustPlatform.buildRustPackage rec { @@ -18,12 +20,34 @@ rustPlatform.buildRustPackage rec { hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4="; }; - # TODO: unify this to one hash because updater do not support this - cargoHash = - if stdenv.hostPlatform.isLinux then - "sha256-JDm7HWMaLSodpOhrR7rm6ZS/ATX/q8fRK+OJ/EKqg3U=" - else - "sha256-mrsqaqJHMyNi3yFDIyAXFBS+LY71VWXE8O7mjvgI6lo="; + # the interim crate contains both README.md and readme.md, + # which causes a hash mismatch on systems with a case-insensitive filesystem. + # This removes the readme files and updates cargo's checksum file accordingly + depsExtraArgs = { + nativeBuildInputs = [ + jq + moreutils + ]; + + postBuild = '' + pushd $name/interim + + if [ -e readme.md ]; then + rm --force --verbose README.md readme.md + jq 'del(.files."README.md") | del(.files."readme.md")' \ + .cargo-checksum.json -c \ + | sponge .cargo-checksum.json + + popd + else + echo "ERROR: the interim crate has been updated" + echo "When you see this message, please remove the workaround for the interim crate from the atuin nix expression" + exit 1 + fi + ''; + }; + + cargoHash = "sha256-l8DsQwEJZL9kr9UIpZzebDSRYET2WM8VFwk+O1Qk9oQ="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix index 1a501b06570627..0181baf34fe9bd 100644 --- a/pkgs/by-name/au/autotools-language-server/package.nix +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -1,44 +1,20 @@ { lib, - python311, + python3, fetchFromGitHub, - fetchpatch, }: -let - python3 = python311.override { - self = python3; - packageOverrides = _: super: { - tree-sitter = super.tree-sitter_0_21; - lsp-tree-sitter = super.lsp-tree-sitter.overridePythonAttrs (__: { - pythonRelaxDeps = [ "tree-sitter" ]; - }); - }; - }; -in python3.pkgs.buildPythonApplication rec { pname = "autotools-language-server"; - version = "0.0.19"; + version = "0.0.22"; pyproject = true; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "autotools-language-server"; tag = version; - hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw="; + hash = "sha256-PvaEcdvUE8QpxKuW65RL8SgDl/RM/C3HTEK3v+YA73c="; }; - patches = [ - # Right before the release, upstream decided to replace the - # tree-sitter-languages dependency with tree-sitter-make, which is yanked - # from some reason. Hopefully upstream will fix this dependency a bit - # better in the next release. See also: - # https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33#r142659163 - (fetchpatch { - url = "https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33.patch"; - hash = "sha256-TrzHbfR6GYAEqDIFiCqSX2+Qv4JeFJ5faiKJhNYojf0="; - revert = true; - }) - ]; build-system = [ python3.pkgs.setuptools-generate @@ -46,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { ]; dependencies = with python3.pkgs; [ - tree-sitter-languages + tree-sitter-make lsp-tree-sitter ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 2d8c96c8671aa3..b4ed85f23d4c4f 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2024-10-22"; + version = "0-unstable-2025-01-04"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "f8a4125d338d86a58723ab36f9f827248d07c85c"; - hash = "sha256-Bv91a5NglKWwddqx0kPgdCrik9SOPtcfQFJDWOdcQG4="; + rev = "504d31851e1d87af8ddb8ee2b6b2de43e32aaa11"; + hash = "sha256-dfCk3ZdMol91YTpAzi0tPQgZYnZQHvCeHPLoFYe5xts="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 3270750884f9ec..5b3fa9301262e8 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; - rev = "v${version}"; - sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc="; + tag = version; + sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM="; }; - cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; + cargoHash = "sha256-6vcTsernIVkemGhMBT9LMTsBsJ4u1Sd12BgIp4Zn3vg="; passthru = { updateScript = nix-update-script { }; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip examples_are_runnable" "--skip tests_are_runnable" + "--skip issue74" ]; meta = { diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 83efaa90400512..526da18da7bf6d 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -77,6 +77,8 @@ python3Packages.buildPythonApplication rec { disabledTests = [ # Relies upon the `charm` tool being installed "test_validate_missing_charm" + "test_read_charm_from_yaml_file_self_contained_success[full-bases.yaml]" + "test_read_charm_from_yaml_file_self_contained_success[full-platforms.yaml]" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix index dbb4278fa9bd8b..4d3601cf43f59d 100644 --- a/pkgs/by-name/hh/hhexen/package.nix +++ b/pkgs/by-name/hh/hhexen/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hhexen"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "sezero"; repo = "hhexen"; rev = "hhexen-${finalAttrs.version}"; - hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI="; + hash = "sha256-D1gIdIqb6RN7TA7ezbBhy2Z82TH1quN8kgAMNRHMfhw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 46bf0cf22216a7..eefc4ea405fcb4 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.25.0"; + version = "1.25.1"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-7I/mthqlV5+EWaLRlCmBZPJaf7dWm8alpUtmlxvUNsY="; + hash = "sha256-Wjei2hJpeVYVgShbbzikZk4yr71HoeP/caqU1ktDQbI="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/mp/mptcpd/package.nix b/pkgs/by-name/mp/mptcpd/package.nix new file mode 100644 index 00000000000000..eee2d99f7ad920 --- /dev/null +++ b/pkgs/by-name/mp/mptcpd/package.nix @@ -0,0 +1,79 @@ +{ + autoreconfHook, + autoconf-archive, + doxygen, + ell, + fetchFromGitHub, + fontconfig, + graphviz, + lib, + pandoc, + perl, + pkg-config, + stdenv, + systemd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mptcpd"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcpd"; + rev = "v${finalAttrs.version}"; + hash = "sha256-gPXtYmCLJ8eL6VfCi3kpDA7lNn38WB6J4FXefdu2D7M="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + doxygen + graphviz + pandoc + perl + pkg-config + ]; + + # ref. https://github.com/multipath-tcp/mptcpd/blob/main/README.md#bootstrapping + preConfigure = "./bootstrap"; + + # fix: 'To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"' + postConfigure = "doxygen -u"; + + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + # fix: 'Fontconfig error: Cannot load default config file: No such file: (null)' + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + buildInputs = [ + ell + systemd + ]; + + # fix: 'Fontconfig error: No writable cache directories' + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + # build and install doc + postBuild = "make doxygen-doc"; + postInstall = "mv doc $doc"; + + doCheck = true; + + meta = { + description = "Daemon for Linux that performs Multipath TCP path management related operations in the user space"; + homepage = "https://github.com/multipath-tcp/mptcpd"; + changelog = "https://github.com/multipath-tcp/mptcpd/blob/${finalAttrs.src.rev}/NEWS"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + mainProgram = "mptcpize"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 486272d6cff505..3857939c244431 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "myks"; - version = "4.2.6"; + version = "4.3.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-0kR1lluTRhDwpXhdUn4HJr5bYzJqnY1p77j/tiWyV68="; + hash = "sha256-r8OT5cbHicJVAVIJ9cfDHPLcJrZGPVYdZ42Sbvu8Jvc="; }; vendorHash = "sha256-LmWuztR6X3x0aOYCqRv3aLiFEZQkaSnh3LT7IOu2Xa0="; diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 444a4cc91cb056..4ab6257c3f7a8d 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -1,5 +1,6 @@ { lib, + buildGoModule, fetchFromGitHub, file, # for libmagic ncurses, @@ -13,8 +14,7 @@ darwin, }: -stdenv.mkDerivation rec { - pname = "nchat"; +let version = "5.4.2"; src = fetchFromGitHub { @@ -24,16 +24,55 @@ stdenv.mkDerivation rec { hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k="; }; + libcgowm = buildGoModule { + pname = "nchat-wmchat-libcgowm"; + inherit version src; + + sourceRoot = "${src.name}/lib/wmchat/go"; + vendorHash = "sha256-EdbOO5cCDT1CcPlCBgMoPDg65FcoOYvBwZa4bz0hfGE="; + + buildPhase = '' + mkdir -p $out/ + go build -o $out/ -buildmode=c-archive + mv $out/go.a $out/libcgowm.a + ln -s $out/libcgowm.a $out/libref-cgowm.a + mv $out/go.h $out/libcgowm.h + ''; + }; +in +stdenv.mkDerivation rec { + pname = "nchat"; + inherit version src; + + nl = "\n"; postPatch = '' substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ --replace "get_git_head_revision" "#get_git_head_revision" substituteInPlace lib/tgchat/CMakeLists.txt \ --replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR" + + # specific mangling to handle whatsapp go module: + + substituteInPlace CMakeLists.txt \ + --replace "if(HAS_WHATSAPP AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))" \ + "if(FALSE AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))" + + substituteInPlace lib/wmchat/CMakeLists.txt \ + --replace-fail "add_subdirectory(go)" \ + "set(GO_LIBRARIES ${libcgowm}/libcgowm.a)${nl}target_include_directories(wmchat PRIVATE ${libcgowm})" + + substituteInPlace lib/wmchat/CMakeLists.txt \ + --replace-fail "target_link_libraries(wmchat PUBLIC ref-cgowm ncutil \''${GO_LIBRARIES})" \ + "target_link_libraries(wmchat PUBLIC ${libcgowm}/libcgowm.a ncutil \''${GO_LIBRARIES})" + + substituteInPlace lib/wmchat/CMakeLists.txt \ + --replace-fail "add_dependencies(wmchat ref-cgowm)" "#add_dependencies(wmchat ref-cgowm)" ''; nativeBuildInputs = [ cmake gperf + libcgowm ]; buildInputs = @@ -56,7 +95,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" - "-DHAS_WHATSAPP=OFF" # go module build required ]; meta = { diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index f23c92d1b2430e..3fd3c4e8c1414d 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -1,38 +1,60 @@ { lib, stdenv, - fetchurl, + fetchzip, pkg-config, glib, libwnck, libnotify, + libtool, dbus-glib, makeWrapper, + gnome-common, gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notify-osd"; - version = "0.9.34"; + version = "0.9.35+20.04.20191129"; - src = fetchurl { - url = "https://launchpad.net/notify-osd/precise/${version}/+download/notify-osd-${version}.tar.gz"; - sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; + src = fetchzip { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/notify-osd_${finalAttrs.version}.orig.tar.gz"; + sha256 = "sha256-aSU83HoWhHZtob8NFHFYNUIIZAecvQ/p0z62KMlQNCU="; + stripRoot = false; }; nativeBuildInputs = [ pkg-config makeWrapper + libtool ]; + buildInputs = [ glib libwnck libnotify dbus-glib gsettings-desktop-schemas + gnome-common ]; - configureFlags = [ "--libexecdir=$(out)/bin" ]; + env = { + NIX_CFLAGS_COMPILE = "-fpermissive"; + }; + + # deprecated function: g_memdup + postPatch = '' + substituteInPlace src/stack.c \ + --replace-fail "g_memdup" "g_memdup2" + ''; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + configureFlags = [ + ''--libexecdir=$(out)/bin'' + ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ @@ -47,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bodil ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 25d5735defb74a..e4ee7a7c7c27b7 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "6.1.0"; + version = "6.6.6"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-bDttjeHcIK90W7zPrKNAS4B1L9mibaRjQdnUAU2N8as="; + hash = "sha256-vScQzj461Pw4m83581FPSgfQIkfeehCSyFioxEgpSDE="; }; build-system = with python3Packages; [ @@ -41,7 +41,10 @@ python3Packages.buildPythonApplication rec { "TestClassOelintVarsHomepagePing" ]; - pythonRelaxDeps = [ "argcomplete" ]; + pythonRelaxDeps = [ + "argcomplete" + "urllib3" + ]; pythonImportsCheck = [ "oelint_adv" ]; diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 38bf29563dd262..15857bf9741498 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -48,6 +48,7 @@ python3Packages.buildPythonApplication rec { ''; disabledTests = [ + "test_project_all_platforms_invalid" "test_run_init_flask" "test_run_init_django" ]; diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 77c4aaf024324a..c7927f854cdf4e 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -170,6 +170,7 @@ python3Packages.buildPythonApplication rec { "test_lifecycle_write_component_metadata" "test_parse_info_integrated" "test_patch_elf" + "test_project_platform_unknown_name" "test_remote_builder_init" "test_setup_assets_remote_icon" "test_snap_command_fallback" diff --git a/pkgs/by-name/st/storcli2/package.nix b/pkgs/by-name/st/storcli2/package.nix new file mode 100644 index 00000000000000..c9d121743a28d8 --- /dev/null +++ b/pkgs/by-name/st/storcli2/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenvNoCC, + fetchzip, + rpmextract, + testers, +}: +stdenvNoCC.mkDerivation ( + finalAttrs: + let + majVer = "8"; + minVer = "11"; + relPhs = "14"; + verCode = "00" + majVer + ".00" + minVer + ".0000.00" + relPhs; + in + { + pname = "storcli"; + version = majVer + "." + minVer; + + src = fetchzip { + url = "https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_24g_p${finalAttrs.version}/StorCLI_Avenger_${finalAttrs.version}-${verCode}.zip"; + hash = "sha256-vztV+Jp+p6nU4q7q8QQIkuL30QsoGj2tyIZp87luhH8="; + }; + + nativeBuildInputs = [ rpmextract ]; + + unpackPhase = + let + inherit (stdenvNoCC.hostPlatform) system; + platforms = { + x86_64-linux = "Linux"; + aarch64-linux = "ARM/Linux"; + }; + platform = platforms.${system} or (throw "unsupported system: ${system}"); + in + '' + rpmextract $src/Avenger_StorCLI/${platform}/storcli2-${verCode}-1.*.rpm + ''; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -D ./opt/MegaRAID/storcli2/storcli2 $out/bin/storcli2 + ''; + + # Not needed because the binary is statically linked + dontFixup = false; + + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "${finalAttrs.meta.mainProgram} v"; + version = verCode; + }; + + meta = with lib; { + # Unfortunately there is no better page for this. + # Filter for downloads, set 100 items per page. Sort by newest does not work. + # Then search manually for the latest version. + homepage = "https://www.broadcom.com/support/download-search?pg=&pf=Host+Bus+Adapters&pn=&pa=&po=&dk=storcli2&pl=&l=false"; + description = "Storage Command Line Tool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ edwtjo ]; + mainProgram = "storcli2"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; + } +) diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index a2bb4434002473..753dc120f3cffa 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; preFixup = '' - for exampleExe in content-hub-test-{importer,exporter,sharer}; do + for exampleExe in lomiri-content-hub-test-{importer,exporter,sharer}; do moveToOutput bin/$exampleExe $examples moveToOutput share/applications/$exampleExe.desktop $examples done diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 64643f50a85486..fc5548020631c2 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; tag = "v${version}"; - hash = "sha256-bGXSlbyV+0RjNtG/6u11xqjcvL7/FhhqdXanv2JlVII="; + hash = "sha256-Nr8OpinQ1Dmo6e8XpBYrtaRRhcX2s1TW/5nM1LxApGg="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-c5q/UFkxDtGJxQORAH7iLlzH3rJI6cCD6H2uSC5bItw="; + cargoHash = "sha256-E1iowktT7oK259WY6AopfvinQuRT1yMnORbJn9Ly+3E="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index f754a0ccfb4d48..6ac00cf8cb2ba2 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-GTsPcivETNP3x8kEI18CsUtV2ouAMkpC/uO+ltSkpnQ="; + hash = "sha256-PJtl1/Eete7zK81grQHdWtr9PBbLL0lC3nwz0vxtFx0="; }; - vendorHash = "sha256-gJgItrEPHgSF2ReNLT4HAK9Dlx9uB6f0rXQ2A7WsNNE="; + vendorHash = "sha256-TjvbuvOwML9v1fMOA+ld9PM2wyysgL4Ws9Swf+N2nwk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index f47ba45289812b..d24dfbee49a251 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-hKNwAZCK7dS/iBTrigEHSBXnCJQ2btSUDMUrfetiL0s="; + hash = "sha256-pc65TtMFsei338t73kjKO8agPhyvYfJrtKleQG7ZLlY="; }; - vendorHash = "sha256-m5Ih/3a3p5BgifpK+vu2Z04glIc0vhz1/ikA4Hl0L7U="; + vendorHash = "sha256-93HlbsEn5BX/9Ch0hCexLJS/zqJHyG0ngyiz/wnAqog="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index d861eab67a0b55..7b9e73b538de72 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.17"; + version = "0.4.18"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-MH/0G9KKmwcVsJKpe6uE1xjvykBEWuYU0DIOGfXiLAw="; + hash = "sha256-Dcv8ncYPIug7e24mvL1gn0x0CeLNAck8djm/r/yiPe8="; }; configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 1fa38229d7a106..6b0b939a7d048a 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -5,7 +5,7 @@ }: let - version = "3.4.0"; + version = "3.4.1"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-Gt6/ARrUzmsAhsdkKPNiX0CBmWTv7D3mHnxvvWjbLnE="; + hash = "sha256-yOqVS58bsFXGhdkQ20LK0E80bV7O2r/BE76CfBoeEqA="; }; doCheck = true; diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 09c40c51ed93ae..289d0ee84d4cdf 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.7.2"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-E+2IQy3O+ccvZfjlORo+eTd+l41FSXk1dIE2Adrn3Ok="; + hash = "sha256-1+2ezwmlzLYbrODGNoOzd9Gbjl/5BzarmXr8eiaKZ9c="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 62bd2d1e5ea86c..64609ea6099d15 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.5.8"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-MeGhtjdvtL0armoLrlqPsV4SUCTWbkBvRTj6ReuKQpQ="; + hash = "sha256-Y6LVSk0Ut5G0aGzV+hAfGmdM8h8a+4NYycQqBKoElXU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix index 1cb5794baad024..c5b12af0cbe5fd 100644 --- a/pkgs/development/python-modules/aionut/default.nix +++ b/pkgs/development/python-modules/aionut/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -22,15 +23,11 @@ buildPythonPackage rec { hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix index 4667087687e149..df824327e6bb36 100644 --- a/pkgs/development/python-modules/bizkaibus/default.nix +++ b/pkgs/development/python-modules/bizkaibus/default.nix @@ -1,25 +1,29 @@ { lib, - requests, + aiohttp, buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "bizkaibus"; - version = "0.1.4"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "UgaitzEtxebarria"; repo = "BizkaibusRTPI"; rev = version; - sha256 = "1v7k9fclndb4x9npzhzj68kbrc3lb3wr6cwal2x46ib207593ckr"; + hash = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; @@ -29,7 +33,8 @@ buildPythonPackage rec { meta = { description = "Python module to get information about Bizkaibus buses"; homepage = "https://github.com/UgaitzEtxebarria/BizkaibusRTPI"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ fab ]; + changelog = "https://github.com/UgaitzEtxebarria/BizkaibusRTPI/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a9ed489cdad203..92e87f08f4fc4b 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.92"; + version = "1.35.93"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-8q9GOInTf7qyPHzQj7GwNfEjrWfks+/Eb3cU+avuXlc="; + hash = "sha256-mCAsipukijtuQ0qc+d5JktfMk+5QXx/EgcV82cgBYj0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index ef491c860556a7..f2b3617210453a 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.92"; + version = "1.35.93"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-wCrnBYjiDRWoEAs0waHr+l8I6Fb2BXDbDRaxKNxMXCQ="; + hash = "sha256-aHLv6iTWsd0fAbdmL/HgvX+bcRDabWRHt4wbhdlDFR8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 14ddeebae157e1..e74061ddd7bcee 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-kDujv7iVUvPfP9g3Ofm0Vso+I6qKBOq9NlFpigd6+Tc="; + hash = "sha256-ywGXzcnWYynmDXjDbSpzn8SroQ7z5fajhlE3JqI3PNk="; }; postPatch = '' @@ -103,6 +103,10 @@ buildPythonPackage rec { "test_to_yaml_file" # Tests expecting pytest-time "test_monitor_builds_success" + # Temporary fix until new release to support Python 3.13 + "test_grammar_aware_part_error" + "test_grammar_aware_part_error[part2]" + "test_grammar_aware_project_error[project0]" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index a9a73aaf099593..035c4c249b4bbd 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" ]; + # Temp fix for test incompatibility with Python 3.13 + disabledTests = [ + "test_grammar_strlist_error[value2]" + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/dctorch/default.nix b/pkgs/development/python-modules/dctorch/default.nix index 37dbcc85da261a..b118714d2833c6 100644 --- a/pkgs/development/python-modules/dctorch/default.nix +++ b/pkgs/development/python-modules/dctorch/default.nix @@ -18,9 +18,11 @@ buildPythonPackage rec { hash = "sha256-TmfLAkiofrQNWYBhIlY4zafbZPgFftISCGloO/rlEG4="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ numpy scipy torch diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index d0d939a55d69ac..ce90484d09bc74 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -10,6 +10,7 @@ orjson, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, @@ -35,8 +36,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" \ - --replace-fail "--cov" "" + --replace-fail "0.0.0" "${version}" ''; build-system = [ poetry-core ]; @@ -58,6 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 69cfeb13bee4e1..85c9d4f93c343d 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.63"; + version = "0.64"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-XA6XvxWHttt+ic5027Q/3VGqrFYznYCiExSFBHU7qcY="; + hash = "sha256-rPQr7nyouBepTi4tW0+wrbROYyWo92KkZUI6ff5jl7I="; }; build-system = [ diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 6d4c4a42744463..211afb5ee57a7a 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -2,20 +2,24 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, fetchpatch, - pytest-xdist, - pytestCheckHook, + + # build-system setuptools, + + # dependencies absl-py, - cvxpy, jax, - jaxlib, matplotlib, numpy, - optax, scipy, + + # tests + cvxpy, + optax, + pytest-xdist, + pytestCheckHook, scikit-learn, }: @@ -24,8 +28,6 @@ buildPythonPackage rec { version = "0.8.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "google"; repo = "jaxopt"; @@ -48,17 +50,16 @@ buildPythonPackage rec { dependencies = [ absl-py jax - jaxlib matplotlib numpy scipy ]; nativeCheckInputs = [ - pytest-xdist - pytestCheckHook cvxpy optax + pytest-xdist + pytestCheckHook scikit-learn ]; @@ -74,6 +75,10 @@ buildPythonPackage rec { [ # https://github.com/google/jaxopt/issues/592 "test_solve_sparse" + + # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 + # https://github.com/google/jaxopt/issues/618 + "test_binary_logit_log_likelihood" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/google/jaxopt/issues/577 @@ -81,6 +86,9 @@ buildPythonPackage rec { "test_solve_sparse" "test_logreg_with_intercept_manual_loop3" + # Flaky (AssertionError) + "test_inv_hessian_product_pytree3" + # https://github.com/google/jaxopt/issues/593 # Makes the test suite crash "test_dtype_consistency" diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 365153f2c80e5c..3b04fbd4584bcc 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-MdJnXb2ESJdW3QYqf/7TMLKr3KO3cV1RFnT1tQdeTdY="; + hash = "sha256-OokTeyKKbpwrP0bjZ6J7dfsxtFjiF3e7qBneZUcH1Z4="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index a2772a48c2ba41..0be04247003899 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.6"; + version = "0.12.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-bd7M2Fd5BsNYmczp32Je7QtzCP0LBTg8zsDt5SYXBPU="; + hash = "sha256-SptIZ5LNsJOzMtrJ3hW1NPWX7+hmg74HKcfKdImCc+8="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index a4ef913cf0b667..eaf74e712c6d12 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-+mh1iIE5BFBs4kREG7SjstOMWmWAc1JSUMkHbg89ues="; + hash = "sha256-P//9FvSUD0ZQybRgBjZjQREEdwqw9wiNygE8M0I2FhY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 54aabd69314b47..38c8e9f0f58858 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-MkLlJtsh3/TnuwQzAhN2BklrSQ8GOcJoDcwok9QWJw8="; + hash = "sha256-88DaBPhUB5Az7jwbER4JdFYAW5o4Z+1LtJuNKOSg8zY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index c94a6a818cb73a..5f10141e285a06 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.3.10"; + version = "0.3.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-/aM0WqS6QbJdkoF+6KVpmTHnnHyHkkPxctbg5svFxbM="; + hash = "sha256-GIAnOn5AnAXx28zbrFzjwhR3GQHNNpautVainf7YR3o="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index d1a6b88da655b6..103b406f1847e1 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-EcOsfi16zp283ZpmLye8pf786YxWgquv+33QHVl3Zlg="; + hash = "sha256-NDegjOyFzrvCEqpz2lybiwVLTcYoM4VoQ1p9+ISJR28="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index d2e613b3700325..6406ef8ce2efe3 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-EVAwC866t83dnim3Jx4JeyePvjUY3ibkNVlYVbEsO5o="; + hash = "sha256-1nei7vBpXQC0h6xOoUyC5qTqreOgnFQPj4FibYUuNJE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index b6216d8bbb894c..32e3900c97d1af 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-yk1uHPH1Bipgy+WNx5KQ5Iuvp6b58uvcYkLP5Ma4STI="; + hash = "sha256-4bbjXMH4T/BRJ/l+vDOYqbv2nn0HE9953h4qFRXFlXQ="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 0b7c5987cc454f..510f6eced702b6 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-hv6cxCSKNtjUfZYNk2oxrJi10wAL4kxZeTx3v1ejlKc="; + hash = "sha256-Agy6T02j5sSZZgiI6eSgxLThwEk2oZNYyMygBo6HWug="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 3e3e44bbcceed8..e2e44c75774619 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.17"; + version = "0.5.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-K6JwDKOxXoTvBy/ty7/q4vwTzntj/uIPzVJJ5vzb04E="; + hash = "sha256-22nacOGZomZHBeuYOnD6krfO4Z3Wz/F1r3aSoLik3VM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index 15fb94d49635b0..3e5b4654521114 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "lsp-tree-sitter"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; src = fetchFromGitHub { owner = "neomutt"; repo = "lsp-tree-sitter"; tag = version; - hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0="; + hash = "sha256-4DQzHdii2YS/Xg6AdT/kXC/8B88ZQaLgUf2oWoOthV8="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a4885c414a21b7..1ca55685883196 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -678,8 +678,8 @@ rec { "sha256-LFhzVLxycvIbGPCIMvD18XAL8KkA1rnE+3LkFty4Q8s="; mypy-boto3-iotsecuretunneling = - buildMypyBoto3Package "iotsecuretunneling" "1.35.0" - "sha256-A1sYvlnpbfKZyxZvFCzBfD/Jbzd1PwlQwgj+fvcybGU="; + buildMypyBoto3Package "iotsecuretunneling" "1.35.93" + "sha256-HBXnSdkTqLdcwSQl42FfFZhQVDiErGfJShaGgt0I7bU="; mypy-boto3-iotsitewise = buildMypyBoto3Package "iotsitewise" "1.35.64" diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 5b08bf5547ceb4..1ea5d33b253c6b 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "5.1.0"; + version = "6.5.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-parser"; tag = version; - hash = "sha256-0cCcbnipijQgWH+08eZbE6Cqcx5cenrb+bQlf3h04tw="; + hash = "sha256-RSdcBWFJoD3aOJCQeC1fnpyzOJvn/CM9K0r2bzq9fsY="; }; pythonRelaxDeps = [ "regex" ]; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 80c9fd506921bb..270607747af9cf 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.5.3"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE="; + hash = "sha256-CjsSn9kbSOSiia47gDHUbMCgJs3pDJaJfQOwMPP+5WI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 3e5c85f24352bd..28e192336d7a63 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,48 +1,55 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, cython, + fetchPypi, + numpy, oldest-supported-numpy, packaging, - setuptools, - setuptools-scm, - wheel, - numpy, pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "pyemd"; version = "1.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4="; }; + build-system = [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ cython numpy oldest-supported-numpy packaging - setuptools - setuptools-scm - wheel ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # Broken with Numpy 2.x, https://github.com/wmayner/pyemd/issues/68 + "test_emd_samples_2" + "test_emd_samples_3" + ]; + meta = { description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; homepage = "https://github.com/wmayner/pyemd"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 1506d4735bd01d..244eb32afad334 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch"; hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI="; }) + # temp fix for Python 3.13 until next release after 1.16.0 + (fetchpatch { + url = "https://github.com/libgit2/pygit2/commit/7f143e1c5beec01ec3429aa4db12435ac02977d3.patch"; + hash = "sha256-2SiFFPWVVo9urKRu64AejjTZMoXo2r+v1OwEIF+AzNo="; + }) ]; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 7ae8461c59bc30..4e007fb64e96ab 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -6,6 +6,7 @@ cryptography, fetchFromGitHub, hatchling, + orjson, pytest-asyncio, pytest-timeout, pytestCheckHook, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,12 +26,15 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; tag = "v${version}"; - hash = "sha256-8NO1IAm16b5jxjVPSQqOSx5hJjAOAXyOknqwkgPT5Zo="; + hash = "sha256-p8c+WY+x5KcF7r6FXeF89JNtAwogRZELqXWgDc2iJek="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + dependencies = [ + cryptography + orjson + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; optional-dependencies = { cli = [ @@ -49,12 +53,12 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" ]; pythonImportsCheck = [ "pylutron_caseta" ]; - + meta = { description = "Python module o control Lutron Caseta devices"; homepage = "https://github.com/gurumitts/pylutron-caseta"; changelog = "https://github.com/gurumitts/pylutron-caseta/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 25659696545439..cf4750b460e3f1 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.8.1"; + version = "3.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${version}"; - hash = "sha256-WuQddane7NPqGo6EHBPlFAZDmkcksDdWmHKdVSsSf+o="; + hash = "sha256-0jS18oCVX+WvGvaIlug3Wbf4oJUmspGYlcmJQR0MXhI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysuezv2/default.nix b/pkgs/development/python-modules/pysuezv2/default.nix index 20e8ca6901e249..4f50b7519533bb 100644 --- a/pkgs/development/python-modules/pysuezv2/default.nix +++ b/pkgs/development/python-modules/pysuezv2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysuezv2"; - version = "1.3.5"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jb101010-2"; repo = "pySuez"; tag = version; - hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8="; + hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index edcf8a83eb2b78..afc8646877aad2 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; tag = version; - hash = "sha256-xbyDiTnEeC/d2dpAxj/5tB27hFC3bKEO5JsUC1jmh18="; + hash = "sha256-9y0M2CYG7tFdT9nAcQLhgvTKeaxoFHAVihM2Rj+0N34="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 6f9b829336553f..c5ebaba0c1b1b9 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; tag = "v${version}"; - hash = "sha256-j9KF2vqDZqQ35mDW/Qx6uy8H9hwuwBYfdcDXD1Cs7rQ="; + hash = "sha256-Y+KFC/g0zJ1Ng3LnMsStN2jOsnjKLzYLyvM+fDmzdGQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index 18312420b380c3..8cd6f0754b5267 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "solax"; - version = "3.2.1"; + version = "3.2.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eeALI7GvhRl8OQaSqv1I26rMaBTxF24w4QQzUcnV2ys="; + hash = "sha256-ht+UP/is9+galMiVz/pkwtre1BXfCTT39SpSz4Vctvs="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 9c585e4ad467e4..62c7202fc1d939 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -7,11 +7,14 @@ cymem, cython_0, fetchPypi, + git, hypothesis, jinja2, langcodes, mock, murmurhash, + nix-update, + nix, numpy, packaging, preshed, @@ -22,6 +25,8 @@ setuptools, spacy-legacy, spacy-loggers, + spacy-lookups-data, + spacy-transformers, srsly, thinc, tqdm, @@ -29,34 +34,34 @@ wasabi, weasel, writeScript, - nix, - git, - nix-update, }: buildPythonPackage rec { pname = "spacy"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-Szfr0lraQFmw3J4Ik+cN3l34NIUymgaO8EWA5wiSpl0="; + hash = "sha256-galn3D1qWgqaslBVlIP+IJIwZYKpGS+Yvnpjvc4nl/c="; }; + postPatch = '' + sed -i "/numpy/d" pyproject.toml + ''; + build-system = [ cymem cython_0 murmurhash numpy + preshed thinc ]; - pythonRelaxDeps = [ - "thinc" - ]; + pythonRelaxDeps = [ "thinc" ]; dependencies = [ catalogue @@ -86,6 +91,11 @@ buildPythonPackage rec { mock ]; + optional-dependencies = { + transformers = [ spacy-transformers ]; + lookups = [ spacy-lookups-data ]; + }; + # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 preCheck = '' cd $out @@ -124,10 +134,10 @@ buildPythonPackage rec { meta = { description = "Industrial-strength Natural Language Processing (NLP)"; - mainProgram = "spacy"; homepage = "https://github.com/explosion/spaCy"; changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}"; license = lib.licenses.mit; maintainers = [ ]; + mainProgram = "spacy"; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 242a84db20d744..47ed66b16049d3 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1296"; + version = "3.0.1297"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-iTcI/pNCcQamVuDYIjv60KR4CBwBRVwZJ+VAJqR1keM="; + hash = "sha256-8EVqWhS814OwmG8nebKgGsAmn4aoKMCYBBU26tOyuj4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 0202b01baf16ca..fc97339437e8d2 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -3,18 +3,19 @@ buildPythonPackage, cairocffi, cython, - fetchPypi, + en_core_web_sm, + fetchFromGitHub, igraph, leidenalg, pandas, poetry-core, + pyarrow, pytestCheckHook, pythonOlder, scipy, setuptools, - spacy, spacy-lookups-data, - en_core_web_sm, + spacy, toolz, tqdm, wasabi, @@ -22,17 +23,19 @@ buildPythonPackage rec { pname = "textnets"; - version = "0.9.4"; - format = "pyproject"; + version = "0.9.5"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-4154ytzo1QpwhKA1BkVMss9fNIkysnClW/yfSVlX33M="; + src = fetchFromGitHub { + owner = "jboynyc"; + repo = "textnets"; + tag = "v${version}"; + hash = "sha256-MdKPxIshSx6U2EFGDTUS4EhoByyuVf0HKqvm9cS2KNY="; }; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools @@ -41,13 +44,16 @@ buildPythonPackage rec { pythonRelaxDeps = [ "igraph" "leidenalg" + "pyarrow" + "toolz" ]; - propagatedBuildInputs = [ + dependencies = [ cairocffi igraph leidenalg pandas + pyarrow scipy spacy spacy-lookups-data diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix new file mode 100644 index 00000000000000..a91fa5fbd913a6 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-make/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cargo, + rustPlatform, + rustc, + setuptools, +}: + +buildPythonPackage rec { + pname = "tree-sitter-make"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter-grammars"; + repo = "tree-sitter-make"; + rev = "v${version}"; + hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-RI/wBnapWdr4kYshx9d9iN9nB30bR91uQ063yqNy4aA="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + ]; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ + "tree_sitter_make" + ]; + + meta = { + description = "Makefile grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter-grammars/tree-sitter-make"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 518efd7c7b6469..f6d88446c6828b 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -41,7 +41,10 @@ let ) allUrls; in ( - qt6Packages + # This removes reference to deprecated `qt6Packages.stdenv` + # so when a KDE package asks for a stdenv, it won't trigger + # an eval warning + (lib.removeAttrs qt6Packages [ "stdenv" ]) // frameworks // gear // plasma @@ -66,10 +69,6 @@ let # Alias because it's just data plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; - # Alias because `self.callPackage` would give deprecated - # `qt6Packages.stdenv` when asked for `stdenv` - inherit stdenv; - selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub alpaka = self.callPackage ./misc/alpaka { }; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 849a2ee4473d26..967dcc54c6071a 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -21,14 +21,14 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.3.0-rc4"; + version = "2.3.0-rc5"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-6O+XQvggyVCZBYpx8/7jbq15tLZsvzmDqp+AtEb9qFU="; + hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 975eab5f1ec9d5..9efcf8e247da1d 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -10,14 +10,13 @@ nixosTests, enableLocalIcons ? false, nix-update-script, - git, }: let dashboardIcons = fetchFromGitHub { - owner = "walkxcode"; + owner = "homarr-labs"; repo = "dashboard-icons"; - rev = "be82e22c418f5980ee2a13064d50f1483df39c8c"; # Until 2024-07-21 - hash = "sha256-z69DKzKhCVNnNHjRM3dX/DD+WJOL9wm1Im1nImhBc9Y="; + rev = "51a2ae7b101c520bcfb5b44e5ddc99e658bc1e21"; # Until 2025-01-06 + hash = "sha256-rKXeMAhHV0Ax7mVFyn6hIZXm5RFkbGakjugU0DG0jLM="; }; installLocalIcons = '' @@ -29,13 +28,13 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-eFRWkwPSXQFhyKORpOTe9ifCX25ZeyVG7iezRmMxPvA="; + hash = "sha256-q8+uoikHMQVuTrVSH8tPsoI5655ZStMc/7tmoAfoZIY="; }; npmDepsHash = "sha256-N39gwct2U4UxlIL5ceDzzU7HpA6xh2WksrZNxGz04PU="; @@ -50,7 +49,7 @@ buildNpmPackage rec { patchShebangs .next/standalone/server.js ''; - nativeBuildInputs = [ git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ nodePackages.node-gyp-build @@ -76,16 +75,14 @@ buildNpmPackage rec { # write its prerender cache. # # This patch ensures that the cache implementation respects the env - # variable `HOMEPAGE_CACHE_DIR`, which is set by default in the + # variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the # wrapper below. - pushd $out - git apply ${./prerender_cache_path.patch} - popd + (cd "$out" && patch -p1 <${./prerender_cache_path.patch}) makeWrapper $out/share/homepage/server.js $out/bin/homepage \ --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \ - --set-default HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard + --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard ${if enableLocalIcons then installLocalIcons else ""} diff --git a/pkgs/servers/homepage-dashboard/prerender_cache_path.patch b/pkgs/servers/homepage-dashboard/prerender_cache_path.patch index 05746b5601c441..1d8c3b34384a50 100644 --- a/pkgs/servers/homepage-dashboard/prerender_cache_path.patch +++ b/pkgs/servers/homepage-dashboard/prerender_cache_path.patch @@ -12,7 +12,7 @@ index b1b74d8..a46c80b 100644 this.fs = ctx.fs; this.flushToDisk = ctx.flushToDisk; - this.serverDistDir = ctx.serverDistDir; -+ this.serverDistDir = path.join(process.env.HOMEPAGE_CACHE_DIR, "homepage"); ++ this.serverDistDir = path.join(process.env.NIXPKGS_HOMEPAGE_CACHE_DIR, "homepage"); this.appDir = !!ctx._appDir; if (ctx.maxMemoryCacheSize) { this.memoryCache = new _lruCache.default({ diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 84b9da8b262946..32c8aedc3d7e94 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -7,13 +7,13 @@ buildPostgresqlExtension rec { pname = "pg_partman"; - version = "5.2.2"; + version = "5.2.4"; src = fetchFromGitHub { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+T+JOGVOyxJH+mb0IhCJbSh+5DDlhaXvagy8C4lQizo="; + sha256 = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; }; meta = { diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index fb30d17841e3da..8e2a77cf0ef1e4 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -3,6 +3,7 @@ , runCommand , runCommandWith , runCommandCC +, bintools , hello , debian-devscripts }: @@ -130,6 +131,56 @@ let ''; brokenIf = cond: drv: if cond then drv.overrideAttrs (old: { meta = old.meta or {} // { broken = true; }; }) else drv; + overridePlatforms = platforms: drv: drv.overrideAttrs (old: { meta = old.meta or {} // { inherit platforms; }; }); + + instructionPresenceTest = label: mnemonicPattern: testBin: expectFailure: runCommand "${label}-instr-test" { + nativeBuildInputs = [ + bintools + ]; + buildInputs = [ + testBin + ]; + } '' + touch $out + if $OBJDUMP -d \ + --no-addresses \ + --no-show-raw-insn \ + "$(PATH=$HOST_PATH type -P test-bin)" \ + | grep -E '${mnemonicPattern}' > /dev/null ; then + echo "Found ${label} instructions" >&2 + ${lib.optionalString expectFailure "exit 1"} + else + echo "Did not find ${label} instructions" >&2 + ${lib.optionalString (!expectFailure) "exit 1"} + fi + ''; + + pacRetTest = testBin: expectFailure: overridePlatforms [ "aarch64-linux" ] ( + instructionPresenceTest "pacret" "\\bpaciasp\\b" testBin expectFailure + ); + + elfNoteTest = label: pattern: testBin: expectFailure: runCommand "${label}-elf-note-test" { + nativeBuildInputs = [ + bintools + ]; + buildInputs = [ + testBin + ]; + } '' + touch $out + if $READELF -n "$(PATH=$HOST_PATH type -P test-bin)" \ + | grep -E '${pattern}' > /dev/null ; then + echo "Found ${label} note" >&2 + ${lib.optionalString expectFailure "exit 1"} + else + echo "Did not find ${label} note" >&2 + ${lib.optionalString (!expectFailure) "exit 1"} + fi + ''; + + shadowStackTest = testBin: expectFailure: brokenIf stdenv.hostPlatform.isMusl (overridePlatforms [ "x86_64-linux" ] ( + elfNoteTest "shadowstack" "\\bSHSTK\\b" testBin expectFailure + )); in nameDrvAfterAttrName ({ bindNowExplicitEnabled = brokenIf stdenv.hostPlatform.isStatic (checkTestBin (f2exampleWithStdEnv stdenv { @@ -204,6 +255,14 @@ in nameDrvAfterAttrName ({ ignoreStackClashProtection = false; }); + pacRetExplicitEnabled = pacRetTest (helloWithStdEnv stdenv { + hardeningEnable = [ "pacret" ]; + }) false; + + shadowStackExplicitEnabled = shadowStackTest (f1exampleWithStdEnv stdenv { + hardeningEnable = [ "shadowstack" ]; + }) false; + bindNowExplicitDisabled = checkTestBin (f2exampleWithStdEnv stdenv { hardeningDisable = [ "bindnow" ]; }) { @@ -271,6 +330,14 @@ in nameDrvAfterAttrName ({ expectFailure = true; }; + pacRetExplicitDisabled = pacRetTest (helloWithStdEnv stdenv { + hardeningDisable = [ "pacret" ]; + }) true; + + shadowStackExplicitDisabled = shadowStackTest (f1exampleWithStdEnv stdenv { + hardeningDisable = [ "shadowstack" ]; + }) true; + # most flags can't be "unsupported" by compiler alone and # binutils doesn't have an accessible hardeningUnsupportedFlags # mechanism, so can only test a couple of flags through altered @@ -472,4 +539,12 @@ in { ignoreStackClashProtection = false; expectFailure = true; }; + + allExplicitDisabledPacRet = pacRetTest (helloWithStdEnv stdenv { + hardeningDisable = [ "all" ]; + }) true; + + allExplicitDisabledShadowStack = shadowStackTest (f1exampleWithStdEnv stdenv { + hardeningDisable = [ "all" ]; + }) true; })) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 481a660c4f4758..c73c7c7651c676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16404,6 +16404,8 @@ self: super: with self; { tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { }; + tree-sitter-make = callPackage ../development/python-modules/tree-sitter-make { }; + tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { }; treelib = callPackage ../development/python-modules/treelib { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 0834419e13bd4d..9e02fbbb11211f 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -126,5 +126,6 @@ makeScopeWithSplicing' { xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; }); } // lib.optionalAttrs config.allowAliases { + # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix` stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05 }