remove nix-ld-rs references

Author: Mic92

Cargo.lock

@@ -1,10 +1,10 @@
 [package]
-name = "nix-ld-rs"
-version = "0.1.0"
+name = "nix-ld"
+version = "2.0.0"
 edition = "2021"
 
 [[bin]]
-name = "nix-ld-rs"
+name = "nix-ld"
 test = false
 
 [[test]]

Cargo.toml

@@ -18,22 +18,22 @@
     lib = pkgs.lib;
   in {
     packages = rec {
-      nix-ld-rs = pkgs.callPackage ./package.nix {};
-      default = nix-ld-rs;
+      nix-ld = pkgs.callPackage ./package.nix {};
+      default = nix-ld;
     };
 
     checks = let
       nixosTests = import ./nixos-tests {
         inherit pkgs;
-        nix-ld-rs = self.packages.${system}.nix-ld-rs;
+        nix-ld = self.packages.${system}.nix-ld;
       };
       packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self.packages.${system};
       devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self.devShells.${system};
     in packages //
       devShells //
       # test driver is broken on i686-linux
       lib.optionalAttrs (system != "i686-linux") nixosTests // {
-      clippy = self.packages.${system}.nix-ld-rs.override {
+      clippy = self.packages.${system}.nix-ld.override {
         enableClippy = true;
       };
     };
@@ -58,7 +58,7 @@
     });
   }) // {
     overlays.default = final: prev: {
-      nix-ld-rs = final.callPackage ./package.nix { };
+      nix-ld = final.callPackage ./package.nix { };
     };
   };
 }

flake.nix

@@ -1,37 +1,37 @@
 {
   pkgs ? import ../nixpkgs.nix,
-  nix-ld-rs ? null,
+  nix-ld ? null,
 }: let
   inherit (pkgs) lib;
 
   nixosLib = import (pkgs.path + "/nixos/lib") {
     inherit pkgs lib;
   };
-  nix-ld-rs' = if nix-ld-rs != null then nix-ld-rs else pkgs.nix-ld-rs;
+  nix-ld' = if nix-ld != null then nix-ld else pkgs.nix-ld;
 in {
   basic = nixosLib.runTest {
     name = "basic";
     hostPkgs = pkgs;
     nodes.machine = { pkgs, ... }: {
       programs.nix-ld = {
         enable = true;
-        package = nix-ld-rs';
+        package = nix-ld';
       };
       environment.systemPackages = [
         (pkgs.runCommand "patched-hello" {} ''
           install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello
-          patchelf $out/bin/hello --set-interpreter $(cat ${nix-ld-rs'}/nix-support/ldpath)
+          patchelf $out/bin/hello --set-interpreter $(cat ${nix-ld'}/nix-support/ldpath)
         '')
       ];
     };
     testScript = ''
       start_all()
       machine.succeed("hello")
       machine.succeed("ls -la /run/current-system/sw/share/nix-ld/lib/ld.so >&2")
-      machine.succeed("$(< ${nix-ld-rs'}/nix-support/ldpath) --version")
+      machine.succeed("$(< ${nix-ld'}/nix-support/ldpath) --version")
 
       # test fallback if NIX_LD is not set
-      machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; $(< ${nix-ld-rs'}/nix-support/ldpath) $(which hello)")
+      machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; $(< ${nix-ld'}/nix-support/ldpath) $(which hello)")
     '';
   };
 }

nixos-tests/default.nix

@@ -19,8 +19,8 @@ let
     else
       "/lib";
 
-  nix-ld-rs = rustPlatform.buildRustPackage {
-    name = "nix-ld-rs";
+  nix-ld = rustPlatform.buildRustPackage {
+    name = "nix-ld";
 
     cargoLock.lockFile = ./Cargo.lock;
 
@@ -37,24 +37,23 @@ let
 
     postInstall = ''
       mkdir -p $out/libexec
-      ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld-rs
-      ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld
+      ln -s $out/bin/nix-ld $out/libexec/nix-ld
 
       mkdir -p $out/nix-support
 
       ldpath=${libDir}/$(basename ${stdenv.cc.bintools.dynamicLinker})
       echo "$ldpath" > $out/nix-support/ldpath
       mkdir -p $out/lib/tmpfiles.d/
       cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF
-        L+ $ldpath - - - - $out/libexec/nix-ld-rs
+        L+ $ldpath - - - - $out/libexec/nix-ld
       EOF
     '';
 
-    passthru.tests = import ./nixos-tests { inherit pkgs nix-ld-rs; };
+    passthru.tests = import ./nixos-tests { inherit pkgs nix-ld; };
   };
 in
 if enableClippy then
-  nix-ld-rs.overrideAttrs (oldAttrs: {
+  nix-ld.overrideAttrs (oldAttrs: {
     nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.clippy ];
     phases = [
       "unpackPhase"
@@ -67,4 +66,4 @@ if enableClippy then
     '';
   })
 else
-  nix-ld-rs
+  nix-ld

package.nix

@@ -117,7 +117,7 @@ fn test_ld_path_restore(libtest: &str, _dt_needed_bin: &Path) {
 
 // Utilities
 
-const EXE: &str = env!("CARGO_BIN_EXE_nix-ld-rs");
+const EXE: &str = env!("CARGO_BIN_EXE_nix-ld");
 const TARGET: &str = env!("NIX_LD_TEST_TARGET");
 
 lazy_static! {