Merge staging-next into staging (0bb1e251) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -1974,6 +1974,11 @@
		githubId = 13426784;
		name = "arcnmx";
		};
		arcstur = {
		github = "arcstur";
		githubId = 24514392;
		name = "arcstur";
		};
		arcticlimer = {
		email = "vinigm.nho@gmail.com";
		github = "viniciusmuller";

nixos/modules/services/security/canaille.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,6 @@ in

		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
		add_header X-Frame-Options "SAMEORIGIN" always;
		add_header X-XSS-Protection "1; mode=block" always;
		add_header X-Content-Type-Options "nosniff" always;
		add_header Referrer-Policy "same-origin" always;
		'';

pkgs/applications/editors/vscode/extensions/continue.continue/default.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
		sources = {
		"x86_64-linux" = {
		arch = "linux-x64";
		hash = "sha256-HXyY96fP9WjGWIe6ggQvygBnTEKRLUb5Qy18Vbjn160=";
		hash = "sha256-xk2maMEa07yFPbLiDGc9N6AbzxjTyfVNy/k7wWSMOHE=";
		};
		"x86_64-darwin" = {
		arch = "darwin-x64";
		hash = "sha256-2b04CLmbOxXsTzheEUacqZuBtA/rSZqRMLor0lT2gsU=";
		hash = "sha256-vcN419nPIrFOT8EaznFzThst6exfMGRrcmxyuQttxXg=";
		};
		"aarch64-linux" = {
		arch = "linux-arm64";
		hash = "sha256-/eKZ3bkZ2jFr8cTpNLO6t8wsRfLyhLkQHMrkTWtCWb8=";
		hash = "sha256-WoBfg35mGTIA8YZEk67iYNinF+Q/XEatiVr6x1HdvBk=";
		};
		"aarch64-darwin" = {
		arch = "darwin-arm64";
		hash = "sha256-JRVrV2yYSfuwuBcM2MDJZz5vNRYHG4n6I/GozgdDOgk=";
		hash = "sha256-e75eRgs0FTBnwFbH1vFxFc+aLK+O9TdxgXbV5YnsQLE=";
		};
		};
		in
		{
		name = "continue";
		publisher = "Continue";
		version = "1.1.76";
		version = "1.2.2";
		}
		// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
		nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -1123,8 +1123,8 @@ let
		mktplcRef = {
		name = "vscode-database-client2";
		publisher = "cweijan";
		version = "8.3.9";
		hash = "sha256-HryTXKCBF7i9zV3JELAM+NF3JW97XWCoSqTRPNr8yjQ=";
		version = "8.4.0";
		hash = "sha256-ly54itCpVdirU6GmK2GM7A749wt2SbHR/TidutTwCUE=";
		};
		meta = {
		description = "Database Client For Visual Studio Code";

pkgs/applications/networking/cluster/k3s/builder.nix

+23 −25

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ lib:
		ethtool,
		fetchFromGitHub,
		fetchgit,
		fetchpatch,
		fetchurl,
		fetchzip,
		findutils,
		@@ -55,7 +54,7 @@ lib:
		kmod,
		lib,
		libseccomp,
		makeWrapper,
		makeBinaryWrapper,
		nixosTests,
		overrideBundleAttrs ? { }, # An attrSet/function to override the `k3sBundle` derivation.
		overrideCniPluginsAttrs ? { }, # An attrSet/function to override the `k3sCNIPlugins` derivation.
		@@ -69,10 +68,11 @@ lib:
		socat,
		sqlite,
		stdenv,
		systemd,
		systemdMinimal,
		util-linuxMinimal,
		yq-go,
		zstd,
		versionCheckHook,
		}:

		# k3s is a kinda weird derivation. One of the main points of k3s is the
		@@ -328,7 +328,7 @@ let
		}).overrideAttrs
		overrideContainerdAttrs;
		in
		buildGoModule rec {
		buildGoModule (finalAttrs: {
		pname = "k3s";
		version = k3sVersion;
		pos = builtins.unsafeGetAttrPos "k3sVersion" attrs;
		@@ -345,15 +345,13 @@ buildGoModule rec {
		# Nix prefers dynamically linked binaries over static binary.

		substituteInPlace scripts/package-cli \
		--replace '"$LDFLAGS $STATIC" -o' \
		'"$LDFLAGS" -o' \
		--replace "STATIC=\"-extldflags \'-static\'\"" \
		""
		--replace-fail '"$LDFLAGS $STATIC" -o' \
		'"$LDFLAGS" -o'

		# Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate':

		substituteInPlace scripts/package-cli \
		--replace '"''${GO}" generate' \
		--replace-fail '"''${GO}" generate' \
		'GOFLAGS="" \
		GOOS="${pkgsBuildBuild.go.GOOS}" \
		GOARCH="${pkgsBuildBuild.go.GOARCH}" \
		@@ -381,7 +379,7 @@ buildGoModule rec {

		k3sKillallDeps = [
		bash
		systemd
		systemdMinimal
		procps
		coreutils
		gnugrep
		@@ -389,10 +387,10 @@ buildGoModule rec {
		gnused
		];

		buildInputs = k3sRuntimeDeps;
		buildInputs = finalAttrs.k3sRuntimeDeps;

		nativeBuildInputs = [
		makeWrapper
		makeBinaryWrapper
		rsync
		yq-go
		zstd
		@@ -439,23 +437,20 @@ buildGoModule rec {
		# wildcard to match the arm64 build too
		install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s
		wrapProgram $out/bin/k3s \
		--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
		--prefix PATH : ${lib.makeBinPath finalAttrs.k3sRuntimeDeps} \
		--prefix PATH : "$out/bin"
		ln -s $out/bin/k3s $out/bin/kubectl
		ln -s $out/bin/k3s $out/bin/crictl
		ln -s $out/bin/k3s $out/bin/ctr
		install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh
		wrapProgram $out/bin/k3s-killall.sh \
		--prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)}
		--prefix PATH : ${lib.makeBinPath (finalAttrs.k3sRuntimeDeps ++ finalAttrs.k3sKillallDeps)}
		runHook postInstall
		'';

		doInstallCheck = true;
		installCheckPhase = ''
		runHook preInstallCheck
		$out/bin/k3s --version \| grep -F "v${k3sVersion}" >/dev/null
		runHook postInstallCheck
		'';
		nativeInstallCheckInputs = [ versionCheckHook ];
		versionCheckProgramArg = "--version";

		passthru = {
		inherit airgap-images;
		@@ -464,13 +459,16 @@ buildGoModule rec {
		k3sRepo = k3sRepo;
		k3sRoot = k3sRoot;
		k3sBundle = k3sBundle;
		tests =
		let
		mkTests =
		version:
		let
		k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
		in
		lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
		tests = passthru.mkTests k3sVersion;
		in
		mkTests k3sVersion;
		updateScript = updateScript;
		imagesList = throw "k3s.imagesList was removed";
		airgapImages = throw "k3s.airgapImages was renamed to k3s.airgap-images";
		@@ -481,4 +479,4 @@ buildGoModule rec {
		// (lib.mapAttrs (_: value: fetchurl value) imagesVersions);

		meta = baseMeta;
		}
		})

Admin message