Commit Graph

148 Commits

Author SHA1 Message Date
Yueh-Shun Li
c3026ac986 apptainer, singularity: warn abuot argument deprecation
Warn when arguments newuidmapPath and newgidmapPath is used.
2024-06-03 07:53:30 +08:00
Yueh-Shun Li
f6d9b4b6fc apptainer, singularity: add argument systemBinPaths
Use systemBinPaths as the new way to specify system bin paths,
especifally for SUID'ed binaries.

Deprecate arguments setuidmapPath and setgidmapPath in favour of
systemBinPaths.

Add NixOS configuration option programs.singularity.systemBinPath, with
"/run/wrappers/bin" included by default.
2024-06-03 07:53:21 +08:00
Yueh-Shun Li
409cbbe61a apptainer, singularity: prioritize original defaultPath
Prefix the upstream-given defalutPath value over the one constructed by
defaultPathInputs.

Make SUID'ed binaries searchable out-of-the-box non-NixOS platforms.
2024-06-03 07:23:40 +08:00
Someone
9f48aac218 Merge pull request #306716 from ShamrockLee/apptainer-default-path-substitution
apptainer, singularity: refactor defaultPath substitution
2024-06-02 22:33:55 +00:00
Gaetan Lepage
315b8a0466 apptainer: 1.3.1 -> 1.3.2
Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.3.2
2024-05-28 20:24:10 +02:00
Gaetan Lepage
752d362b4b singularity: 4.1.2 -> 4.1.3
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.1.3
2024-05-08 21:02:14 +02:00
Yueh-Shun Li
2ab0240295 apptainer, singularity: refactor defaultPath substitution
Add argument sourceFilesWithDefaultPaths to specify the "defaultPath"s
to substitute.

Passthru "sourceFilesWithDefaultPaths" for easier overriding.

Use "--replace-fail" during defalutPath substitution.
2024-04-26 14:45:53 +08:00
Yueh-Shun Li
7a8bdf766d apptainer, singularity: add mount to defaultPathInputs 2024-04-26 14:02:13 +08:00
Yueh-Shun Li
7b62cf00cb apptainer, singularity: avoid list absorption when appended by two more ++ 2024-04-25 14:05:53 +08:00
Yueh-Shun Li
39db1c03ef apptainer, singularity: format Nix expression with nixfmt
Make the Nix expression generic.nix and package.nix conformant to Nix
RFC 166.
2024-04-25 14:01:21 +08:00
Yueh-Shun Li
770818b715 singhularity: add comment to defaultToSuid
Add comment above "defaultToSuid = true" to explain it
and to keep it multi-line after formatting.
2024-04-25 13:57:33 +08:00
Yueh-Shun Li
484782e7f4 apptainer: rearrange dependencies 2024-04-25 13:00:10 +08:00
Gaetan Lepage
3a0d9d3721 apptainer: 1.3.0 -> 1.3.1
Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.3.1
2024-04-24 21:58:53 +02:00
Sergei Trofimovich
7dde9fa428 apptainer.gpuChecks.saxpy: fix the eval
Without the change the eval fails as:

    $ nix build --no-link -f. apptainer.gpuChecks.saxpy
    error:
           error: attribute 'image-saxpy' missing
           at pkgs/applications/virtualization/singularity/generic.nix:303:72:
              302|                 ''
              303|                   ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy
                 |                                                                        ^
              304|                 '';
