qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

singularity-tools: drop override argument storeDir

Browse Source
This commit is contained in:
Yueh-Shun Li 2023-04-03 22:38:17 +08:00 committed by Yueh-Shun Li
parent c2fa248bca
commit d3692ddf54
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -124,6 +124,8 @@
Processes also now run as a dynamically allocated user by default instead of Processes also now run as a dynamically allocated user by default instead of
root. root.
- `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead.
- The `budgie` and `budgiePlugins` scope have been removed and their packages - The `budgie` and `budgiePlugins` scope have been removed and their packages
moved into the top level scope (i.e., `budgie.budgie-desktop` is now moved into the top level scope (i.e., `budgie.budgie-desktop` is now
`budgie-desktop`) `budgie-desktop`)

7
pkgs/build-support/singularity-tools/default.nix
View File

@ -13,7 +13,6 @@
bashInteractive, bashInteractive,
runtimeShell, runtimeShell,
singularity, singularity,
storeDir ? builtins.storeDir,
}: }:
let let
@ -83,10 +82,10 @@ rec {
# Run root script # Run root script
${lib.optionalString (runAsRoot != null) '' ${lib.optionalString (runAsRoot != null) ''
mkdir -p ./${storeDir} mkdir -p ./${builtins.storeDir}
mount --rbind ${storeDir} ./${storeDir} mount --rbind "${builtins.storeDir}" ./${builtins.storeDir}
unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile}
umount -R ./${storeDir} umount -R ./${builtins.storeDir}
''} ''}
# Build /bin and copy across closure # Build /bin and copy across closure