nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

dockerTools: Updated streamNixShellImage Nix GitHub links (#449992)

authored by philiptaron.tngl.sh and committed by

GitHub b3877f12 c2808a28

+18 -18
+3 -3
ci/OWNERS
··· 387 387 /pkgs/top-level/php-packages.nix @jtojnar @aanderse @globin @ma27 @talyz 388 388 389 389 # Docker tools 390 - /pkgs/build-support/docker @roberth 391 - /nixos/tests/docker-tools* @roberth 392 - /doc/build-helpers/images/dockertools.section.md @roberth 390 + /pkgs/build-support/docker @roberth @jhol 391 + /nixos/tests/docker-tools* @roberth @jhol 392 + /doc/build-helpers/images/dockertools.section.md @roberth @jhol 393 393 394 394 # Blockchains 395 395 /pkgs/applications/blockchains @mmahut @RaghavSood
+15 -15
pkgs/build-support/docker/default.nix
··· 1270 1270 1271 1271 staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; 1272 1272 1273 - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L493-L526 1273 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L617-L651 1274 1274 rcfile = writeText "nix-shell-rc" '' 1275 1275 unset PATH 1276 1276 dontAddDisableDepTrack=1 1277 - # TODO: https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L506 1277 + # TODO: https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L628 1278 1278 [ -e $stdenv/setup ] && source $stdenv/setup 1279 1279 PATH=${staticPath}:"$PATH" 1280 1280 SHELL=${lib.escapeShellArg shell} ··· 1294 1294 ''} 1295 1295 ''; 1296 1296 1297 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 1297 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/include/nix/store/globals.hh#L778-L788 1298 1298 sandboxBuildDir = "/build"; 1299 1299 1300 1300 drvEnv = ··· 1311 1311 SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 1312 1312 NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 1313 1313 1314 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030 1314 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1001-L1004 1315 1315 # PATH = "/path-not-set"; 1316 1316 # Allows calling bash and `buildDerivation` as the Cmd 1317 1317 PATH = staticPath; 1318 1318 1319 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038 1319 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1006-L1012 1320 1320 HOME = homeDirectory; 1321 1321 1322 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044 1322 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1014-L1018 1323 1323 NIX_STORE = storeDir; 1324 1324 1325 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047 1325 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1020-L1021 1326 1326 # TODO: Make configurable? 1327 1327 NIX_BUILD_CORES = "1"; 1328 1328 ··· 1330 1330 // drvEnv 1331 1331 // { 1332 1332 1333 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010 1333 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1035-L1037 1334 1334 NIX_BUILD_TOP = sandboxBuildDir; 1335 1335 1336 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013 1336 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1039-L1040 1337 1337 TMPDIR = sandboxBuildDir; 1338 1338 TEMPDIR = sandboxBuildDir; 1339 1339 TMP = sandboxBuildDir; 1340 1340 TEMP = sandboxBuildDir; 1341 1341 1342 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019 1342 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1042-L1046 1343 1343 PWD = sandboxBuildDir; 1344 1344 1345 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074 1345 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1079-L1082 1346 1346 # We don't set it here because the output here isn't handled in any special way 1347 1347 # NIX_LOG_FD = "2"; 1348 1348 1349 - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077 1349 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1084-L1085 1350 1350 TERM = "xterm-256color"; 1351 1351 }; 1352 1352 ··· 1358 1358 usrBinEnv 1359 1359 (fakeNss.override { 1360 1360 # Allows programs to look up the build user's home directory 1361 - # https://github.com/NixOS/nix/blob/ffe155abd36366a870482625543f9bf924a58281/src/libstore/build/local-derivation-goal.cc#L906-L910 1361 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416 1362 1362 # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir. 1363 1363 # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379 1364 1364 extraPasswdLines = [ ··· 1386 1386 # Run this image as the given uid/gid 1387 1387 config.User = "${toString uid}:${toString gid}"; 1388 1388 config.Cmd = 1389 - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L185-L186 1390 - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L534-L536 1389 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L240-L241 1390 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L659 1391 1391 if run == null then 1392 1392 [ 1393 1393 shell