Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

singularity: fix defaultPath and reflect upstream changes #158486

Merged
merged 6 commits into from
Feb 8, 2023
Merged

singularity: fix defaultPath and reflect upstream changes #158486

merged 6 commits into from
Feb 8, 2023

Commits on Feb 8, 2023

  1. singularity-tool: format expression

    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    b33d640 View commit details
    Browse the repository at this point in the history

  2. nixos/modules/programs/singularity.nix: format expression

    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    136bbe2 View commit details
    Browse the repository at this point in the history

  3. all-packages.nix: move the line of singularity per alphabetical ordering

    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    ef09cfe View commit details
    Browse the repository at this point in the history

  4. apptainer, singularity: fix defaultPath and reflect upstream changes 

    Upstream changes:
singularity 3.8.7 (the legacy) -> apptainer 1.1.3 (the renamed) / singularity 3.10.4 (Sylabs's fork)

Build process:
*   Share between different sources
*   Fix the sed regexp to make defaultPath patch work
*   allowGoReference is now true
*   Provied input parameter removeCompat (default to false)
    that removes the compatible "*singularity*" symbolic links
    and related autocompletion files when projectName != "singularity"
*   Change localstatedir to /var/lib
*   Format with nixpkgs-fmt
*   Fix the defaultPath patching
    and use it instead of the `<executable> path` config directive
    deprecated in Apptainer
*   Provide dependencies for new functionalities such as
    squashfuse (unprivileged squashfs mount)
*   Provide an attribute `defaultPathInputs` to override
    prefix of container runtime default PATH

NixOS module programs.singularity:
*   Allow users to specify packages
*   Place related directories to /var/lib
*   Format with nixpkgs-fmt

singularity-tools:
*   Allow users to specify packages
*   Place related directories to /var/lib when building images in VM
    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    50788d2 View commit details
    Browse the repository at this point in the history

  5. apptainer, singularity: enable non-FHS --fakeroot support 

    This patch provides input arguments `newuidmapPath` and `newgidmapPath`
for apptainer and singularity to specify the path to the SUID-ed executables
newuidmap and newgidmap where they are not available from the FHS PATH.

As NixOS places those suided executables in a non-FHS position
(/run/wrapper/bin), this patch provides
programs.singularity.enableFakeroot option and implement with the above
input parameters.
    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    71a8929 View commit details
    Browse the repository at this point in the history

  6. apptainer-overriden-nixos,singularity-overriden-nixos: init

    @ShamrockLee
    ShamrockLee committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    d35f5c2 View commit details
    Browse the repository at this point in the history