diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 255a24508f59..f36268e46740 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8257,13 +8257,6 @@ github = "feathecutie"; githubId = 53912746; }; - federicoschonborn = { - name = "Federico Damián Schonborn"; - email = "federicoschonborn@disroot.org"; - github = "FedericoSchonborn"; - githubId = 62166915; - matrix = "@FedericoDSchonborn:matrix.org"; - }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 7c205022555b..668f68b4b66f 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -890,12 +890,13 @@ in ''; serviceConfig = { - Type = "simple"; + Type = "notify"; User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; ExecStart = "${exe} web --pid /run/gitea/gitea.pid"; Restart = "always"; + WatchdogSec = 30; # Runtime directory and mode RuntimeDirectory = "gitea"; RuntimeDirectoryMode = "0755"; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 62bf38e31b18..962e5f494d15 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -232,10 +232,17 @@ in # containers cannot reach aardvark-dns otherwise networking.firewall.interfaces.${network_interface}.allowedUDPPorts = lib.mkIf dns_enabled [ 53 ]; + virtualisation.podman.extraPackages = [ + pkgs.iptables + ] + ++ lib.optional config.networking.nftables.enable pkgs.nftables; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration containersConf.settings = { - network.network_backend = "netavark"; + network = { + network_backend = "netavark"; + firewall_driver = lib.mkIf config.networking.nftables.enable "nftables"; + }; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index dd3a6ce44680..4d53cecada38 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -8,7 +8,7 @@ nodejs, s, melpaBuild, - copilot-language-server-fhs, + copilot-language-server, }: melpaBuild (finalAttrs: { pname = "copilot"; @@ -26,7 +26,7 @@ melpaBuild (finalAttrs: { postPatch = '' substituteInPlace copilot.el \ --replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \ - "defcustom copilot-server-executable \"${lib.getExe copilot-language-server-fhs}\"" + "defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\"" ''; packageRequires = [ diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 936ed34a04f6..e9f2e4700474 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6181,6 +6181,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + hlargs-nvim = buildVimPlugin { + pname = "hlargs.nvim"; + version = "2025-06-16"; + src = fetchFromGitHub { + owner = "m-demare"; + repo = "hlargs.nvim"; + rev = "ce8d705866dae44513ff48613d5e37e4da524d70"; + sha256 = "03h0hx2jgr9ac4sa8gwz8q7kxsr2h67c7jin04maih0sszi2hiiw"; + }; + meta.homepage = "https://github.com/m-demare/hlargs.nvim/"; + meta.hydraPlatforms = [ ]; + }; + hlchunk-nvim = buildVimPlugin { pname = "hlchunk.nvim"; version = "2025-05-06"; @@ -21024,6 +21037,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-textobj-line = buildVimPlugin { + pname = "vim-textobj-line"; + version = "2021-09-27"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-textobj-line"; + rev = "1a6780d29adcf7e464e8ddbcd0be0a9df1a37339"; + sha256 = "0di9y3nbb9raj0lj7d76cjic4vs1msrqk3gzsl3r7b1qr0y3mdw7"; + }; + meta.homepage = "https://github.com/kana/vim-textobj-line/"; + meta.hydraPlatforms = [ ]; + }; + vim-textobj-multiblock = buildVimPlugin { pname = "vim-textobj-multiblock"; version = "2014-06-02"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 027432079d70..f4a77493ab62 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3947,6 +3947,13 @@ assertNoAdditions { }; }); + vim-textobj-line = super.vim-textobj-line.overrideAttrs (old: { + dependencies = [ self.vim-textobj-user ]; + meta = old.meta // { + maintainers = with lib.maintainers; [ llakala ]; + }; + }); + vim-tpipeline = super.vim-tpipeline.overrideAttrs { # Requires global variable nvimSkipModules = "tpipeline.main"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a72fe0145a46..5eb5b50e5b95 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -473,6 +473,7 @@ https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, https://github.com/pimalaya/himalaya-vim/,, +https://github.com/m-demare/hlargs.nvim/,HEAD, https://github.com/shellRaining/hlchunk.nvim/,HEAD, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, @@ -1614,6 +1615,7 @@ https://github.com/glts/vim-textobj-comment/,, https://github.com/kana/vim-textobj-entire/,, https://github.com/kana/vim-textobj-function/,, https://github.com/gibiansky/vim-textobj-haskell/,, +https://github.com/kana/vim-textobj-line/,HEAD, https://github.com/osyo-manga/vim-textobj-multiblock/,, https://github.com/kana/vim-textobj-user/,, https://github.com/Julian/vim-textobj-variable-segment/,, diff --git a/pkgs/applications/video/mpv/scripts/skipsilence.nix b/pkgs/applications/video/mpv/scripts/skipsilence.nix index 7b672fa25ec3..b872bd8ff478 100644 --- a/pkgs/applications/video/mpv/scripts/skipsilence.nix +++ b/pkgs/applications/video/mpv/scripts/skipsilence.nix @@ -7,13 +7,13 @@ buildLua { pname = "mpv-skipsilence"; - version = "0-unstable-2025-08-03"; + version = "0-unstable-2025-09-06"; src = fetchFromGitHub { owner = "ferreum"; repo = "mpv-skipsilence"; - rev = "42e511c52c68c1aa9678e18caea41e43eee9149b"; - hash = "sha256-+sOMWFFumJUk5gFE1iCTvWub3PWzYOkulXJLCGS4fYA="; + rev = "75e1334e513682f0ece6790c614c1fcbd82257cc"; + hash = "sha256-XmrVZRJAQctIiuznw/fQzs+9+QKOyTnJI2JOEWBWnVA="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index d476179ddea4..1e10e3c9329f 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZIa0peLluZ0AVT0f6bMW+bRCIxMRUVlN798PE4iHRAw="; + hash = "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/biplanes-revival/package.nix b/pkgs/by-name/bi/biplanes-revival/package.nix index a666de6ec8b3..4a04c5e35df2 100644 --- a/pkgs/by-name/bi/biplanes-revival/package.nix +++ b/pkgs/by-name/bi/biplanes-revival/package.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/regular-dev/biplanes-revival/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/bl/bluejay/package.nix b/pkgs/by-name/bl/bluejay/package.nix index f033f62213e8..939d348ae361 100644 --- a/pkgs/by-name/bl/bluejay/package.nix +++ b/pkgs/by-name/bl/bluejay/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/EbonJaeger/bluejay/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index e2ba148501b9..1e1c00c11019 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -1,71 +1,46 @@ { lib, stdenvNoCC, - buildFHSEnv, + makeWrapper, fetchzip, nix-update-script, + nodejs, + + testers, }: - -let - arch = - { - aarch64-darwin = "arm64"; - aarch64-linux = "arm64"; - x86_64-darwin = "x64"; - x86_64-linux = "x64"; - } - ."${stdenvNoCC.hostPlatform.system}" - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - os = - { - aarch64-darwin = "darwin"; - aarch64-linux = "linux"; - x86_64-darwin = "darwin"; - x86_64-linux = "linux"; - } - ."${stdenvNoCC.hostPlatform.system}" - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - - executableName = "copilot-language-server"; - fhs = - { package }: - buildFHSEnv { - name = package.meta.mainProgram; - version = package.version; - targetPkgs = pkgs: [ pkgs.stdenv.cc.cc.lib ]; - runScript = lib.getExe package; - - meta = package.meta // { - description = - package.meta.description - + " (FHS-wrapped, expand package details for further information when to use it)"; - longDescription = "Use this version if you encounter an error like `Could not start dynamically linked executable` or `SyntaxError: Invalid or unexpected token` (see nixpkgs issue [391730](https://github.com/NixOS/nixpkgs/issues/391730))."; - }; - }; -in stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.357.0"; + version = "1.367.0"; src = fetchzip { - url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; - hash = "sha256-uVfQk26a/huFxsAtYKPfaJyYSWH17+8PqDh/HFecsdA="; + url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; + hash = "sha256-JQf6pQChQQOjJmdoL6DvLxajLfbEZi50p5FeJny0/Ss="; stripRoot = false; }; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + nodejs + ]; + installPhase = '' runHook preInstall - install "${os}-${arch}/${executableName}" -Dm755 -t "$out"/bin + mkdir -p $out/share/copilot-language-server + cp -r ./* $out/share/copilot-language-server/ + + makeWrapper ${lib.getExe nodejs} $out/bin/copilot-language-server \ + --add-flags $out/share/copilot-language-server/main.js runHook postInstall ''; - dontStrip = true; - passthru = { updateScript = nix-update-script { }; - fhs = fhs { package = finalAttrs.finalPackage; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { @@ -79,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { shortName = "GitHub Copilot License"; url = "https://github.com/customer-terms/github-copilot-product-specific-terms"; }; - mainProgram = executableName; + mainProgram = "copilot-language-server"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/he/hedgemodmanager/package.nix b/pkgs/by-name/he/hedgemodmanager/package.nix index de333ce11701..a8d82929ad7a 100644 --- a/pkgs/by-name/he/hedgemodmanager/package.nix +++ b/pkgs/by-name/he/hedgemodmanager/package.nix @@ -48,6 +48,6 @@ buildDotnetModule (finalAttrs: { changelog = "https://github.com/hedge-dev/HedgeModManager/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index d6b48f4b5811..73033c189629 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -84,7 +84,6 @@ buildGoModule (finalAttrs: { schneefux Br1ght0ne Frostman - federicoschonborn ]; }; }) diff --git a/pkgs/by-name/mi/minesector/package.nix b/pkgs/by-name/mi/minesector/package.nix index 28d8ff2ff85e..d9a39851e3b1 100644 --- a/pkgs/by-name/mi/minesector/package.nix +++ b/pkgs/by-name/mi/minesector/package.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/grassdne/minesector"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index 566a189e706c..a9e7decde0f5 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index 5f107524a7a6..adf9b1543aea 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -20,14 +20,14 @@ let pname = "pgadmin"; - version = "9.7"; - yarnHash = "sha256-c+qPT9E4a/xqgSmfE0OnzLP31k0dXC6b2fwXnBKZjuE="; + version = "9.8"; + yarnHash = "sha256-NvQlrDXn9sa4MpytFYPsC4bKO8Thx/MuqG8M6VIa2ig="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-UpeqEjaXm4mHVLpgJM1/pa2mhM6WbqW4A4U9u3RK+qw="; + hash = "sha256-gnVrMuxWV7lAol1gyONbhtuUL4EEOfOPkRUM2esMgi0="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/by-name/pg/pgadmin4/update.sh b/pkgs/by-name/pg/pgadmin4/update.sh index de6bfcf81988..3f66e5b9848b 100755 --- a/pkgs/by-name/pg/pgadmin4/update.sh +++ b/pkgs/by-name/pg/pgadmin4/update.sh @@ -63,7 +63,7 @@ fi printf "Done\n" popd -sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$YARN_HASH\"#" ${scriptDir}/default.nix +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$YARN_HASH\"#" ${scriptDir}/package.nix update-source-version pgadmin4 "$newest_version" --print-changes touch $TMPDIR/.done diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index e4f5afedd486..2f6f751288fc 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.29.3"; + version = "0.30.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-BthnDSSWlUSPTou0Vta0OYrjpbbWh/zIb2pnuWaxX5U="; + hash = "sha256-5Qlq7ImVe+YJ4EYNpaWW8CNU9XvwupngdwqiSjNXNT0="; }; - vendorHash = "sha256-J86NsLM7y87HBfjwuYb/djkSBtySKYatkTDMPI9KLU4="; + vendorHash = "sha256-tS48r/4dn5tJEOtEdVDdIJHIFQHKCbLx31F542rutbM="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 34170da7994f..27705ccd4366 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -25,7 +25,6 @@ extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki fuse-overlayfs, util-linuxMinimal, - iptables, iproute2, catatonit, gvproxy, @@ -43,7 +42,6 @@ let lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linuxMinimal - iptables iproute2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/su/surgescript/package.nix b/pkgs/by-name/su/surgescript/package.nix index 6d340cb3e347..55c7ffd67c25 100644 --- a/pkgs/by-name/su/surgescript/package.nix +++ b/pkgs/by-name/su/surgescript/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/alemart/surgescript/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix index 8dcc9dbdf6c7..852129c1be7b 100644 --- a/pkgs/by-name/xd/xdvdfs-cli/package.nix +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/antangelo/xdvdfs"; changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index 9d7bab15e3ef..e0009073167e 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-S9AekSlyB7+kUOpA1NWpOxtTGl5DhHOyoG4Y4HciciU="; + hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ="; }; strictDeps = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4bff79f95d7a..a485ab7196e7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -563,6 +563,16 @@ with haskellLib; # TODO(@sternenseemann): submit upstreamable patch resolving this # (this should be possible by also taking PREFIX into account). ./patches/git-annex-no-usr-prefix.patch + # https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/ + (pkgs.fetchpatch { + name = "git-annex-workaround-for-git-2.50_bis.patch"; + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=cf449837ea9ab7687d8a157f21cad31ddf5bbfb6"; + sha256 = "sha256-HmNJ85dLht5Hy85AUkjACnET9YLPP2MshYHsApUax+I="; + excludes = [ + "doc/**" + "CHANGELOG" + ]; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index 82ee9e63acdf..af42ebdb3891 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, hypothesis, hatchling, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonOlder, trustme, @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aiosmtpd hypothesis - pytest-asyncio + pytest-asyncio_0 pytestCheckHook trustme ]; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4322c9f6a58c..9c30cb312d48 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -52,16 +52,11 @@ buildPythonPackage rec { patchShebangs --build packaging/cli-doc/build.py SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"' - PYPROJECT=$(cat pyproject.toml) - if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then - echo "setuptools replace: ''${BASH_REMATCH[0]}" - echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml - else - exit 2 - fi - - substituteInPlace pyproject.toml \ - --replace-fail "wheel == 0.45.1" wheel + WHEEL_PATTERN='"wheel[0-9 <>=.,]+"' + echo "Patching pyproject.toml" + # print replaced patterns to stdout + sed -r -i -e 's/'"$SETUPTOOLS_PATTERN"'/"setuptools"/w /dev/stdout' \ + -e 's/'"$WHEEL_PATTERN"'/"wheel"/w /dev/stdout' pyproject.toml ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index fcf750f68395..56450df2cf62 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -6,6 +6,7 @@ expiringdict, fetchFromGitHub, hatchling, + importlib-resources, pem, publicsuffixlist, pyleri, @@ -39,6 +40,7 @@ buildPythonPackage rec { cryptography dnspython expiringdict + importlib-resources pem publicsuffixlist pyleri diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 592bb9495422..f3731730fe0f 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -14,7 +14,7 @@ let pname = "discord.py"; - version = "2.5.2"; + version = "2.6.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "Rapptz"; repo = "discord.py"; tag = "v${version}"; - hash = "sha256-xaZeOkfOhm1CL5ceu9g/Vlas4jpYoQDlGMEtACFY7PE="; + hash = "sha256-OEU09pdV2H/RxhvxWNIrg8mPh7yiv6ItKNwvhMKKhco="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 02a0a99047e3..25b6bfbbd2da 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -1,20 +1,20 @@ { lib, - appdirs, - build, buildPythonPackage, fetchFromGitHub, hatchling, hatch-vcs, - magicgui, - napari, # reverse dependency, for tests - pydantic, pythonOlder, - pytomlpp, pyyaml, + platformdirs, + build, + psygnal, + pydantic, + tomli-w, + tomli, rich, typer, - tomli-w, + napari, # reverse dependency, for tests }: buildPythonPackage rec { @@ -37,15 +37,17 @@ buildPythonPackage rec { ]; dependencies = [ - appdirs - build - magicgui - pydantic - pytomlpp pyyaml + platformdirs + build + psygnal + pydantic + tomli-w rich typer - tomli-w + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; pythonImportsCheck = [ "npe2" ]; @@ -54,11 +56,11 @@ buildPythonPackage rec { inherit napari; }; - meta = with lib; { + meta = { description = "Plugin system for napari (the image visualizer)"; homepage = "https://github.com/napari/npe2"; - license = licenses.bsd3; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SomeoneSerge ]; mainProgram = "npe2"; }; } diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 403c1f6b1e19..a42729ecf103 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.20250827"; + version = "1.0.2.20250906"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zXNmWSi7UWtSn2XKRodCOgoYhk/jk7eOgpe/oQzkLi0="; + hash = "sha256-q2NaPMku1mwTHdhvi8xnWNcrBBXL7KOxMYd5g8cnWGU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 275ba924f033..f4e972e0bf41 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "neovim"; repo = "pynvim"; tag = version; - hash = "sha256-/frugwYPS4rS4L6BRsmNb5pJI8xfLJvbr+PyOLx25a4="; + hash = "sha256-Wxn4g/lFelAJx0Zz2yaeXqX56xeOWUJNb2p8EiJgKE0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 79ad7395598e..26f1eb0d3323 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; tag = version; - hash = "sha256-91V2R29M/+kiosfkl5t6Y8qT/E041Wl1jhXCw3eQ7us="; + hash = "sha256-Dt6jN+0Ktv3CO88RmbgKCU8v3Oa10MnKjyJaePxXsaI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix index d70eb062280c..a196a5fc8c8b 100644 --- a/pkgs/development/python-modules/python-watcherclient/default.nix +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-watcherclient"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-watcherclient"; tag = version; - hash = "sha256-ZwMsLXqfRw/qJ71B/WcLkK9TGX77GLiy/nLE7kRD1Xg="; + hash = "sha256-ik//J9R9F4SCljexijcfXuSbDgDUNnMTqfpxIPd2Jm8="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index a56b71cd1979..1e344f595347 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-zaqarclient"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zaqarclient"; tag = version; - hash = "sha256-oqfD9+9xNYAEjCy3DvpHOF9PeRGnwo7flpFQCSnpt7g="; + hash = "sha256-JzZc2g1L7Z26EcAIj5TIkle4WPut9YH6+wDUo4nYjyw="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index 081015337342..f97e35143965 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.2.9"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-9eK5ZCkgku/ZDEGAdpXFvZZiFY5sorJ0r0Ko/HuYi1o="; + hash = "sha256-SvRcqkaTioYBclKZHimo6wbDg9y0vCgmLqCStdjCvKg="; }; build-system = [ diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 6b84988e90d4..f5cb35002b82 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -18,14 +18,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.8.2"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; tag = "v${version}"; - hash = "sha256-aHJ2AAoSm+5viEieAHzhU0EDyS+VQrMWlhm0CkV7/s4="; + hash = "sha256-E4VhLkBl4kFg/OpOc050jIPQHEznxjMp22PIxDhVMIU="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index a9d21294aafa..773f442194e3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.11.5"; + version = "1.11.6"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-lJM3qaCC0BSPirUFiTJGf2nK48TBYZ9KGVZuwPG7ZJI="; + hash = "sha256-zkmV6GrPf91X23hZXNaRjAF4Gmp0EXDmQJrbpZfg2D0="; }; postPatch = '' diff --git a/pkgs/kde/third-party/dynamic-workspaces/default.nix b/pkgs/kde/third-party/dynamic-workspaces/default.nix index 39837e11d96c..701c371dbf6e 100644 --- a/pkgs/kde/third-party/dynamic-workspaces/default.nix +++ b/pkgs/kde/third-party/dynamic-workspaces/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { description = "KWin script that automatically adds/removes virtual desktops"; homepage = "https://github.com/maurges/dynamic_workspaces"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2866dfb6b491..076f16967bb3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -640,6 +640,7 @@ mapAliases { colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19 colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 + copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07 copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22 cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2905fb01e77a..36397e97cbfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -343,8 +343,6 @@ with pkgs; coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - copilot-language-server-fhs = copilot-language-server.fhs; - cup-docker-noserver = cup-docker.override { withServer = false; }; dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };