nixos-install: set pname and version (#541933 )

nixos-enter: set pname and version (#541927 )
nixos-container: set pname and version (#541953 )
2026-07-25 18:10:37 +00:00 · 2026-07-25 16:04:35 +00:00 · 2026-07-25 16:03:25 +00:00 · 2026-07-25 16:02:39 +00:00 · 2026-07-25 16:02:02 +00:00 · 2026-07-25 12:45:23 +00:00
9 changed files with 37 additions and 9 deletions
--- a/pkgs/by-name/gr/grub2/package.nix
+++ b/pkgs/by-name/gr/grub2/package.nix
@@ -583,6 +583,13 @@ stdenv.mkDerivation rec {
      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ac1512b872af8567b408518a7efa01607a0219ae";
      hash = "sha256-deyp6Yatlgv86bYMt7WcWhKg8J6StDPUEy4UPHqJYIc=";
    })
+    # Required to build grub2_efi with GCC 16, or fails with "error: 'regparm'
+    # attribute ignored [-Werror=attributes]"
+    (fetchpatch {
+      name = "gcc16_make_regparm_attribute_more_conditional.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9922ed133c2c754ec9f37198da2b3e3e8a4fd5ff";
+      hash = "sha256-V2vffDxL/qQ14YN5scc3CFPBFBWvkh57dc5/hWd/6F4=";
+    })
  ];

  postPatch =
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -34,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    ./nix-store-date.patch
+
+    # GCC 16's unused variable analysis is more advanced than previous
+    # versions, and detects that these variables are unused.
+    # https://github.com/wolfcw/libfaketime/pull/528
+    (fetchpatch {
+      name = "libfaketime-silence-unused-variable-warning.patch";
+      url = "https://github.com/wolfcw/libfaketime/commit/712733e5f01e45372f3160cfdbcfd91520cb093d.patch";
+      hash = "sha256-Gu13gFhgvkncj8aowAnSRbHbUCctF5sakbX4uRwdy+A=";
+    })
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    (fetchpatch {
--- a/pkgs/by-name/ni/nixos-build-vms/package.nix
+++ b/pkgs/by-name/ni/nixos-build-vms/package.nix
@@ -2,9 +2,11 @@
  replaceVarsWith,
  runtimeShell,
  installShellFiles,
+  lib,
 }:
 replaceVarsWith {
-  name = "nixos-build-vms";
+  pname = "nixos-build-vms";
+  version = lib.trivial.release;

  src = ./nixos-build-vms.sh;

--- a/pkgs/by-name/ni/nixos-container/package.nix
+++ b/pkgs/by-name/ni/nixos-container/package.nix
@@ -8,9 +8,11 @@
  stateDirectory ? "/var/lib/nixos-containers",
  nixosTests,
  path,
+  lib,
 }:
 replaceVarsWith {
-  name = "nixos-container";
+  pname = "nixos-container";
+  version = lib.trivial.release;
  dir = "bin";
  isExecutable = true;
  src = ./nixos-container.pl;
--- a/pkgs/by-name/ni/nixos-enter/package.nix
+++ b/pkgs/by-name/ni/nixos-enter/package.nix
@@ -6,7 +6,8 @@
  util-linuxMinimal,
 }:
 replaceVarsWith {
-  name = "nixos-enter";
+  pname = "nixos-enter";
+  version = lib.trivial.release;
  src = ./nixos-enter.sh;

  replacements = {
--- a/pkgs/by-name/ni/nixos-install/package.nix
+++ b/pkgs/by-name/ni/nixos-install/package.nix
@@ -9,7 +9,9 @@
  nixosTests,
 }:
 replaceVarsWith {
-  name = "nixos-install";
+  pname = "nixos-install";
+  version = lib.trivial.release;
+
  src = ./nixos-install.sh;

  replacements = {
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,7 +16,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ruff";
-  version = "0.15.22";
+  version = "0.16.0";

  __structuredAttrs = true;

@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "astral-sh";
    repo = "ruff";
    tag = finalAttrs.version;
-    hash = "sha256-pa42J3M5iwSjfnuatqOOR9DEqzyVtdBbMk6JIRbu12Q=";
+    hash = "sha256-H9ZcqMzPiu2ACyzlYNStKHAX71u9FCTEYwpKqwJcg/E=";
  };

  cargoBuildFlags = [ "--package=ruff" ];

-  cargoHash = "sha256-jDm0pIrq09ETU+djMLsKSFZJzRx0lKSUx6kjJ4hAkvE=";
+  cargoHash = "sha256-T3bWSLScIXgXXoGaogTF1N+jG0yFhAqxbZxQE12mkR8=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/sc/scdoc/package.nix
+++ b/pkgs/by-name/sc/scdoc/package.nix
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "scdoc";
-  version = "1.11.4";
+  version = "1.11.5";

  src = fetchFromSourcehut {
    owner = "~sircmpwn";
    repo = "scdoc";
    rev = finalAttrs.version;
-    hash = "sha256-gldCHzLigeLKDFDcE3TYrNOEWoSt/uYIg9aTg6wwW54=";
+    hash = "sha256-Tjafa7m+YcUTryYHnW2EF0yaXPRc3uNzWdeEucCdEso=";
  };

  outputs = [
--- a/pkgs/by-name/to/toml11/package.nix
+++ b/pkgs/by-name/to/toml11/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
    cmake
  ];
  cmakeFlags = [
+    # GCC 16 warns that various uses of `fmt` in value.hpp are used
+    # uninitialized. This may be a true failure, but it does not seem like a
+    # major concern, so we silence it for now.
+    # https://github.com/ToruNiina/toml11/issues/313
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=maybe-uninitialized")
    (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" finalAttrs.finalPackage.doCheck)
  ];
  checkInputs = [
Author	SHA1	Message	Date
Sandro	bfb1407c0e	nixos-install: set pname and version (#541933 )	2026-07-25 16:04:35 +00:00
Sandro	8ae3eff700	nixos-enter: set pname and version (#541927 )	2026-07-25 16:03:25 +00:00
Sandro	a96ab25d1d	nixos-container: set pname and version (#541953 )	2026-07-25 16:02:39 +00:00
Sandro	44bed8fa8b	nixos-build-vms: set pname and version (#541955 )	2026-07-25 16:02:02 +00:00
Sandro	a051724bdf	libfaketime: add patch for gcc 16 (#537420 )	2026-07-25 12:45:23 +00:00
Sandro	815d4b5a60	grub2_efi: apply patch for gcc 16 (#537671 )	2026-07-25 12:44:07 +00:00
Sandro	9bd363e27a	toml11: make maybe-uninitialized non-fatal for gcc 16 (#537650 )	2026-07-25 12:42:18 +00:00
nixpkgs-ci[bot]	5a187f6052	Merge master into staging-nixos	2026-07-25 06:48:32 +00:00
nixpkgs-ci[bot]	a3a1e84bd9	Merge master into staging-nixos	2026-07-25 00:33:49 +00:00
Gaétan Lepage	e29345d5be	ruff: 0.15.22 -> 0.16.0 (#545026 )	2026-07-24 22:25:21 +00:00
Masum Reza	d13e8c8662	scdoc: 1.11.4 -> 1.11.5 (#539435 )	2026-07-24 19:44:57 +00:00
nixpkgs-ci[bot]	42351f6971	Merge master into staging-nixos	2026-07-24 18:31:46 +00:00
Jost Alemann	9eb9dda021	ruff: 0.15.22 -> 0.16.0 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.16.0 Diff: https://github.com/astral-sh/ruff/compare/0.15.22...0.16.0	2026-07-23 22:59:57 +02:00
klea	15f04744d9	nixos-container: set pname and version	2026-07-14 21:38:15 +00:00
klea	4b309135ab	nixos-build-vms: set pname and version	2026-07-14 21:36:38 +00:00
klea	1c34bdfe4c	nixos-install: set pname and version	2026-07-14 20:27:09 +00:00
klea	27ffce9d57	nixos-enter: set pname and version	2026-07-14 20:20:16 +00:00
R. Ryantm	6b905e28e3	scdoc: 1.11.4 -> 1.11.5	2026-07-08 00:34:26 +00:00
whispers	4a2acc3c76	toml11: make maybe-uninitialized non-fatal for gcc 16 GCC 16 flags various calls here as if they're uninitialized, but they appear (to me as a non-C++ expert) to be false positives. Accordingly, we make those non-fatal. This fixes the build on GCC 16.	2026-07-02 08:37:26 -04:00
whispers	5cc1bf9715	grub2_efi: apply patch for gcc 16 gcc 16 gains stricter analysis of whether attributes are ignored, leading to build failures when built with -Werror. we could silence the error, but this was fixed in a trivial commit upstream that is obviously correct, so we pull it in: https://cgit.git.savannah.gnu.org/cgit/grub.git/commit/?id=9922ed133c2c754ec9f37198da2b3e3e8a4fd5ff	2026-07-02 00:06:04 -04:00
whispers	2ce153e20d	libfaketime: add patch for gcc 16 gcc 16's unused variable analysis is more advanced than previous versions, and detects that some variables used in tests are unused. upstream patched this away, so we fetch their patch. alternatively, we could pass `-Wno-error=unused-but-set-variable` if that is preferred.	2026-07-01 09:15:30 -04:00