Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aeec2e7a3adc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a351c3f6513
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 20, 2020

  1. dockerTools.*: Assertion against building for darwin 

    Building a docker image with darwin binaries just yields a confusing
error when ran:

  standard_init_linux.go:211: exec user process caused "exec format error"

This change prevents people from building such images in the first place
    @infinisil
    infinisil committed Jan 20, 2020
    Copy the full SHA
    b6a9211 View commit details

Commits on Jan 31, 2020

  1. dockerTools.*: Assertion against building for Darwin (#77952) 

    dockerTools.*: Assertion against building for Darwin
    @infinisil
    infinisil authored Jan 31, 2020
    Copy the full SHA
    0a351c3 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/build-support/docker/default.nix
4 changes: 4 additions & 0 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -593,6 +593,8 @@ rec {
if tag == null
then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result)))
else lib.toLower tag;
# Docker can't be made to run darwin binaries
meta.badPlatforms = lib.platforms.darwin;
} ''
${if (tag == null) then ''
outName="$(basename "$out")"
@@ -723,6 +725,8 @@ rec {
layerClosure = writeReferencesToFile layer;
passthru.buildArgs = args;
passthru.layer = layer;
# Docker can't be made to run darwin binaries
meta.badPlatforms = lib.platforms.darwin;
} ''
${lib.optionalString (tag == null) ''
outName="$(basename "$out")"