From 4848711568852e98e3452bcb77ad8b20e13626ea Mon Sep 17 00:00:00 2001 From: Fazzi Date: Sun, 11 May 2025 23:11:04 +0100 Subject: [PATCH 01/26] app2unit: init at 0-unstable-2025-05-09 --- pkgs/by-name/ap/app2unit/package.nix | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ap/app2unit/package.nix diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix new file mode 100644 index 000000000000..206426146251 --- /dev/null +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + dash, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "app2unit"; + version = "0-unstable-2025-05-09"; + + src = fetchFromGitHub { + owner = "Vladimir-csp"; + repo = "app2unit"; + rev = "7b9672a2dc16bdfbe7b7b7c27043529ca3bcb6ae"; + sha256 = "03dnx5v75530fwppfgpjl6xzzmdbk73ymrlix129d9n5sqrz9wgk"; + }; + + installPhase = '' + install -Dt $out/bin app2unit + ln -s $out/bin/app2unit $out/bin/app2unit-open + ''; + + dontPatchShebangs = true; + postFixup = '' + substituteInPlace $out/bin/app2unit \ + --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' + ''; + + meta = { + description = "Launches Desktop Entries as Systemd user units"; + homepage = "https://github.com/Vladimir-csp/app2unit"; + license = lib.licenses.gpl3; + mainProgram = "app2unit"; + maintainers = with lib.maintainers; [ fazzi ]; + platforms = lib.platforms.linux; + }; +} From fbd42376f9654be0625a798666064bd7b4190160 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 30 May 2025 22:27:27 +0200 Subject: [PATCH 02/26] nixos/jenkins: Make use of mkEnableOption Signed-off-by: Felix Singer --- .../services/continuous-integration/jenkins/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c76aac1fa7de..017608bbd1a6 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -11,13 +11,7 @@ in { options = { services.jenkins = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable the jenkins continuous integration server. - ''; - }; + enable = lib.mkEnableOption "Jenkins, a continuous integration server"; user = lib.mkOption { default = "jenkins"; From 131d83ea6a2459b24c93faaaad24d6613260e7ef Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 30 May 2025 22:37:11 +0200 Subject: [PATCH 03/26] nixos/jenkins: Introduce and make use of javaPackage option Signed-off-by: Felix Singer --- .../services/continuous-integration/jenkins/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 017608bbd1a6..f9bb85446784 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -83,6 +83,8 @@ in package = lib.mkPackageOption pkgs "jenkins" { }; + javaPackage = lib.mkPackageOption pkgs "jdk17" { }; + packages = lib.mkOption { default = [ pkgs.stdenv @@ -233,7 +235,7 @@ in # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' - ${pkgs.jdk17}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${cfg.javaPackage}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ -Djava.awt.headless=true \ From d1f0807db5ba3d1229917c338009ababb6463cac Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 30 May 2025 23:06:36 +0200 Subject: [PATCH 04/26] nixos/jenkins: Bump Java version to 21 Java 17 goes EOL in September 2026 and Jenkins already supports Java 21. So bump the Java version to 21. Signed-off-by: Felix Singer --- .../services/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index f9bb85446784..96ded1e4c765 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -83,13 +83,13 @@ in package = lib.mkPackageOption pkgs "jenkins" { }; - javaPackage = lib.mkPackageOption pkgs "jdk17" { }; + javaPackage = lib.mkPackageOption pkgs "jdk21" { }; packages = lib.mkOption { default = [ pkgs.stdenv pkgs.git - pkgs.jdk17 + pkgs.jdk21 config.programs.ssh.package pkgs.nix ]; From bd8e3683cb1151859407e02eac0a97c0302e44fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Jun 2025 15:14:46 +0000 Subject: [PATCH 05/26] c3c: 0.7.1 -> 0.7.2 --- pkgs/by-name/c3/c3c/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 28253a6300da..b2c9d6e2d78e 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -19,13 +19,13 @@ in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c${optionalString debug "-debug"}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU="; + hash = "sha256-/S2rcZZe441b1sbiJDH1rnxT/mEP1694d5L8MIV6QQc="; }; cmakeBuildType = if debug then "Debug" else "Release"; From 006f78adc7d07ea02040d701b656aa69434abd4c Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Tue, 3 Jun 2025 09:35:33 +0200 Subject: [PATCH 06/26] roslyn-ls: 5.0.0-1.25263.3 -> 5.0.0-1.25266.2 --- pkgs/by-name/ro/roslyn-ls/deps.json | 12 ++++++------ pkgs/by-name/ro/roslyn-ls/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index c6dee3bbd21d..728f6b4653fe 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -193,15 +193,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25255.5", - "hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg" + "version": "9.0.0-beta.25263.2", + "hash": "sha256-mFVYybJiMi58vu+hT4VfXgWCWAXGeKxI7OwUQi2FO/A=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25263.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25263.2.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25255.5", - "hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg" + "version": "9.0.0-beta.25263.2", + "hash": "sha256-J86joC1OMlnjMppEBf9GwEbc0IdVJ/XjshBiZunH/EU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25263.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25263.2.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 4c45c67694c9..60c5cb3b1360 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.78.15"; + vsVersion = "2.80.16"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-Lim2f2//NFiMrZzvpREMlk6/5NWatVTiQrciAAxIiLY="; + hash = "sha256-4kFu0bxbLZ31ifGluSrN9sN5EwzLg3bVHnh9iB9TGpA="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.0.0-1.25263.3"; + version = "5.0.0-1.25266.2"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 88e29e8afdc74dff2b91c7ff47d9e772a5a3bb63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 12:00:10 +0000 Subject: [PATCH 07/26] python3Packages.pylamarzocco: 2.0.7 -> 2.0.8 --- pkgs/development/python-modules/pylamarzocco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index 378343d7fb02..26f5ed6cdcaa 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.7"; + version = "2.0.8"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-IFac66zBGvRASXJDa/Y6F3BxZhRD9tG8yAB2l2IsDVk="; + hash = "sha256-Fsxs3ugjzU9l3SlxqKs+Bej34kRn2mKrwzCZ94P2UGo="; }; build-system = [ setuptools ]; From 05482c6b799344b813a4b55dd6ebb402c61b28b7 Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 3 Jun 2025 17:56:12 -0400 Subject: [PATCH 08/26] glibc: allow easier overriding of linux headers package Before this change, one would have to `callPackage` `common.nix` manually, but now this can be done via `glibc.override`. --- pkgs/development/libraries/glibc/common.nix | 1 + pkgs/development/libraries/glibc/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5117d420463b..18e7d84477f7 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -260,6 +260,7 @@ stdenv.mkDerivation ( // (removeAttrs args [ "withLinuxHeaders" + "linuxHeaders" "withGd" "enableCET" "postInstall" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index d165cb8fff62..fc76ebe9ae05 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -3,6 +3,7 @@ stdenv, callPackage, withLinuxHeaders ? true, + linuxHeaders ? null, profilingLibraries ? false, withGd ? false, enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false, @@ -19,7 +20,7 @@ let ]; in -(callPackage ./common.nix { inherit stdenv; } { +(callPackage ./common.nix { inherit stdenv linuxHeaders; } { inherit withLinuxHeaders withGd From 1e422c37983d81e275d9b005b2791dafc61f9530 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 5 Jun 2025 23:37:43 +0200 Subject: [PATCH 09/26] palemoon-bin: 33.7.1 -> 33.7.2 https://www.palemoon.org/releasenotes.shtml#v33.7.2 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 5defd3f14dd5..476f8c8d9dbd 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.7.1"; + version = "33.7.2"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU="; + hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE="; + hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q="; }; }; From f51e34cc06c5c9be3f5e1e232d6994c3ab3a8a43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 01:36:22 +0000 Subject: [PATCH 10/26] kodiPackages.controller-topology-project: 1.0.2 -> 1.0.3 --- .../video/kodi/addons/controller-topology-project/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index a76afe010f3b..3c06a8d40ff8 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -8,13 +8,13 @@ let drv = stdenv.mkDerivation rec { pname = "controller-topology-project"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; rev = "v${version}"; - sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg="; + sha256 = "sha256-KHM4DAF6xLLlxF19R4UKfVMbLsmniuxy/C4STcL0IHQ="; }; postPatch = '' From ef984d1859b1ba6d35d5813dba26d59aee22c3c9 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Fri, 6 Jun 2025 15:35:10 +0300 Subject: [PATCH 11/26] teleport_16: 16.5.10 -> 16.5.11 Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.11 Diff: https://github.com/gravitational/teleport/compare/v16.5.10...v16.5.11 --- pkgs/by-name/te/teleport_16/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 8011f843ac44..e33ad9171a3a 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -2,9 +2,9 @@ teleport, }: teleport.override { - version = "16.5.10"; - hash = "sha256-i+2IK+X0Opyv2tQPpj2XhY64aQGdbylS/C7LsTykuXI="; - vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I="; + version = "16.5.11"; + hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s="; + vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI="; pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; } From eb1a6a6b85f8c23c7871613f1e2876274fa4e7d3 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 7 Jun 2025 00:47:16 +0800 Subject: [PATCH 12/26] debian-devscripts: 2.25.10 -> 2.25.14 --- pkgs/by-name/de/debian-devscripts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index ec27b1091aba..c37453bfbfe2 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.10"; + version = "2.25.14"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; - hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; + hash = "sha256-z95BOgGNYFvleqCv8e6B7Tl91xPzgQHkcxIg55maXvQ="; }; patches = [ From 871b5f6e4173711ce7666e51e0f82738ef111825 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Jun 2025 23:22:41 +0200 Subject: [PATCH 13/26] air-formatter: 0.6.0 -> 0.7.0 Diff: https://github.com/posit-dev/air/compare/refs/tags/0.6.0...refs/tags/0.7.0 Changelog: https://github.com/posit-dev/air/blob/0.7.0/CHANGELOG.md --- pkgs/by-name/ai/air-formatter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 82a0f0cb5f57..37c140ed3134 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -7,20 +7,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "air-formatter"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "posit-dev"; repo = "air"; tag = finalAttrs.version; - hash = "sha256-32/wdz4CFYM/PFVSQiqYErXGHHn2KJyreiQq48vQryY="; + hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE="; }; # Remove duplicate entries from cargo lock cargoPatches = [ ./cargo-lock.patch ]; useFetchCargoVendor = true; - cargoHash = "sha256-zPT47K8OGtprxQt3ZOF2xmf6IRV5rsKWXeaXlyBdVlE="; + cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck="; useNextest = true; From e3846c4216caf5ea1bcc1d7f69810186d22d1c0e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 May 2025 00:30:32 +0200 Subject: [PATCH 14/26] jenkins: Pin Java version to 21 Java 21 is the latest supported version by Jenkins. In order to not get any unexpected issues, pin the Java package to 21. Signed-off-by: Felix Singer --- pkgs/by-name/je/jenkins/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index c692d25eda70..1cb0d7d042c6 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -8,7 +8,7 @@ gnused, makeWrapper, nix, - openjdk, + jdk21, writeScript, nixosTests, jq, @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { cp "$src" "$out/webapps/jenkins.war" # Create the `jenkins-cli` command. - ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \ + ${jdk21}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \ && mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar" - makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ + makeWrapper "${jdk21}/bin/java" "$out/bin/jenkins-cli" \ --add-flags "-jar $out/share/jenkins-cli.jar" ''; From 3cf7d02c3eb8a375653a94929361d0b278daa46a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Jun 2025 12:20:08 +0200 Subject: [PATCH 15/26] php83: 8.3.21 -> 8.3.22 ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.22 --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 61b3554a3489..00325c5ccb63 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.21"; - hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ="; + version = "8.3.22"; + hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs="; } ); in From a202cd1d896471088835841e69d1b43977bef228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 12:35:59 +0000 Subject: [PATCH 16/26] debianutils: 5.22 -> 5.23.1 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index af377878b5f2..451fc60a76bd 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.22"; + version = "5.23.1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-TcPWQIgCSJWvJiePqEdRK2kju9xDpl6c9+VOagDsOhs="; + hash = "sha256-kQFl57kusyL3kGG9pJ8j2AsKBH4245xiPoDUYHjjv1g="; }; nativeBuildInputs = [ From 6ed2e62ab12e19922f2395d0eca0016d587aa725 Mon Sep 17 00:00:00 2001 From: vinylen Date: Sat, 7 Jun 2025 15:21:59 +0200 Subject: [PATCH 17/26] vimPlugins.checkmate-nvim: init at 2025-06-05 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f4b84f57180d..1f67f7cd764b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1960,6 +1960,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + checkmate-nvim = buildVimPlugin { + pname = "checkmate.nvim"; + version = "2025-06-05"; + src = fetchFromGitHub { + owner = "bngarren"; + repo = "checkmate.nvim"; + rev = "aabe87c58d3c30f45aadab4bef38536e9933cd4a"; + sha256 = "1qc3i32hkp59sha7rxbil1r76krlxgqqxn9wj7qlabc99bh11d3s"; + }; + meta.homepage = "https://github.com/bngarren/checkmate.nvim/"; + meta.hydraPlatforms = [ ]; + }; + ci_dark = buildVimPlugin { pname = "ci_dark"; version = "2022-03-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5f3dcded1e6f..384c01050c1e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -149,6 +149,7 @@ https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, https://github.com/ms-jpq/chadtree/,HEAD, https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, +https://github.com/bngarren/checkmate.nvim/,HEAD, https://github.com/yunlingz/ci_dark/,, https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, From f7a8cfb11990347e4df8a07ff4b918a4d5422468 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Jun 2025 15:38:27 +0200 Subject: [PATCH 18/26] nixos/lasuite-docs: Set collaboration server allowed origins (#413190) Without this, the collaboration server closes the websocket connection and activity within the doc is not synchronized. --- nixos/modules/services/web-apps/lasuite-docs.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix index ee9042037a1b..26808c2e7f55 100644 --- a/nixos/modules/services/web-apps/lasuite-docs.nix +++ b/nixos/modules/services/web-apps/lasuite-docs.nix @@ -176,6 +176,13 @@ in defaultText = lib.literalExpression "https://\${cfg.domain}"; description = "URL to the backend server base"; }; + + COLLABORATION_SERVER_ORIGIN = mkOption { + type = types.str; + default = "https://${cfg.domain}"; + defaultText = lib.literalExpression "https://\${cfg.domain}"; + description = "Origins allowed to connect to the collaboration server"; + }; }; }; default = { }; From 661ba9dd8c9c2f704b0682324e387adb6c551fa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 14:44:38 +0000 Subject: [PATCH 19/26] cubeb: 0-unstable-2025-05-29 -> 0-unstable-2025-06-03 --- pkgs/by-name/cu/cubeb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index f399ddd06a8b..29ea331d3885 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2025-05-29"; + version = "0-unstable-2025-06-03"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d"; - hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o="; + rev = "24c170b2346bb675456449f51406dac6442a84a7"; + hash = "sha256-/XTDaG48IFPFPrEcDd3IqX4bN+VbrpaHpzd/7N8J3a8="; }; outputs = [ From cd7501745a6a995a5f2b52ddb3114e52342e8d47 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 7 Jun 2025 10:46:55 -0400 Subject: [PATCH 20/26] gmnisrv: drop Fails to build with gcc 14, unmaintained upstream for 2 years. Link to upstream: https://git.sr.ht/~sircmpwn/gmnisrv --- pkgs/by-name/gm/gmnisrv/package.nix | 52 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/by-name/gm/gmnisrv/package.nix diff --git a/pkgs/by-name/gm/gmnisrv/package.nix b/pkgs/by-name/gm/gmnisrv/package.nix deleted file mode 100644 index 52e3feb60491..000000000000 --- a/pkgs/by-name/gm/gmnisrv/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - stdenv, - lib, - fetchFromSourcehut, - pkg-config, - openssl, - mailcap, - scdoc, -}: - -stdenv.mkDerivation rec { - pname = "gmnisrv"; - version = "1.0"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "gmnisrv"; - rev = version; - sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; - }; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=deprecated-declarations" - ]; - - postPatch = '' - substituteInPlace config.sh \ - --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" - ''; - - MIMEDB = "${mailcap}/etc/mime.types"; - nativeBuildInputs = [ - pkg-config - scdoc - ]; - buildInputs = [ - openssl - mailcap - ]; - - meta = with lib; { - description = "Simple Gemini protocol server"; - mainProgram = "gmnisrv"; - homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - bsima - jb55 - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0fa7d279038..5b792147b534 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 + gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07 gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; From 39db0181a66d4ba2c9660c96252953af24f28033 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Jun 2025 17:00:22 +0200 Subject: [PATCH 21/26] evcc: 0.204.1 -> 0.204.2 https://github.com/evcc-io/evcc/releases/tag/0.204.2 --- pkgs/by-name/ev/evcc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 16b22ef13917..f2671bcb5d73 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.204.1"; + version = "0.204.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-z3SwTBcCETIe2xPN9VU3mqYxd7npvrs44FkGQp56Y00="; + hash = "sha256-e0z1DUXEYbfSIcJBI2gpxY2hb0Tak3sFoYOi5WdsQPY="; }; vendorHash = "sha256-dBOZ5kYQxVTWB1CTTF3L+FIsuLnVQmA7Vjid7CdJbeo="; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-z64qzc3rDFByJ6Usubm9IIHfu4/i07O/zjtq2VjN7lk="; + hash = "sha256-Hyx9jUVF6aCPD89cxQx7dl77lCfDxcOIZVhSXx0+q0U="; }; nativeBuildInputs = [ From 21e21bf5c38cd2a07d0c1b0fa481925715f3cf1b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 Jun 2025 16:09:21 +0100 Subject: [PATCH 22/26] minimal-bootstrap: fix the eval (rewriteURL fallout) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix-instantiate -A minimal-bootstrap.bash --argstr system i686-linux error: … while calling the 'derivationStrict' builtin at :37:12: 36| 37| strict = derivationStrict drvAttrs; | ^ 38| … while evaluating derivation 'bash-5.2.15' whose name attribute is located at pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix:85:19 … while evaluating attribute 'PATH' of derivation 'bash-5.2.15' at pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix:108:11: 107| SHELL = "${bash_2_05}/bin/bash"; 108| PATH = lib.makeBinPath ( | ^ 109| (env.nativeBuildInputs or [ ]) (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: function 'anonymous lambda' called without required argument 'rewriteURL' at /tmp/nixpkgs/pkgs/build-support/fetchurl/boot.nix:5:1: 4| 5| { | ^ 6| rewriteURL, --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20f87db9d05..78cb8d022fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11270,6 +11270,7 @@ with pkgs; inherit lib config; fetchurl = import ../build-support/fetchurl/boot.nix { inherit (stdenv.buildPlatform) system; + inherit (config) rewriteURL; }; checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; }; } From ad3580bed9e150b11ac4026b5dd48f2eca7db234 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 7 Jun 2025 18:16:35 +0300 Subject: [PATCH 23/26] mesa: 25.1.2 -> 25.1.3 Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.1.2...mesa-25.1.3 Changelog: https://docs.mesa3d.org/relnotes/25.1.3.html --- pkgs/development/libraries/mesa/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 6d4cd1704617..0e7f52736bfe 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.1.2"; + version = "25.1.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-oE1QZyCBFdWCFq5T+Unf0GYpvCssVNOEQtPQgPbatQQ="; + hash = "sha256-BFncfkbpjVYO+7hYh5Ui6RACLq7/m6b8eIJ5B5lhq5Y="; }; meta = { From 47d5fd8b5184b799e5aa826fcfddf56bce6251df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 01:54:06 +0000 Subject: [PATCH 24/26] osinfo-db: 20250124 -> 20250606 --- pkgs/by-name/os/osinfo-db/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/osinfo-db/package.nix b/pkgs/by-name/os/osinfo-db/package.nix index 5e39efb7c50e..3105e22f841d 100644 --- a/pkgs/by-name/os/osinfo-db/package.nix +++ b/pkgs/by-name/os/osinfo-db/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20250124"; + version = "20250606"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - hash = "sha256-fKcX8JdaeYE1orOe790UNqCwaC4paFx/0B73+DolclA="; + hash = "sha256-mUCqR98pgHPFHc+KTcyFX0lKuGTCTNvaRr2JeVc1f+E="; }; nativeBuildInputs = [ From 8308f5ed6a8fe8b816e5668a58cf6ebc1974d163 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 15:57:10 +0000 Subject: [PATCH 25/26] postgresqlPackages.pg_net: 0.14.0 -> 0.15.1 --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index ce821a3b1901..5ac42c9bb499 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_net"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "supabase"; repo = "pg_net"; tag = "v${finalAttrs.version}"; - hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI="; + hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM="; }; buildInputs = [ curl ]; From cd64f1bd874fbae5beaf0fcb39e05c2da75b16e1 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 4 Jun 2025 20:55:03 +0530 Subject: [PATCH 26/26] treewide: migrate nixos modules to networking.hosts Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- nixos/lib/testing/network.nix | 23 +++++++++---------- .../services/cluster/kubernetes/pki.nix | 9 +++++--- .../virtualisation/google-compute-config.nix | 10 ++++---- .../virtualisation/nixos-containers.nix | 12 ++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 5caea2710754..2a188e480ecb 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -3,15 +3,15 @@ let inherit (lib) attrNames - concatMap + concatMapAttrs concatMapStrings - flip forEach head listToAttrs mkDefault mkOption nameValuePair + optionalAttrs optionalString range toLower @@ -91,23 +91,22 @@ let # interfaces, use the IP address corresponding to # the first interface (i.e. the first network in its # virtualisation.vlans option). - networking.extraHosts = flip concatMapStrings (attrNames nodes) ( - m': + networking.hosts = concatMapAttrs ( + name: config: let - config = nodes.${m'}; hostnames = optionalString ( config.networking.domain != null ) "${config.networking.hostName}.${config.networking.domain} " + "${config.networking.hostName}\n"; in - optionalString ( - config.networking.primaryIPAddress != "" - ) "${config.networking.primaryIPAddress} ${hostnames}" - + optionalString (config.networking.primaryIPv6Address != "") ( - "${config.networking.primaryIPv6Address} ${hostnames}" - ) - ); + optionalAttrs (config.networking.primaryIPAddress != "") { + "${config.networking.primaryIPAddress}" = [ hostnames ]; + } + // optionalAttrs (config.networking.primaryIPv6Address != "") { + "${config.networking.primaryIPv6Address}" = [ hostnames ]; + } + ) nodes; virtualisation.qemu.options = qemuOptions; boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules; diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index e4f8cf44e703..0453091fb9b6 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -365,9 +365,12 @@ in keyFile = mkDefault key; trustedCaFile = mkDefault caCert; }; - networking.extraHosts = mkIf (config.services.etcd.enable) '' - 127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local - ''; + networking.hosts = mkIf (config.services.etcd.enable) { + "127.0.0.1" = [ + "etcd.${top.addons.dns.clusterDomain}" + "etcd.local" + ]; + }; services.flannel = with cfg.certs.flannelClient; { kubeconfig = top.lib.mkKubeConfig "flannel" { diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 8f9e2b4f4075..3b6387a3a565 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -70,10 +70,12 @@ in # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; - # Configure default metadata hostnames - networking.extraHosts = '' - 169.254.169.254 metadata.google.internal metadata - ''; + networking.hosts = { + "169.254.169.254" = [ + "metadata.google.internal" + "metadata" + ]; + }; networking.timeServers = [ "metadata.google.internal" ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index e5a0d37d6a9c..1854a279285d 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -1084,14 +1084,10 @@ in ) config.containers; # Generate /etc/hosts entries for the containers. - networking.extraHosts = concatStrings ( - mapAttrsToList ( - name: cfg: - optionalString (cfg.localAddress != null) '' - ${head (splitString "/" cfg.localAddress)} ${name}.containers - '' - ) config.containers - ); + networking.hosts = lib.mapAttrs' (name: cfg: { + name = head (splitString "/" cfg.localAddress); + value = lib.optionals (cfg.localAddress != null) [ "${name}.containers" ]; + }) config.containers; networking.dhcpcd.denyInterfaces = [ "ve-*"