commit f6d9b4b6fc7f376e5f5ecacace951f57c155045c · pyrox.dev/nixpkgs

+20 -5

nixos/modules/programs/singularity.nix

···

       56
       56
        
           enableFakeroot = lib.mkOption {

     

       57
       57
        
             type = lib.types.bool;

     

       58
       58
        
             default = true;

     

       59
       59
       -
             example = false;

     

       60
       59
        
             description = ''

     

       61
       60
        
               Whether to enable the `--fakeroot` support of Singularity/Apptainer.

     

       61
       61
       +
       

     

       62
       62
       +
               This option is deprecated and has no effect.

     

       63
       63
       +
               `--fakeroot` support is enabled automatically,

     

       64
       64
       +
               as `systemBinPaths = [ "/run/wrappers/bin" ]` is always specified.

     

       62
       65
        
             '';

     

       63
       66
        
           };

     

       64
       67
        
           enableSuid = lib.mkOption {

     
···

       74
       77
        
               Whether to enable the SUID support of Singularity/Apptainer.

     

       75
       78
        
             '';

     

       76
       79
        
           };

     

       80
       80
       +
           systemBinPaths = lib.mkOption {

     

       81
       81
       +
             type = lib.types.listOf lib.types.path;

     

       82
       82
       +
             default = [ ];

     

       83
       83
       +
             description = ''

     

       84
       84
       +
               (Extra) system-wide /**/bin paths

     

       85
       85
       +
               for Apptainer/Singularity to find command-line utilities in.

     

       86
       86
       +
       

     

       87
       87
       +
               `"/run/wrappers/bin"` is included by default to make

     

       88
       88
       +
               utilities with SUID bit set available to Apptainer/Singularity.

     

       89
       89
       +
               Use `lib.mkForce` to shadow the default values.

     

       90
       90
       +
             '';

     

       91
       91
       +
           };

     

       77
       92
        
         };

     

       78
       93
        
       

     

       79
       94
        
         config = lib.mkIf cfg.enable {

     

       80
       95
        
           programs.singularity.packageOverriden = (

     

       81
       96
        
             cfg.package.override (

     

       82
       82
       -
               lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; }

     

       83
       83
       -
               // lib.optionalAttrs cfg.enableFakeroot {

     

       84
       84
       -
                 newuidmapPath = "/run/wrappers/bin/newuidmap";

     

       85
       85
       -
                 newgidmapPath = "/run/wrappers/bin/newgidmap";

     

       97
       97
       +
               {

     

       98
       98
       +
                 systemBinPaths = cfg.systemBinPaths;

     

       86
       99
        
               }

     

       100
       100
       +
               // lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; }

     

       87
       101
        
               // lib.optionalAttrs cfg.enableSuid {

     

       88
       102
        
                 enableSuid = true;

     

       89
       103
        
                 starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid";

     

       90
       104
        
               }

     

       91
       105
        
             )

     

       92
       106
        
           );

     

       107
       107
       +
           programs.singularity.systemBinPaths = [ "/run/wrappers/bin" ];

     

       93
       108
        
           environment.systemPackages = [ cfg.packageOverriden ];

     

       94
       109
        
           security.wrappers."${cfg.packageOverriden.projectName}-suid" = lib.mkIf cfg.enableSuid {

     

       95
       110
        
             setuid = true;

+24 -7

pkgs/applications/virtualization/singularity/generic.nix

···

       70
       70
        
         # Whether to compile with SUID support

     

       71
       71
        
         enableSuid ? false,

     

       72
       72
        
         starterSuidPath ? null,

     

       73
       73
       -
         # newuidmapPath and newgidmapPath are to support --fakeroot

     

       74
       74
       -
         # where those SUID-ed executables are unavailable from the FHS system PATH.

     

       73
       73
       +
         # Extra system-wide /**/bin paths to prefix,

     

       74
       74
       +
         # useful to specify directories containing binaries with SUID bit set.

     

       75
       75
       +
         # The paths take higher precedence over the FHS system PATH specified

     

       76
       76
       +
         # inside the upstream source code.

     

       77
       77
       +
         # Include "/run/wrappers/bin" by default for the convenience of NixOS users.

     

       78
       78
       +
         systemBinPaths ? [ "/run/wrappers/bin" ],

     

       75
       79
        
         # Path to SUID-ed newuidmap executable

     

       80
       80
       +
         # Deprecated in favour of systemBinPaths

     

       81
       81
       +
         # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off

     

       76
       82
        
         newuidmapPath ? null,

     

       77
       83
        
         # Path to SUID-ed newgidmap executable

     

       84
       84
       +
         # Deprecated in favour of systemBinPaths

     

       85
       85
       +
         # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off

     

       78
       86
        
         newgidmapPath ? null,

     

       79
       87
        
         # External LOCALSTATEDIR

     

       80
       88
        
         externalLocalStateDir ? null,

     
···

       99
       107
        
         vendorHash ? _defaultGoVendorArgs.vendorHash,

     

       100
       108
        
         deleteVendor ? _defaultGoVendorArgs.deleteVendor,

     

       101
       109
        
         proxyVendor ? _defaultGoVendorArgs.proxyVendor,

     

       102
       102
       -
       }:

     

       110
       110
       +
       }@args:

     

       103
       111
        
       

     

       104
       112
        
       let

     

       113
       113
       +
         # Backward compatibility for privileged-un-utils.

     

       114
       114
       +
         # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.

     

       105
       115
        
         privileged-un-utils =

     

       106
       116
        
           if ((newuidmapPath == null) && (newgidmapPath == null)) then

     

       107
       117
        
             null

     

       108
       118
        
           else

     

       109
       109
       -
             (runCommandLocal "privileged-un-utils" { } ''

     

       119
       119
       +
             runCommandLocal "privileged-un-utils" { } ''

     

       110
       120
        
               mkdir -p "$out/bin"

     

       111
       121
        
               ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"

     

       112
       122
        
               ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"

     

       113
       113
       -
             '');

     

       123
       123
       +
             '';

     

       124
       124
       +
       

     

       125
       125
       +
         # Backward compatibility for privileged-un-utils.

     

       126
       126
       +
         # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.

     

       127
       127
       +
         systemBinPaths =

     

       128
       128
       +
           lib.optional (privileged-un-utils != null) (lib.makeBinPath [ privileged-un-utils ])

     

       129
       129
       +
           ++ args.systemBinPaths or [ "/run/wrappers/bin" ];

     

       114
       130
        
       

     

       115
       131
        
         concatMapStringAttrsSep =

     

       116
       132
        
           sep: f: attrs:

     
