commit 7169b5d65cbcbc2b4b2c30ca0aeeacb1119a0035 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/nix-ld.nix

···

       22
       22
        
       {

     

       23
       23
        
         meta.maintainers = [ lib.maintainers.mic92 ];

     

       24
       24
        
         options.programs.nix-ld = {

     

       25
       25
       -
           enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'';

     

       25
       25
       +
           enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/nix-community/nix-ld>'';

     

       26
       26
        
           package = lib.mkPackageOption pkgs "nix-ld" { };

     

       27
       27
        
           libraries = lib.mkOption {

     

       28
       28
        
             type = lib.types.listOf lib.types.package;

+1 -1

nixos/tests/all-tests.nix

···

       914
       914
        
         nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;

     

       915
       915
        
         nitter = handleTest ./nitter.nix { };

     

       916
       916
        
         nix-config = handleTest ./nix-config.nix { };

     

       917
       917
       -
         nix-ld = handleTest ./nix-ld.nix { };

     

       917
       917
       +
         nix-ld = runTest ./nix-ld.nix;

     

       918
       918
        
         nix-misc = handleTest ./nix/misc.nix { };

     

       919
       919
        
         nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };

     

       920
       920
        
         nix-required-mounts = runTest ./nix-required-mounts;

+10 -28

nixos/tests/nix-ld.nix

···

       1
       1
       +
       { ... }:

     

       1
       2
        
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         config ? { },

     

       4
       4
       -
         pkgs ? import ../.. { inherit system config; },

     

       5
       5
       -
       }:

     

       6
       6
       -
       let

     

       7
       7
       -
         inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       8
       8
       -
         shared =

     

       3
       3
       +
         name = "nix-ld";

     

       4
       4
       +
       

     

       5
       5
       +
         nodes.machine =

     

       9
       6
        
           { config, pkgs, ... }:

     

       10
       7
        
           {

     

       11
       8
        
             programs.nix-ld.enable = true;

     

       9
       9
       +
       

     

       12
       10
        
             environment.systemPackages = [

     

       13
       11
        
               (pkgs.runCommand "patched-hello" { } ''

     

       14
       12
        
                 install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello

     
···

       16
       14
        
               '')

     

       17
       15
        
             ];

     

       18
       16
        
           };

     

       19
       19
       -
       in

     

       20
       20
       -
       {

     

       21
       21
       -
         nix-ld = makeTest {

     

       22
       22
       -
           name = "nix-ld";

     

       23
       23
       -
           nodes.machine = shared;

     

       24
       24
       -
           testScript = ''

     

       25
       25
       -
             start_all()

     

       26
       26
       -
             machine.succeed("hello")

     

       27
       27
       -
           '';

     

       28
       28
       -
         };

     

       29
       29
       -
         nix-ld-rs = makeTest {

     

       30
       30
       -
           name = "nix-ld-rs";

     

       31
       31
       -
           nodes.machine = {

     

       32
       32
       -
             imports = [ shared ];

     

       33
       33
       -
             programs.nix-ld.package = pkgs.nix-ld-rs;

     

       34
       34
       -
           };

     

       35
       35
       -
           testScript = ''

     

       36
       36
       -
             start_all()

     

       37
       37
       -
             machine.succeed("hello")

     

       38
       38
       -
           '';

     

       39
       39
       -
         };

     

       17
       17
       +
       

     

       18
       18
       +
         testScript = ''

     

       19
       19
       +
           start_all()

     

       20
       20
       +
           machine.succeed("hello")

     

       21
       21
       +
         '';

     

       40
       22
        
       }

+9 -11

pkgs/by-name/ni/nix-ld/package.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "nix-ld";

     

       11
       11
       -
         version = "2.0.3";

     

       11
       11
       +
         version = "2.0.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "mic92";

     

       14
       14
       +
           owner = "nix-community";

     

       15
       15
        
           repo = "nix-ld";

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";

     

       17
       17
       +
           hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";

     

       18
       18
        
         };

     

       19
       19
       -
       

     

       20
       20
       -
         patches = [ ./rust-1.83.patch ];

     

       21
       19
        
       

     

       22
       20
        
         useFetchCargoVendor = true;

     

       23
       23
       -
         cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4=";

     

       21
       21
       +
         cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";

     

       24
       22
        
       

     

       25
       23
        
         hardeningDisable = [ "stackprotector" ];

     

       26
       24
        
       

     
