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: bd3fdc99e365
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c36c048c0ea3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 21, 2019

  1. dockerTools: mark store-path-to-layer.sh as executable

    bcf54ce introduced a treewide change to
    use ${stdenv.shell} where-ever possible. However, this broke a script
    used by dockerTools, store-path-to-layer.sh, as it did not preserve the
    +x mode bit. This meant the file got put into the store as mode 0444,
    resulting in a build-time error later on that looked like:
    
        xargs: /nix/store/jixivxhh3c8sncp9xlkc4ls3y5f2mmxh-store-path-to-layer.sh: Permission denied
    
    However, in a twist of fate, bcf54ce
    not only introduced this regression but, in this particular instance,
    didn't even fix the original bug: the store-path-to-layer.sh script
    *still* uses /bin/sh as its shebang line, rather than an absolute path
    to stdenv. (Fixing this can be done in a separate commit.)
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Feb 21, 2019
    Copy the full SHA
    c36c048 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/build-support/docker/default.nix
1 change: 1 addition & 0 deletions pkgs/build-support/docker/default.nix
Original file line number Diff line number Diff line change
@@ -283,6 +283,7 @@ rec {
let
storePathToLayer = substituteAll
{ inherit (stdenv) shell;
isExecutable = true;
src = ./store-path-to-layer.sh;
};
in