From 30d7d4049d8423fc36d34408b9858b2a1aec2484 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 27 Jun 2024 15:41:46 +0200 Subject: Add Linux 6.6 environment (without Rust) --- flake.nix | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 8eb47d7..99af264 100644 --- a/flake.nix +++ b/flake.nix @@ -117,15 +117,13 @@ devShells = { default = self.devShells."${system}".linux_6_8; - # Linux 6.8 - linux_6_8 = pkgs.mkShell { + # Linux 6.6 + linux_6_6 = pkgs.mkShell { packages = linuxLlvmDependencies - ++ (linuxRustDependencies "rust_1_74_1") ++ linuxCommonDependencies; - # To force LLVM build mode. This should create less problems - # with Rust interop. + # To force LLVM build mode. LLVM = "1"; # Disable all automatically applied hardening. The Linux @@ -133,7 +131,7 @@ NIX_HARDENING_ENABLE = ""; }; - linux_6_8_gcc = pkgs.mkShell { + linux_6_6_gcc = pkgs.mkShell { packages = linuxGccDependencies ++ linuxCommonDependencies; @@ -143,6 +141,24 @@ NIX_HARDENING_ENABLE = ""; }; + # Linux 6.8 + linux_6_8 = pkgs.mkShell { + packages = + linuxLlvmDependencies + ++ (linuxRustDependencies "rust_1_74_1") + ++ linuxCommonDependencies; + + # To force LLVM build mode. This should create less problems + # with Rust interop. + LLVM = "1"; + + # Disable all automatically applied hardening. The Linux + # kernel will take care of itself. + NIX_HARDENING_ENABLE = ""; + }; + + linux_6_8_gcc = self.devShells."${system}".linux_6_6_gcc; + # Linux 6.9 linux_6_9 = pkgs.mkShell { packages = -- cgit v1.3.1