···

       47
       45
        
       

     

       48
       46
        
         passthru.tests = nixosTests.nix-ld;

     

       49
       47
        
       

     

       50
       50
       -
         meta = with lib; {

     

       48
       48
       +
         meta = {

     

       51
       49
        
           description = "Run unpatched dynamic binaries on NixOS";

     

       52
       52
       -
           homepage = "https://github.com/Mic92/nix-ld";

     

       53
       53
       -
           license = licenses.mit;

     

       54
       54
       -
           maintainers = with maintainers; [ mic92 ];

     

       55
       55
       -
           platforms = platforms.linux;

     

       50
       50
       +
           homepage = "https://github.com/nix-community/nix-ld";

     

       51
       51
       +
           license = lib.licenses.mit;

     

       52
       52
       +
           maintainers = with lib.maintainers; [ mic92 ];

     

       53
       53
       +
           platforms = lib.platforms.linux;

     

       56
       54
        
         };

     

       57
       55
        
       }

-36

pkgs/by-name/ni/nix-ld/rust-1.83.patch

···

       1
       1
       -
       --- a/src/arch.rs

     

       2
       2
       -
       +++ b/src/arch.rs

     

       3
       3
       -
       @@ -142,7 +142,7 @@ cfg_match! {

     

       4
       4
       -
        

     

       5
       5
       -
                #[naked]

     

       6
       6
       -
                unsafe extern "C" fn entry_trampoline() -> ! {

     

       7
       7
       -
       -            core::arch::asm!(

     

       8
       8
       -
       +            core::arch::naked_asm!(

     

       9
       9
       -
                        "lea r10, [rip + {context}]",

     

       10
       10
       -
                        "mov r11, [r10 + {size} * 1]", // .env_entry

     

       11
       11
       -
                        "test r11, r11",

     

       12
       12
       -
       @@ -153,7 +153,6 @@ cfg_match! {

     

       13
       13
       -
                        "jmp [rip + {context}]",

     

       14
       14
       -
                        context = sym TRAMPOLINE_CONTEXT,

     

       15
       15
       -
                        size = const core::mem::size_of::<*const u8>(),

     

       16
       16
       -
       -                options(noreturn),

     

       17
       17
       -
                    )

     

       18
       18
       -
                }

     

       19
       19
       -
            }

     

       20
       20
       -
       @@ -162,7 +161,7 @@ cfg_match! {

     

       21
       21
       -
        

     

       22
       22
       -
                #[naked]

     

       23
       23
       -
                unsafe extern "C" fn entry_trampoline() -> ! {

     

       24
       24
       -
       -            core::arch::asm!(

     

       25
       25
       -
       +            core::arch::naked_asm!(

     

       26
       26
       -
                        "adrp x8, {context}",

     

       27
       27
       -
                        "ldr x9, [x8, {env_entry_off}]", // .env_entry

     

       28
       28
       -
                        "cbz x9, 2f",

     

       29
       29
       -
       @@ -174,7 +173,6 @@ cfg_match! {

     

       30
       30
       -
                        context = sym TRAMPOLINE_CONTEXT,

     

       31
       31
       -
                        env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,

     

       32
       32
       -
                        env_string_off = const TrampolineContext::ENV_STRING_OFFSET,

     

       33
       33
       -
       -                options(noreturn),

     

       34
       34
       -
                    )

     

       35
       35
       -
                }

     

       36
       36
       -
            }