diff --git a/README.md b/README.md index f90e4fe3..18a7a4e5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ The `nix-installer` has successfully completed over 2,000,000 installs in a numb | WSL2 (x86_64 & aarch64) | ✓ (via [systemd]) | ✓ | Stable | | Podman Linux Containers | ✓ (via [systemd]) | ✓ | Stable | | Docker Containers | | ✓ | Stable | -| Linux (i686) | ✓ (via [systemd]) | ✓ | Unstable | > [!NOTE] > On **MacOS only**, removing users and/or groups may fail if there are no users who are logged in graphically. diff --git a/flake.nix b/flake.nix index b6649e79..3b9a4a79 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ , ... } @ inputs: let - supportedSystems = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; systemsSupportedByDeterminateNixd = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: (forSystem system f)); @@ -65,8 +65,6 @@ stable.rust-src ] ++ nixpkgs.lib.optionals (system == "x86_64-linux") [ targets.x86_64-unknown-linux-musl.stable.rust-std - ] ++ nixpkgs.lib.optionals (system == "i686-linux") [ - targets.i686-unknown-linux-musl.stable.rust-std ] ++ nixpkgs.lib.optionals (system == "aarch64-linux") [ targets.aarch64-unknown-linux-musl.stable.rust-std ]); @@ -149,12 +147,6 @@ (sharedAttrs // { CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; }); - } // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "i686-linux") rec { - default = nix-installer-static; - nix-installer-static = naerskLib.buildPackage - (sharedAttrs // { - CARGO_BUILD_TARGET = "i686-unknown-linux-musl"; - }); } // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "aarch64-linux") rec { default = nix-installer-static; nix-installer-static = naerskLib.buildPackage @@ -241,9 +233,6 @@ } // nixpkgs.lib.optionalAttrs (system == "x86_64-linux") { inherit (pkgs) nix-installer-static; default = pkgs.nix-installer-static; - } // nixpkgs.lib.optionalAttrs (system == "i686-linux") { - inherit (pkgs) nix-installer-static; - default = pkgs.nix-installer-static; } // nixpkgs.lib.optionalAttrs (system == "aarch64-linux") { inherit (pkgs) nix-installer-static; default = pkgs.nix-installer-static; diff --git a/nix-installer.sh b/nix-installer.sh index 486ed42a..7bb33611 100755 --- a/nix-installer.sh +++ b/nix-installer.sh @@ -213,10 +213,6 @@ get_architecture() { _cputype=x86_64 ;; - i686) - _cputype=i686 - ;; - *) err "unknown CPU type: $_cputype" ;; diff --git a/src/self_test.rs b/src/self_test.rs index be04dfa1..4c031e8e 100644 --- a/src/self_test.rs +++ b/src/self_test.rs @@ -93,8 +93,6 @@ impl Shell { #[cfg(all(target_os = "linux", target_arch = "x86_64"))] const SYSTEM: &str = "x86_64-linux"; - #[cfg(all(target_os = "linux", target_arch = "x86"))] - const SYSTEM: &str = "x86-linux"; #[cfg(all(target_os = "linux", target_arch = "aarch64"))] const SYSTEM: &str = "aarch64-linux"; #[cfg(all(target_os = "macos", target_arch = "x86_64"))] diff --git a/src/settings.rs b/src/settings.rs index 98537fbc..645df0ab 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -21,22 +21,14 @@ pub const NIX_TARBALL_PATH: &str = env!("NIX_INSTALLER_TARBALL_PATH"); /// in the resulting binary. pub const NIX_TARBALL: &[u8] = include_bytes!(env!("NIX_INSTALLER_TARBALL_PATH")); -#[cfg(all( - feature = "determinate-nix", - // Determinate Nix is available on everything but i686-linux, so set the bytes - not(all(target_os = "linux", target_arch = "x86")) -))] +#[cfg(feature = "determinate-nix")] /// The DETERMINATE_NIXD_BINARY_PATH environment variable should point to a target-appropriate /// static build of the Determinate Nixd binary. The contents are embedded in the resulting /// binary if the determinate-nix feature is turned on. pub const DETERMINATE_NIXD_BINARY: Option<&[u8]> = Some(include_bytes!(env!("DETERMINATE_NIXD_BINARY_PATH"))); -#[cfg(not(all( - feature = "determinate-nix", - // Determinate Nix is not available on i686-linux, so default it to None - not(all(target_os = "linux", target_arch = "x86")) -)))] +#[cfg(not(feature = "determinate-nix"))] /// The DETERMINATE_NIXD_BINARY_PATH environment variable should point to a target-appropriate /// static build of the Determinate Nixd binary. The contents are embedded in the resulting /// binary if the determinate-nix feature is turned on.