From 92bc5a4ef8d7add163d7fc5c707e3e35a327f7a4 Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Fri, 12 Apr 2024 07:49:02 -0600 Subject: [PATCH] experimental release: add a release so we can try out the installer --- .gitignore | 1 + README.md | 5 ++--- src/action/common/place_nix_configuration.rs | 5 ----- src/settings.rs | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 99ab088..7dc1bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ .ci-store .direnv result* +release-assets src/action/linux/selinux/nix.mod .idea diff --git a/README.md b/README.md index 7bd6f9c..c01b8eb 100644 --- a/README.md +++ b/README.md @@ -341,12 +341,11 @@ Here are some example `nix` package URLs including nix version, OS and architect Differing from the upstream [Nix](https://github.com/NixOS/nix) installer scripts: * In `nix.conf`: - + the `nix-command` and `flakes` features are enabled + + the `nix-command` feature is enabled + `bash-prompt-prefix` is set + `auto-optimise-store` is set to `true` (On Linux only) - * `extra-nix-path` is set to `nixpkgs=flake:nixpkgs` + * if flakes are enabled, `extra-nix-path` is set to `nixpkgs=flake:nixpkgs` * `max-jobs` is set to `auto` - * `upgrade-nix-store-path-url` is set to `https://install.lix.systems/lix-upgrade/stable/universal` * an installation receipt (for uninstalling) is stored at `/nix/receipt.json` as well as a copy of the install binary at `/nix/lix-installer` * `nix-channel --update` is not run, `~/.nix-channels` is not provisioned * `ssl-cert-file` is set in `/etc/nix/nix.conf` if the `ssl-cert-file` argument is used. diff --git a/src/action/common/place_nix_configuration.rs b/src/action/common/place_nix_configuration.rs index 820f937..403c49f 100644 --- a/src/action/common/place_nix_configuration.rs +++ b/src/action/common/place_nix_configuration.rs @@ -129,11 +129,6 @@ impl PlaceNixConfiguration { "extra-nix-path".to_string(), "nixpkgs=flake:nixpkgs".to_string(), ); - settings.insert( - "upgrade-nix-store-path-url".to_string(), - "https://install.lix.systems/lix-upgrade/stable/universal".to_string(), - ); - let create_directory = CreateDirectory::plan(NIX_CONF_FOLDER, None, None, 0o0755, force) .await .map_err(Self::error)?; diff --git a/src/settings.rs b/src/settings.rs index 8101ed9..b7d6985 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -11,21 +11,21 @@ use url::Url; pub const SCRATCH_DIR: &str = "/nix/temp-install-dir"; -/// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux x86_64 +/// Default [`lix_package_url`](CommonSettings::lix_package_url) for Linux x86_64 pub const NIX_X64_64_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.20.5/nix-2.20.5-x86_64-linux.tar.xz"; -/// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux x86 (32 bit) + "https://releases.web.lix.systems/lix/lix-2.90.0pre20240412/lix-2.90.0pre20240412-x86_64-linux.tar.xz"; +/// Default [`lix_package_url`](CommonSettings::lix_package_url) for Linux x86 (32 bit) pub const NIX_I686_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.20.5/nix-2.20.5-i686-linux.tar.xz"; -/// Default [`nix_package_url`](CommonSettings::nix_package_url) for Linux aarch64 + "https://releases.web.lix.systems/lix/lix-2.90.0pre20240412/lix-2.90.0pre20240412-i686-linux.tar.xz"; +/// Default [`lix_package_url`](CommonSettings::lix_package_url) for Linux aarch64 pub const NIX_AARCH64_LINUX_URL: &str = - "https://releases.nixos.org/nix/nix-2.20.5/nix-2.20.5-aarch64-linux.tar.xz"; -/// Default [`nix_package_url`](CommonSettings::nix_package_url) for Darwin x86_64 + "https://releases.web.lix.systems/lix/lix-2.90.0pre20240412/lix-2.90.0pre20240412-aarch64-linux.tar.xz"; +/// Default [`lix_package_url`](CommonSettings::lix_package_url) for Darwin x86_64 pub const NIX_X64_64_DARWIN_URL: &str = - "https://releases.nixos.org/nix/nix-2.20.5/nix-2.20.5-x86_64-darwin.tar.xz"; -/// Default [`nix_package_url`](CommonSettings::nix_package_url) for Darwin aarch64 + "https://releases.web.lix.systems/lix/lix-2.90.0pre20240412/lix-2.90.0pre20240412-x86_64-darwin.tar.xz"; +/// Default [`lix_package_url`](CommonSettings::lix_package_url) for Darwin aarch64 pub const NIX_AARCH64_DARWIN_URL: &str = - "https://releases.nixos.org/nix/nix-2.20.5/nix-2.20.5-aarch64-darwin.tar.xz"; + "https://releases.web.lix.systems/lix/lix-2.90.0pre20240412/lix-2.90.0pre20240412-aarch64-darwin.tar.xz"; #[derive(Debug, serde::Deserialize, serde::Serialize, Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "cli", derive(clap::ValueEnum))]