diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 331b6a919479..bfa65265ff8f 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -28,7 +28,7 @@ - Rustical migrates from `settings.http.host` and `settings.http.port` to `settings.http.bind` to support UNIX domain sockets as well as TCP sockets in one setting. -- `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute. +- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options. - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index c6ae9cb5c290..3076d94e83b9 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -50,6 +50,7 @@ in serviceConfig = { User = "sing-box"; Group = "sing-box"; + ConfigurationDirectory = "sing-box"; StateDirectory = "sing-box"; StateDirectoryMode = "0700"; RuntimeDirectory = "sing-box"; @@ -62,11 +63,15 @@ in chown --reference=/run/sing-box /run/sing-box/config.json ''; in - "+${script}"; - ExecStart = [ - "" - "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run" - ]; + lib.mkIf (cfg.settings != { }) "+${script}"; + ExecStart = + let + configDir = if cfg.settings != { } then "RUNTIME_DIRECTORY" else "CONFIGURATION_DIRECTORY"; + in + [ + "" + "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${${configDir}} run" + ]; }; # After= is specified by upstream requires = [ "network-online.target" ]; diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index cc890fa6fe69..820675d69a11 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -511,6 +511,31 @@ in }; }; }; + + empty_settings = + { ... }: + { + environment.etc."sing-box/config.json".text = builtins.toJSON { + inbounds = [ + { + type = "mixed"; + listen = "127.0.0.1"; + listen_port = 1088; + } + ]; + outbounds = [ + { + type = "direct"; + tag = "outbound:direct"; + } + ]; + }; + + services.sing-box = { + enable = true; + settings = { }; + }; + }; }; testScript = '' @@ -558,6 +583,9 @@ in fakeip.wait_for_unit("sing-box.service") fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'") fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'") + + with subtest("empty settings"): + empty_settings.wait_for_unit("sing-box.service") ''; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 037aa4efd193..a7f2ff8c2e91 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -905,13 +905,13 @@ "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58=" }, "metio_migadu": { - "hash": "sha256-q+7tTBMxqGlN6GyosnL70/qGtnwueWr1n+WI5BhnV4E=", + "hash": "sha256-F/eTAR0Du0NeRwH9m8hHzjIkx31xv8aRGNWuVrntxjQ=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2026.5.28", + "rev": "2026.6.18", "spdx": "0BSD", - "vendorHash": "sha256-ap1+0luy/9OQYNkYh1Aj+2LPMt7JdhKNn0ENrQMz3Uk=" + "vendorHash": "sha256-7/2iHstATnmeuvoIFIQw2Gi3QSIoXp5W69fnUYHipxc=" }, "mongey_kafka": { "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=", @@ -1139,11 +1139,11 @@ "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, "rootlyhq_rootly": { - "hash": "sha256-lGd864ugC5hfgN86ByEIJhjkMJVCPDNCKzoXx6pKjS0=", + "hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.16.0", + "rev": "v5.16.1", "spdx": "MPL-2.0", "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM=" }, diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index cd08c04e54c3..bdb05412f5eb 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,56 +1,56 @@ { "stable": { "linux": { - "version": "8.12.22", + "version": "8.12.24", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.22.x64.tar.gz", - "hash": "sha256-dec+oqixlPAbHYWqOBEBNB9IU8+Hfz2W4bm1y6/CbuM=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.24.x64.tar.gz", + "hash": "sha256-XzxS1fLuqA1gxddrMToeqO/MI1RT2s5ntaPQ3trxieI=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.22.arm64.tar.gz", - "hash": "sha256-qPQbEkXZs0/D/PgDbepUWm5po/Jg42YvxT0a2A+9mOk=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.24.arm64.tar.gz", + "hash": "sha256-Ebdezv4dZcT3035hf9PQsm1ahnJLXpxQWc4vVcUvjRg=" } } }, "darwin": { - "version": "8.12.22", + "version": "8.12.24", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.22-x86_64.zip", - "hash": "sha256-UR1urZS2WuTRrE3Tn3P/QaXKze6Wjrw0ZKEZc06Up8I=" + "url": "https://downloads.1password.com/mac/1Password-8.12.24-x86_64.zip", + "hash": "sha256-ofZhY3fsQ86N+ooQYwv6ZYEGE/fpx5nWvRLosgLIToI=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.22-aarch64.zip", - "hash": "sha256-Rbac0JcB2kbH6EfEGkuKwhaIW0Bgkhyw7olSjqe1euE=" + "url": "https://downloads.1password.com/mac/1Password-8.12.24-aarch64.zip", + "hash": "sha256-6mCv+YbIXqp57t/E/3Xv+lsWDjlUmoOHQS/hh+ma0WY=" } } } }, "beta": { "linux": { - "version": "8.12.24-24.BETA", + "version": "8.12.26-31.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.24-24.BETA.x64.tar.gz", - "hash": "sha256-2pdVY7X2qfSkxhSEIKod9+8zGsJ91r9rY3ODTjA4Bw8=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.26-31.BETA.x64.tar.gz", + "hash": "sha256-jlBvt2QEOgoisC1u8WY7cEXuCgk3wKcgQ1owu02rEio=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.24-24.BETA.arm64.tar.gz", - "hash": "sha256-HIFlrclzIHZftUtYKyMRX9s1UjS//sibTFyhi0NU4pE=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.26-31.BETA.arm64.tar.gz", + "hash": "sha256-jCI5G9xGdXChGW8388BMpMfyYwxzNxYNoV2sYBj8eV4=" } } }, "darwin": { - "version": "8.12.24-24.BETA", + "version": "8.12.26-31.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-x86_64.zip", - "hash": "sha256-KXgqH7bFCIMdmruqnCel7tCWa8YdwKtajFv/HGxb7AE=" + "url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-x86_64.zip", + "hash": "sha256-TBNhnCrKVZD1CVeBZ3dZ0TVeldrRotUpXEycFnvPfZo=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-aarch64.zip", - "hash": "sha256-u8uRcR7z65Hs0jq3dXz4HNgI4UH4+AJjtPBH2keUXZI=" + "url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-aarch64.zip", + "hash": "sha256-8+H9+Z7/uqlnMP2eUm7z493S6ZCEV0a5Sorw3AGTDCc=" } } } diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index fe671d65afe7..0ec6ac776fb1 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.498.0"; + version = "1.509.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-WpZKsi8OgF72cuAxSD4AHJBZkvRsPtveiG5AmaQH320="; + hash = "sha256-PY4pr9FHKHSJjNctq7bGlsZ1yvDM6IqbmfobI1WsDP0="; stripRoot = false; }; diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 32d2848178e1..3269e0d4882c 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, - fetchpatch, applyPatches, libuuid, bc, @@ -29,18 +28,23 @@ let "LOONGARCH64" else throw "Unsupported architecture"; + + # The toolchain definition uses different variables for different architectures. + targetPrefixes = lib.genAttrs [ "GCC_BIN" "GCC_${targetArch}_PREFIX" ] ( + lib.const stdenv.cc.targetPrefix + ); in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202602"; + version = "202605"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-TeMGpqVpXYRaeLjjg/aWHjtvfJpEfauA7Xg7dfe3XNg="; + hash = "sha256-sUqLocdX7lxN2pEdn84Cjh8pOzYqIeKqO144XhwKA30="; }; src = applyPatches { @@ -48,12 +52,6 @@ stdenv.mkDerivation (finalAttrs: { src = finalAttrs.srcWithVendoring; patches = [ - # pass targetPrefix as an env var - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; - }) - ./fix-cross-compilation-antlr-dlg.patch ]; @@ -106,10 +104,8 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; PYTHON_COMMAND = lib.getExe pythonEnv; - # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; - - }; + } + // targetPrefixes; hardeningDisable = [ "format" @@ -169,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { finalAttrsInner: let attrs = lib.toFunction attrsOrFun finalAttrsInner; - buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5"); + buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC"); in { inherit (finalAttrs) src; @@ -212,10 +208,7 @@ stdenv.mkDerivation (finalAttrs: { "env" ] // { - env = { - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; - } - // (attrs.env or { }); + env = targetPrefixes // (attrs.env or { }); } ); }; diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index a15b28d8faef..0ebcddd09f8e 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "getmail6"; - version = "6.19.12"; + version = "6.20.00"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${finalAttrs.version}"; - hash = "sha256-E+S6p12eqVDkzTv6RdeBpUJqPd4a4LMVoGaYOr2XKVo="; + hash = "sha256-f0IH0wI7Ue/HjvMIhBRGaMoO9BYDJoH/3fWRDsFD9+8="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index a0e9cb7965eb..6cb1b3f215fd 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -14,13 +14,13 @@ let pnpm = pnpm_10; - version = "0.63.15"; + version = "0.63.17"; src = fetchFromGitHub { owner = "pommee"; repo = "goaway"; tag = "v${version}"; - hash = "sha256-jtUAMCGdFmt89kchHdy9AnSMKu1rZeTLPcFIzqipOyw="; + hash = "sha256-cRx7XN8eaxqqI5+CWF93U4rgP8sH3HY4MPOA6VtqXK8="; }; goaway-web = stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index e515f6933a23..f8058a3ad70e 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -36,11 +36,11 @@ let # TODO: we could cut the `let` short here, but it would de-indent everything. unwrapped = stdenv.mkDerivation (finalAttrs: { pname = "knot-resolver_6"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz"; - hash = "sha256-uHMGGX90NrSQecYzNkvF33GjkyNvsl6fzn0ESAvHUY4="; + hash = "sha256-T0v+CfjXOw7n1nDdHJD18qwOkGD5sUeDVfJvJzdGrIA="; }; outputs = [ diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix index 9d1783fc9710..107ad7a7418e 100644 --- a/pkgs/by-name/li/libmirage/package.nix +++ b/pkgs/by-name/li/libmirage/package.nix @@ -6,12 +6,17 @@ vala, glib, libsndfile, + flac, + libogg, + libvorbis, + libopus, zlib, bzip2, xz, libsamplerate, + libgcrypt, + libgpg-error, intltool, - pcre, util-linux, libselinux, libsepol, @@ -37,10 +42,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib libsndfile + flac + libogg + libvorbis zlib bzip2 xz libsamplerate + libgcrypt + libgpg-error ]; nativeBuildInputs = [ @@ -52,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - pcre util-linux libselinux libsepol diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 33556adf0b98..d032717d2235 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "152.0-1", + "packageVersion": "152.0.1-2", "source": { - "rev": "152.0-1", - "hash": "sha256-T7ZRCmHx3jnFz7zzXS8btEepP9HRtKS8CWTehxdxIlM=" + "rev": "152.0.1-2", + "hash": "sha256-qr0eO+ucXguTb2QDhbsI9jjlx9fzfZVAI++87UfXcXE=" }, "firefox": { - "version": "152.0", - "hash": "sha512-LHrfNnAEBj7p8zheaS9hLY5cDBBmK/KUmWwRgAHkPewSyoy0/XDmeiWpA9v1rfg9IuSH8Evz+TDaKoFcgDeM6w==" + "version": "152.0.1", + "hash": "sha512-myWVFI7ZdwQOorIefW7OcPDlP6yblrMRWxE76nbq1sBCL26UsVQCg7Qw/tXo6aIndxpjV78W9W1TCn+ufcdVOg==" } } diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 0d1e0587e93c..ff61c516c295 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-AbiUHoNRaz2yL6pV5D1R0kmDGcV8+nmEa+EDDK6soe0="; + hash = "sha256-fHT6z0ZGDbhih3Qe1xdXmFqEAZNe+MfqEpD/5SjmTzk="; }; patches = [ diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix index 2d5c3a7f1422..fd6a2de90225 100644 --- a/pkgs/by-name/ni/nixfmt-tree/package.nix +++ b/pkgs/by-name/ni/nixfmt-tree/package.nix @@ -54,7 +54,7 @@ let '' allRuntimeInputs; }; in -treefmtWithConfig.overrideAttrs { +treefmtWithConfig.overrideAttrs (prevAttrs: { meta = { mainProgram = "treefmt"; description = "Official Nix formatter zero-setup starter using treefmt"; @@ -118,63 +118,65 @@ treefmtWithConfig.overrideAttrs { platforms = lib.platforms.all; }; - passthru.tests.simple = - runCommand "nixfmt-tree-test-simple" - { - nativeBuildInputs = [ - git - nixfmt-tree - writableTmpDirAsHomeHook - ]; - } - '' - git config --global user.email "nix-builder@nixos.org" - git config --global user.name "Nix Builder" + passthru = prevAttrs.passthru // { + tests.simple = + runCommand "nixfmt-tree-test-simple" + { + nativeBuildInputs = [ + git + nixfmt-tree + writableTmpDirAsHomeHook + ]; + } + '' + git config --global user.email "nix-builder@nixos.org" + git config --global user.name "Nix Builder" - cat > unformatted.nix < unformatted.nix < formatted.nix < formatted.nix <