Merge pull request #163 from nix-community/rust-2024

Update to Rust 2024

Author: Mic92

.cargo/config renamed to .cargo/config.toml

@@ -4,7 +4,4 @@ rustflags = ["-C", "relocation-model=pie", "-Z", "plt=yes"]
 [target.'cfg(target_arch = "aarch64")']
 rustflags = [
 	"-C", "relocation-model=pie", "-Z", "plt=yes",
-
-	# <https://github.com/rust-lang/rust/issues/109064> :/
-	"-C", "target-feature=-outline-atomics",
 ]

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "nix-ld"
 version = "2.0.4"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "nix-ld"
@@ -11,21 +11,24 @@ test = false
 name = "tests"
 
 [dependencies]
-cfg-match = "0.2.1"
-constcat = "0.6.1"
-default-env = "0.1.1"
 embedded-io = "0.6.1"
-goblin = { version = "0.9.3", default-features = false, features = ["elf32", "elf64"] }
+goblin = { version = "0.9.3", default-features = false, features = [
+    "elf32",
+    "elf64",
+] }
 heapless = "0.8.0"
-linux-raw-sys = { version = "0.9.4", default-features = false, features = ["no_std", "general", "errno"] }
+linux-raw-sys = { version = "0.9.4", default-features = false, features = [
+    "no_std",
+    "general",
+    "errno",
+] }
 log = "0.4.27"
 
 [build-dependencies]
 cc = "1.2.25"
 
 [dev-dependencies]
 cc = "1.2.25"
-lazy_static = "1.5.0"
 rstest = { version = "0.25.0", default-features = false }
 tempfile = "3.20.0"
 

Cargo.toml

@@ -1,8 +1,8 @@
 {
+  lib,
   stdenv,
   pkgs,
   rustPlatform,
-  nix-gitignore,
   enableClippy ? false,
 }:
 
@@ -24,7 +24,17 @@ let
 
     cargoLock.lockFile = ./Cargo.lock;
 
-    src = nix-gitignore.gitignoreSource [ ] ./.;
+    src = lib.fileset.toSource {
+      root = ./.;
+      fileset = lib.fileset.unions [
+        ./src
+        ./Cargo.toml
+        ./Cargo.lock
+        ./build.rs
+        ./vendor
+        ./tests
+      ];
+    };
 
     hardeningDisable = [ "stackprotector" ];