From 335f2be3c58c3f4fdee380b3a97658c27bcfc9db Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 16 Feb 2026 10:08:36 +0100 Subject: [PATCH] treewide: replace `lib.trivial.version` with `lib.trivial.release` includes a fix that will be reverted in staging --- pkgs/build-support/trivial-builders/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 36da837f31cf..2df2c74c47a9 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -774,7 +774,7 @@ rec { # turn off __structuredAttrs to unbreak substituteAll __structuredAttrs = false; pname = name; - inherit (lib.trivial) version; + version = lib.trivial.release + "pre-git"; inherit meta; inherit depsTargetTargetPropagated; inherit propagatedBuildInputs; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 1843c2507c85..74c64f080c2d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -5,7 +5,7 @@ let argsStdenv@{ name ? "stdenv", pname ? name, - version ? lib.trivial.version, + version ? lib.trivial.release + "pre-git", preHook ? "", initialPath,