From 5a58cf20bec1b34f62e11709a60ed60d2d640353 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 1 May 2023 13:15:21 -0400 Subject: [PATCH] Nix 2.13.3 -> 2.15.0 (#428) * Nix 2.13.3 -> 2.15.0 * Use new path for profile path addition --------- Co-authored-by: Ana Hobden --- src/action/common/configure_shell_profile.rs | 5 +---- src/settings.rs | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/action/common/configure_shell_profile.rs b/src/action/common/configure_shell_profile.rs index 4ae92d1..f552b0d 100644 --- a/src/action/common/configure_shell_profile.rs +++ b/src/action/common/configure_shell_profile.rs @@ -154,10 +154,7 @@ impl ConfigureShellProfile { let mut buf = "/nix/var/nix/profiles/default/bin\n".to_string(); // Actions runners operate as `runner` user by default if let Ok(Some(runner)) = User::from_name("runner") { - buf += &format!( - "/nix/var/nix/profiles/per-user/{}/profile/bin\n", - runner.name - ); + buf += &format!("/home/{}/.nix-profile/bin\n", runner.name); } create_or_insert_files.push( CreateOrInsertIntoFile::plan( diff --git a/src/settings.rs b/src/settings.rs index 138c030..6caa508 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -10,19 +10,19 @@ pub const SCRATCH_DIR: &str = "/nix/temp-install-dir"; /// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux x86_64 pub const NIX_X64_64_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-linux.tar.xz"; + "https://releases.nixos.org/nix/nix-2.15.0/nix-2.15.0-x86_64-linux.tar.xz"; /// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux x86 (32 bit) pub const NIX_I686_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-i686-linux.tar.xz"; + "https://releases.nixos.org/nix/nix-2.15.0/nix-2.15.0-i686-linux.tar.xz"; /// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux aarch64 pub const NIX_AARCH64_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-aarch64-linux.tar.xz"; + "https://releases.nixos.org/nix/nix-2.15.0/nix-2.15.0-aarch64-linux.tar.xz"; /// Default [`nix_package_url`](CommonSettings::nix_package_url) for Darwin x86_64 pub const NIX_X64_64_DARWIN_URL: &str = - "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-darwin.tar.xz"; + "https://releases.nixos.org/nix/nix-2.15.0/nix-2.15.0-x86_64-darwin.tar.xz"; /// Default [`nix_package_url`](CommonSettings::nix_package_url) for Darwin aarch64 pub const NIX_AARCH64_DARWIN_URL: &str = - "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-aarch64-darwin.tar.xz"; + "https://releases.nixos.org/nix/nix-2.15.0/nix-2.15.0-aarch64-darwin.tar.xz"; #[derive(Debug, serde::Deserialize, serde::Serialize, Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "cli", derive(clap::ValueEnum))]