From 5db5be778ca54baacc2e7d30225f23b25d3d5de0 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 17 Sep 2025 14:11:08 +0200 Subject: [PATCH 1/3] Update wording around upstream Nix --- src/cli/subcommand/install/determinate.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cli/subcommand/install/determinate.rs b/src/cli/subcommand/install/determinate.rs index 99719c36f..514ddd27c 100644 --- a/src/cli/subcommand/install/determinate.rs +++ b/src/cli/subcommand/install/determinate.rs @@ -11,15 +11,15 @@ const PRE_PKG_SUGGEST: &str = "For a more robust Nix installation, use the Deter const INSTALL_DETERMINATE_NIX_PROMPT: &str = "\ Install Determinate Nix? -It has stable flakes, lazy trees, parallel evaluation, and more. +It offers stable flakes, lazy trees, parallel evaluation, a wide variety of developer experience improvements, and more. -Selecting 'no' will install upstream Nix, which comes from NixOS.org.\ +Selecting 'no' installs upstream Nix, which comes from nixos.org.\ "; const DETERMINATE_MSG_EXPLAINER: &str = "\ Determinate Nix is Determinate Systems' validated and secure downstream Nix distribution for enterprises. \ -It is the direct result of our work to ship meaningful user experience and reliability improvements to Nix. -It comes bundled with Determinate Nixd, a helpful daemon that automates some otherwise-unpleasant aspects of using Nix, such as garbage collection, and enables you to easily authenticate with FlakeHub. +This distribution enables us to ship user experience and reliability improvements to Nix on an accelerated schedule and independently of community decision-making processes. +It comes bundled with Determinate Nixd, a helpful daemon that automates some otherwise-unpleasant aspects of using Nix, such as configuration and garbage collection, and enables you to easily authenticate with FlakeHub. For more details: https://dtr.mn/determinate-nix\ "; @@ -52,7 +52,7 @@ pub(crate) async fn prompt_for_determinate( eprintln!(); eprintln!( - "{} The Determinate Nix Installer will stop distributing upstream Nix no sooner than {}.", + "{} The Determinate Nix Installer will stop distributing upstream Nix from the NixOS/nix GitHub repo on {}.", "Important:".bold().red().italic(), "January 1, 2026".italic() ); @@ -60,19 +60,19 @@ pub(crate) async fn prompt_for_determinate( eprintln!("\n{}", "Timeline".bold().underline()); eprintln!( - "* {}: we are changing the installer to default to Determinate Nix.", + "* {}: the installer will begin to default to Determinate Nix.", "November 10".bold() ); eprintln!( - " You can add the `{}` flag now to keep upstream Nix as the default.", + " After this date, you'll need to apply the `{}` flag to install upstream Nix as the default.", "--prefer-upstream-nix".italic() ); eprintln!( - "* {}: we are removing support for installing upstream Nix.", + "* {}: installing upstream Nix will no longer be supported.", "January 1".bold() ); eprintln!( - " The `{}` flag will not have an effect any longer.", + " The `{}` flag will no longer have any effect.", "--prefer-upstream-nix".italic() ); From 0eda7e79fa91599f30ca1aa515a6a82136afe4bd Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 17 Sep 2025 15:26:42 +0200 Subject: [PATCH 2/3] Italicize repo names --- src/cli/subcommand/install/determinate.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cli/subcommand/install/determinate.rs b/src/cli/subcommand/install/determinate.rs index 514ddd27c..784b0c803 100644 --- a/src/cli/subcommand/install/determinate.rs +++ b/src/cli/subcommand/install/determinate.rs @@ -52,7 +52,8 @@ pub(crate) async fn prompt_for_determinate( eprintln!(); eprintln!( - "{} The Determinate Nix Installer will stop distributing upstream Nix from the NixOS/nix GitHub repo on {}.", + "{} The Determinate Nix Installer will stop distributing upstream Nix from the {} GitHub repo on {}.", + "NixOS/nix".italic(), "Important:".bold().red().italic(), "January 1, 2026".italic() ); @@ -77,7 +78,8 @@ pub(crate) async fn prompt_for_determinate( ); eprintln!( - "\nThe DeterminateSystems/nix-installer-action GitHub Action is also affected.\n" + "\nThe {} GitHub Action is also affected.\n", + "DeterminateSystems/nix-installer-action".italic() ); eprintln!( "{} https://determinate.systems/blog/installer-dropping-upstream/", From 83bff9f22b0b1950bf7c3f6762ef7987918f6b51 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 17 Sep 2025 15:29:35 +0200 Subject: [PATCH 3/3] Fix interpolated text ordering --- src/cli/subcommand/install/determinate.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/subcommand/install/determinate.rs b/src/cli/subcommand/install/determinate.rs index 784b0c803..fc4f33207 100644 --- a/src/cli/subcommand/install/determinate.rs +++ b/src/cli/subcommand/install/determinate.rs @@ -53,9 +53,9 @@ pub(crate) async fn prompt_for_determinate( eprintln!(); eprintln!( "{} The Determinate Nix Installer will stop distributing upstream Nix from the {} GitHub repo on {}.", - "NixOS/nix".italic(), "Important:".bold().red().italic(), - "January 1, 2026".italic() + "NixOS/nix".italic(), + "January 1, 2026".bold() ); eprintln!("\n{}", "Timeline".bold().underline());