about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2023-06-20 21:23:27 +0100
committerGitHub <noreply@github.com>2023-06-20 20:23:27 +0000
commitbfc002e2f10ccaa6c6bae2882c5df1fa727e16f0 (patch)
tree1b4a19bde55b22e068b2875bd2352413f5a40d0f
parent46e5e1edd559a94b44dd8d14eebdcc54a9c74584 (diff)
nix-ld: 1.2.1 -> 1.2.2 (#237962)
* nix-ld: 1.2.1 -> 1.2.2

Diff: https://github.com/mic92/nix-ld/compare/1.2.1...1.2.2

* Update pkgs/os-specific/linux/nix-ld/default.nix

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>

---------

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
-rw-r--r--nixos/tests/nix-ld.nix3
-rw-r--r--pkgs/os-specific/linux/nix-ld/default.nix4
2 files changed, 2 insertions, 5 deletions
diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix
index c62c0437e04ec..8733f5b0c3978 100644
--- a/nixos/tests/nix-ld.nix
+++ b/nixos/tests/nix-ld.nix
@@ -13,8 +13,5 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
   testScript = ''
     start_all()
     machine.succeed("hello")
-
-    # test fallback if NIX_LD is not set
-    machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; hello")
  '';
 })
diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix
index 534955f0b8576..84685e77aaeaa 100644
--- a/pkgs/os-specific/linux/nix-ld/default.nix
+++ b/pkgs/os-specific/linux/nix-ld/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nix-ld";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "mic92";
     repo = "nix-ld";
     rev = version;
-    sha256 = "sha256-NitUt9LBJMpAbbKC98aRPYMfxZFq3PHH6ieqM4MVO08=";
+    hash = "sha256-+z9t7BLugZO1WhyYEq6FI38TMh2EwfgfAv3RDFSjwtc=";
   };
 
   doCheck = true;