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

Commits on Apr 9, 2018

  1. nixos/make-ext4-fs: Use closureInfo 

    exportReferencesGraph is deprecated and doesn't have the generated
initial Nix database contain the SHA256 of the contents of the store
paths, which breaks various things under Nix 2.0.
    @dezgeg
    dezgeg committed Apr 9, 2018
    Copy the full SHA
    487be79 View commit details
Showing with 7 additions and 8 deletions.
  1. +7 −8 nixos/lib/make-ext4-fs.nix
15 changes: 7 additions & 8 deletions nixos/lib/make-ext4-fs.nix
View file
Original file line number Diff line number Diff line change
@@ -7,23 +7,22 @@
, volumeLabel
}:

let
sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; };
in

pkgs.stdenv.mkDerivation {
name = "ext4-fs.img";

nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];

# For obtaining the closure of `storePaths'.
exportReferencesGraph =
map (x: [("closure-" + baseNameOf x) x]) storePaths;

buildCommand =
''
# Add the closures of the top-level store objects.
storePaths=$(perl ${pkgs.pathsFromGraph} closure-*)
storePaths=$(cat ${sdClosureInfo}/store-paths)
# Also include a manifest of the closures in a format suitable
# for nix-store --load-db.
printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
cp ${sdClosureInfo}/registration nix-path-registration
# Make a crude approximation of the size of the target image.
# If the script starts failing, increase the fudge factors here.