2024-03-16 20:29:17 +00:00
Gaetan Lepage
d9b79e9307 apptainer: 1.2.5 -> 1.3.0
Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.3.0
2024-03-13 16:21:57 +01:00
Gaetan Lepage
a4c22942fb singularity: 4.1.1 -> 4.1.2
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.1.2
2024-03-06 16:13:32 +01:00
Gaetan Lepage
816755e672 singularity: 4.1.0 -> 4.1.1
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.1.1
2024-02-01 13:48:01 +01:00
Gaetan Lepage
cb25cc7e66 singularity: 4.0.3 -> 4.1.0
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.1.0
2024-01-25 15:55:07 +01:00
Gaetan Lepage
9b156b4bfc singularity: 4.0.2 -> 4.0.3
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.0.3
2024-01-11 13:05:11 +01:00
Someone Serge
562dd63932 apptainer: fix nvliblist.conf-based --nv
(cherry picked from commit 680bbed84f)
2024-01-10 20:47:55 +00:00
Someone Serge
231aca2b97 apptainer: add a cuda test
(cherry picked from commit 0c4fe1f452)
2024-01-10 20:47:34 +00:00
Someone Serge
c76883f955 apptainer: allow --nvccli with read-only images
(cherry picked from commit 07305dff4f)
2024-01-10 17:39:50 +00:00
Silvan Mosberger
fdbeeb3547 Merge pull request #269324 from GaetanLepage/apptainer
apptainer: 1.2.4 -> 1.2.5
2023-11-24 19:41:11 +01:00
Silvan Mosberger
bf01ec00a0 Merge pull request #250949 from ShamrockLee/apptainer-localstatedir
apptainer, singularity: use self-contained LOCALSTATEDIR by default
2023-11-23 01:37:54 +01:00
Gaetan Lepage
25e6e0273e apptainer: 1.2.4 -> 1.2.5
Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.2.5
2023-11-22 23:59:45 +01:00
Gaetan Lepage
0e1b638d8a singularity: 4.0.1 -> 4.0.2
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.0.2
2023-11-17 01:59:12 +01:00
Gaetan Lepage
7ea6f41331 singularity-ce: 3.11.4 -> 4.0.1
Changelog: https://github.com/sylabs/singularity/releases/tag/v4.0.1
2023-11-10 10:10:52 +01:00
Gaetan Lepage
dff69dc812 apptainer: 1.2.2 -> 1.2.4
Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.2.4
2023-11-10 09:49:53 +01:00
Gaetan Lepage
6a6c30dfc1 singularity-ce: 3.11.1 -> 3.11.4 2023-08-31 16:15:54 +02:00
Gaetan Lepage
a2e3cf7ef3 apptainer: 1.1.7 -> 1.2.2 2023-08-31 16:12:15 +02:00
Justin Bedő
430b94c3a2 Merge pull request #230992 from ShamrockLee/singularity-nvidia
apptainer, singularity: fix wrapper PATH prefix
2023-08-25 14:41:20 +10:00
Yueh-Shun Li
ac77669531 apptainer, singularity: make LOCALSTATEDIR internal by default
Use "$out/var/lib" as LOCALSTATEDIR configuration value
by default intsead of "/var/lib"
as a way toward top-level-directory independent runtime.

Add input argument externalLocalStateDir to optionally specify the
path to external LOCALSTATEDIR if not null.

Add NixOS module option
programs.singularity.enableExternalLocalStateDir (default to true)
to use "/var/lib" as LOCALSTATEDIR.
2023-08-23 18:40:20 +08:00
Artturi
c831e7939f Merge pull request #242905 from Artturin/gomodu1 2023-07-14 01:36:16 +03:00
Artturin
1c29673fcc treewide: go-modules -> goModules
In 787af0f79f
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so  i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.

Instead of making nix-update more complicated, make go-modules naming match cargoDeps.

`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix

release note added
2023-07-14 00:18:06 +03:00
Robert Scott
8dda355280 apptainer: disable fortify3 hardening flag 2023-07-09 11:51:26 +01:00
Yueh-Shun Li
0fcf35ae58 singularity: specify "nvidia-container-cli path" 2023-05-19 06:57:18 +00:00
Yueh-Shun Li
466e154fb2 apptainer, singularity: fix wrapper PATH prefix
Fix the missing trailing /bin in f6e7fcc
2023-05-18 00:30:40 +00:00
Yueh-Shun Li
722948a942 singularity, apptainer: adjust dependencies 2023-04-08 17:13:35 +08:00
Yueh-Shun Li
f6e7fccfa6 apptainer, singularity: unify the PATH prefix to defaultPath and wrapProgram
Use defaultPathInputs to control both path prefixes,
reducing the number of input lists to maintain.
2023-04-06 12:40:09 +08:00
Yueh-Shun Li
1f32cee4d4 apptainer, singularity: add passthru.tests.image-hello-cowsay
Add image-building tests with singularity-tools
2023-04-05 04:08:29 +08:00
Yueh-Shun Li
e5d66059d9 apptainer: 1.1.5 -> 1.1.7, singularity: 3.10.4 -> 3.11.1 2023-04-05 00:39:03 +08:00
Felix Buehler
d10e69c86b treewide: deprecate isNull
https://nixos.org/manual/nix/stable/language/builtins.html#builtins-isNull
2023-03-06 22:40:04 +01:00
Yueh-Shun Li
6e9902c7f6 apptainer: always specify either --with-suid or --without-suid build flag 2023-02-19 07:55:10 +00:00
Gaetan Lepage
467eced7c5 apptainer: 1.1.3 -> 1.1.5 2023-02-10 16:36:22 +01:00
Yueh-Shun Li
d35f5c2695 apptainer-overriden-nixos,singularity-overriden-nixos: init 2023-02-08 18:04:05 +08:00
Yueh-Shun Li
71a89291ee 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.
2023-02-08 18:04:05 +08:00
Yueh-Shun Li
50788d2fb0 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
2023-02-08 18:03:11 +08:00
R. Ryantm
9b9db934cd singularity: 3.8.6 -> 3.8.7 2022-03-20 00:22:52 +00:00
R. Ryantm
4fba64110f singularity: 3.8.5 -> 3.8.6 2022-02-10 11:39:21 -08:00
Justin Bedo
eab0561eb0 singularity: 3.8.4 -> 3.8.5 2021-11-30 20:12:29 +11:00