From dd4f4efba50dbcbc59514a0efd8ea798c2d1a33a Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Thu, 17 Oct 2024 12:19:44 +0200
Subject: [PATCH] nix-ld-rs was merged into nix-ld

---
 flake.lock                       | 74 +-------------------------------
 flake.nix                        |  5 ---
 machines/loki/configuration.nix  |  3 +-
 machines/mimir/configuration.nix |  2 -
 machines/odin/configuration.nix  |  2 -
 5 files changed, 2 insertions(+), 84 deletions(-)

diff --git a/flake.lock b/flake.lock
index abfc5fa..7d19955 100644
--- a/flake.lock
+++ b/flake.lock
@@ -334,22 +334,6 @@
         "type": "github"
       }
     },
-    "flake-compat_6": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -443,24 +427,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-fs-monitor": {
       "inputs": {
         "crane": "crane_2",
@@ -634,28 +600,6 @@
         "type": "github"
       }
     },
-    "nix-ld-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat_5",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723871880,
-        "narHash": "sha256-HKHx2tDZEcKTKKkhyIDRifJW7a4bxOsWlvIVI1qm+ng=",
-        "owner": "nix-community",
-        "repo": "nix-ld-rs",
-        "rev": "8af5fc9add315c251edea8f659b56fc7836a163f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-ld-rs",
-        "type": "github"
-      }
-    },
     "nixos-facter-modules": {
       "locked": {
         "lastModified": 1728725827,
@@ -824,7 +768,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_5",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
@@ -862,7 +806,6 @@
         "microvm": "microvm",
         "naersk": "naersk",
         "nil": "nil",
-        "nix-ld-rs": "nix-ld-rs",
         "nixos-facter-modules": "nixos-facter-modules",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
@@ -976,21 +919,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index bc159b7..ead5e66 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,11 +87,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-ld-rs = {
-      url = "github:nix-community/nix-ld-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     attic = {
       url = "github:zhaofengli/attic";
       # inputs.nixpkgs.follows = "nixpkgs";
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index dcd03dd..5841797 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -1,4 +1,4 @@
-{ nixos-hardware, nix-ld-rs, ... }:
+{ nixos-hardware, ... }:
 { pkgs, config, ... }:
 {
   imports = [
@@ -448,7 +448,6 @@
 
     nix-ld = {
       enable = true;
-      package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
       libraries = with pkgs; [
         alsa-lib
         at-spi2-atk
diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index 71a2247..d6a7bd1 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -1,7 +1,6 @@
 {
   nixos-hardware,
   microvm,
-  nix-ld-rs,
   attic,
   ...
 }:
@@ -369,7 +368,6 @@
     gnome-disks.enable = true;
     nix-ld = {
       enable = true;
-      package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
       libraries = with pkgs; [
         alsa-lib
         at-spi2-atk
diff --git a/machines/odin/configuration.nix b/machines/odin/configuration.nix
index ad378c7..23830b0 100644
--- a/machines/odin/configuration.nix
+++ b/machines/odin/configuration.nix
@@ -1,7 +1,6 @@
 {
   nixos-hardware,
   disko,
-  nix-ld-rs,
   ...
 }:
 { pkgs, config, ... }:
@@ -119,7 +118,6 @@
     bandwhich.enable = true;
     nix-ld = {
       enable = true;
-      package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
     };
   };