diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a358e5d1007a..e983039c86cf 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -121,6 +121,8 @@ - `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives. +- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`. + - `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details. - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 1c2fdbd45d1d..f805920c5b87 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -40,6 +40,7 @@ let "flow" "fritz" "fritzbox" + "frr" "graphite" "idrac" "imap-mailstat" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/frr.nix b/nixos/modules/services/monitoring/prometheus/exporters/frr.nix new file mode 100644 index 000000000000..f2d3f5a031a6 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/frr.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.frr; + inherit (lib) + mkOption + types + concatStringsSep + concatMapStringsSep + ; +in +{ + port = 9342; + extraOpts = { + enabledCollectors = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "vrrp" ]; + description = '' + Collectors to enable. The collectors listed here are enabled in addition to the default ones. + ''; + }; + disabledCollectors = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "bfd" ]; + description = '' + Collectors to disable which are enabled by default. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = false; + RuntimeDirectory = "prometheus-frr-exporter"; + ExecStart = '' + ${lib.getExe pkgs.prometheus-frr-exporter} \ + ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ + ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5684b9085825..b49e0786f8e7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4329,8 +4329,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.12.0"; - hash = "sha256-go7H9DS1uJkzKowIQ2riSPOZRC737/Q0AWxzHIcBwg4="; + version = "1.13.0"; + hash = "sha256-bcj9p/hvzZ1z03D1dXxiyPmGndh3pD7seI5VYHWsvzU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index cf021ffa39bc..51a95bb88187 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.73.4"; + version = "0.73.5"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-LCo/SWfsmwbHhDZRf9PRN0FbB81js616YLUQG/Xtz2A="; + hash = "sha256-U3OqRfJUtH0rMdVypaoFF3Mi6oBvgt08ufnERPFVjC4="; }; - vendorHash = "sha256-5NTHIeKwruVMO7mBxcO+wglUslOJVFmxS2krDfdFAgg="; + vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI="; ldflags = [ "-s" diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix index d1a4a16c5366..7c4c0e008650 100644 --- a/pkgs/by-name/fr/freeipmi/package.nix +++ b/pkgs/by-name/fr/freeipmi/package.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { "ac_cv_file__dev_random=true" ]; + # Fix GCC 14 build. + # https://savannah.gnu.org/bugs/?65203 + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + doCheck = true; meta = { diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index fdd669ad983e..94e34d40423d 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.45.31740.9"; + version = "24.48.31907.7"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-b7mHIet+zgbS0JfJLKvt9+xILWeuA2rvTAeXetlFz/w="; + hash = "sha256-1YWPCVvG4jjEIDrkAfljhnXYlW0TTiPBCp2mhInuOfY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index ed76d8d2ebb4..387c2fa69c17 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kind"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-6WlkZ2dLMSSSlJAEshMpD5Ai0WVo1NzXAvpjEQd3JPA="; + hash = "sha256-1bU4vHC9bVz8TfO7knO1RYRxJUnwsXxZrRVnit5iQz0="; }; patches = [ diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index f149d318b121..8317d9da71bb 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.12.13"; + version = "2024.12.23"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-d+Fa+51GDstylKObteOdyfTopl86N+9NtYgAuU0JVRE="; + hash = "sha256-rA5ytakBe6EEtCWFRiAafO3DjovSByfgxjt3yCm0Jek="; }; build-system = with python3Packages; [ @@ -98,8 +98,8 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md"; license = licenses.unlicense; maintainers = with maintainers; [ - mkg20001 SuperSandro2000 + donteatoreo ]; mainProgram = "yt-dlp"; }; diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix index 69665583f2e4..5e5c6aa07fbc 100644 --- a/pkgs/by-name/yu/yubico-piv-tool/package.nix +++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.6.1"; + version = "2.7.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-RYT/kBlUfVkJG8RNELVQ5gyC+HDteD5xqaI479nsvKw="; + hash = "sha256-ow9SS7YGCZzSxds3WKsHx9/Vxloy9RqvDjpIBJUBSb0="; }; postPatch = '' diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix index 7e65a3f73a77..f041e3bce857 100644 --- a/pkgs/development/compilers/idris2/pack.nix +++ b/pkgs/development/compilers/idris2/pack.nix @@ -2,6 +2,12 @@ lib, idris2Packages, fetchFromGitHub, + clang, + chez, + gmp, + zsh, + makeBinaryWrapper, + stdenv, }: let inherit (idris2Packages) idris2Api buildIdris; @@ -42,6 +48,28 @@ let filepath ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildInputs = [ + gmp + clang + chez + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; + + postInstall = '' + wrapProgram $out/bin/pack \ + --suffix C_INCLUDE_PATH : ${lib.makeIncludePath [ gmp ]} \ + --suffix PATH : ${ + lib.makeBinPath ( + [ + clang + chez + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ] + ) + } + ''; + meta = { description = "An Idris2 Package Manager with Curated Package Collections"; mainProgram = "pack"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index df349d965743..38c8278b02a0 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, fetchFromGitHub, @@ -32,6 +31,7 @@ coreutils, git, wrapGAppsHook3, + zlib, }: { baseName ? "erlang", @@ -144,20 +144,12 @@ stdenv.mkDerivation ( [ ncurses opensslPackage + zlib ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages - ++ optional systemdSupport systemd - ++ optionals stdenv.hostPlatform.isDarwin ( - with pkgs.darwin.apple_sdk.frameworks; - [ - AGL - Carbon - Cocoa - WebKit - ] - ); + ++ optional systemdSupport systemd; debugInfo = enableDebugInfo; diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 41d56c34ac4b..7c7cc9a181d5 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "5.6.0"; + version = "5.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-UiLDJja+BwojDfnTFBoLJ6lfCjtpePTBSFvK2kekw8s="; + hash = "sha256-OYxGC5z3yzl+3nliIj5LiAePsvvFNmWkejThsoiQ9M4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 4c035988ae4b..f4da6a9f001c 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,49 +1,44 @@ { - stdenv, lib, - substituteAll, - fetchpatch, - fetchFromGitHub, + stdenv, buildPythonPackage, - pythonOlder, + fetchFromGitHub, + substituteAll, + fontconfig, + python, # build-system cython, setuptools, + + # nativeBuildInputs + SDL2, pkg-config, - # native dependencies - AppKit, - fontconfig, + # buildInputs freetype, libjpeg, libpng, libX11, portmidi, - SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, - - # tests - python, }: buildPythonPackage rec { pname = "pygame"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/${version}"; + owner = "pygame"; + repo = "pygame"; + tag = version; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-wNXcmH0IIuAOoomIdmhAPxe4TiEzes3Kq+Vth2r4/IA="; + hash = "sha256-paSDF0oPogq0g0HSDRagGu0OfsqIku6q4GGAMveGntk="; postFetch = "rm -rf $out/docs/reST"; }; @@ -76,13 +71,16 @@ buildPythonPackage rec { --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list ''; - nativeBuildInputs = [ + build-system = [ cython - pkg-config - SDL2 setuptools ]; + nativeBuildInputs = [ + SDL2 + pkg-config + ]; + buildInputs = [ freetype libjpeg @@ -93,7 +91,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + ]; preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py @@ -110,17 +108,20 @@ buildPythonPackage rec { export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk - ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 + ${python.interpreter} -m pygame.tests -v \ + --exclude opengl,timing \ + --time_out 300 runHook postCheck ''; pythonImportsCheck = [ "pygame" ]; - meta = with lib; { + meta = { description = "Python library for games"; homepage = "https://www.pygame.org/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ emilytrau ]; - platforms = platforms.unix; + changelog = "https://github.com/pygame/pygame/releases/tag/${src.tag}"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ emilytrau ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index ec338b8d807b..e23290e67681 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -14,21 +14,21 @@ let channels = { stable = { - version = "2.16.1"; + version = "2.17.3"; hash = { - x86_64-linux = "sha256-Mv+4xFuilzGU4ccDhc+Xhk5+cN8ixA8Api5yOJtQ2xY="; - x86_64-darwin = "sha256-it+XaD9Zn9mJQpS+sNN2dGVH0pGDyv/UnOPZQ2hnk0c="; - aarch64-linux = "sha256-HzS7NKnaglzctEFLnmMDV6P4BPNOqqCvT1Y6iO/+a2s="; - aarch64-darwin = "sha256-/tKiFVr06EkAOctrQ3n3GjFT7BryJfYVUkP/Tqw2IE4="; + x86_64-linux = "sha256-Okkw13WRIS9OWmS8rSnoVWlNROQhYlMIqmXRAdcgpGM="; + x86_64-darwin = "sha256-B+bqvQcVb5yMO66OImoNIRolRHqaFSZaBNSWAE5hHzE="; + aarch64-linux = "sha256-t94MGHh8a2cUtdv+vZ687sR47oMSvfOEvuJ6syUZ8SQ="; + aarch64-darwin = "sha256-nfg+tyYV2h+K1u+6DcG36juEelK/9viL657RP74/L8s="; }; }; mainline = { - version = "2.17.2"; + version = "2.18.1"; hash = { - x86_64-linux = "sha256-IhR6C9qwe6p4svdXR+BreFTeJb0MYOEgjIVE3JHH4XA="; - x86_64-darwin = "sha256-titICVmAfXP306Mj9vFHPGtA4T85BncHta944qyEPZI="; - aarch64-linux = "sha256-bvCBO4IcmCi5jgdNXsManCXErV4raKUoiwHLP9GHZhk="; - aarch64-darwin = "sha256-3pC5oryN8wDNHuaWJBkUUOLy3HbnCEIsLXbzzuwfuPY="; + x86_64-linux = "sha256-nZZx0QD6lpg/+uBEYmFvO16Y80CscAovSuq6ws5y+Xo="; + x86_64-darwin = "sha256-CD/s8C1RcU2cF6MRsiFwIDcyYS9Ef4eEo1h1ZRPRcYI="; + aarch64-linux = "sha256-G2wpfyCXAx5j/VAFXLeElq9zfheaScU/sNheu6EosqU="; + aarch64-darwin = "sha256-cgEGZFfNph25LgXpZ+FReZdBfGFLjteWqNY2WGQdPTM="; }; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f9780d093da..f15d0ec2bb3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11722,7 +11722,6 @@ self: super: with self; { pygal = callPackage ../development/python-modules/pygal { }; pygame = callPackage ../development/python-modules/pygame { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; SDL2_image = pkgs.SDL2_image_2_0; };