···

       207
       223
        
           fuse2fs # Mount ext3 filesystems

     

       208
       224
        
           go

     

       209
       225
        
           mount # mount

     

       210
       210
       -
           privileged-un-utils

     

       211
       226
        
           squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image

     

       212
       227
        
           squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges

     

       213
       228
        
         ] ++ lib.optional enableNvidiaContainerCli nvidia-docker;

     
···

       229
       244
        
                   lib.concatStringsSep " " [

     

       230
       245
        
                     "--replace-fail"

     

       231
       246
        
                     (addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath))

     

       232
       232
       -
                     (addShellDoubleQuotes ''${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'')

     

       247
       247
       +
                     (addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'')

     

       233
       248
        
                   ]

     

       234
       249
        
                 ) originalDefaultPaths

     

       235
       250
        
               }

     
···

       271
       286
        
           # Respect PATH from the environment/the user.

     

       272
       287
        
           # Fallback to bin paths provided by Nixpkgs packages.

     

       273
       288
        
           wrapProgram "$out/bin/${projectName}" \

     

       289
       289
       +
             --suffix PATH : "$systemDefaultPath" \

     

       274
       290
        
             --suffix PATH : "$inputsDefaultPath"

     

       275
       291
        
           # Make changes in the config file

     

       276
       292
        
           ${lib.optionalString forceNvcCli ''

     
···

       329
       345
        
       }).overrideAttrs

     

       330
       346
        
         (

     

       331
       347
        
           finalAttrs: prevAttrs: {

     

       348
       348
       +
             systemDefaultPath = lib.concatStringsSep ":" systemBinPaths;

     

       332
       349
        
             inputsDefaultPath = lib.makeBinPath finalAttrs.defaultPathInputs;

     

       333
       350
        
             passthru = prevAttrs.passthru or { } // {

     

       334
       351
        
               inherit sourceFilesWithDefaultPaths;