movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse source 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
This commit is contained in:
Tuomas Tynkkynen 2018-03-13 23:04:18 +02:00
commit 2fec9c6e29
288 changed files with 10208 additions and 9553 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/loader/grub/install-grub.pl
View file

@ -182,7 +182,7 @@ sub GrubFs {
# Based on the type pull in the identifier from the system
my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");
if ($status != 0) {
die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";
}
my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
if ($#matches != 0) {