yvan-sraka/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Nix 2.13.3 -> 2.15.0 (#428)

Browse source 
* Nix 2.13.3 -> 2.15.0

* Use new path for profile path addition

---------

Co-authored-by: Ana Hobden <operator@hoverbear.org>
This commit is contained in:
Graham Christensen 2023-05-01 13:15:21 -04:00 committed by GitHub
parent e4956fe3ea
commit 5a58cf20be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/action/common/configure_shell_profile.rs
View file

@ -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(

10
src/settings.rs
View file

@ -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))]