buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
This commit is contained in:
parent
9c61317002
commit
e4610f2965
|
@ -35,6 +35,7 @@ with lib;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
'';
|
'';
|
||||||
|
meta.priority = 4;
|
||||||
};
|
};
|
||||||
description = ''
|
description = ''
|
||||||
Wrapper around modprobe that sets the path to the modules
|
Wrapper around modprobe that sets the path to the modules
|
||||||
|
|
|
@ -5,6 +5,7 @@ use Cwd 'abs_path';
|
||||||
use IO::Handle;
|
use IO::Handle;
|
||||||
use File::Path;
|
use File::Path;
|
||||||
use File::Basename;
|
use File::Basename;
|
||||||
|
use JSON::PP;
|
||||||
|
|
||||||
STDOUT->autoflush(1);
|
STDOUT->autoflush(1);
|
||||||
|
|
||||||
|
@ -17,7 +18,7 @@ sub isInPathsToLink {
|
||||||
$path = "/" if $path eq "";
|
$path = "/" if $path eq "";
|
||||||
foreach my $elem (@pathsToLink) {
|
foreach my $elem (@pathsToLink) {
|
||||||
return 1 if
|
return 1 if
|
||||||
$elem eq "/" ||
|
$elem eq "/" ||
|
||||||
(substr($path, 0, length($elem)) eq $elem
|
(substr($path, 0, length($elem)) eq $elem
|
||||||
&& (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
|
&& (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
|
||||||
}
|
}
|
||||||
|
@ -28,25 +29,27 @@ sub isInPathsToLink {
|
||||||
# For each activated package, determine what symlinks to create.
|
# For each activated package, determine what symlinks to create.
|
||||||
|
|
||||||
my %symlinks;
|
my %symlinks;
|
||||||
$symlinks{""} = ""; # create root directory
|
$symlinks{""} = ["", 0]; # create root directory
|
||||||
|
|
||||||
|
my %priorities;
|
||||||
|
|
||||||
sub findFiles;
|
sub findFiles;
|
||||||
|
|
||||||
sub findFilesInDir {
|
sub findFilesInDir {
|
||||||
my ($relName, $target, $ignoreCollisions) = @_;
|
my ($relName, $target, $ignoreCollisions, $priority) = @_;
|
||||||
|
|
||||||
opendir DIR, "$target" or die "cannot open `$target': $!";
|
opendir DIR, "$target" or die "cannot open `$target': $!";
|
||||||
my @names = readdir DIR or die;
|
my @names = readdir DIR or die;
|
||||||
closedir DIR;
|
closedir DIR;
|
||||||
|
|
||||||
foreach my $name (@names) {
|
foreach my $name (@names) {
|
||||||
next if $name eq "." || $name eq "..";
|
next if $name eq "." || $name eq "..";
|
||||||
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions);
|
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $priority);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub findFiles {
|
sub findFiles {
|
||||||
my ($relName, $target, $baseName, $ignoreCollisions) = @_;
|
my ($relName, $target, $baseName, $ignoreCollisions, $priority) = @_;
|
||||||
|
|
||||||
# Urgh, hacky...
|
# Urgh, hacky...
|
||||||
return if
|
return if
|
||||||
|
@ -57,41 +60,48 @@ sub findFiles {
|
||||||
$baseName eq "perllocal.pod" ||
|
$baseName eq "perllocal.pod" ||
|
||||||
$baseName eq "log";
|
$baseName eq "log";
|
||||||
|
|
||||||
my $oldTarget = $symlinks{$relName};
|
my ($oldTarget, $oldPriority) = @{$symlinks{$relName} // [undef, undef]};
|
||||||
|
|
||||||
if (!defined $oldTarget) {
|
# If target doesn't exist, create it. If it already exists as a
|
||||||
$symlinks{$relName} = $target;
|
# symlink to a file (not a directory) in a lower-priority package,
|
||||||
|
# overwrite it.
|
||||||
|
if (!defined $oldTarget || ($priority < $oldPriority && ($oldTarget ne "" && ! -d $oldTarget))) {
|
||||||
|
$symlinks{$relName} = [$target, $priority];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
# If target already exists as a symlink to a file (not a
|
||||||
|
# directory) in a higher-priority package, skip.
|
||||||
|
if (defined $oldTarget && $priority > $oldPriority && $oldTarget ne "" && ! -d $oldTarget) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
|
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
|
||||||
if ($ignoreCollisions) {
|
if ($ignoreCollisions) {
|
||||||
warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
|
warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
die "collision between `$target' and `$oldTarget'";
|
die "collision between `$target' and `$oldTarget'\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
findFilesInDir($relName, $oldTarget, $ignoreCollisions) unless $oldTarget eq "";
|
findFilesInDir($relName, $oldTarget, $ignoreCollisions, $oldPriority) unless $oldTarget eq "";
|
||||||
findFilesInDir($relName, $target, $ignoreCollisions);
|
findFilesInDir($relName, $target, $ignoreCollisions, $priority);
|
||||||
|
|
||||||
$symlinks{$relName} = ""; # denotes directory
|
$symlinks{$relName} = ["", $priority]; # denotes directory
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
my %done;
|
my %done;
|
||||||
my %postponed;
|
my %postponed;
|
||||||
|
|
||||||
sub addPkg;
|
sub addPkg {
|
||||||
sub addPkg($;$) {
|
my ($pkgDir, $ignoreCollisions, $priority) = @_;
|
||||||
my $pkgDir = shift;
|
|
||||||
my $ignoreCollisions = shift;
|
|
||||||
|
|
||||||
return if (defined $done{$pkgDir});
|
return if (defined $done{$pkgDir});
|
||||||
$done{$pkgDir} = 1;
|
$done{$pkgDir} = 1;
|
||||||
|
|
||||||
findFiles("", "$pkgDir", "", $ignoreCollisions);
|
findFiles("", $pkgDir, "", $ignoreCollisions, $priority);
|
||||||
|
|
||||||
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
|
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
|
||||||
if (-e $propagatedFN) {
|
if (-e $propagatedFN) {
|
||||||
|
@ -106,23 +116,25 @@ sub addPkg($;$) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Symlink to the packages that have been installed explicitly by the user.
|
# Symlink to the packages that have been installed explicitly by the
|
||||||
my @args = split ' ', $ENV{"paths"};
|
# user.
|
||||||
|
for my $pkg (@{decode_json $ENV{"pkgs"}}) {
|
||||||
foreach my $pkgDir (@args) {
|
for my $path (@{$pkg->{paths}}) {
|
||||||
addPkg($pkgDir, $ENV{"ignoreCollisions"} eq "1") if -e $pkgDir;
|
addPkg($path, $ENV{"ignoreCollisions"} eq "1", $pkg->{priority}) if -e $path;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Symlink to the packages that have been "propagated" by packages
|
# Symlink to the packages that have been "propagated" by packages
|
||||||
# installed by the user (i.e., package X declares that it want Y
|
# installed by the user (i.e., package X declares that it wants Y
|
||||||
# installed as well). We do these later because they have a lower
|
# installed as well). We do these later because they have a lower
|
||||||
# priority in case of collisions.
|
# priority in case of collisions.
|
||||||
|
my $priorityCounter = 1000; # don't care about collisions
|
||||||
while (scalar(keys %postponed) > 0) {
|
while (scalar(keys %postponed) > 0) {
|
||||||
my @pkgDirs = keys %postponed;
|
my @pkgDirs = keys %postponed;
|
||||||
%postponed = ();
|
%postponed = ();
|
||||||
foreach my $pkgDir (sort @pkgDirs) {
|
foreach my $pkgDir (sort @pkgDirs) {
|
||||||
addPkg($pkgDir, 2);
|
addPkg($pkgDir, 2, $priorityCounter++);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +142,7 @@ while (scalar(keys %postponed) > 0) {
|
||||||
# Create the symlinks.
|
# Create the symlinks.
|
||||||
my $nrLinks = 0;
|
my $nrLinks = 0;
|
||||||
foreach my $relName (sort keys %symlinks) {
|
foreach my $relName (sort keys %symlinks) {
|
||||||
my $target = $symlinks{$relName};
|
my ($target, $priority) = @{$symlinks{$relName}};
|
||||||
my $abs = "$out/$relName";
|
my $abs = "$out/$relName";
|
||||||
next unless isInPathsToLink $relName;
|
next unless isInPathsToLink $relName;
|
||||||
if ($target eq "") {
|
if ($target eq "") {
|
||||||
|
|
|
@ -9,10 +9,10 @@
|
||||||
, # The manifest file (if any). A symlink $out/manifest will be
|
, # The manifest file (if any). A symlink $out/manifest will be
|
||||||
# created to it.
|
# created to it.
|
||||||
manifest ? ""
|
manifest ? ""
|
||||||
|
|
||||||
, # The paths to symlink.
|
, # The paths to symlink.
|
||||||
paths
|
paths
|
||||||
|
|
||||||
, # Whether to ignore collisions or abort.
|
, # Whether to ignore collisions or abort.
|
||||||
ignoreCollisions ? false
|
ignoreCollisions ? false
|
||||||
|
|
||||||
|
@ -28,7 +28,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
runCommand name
|
runCommand name
|
||||||
{ inherit manifest paths ignoreCollisions passthru pathsToLink postBuild;
|
{ inherit manifest ignoreCollisions passthru pathsToLink postBuild;
|
||||||
|
pkgs = builtins.toJSON (map (drv: {
|
||||||
|
paths = [ drv ]; # FIXME: handle multiple outputs
|
||||||
|
priority = drv.meta.priority or 5;
|
||||||
|
}) paths);
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.unfreeRedistributableFirmware;
|
license = licenses.unfreeRedistributableFirmware;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ wkennington ];
|
maintainers = with maintainers; [ wkennington ];
|
||||||
|
priority = 6; # give precedence to kernel firmware
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = { inherit version; };
|
passthru = { inherit version; };
|
||||||
|
|
|
@ -63,5 +63,6 @@ stdenv.mkDerivation {
|
||||||
license = licenses.unfreeRedistributable;
|
license = licenses.unfreeRedistributable;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.vcunat ];
|
maintainers = [ maintainers.vcunat ];
|
||||||
|
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
|
homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
|
||||||
description = "A set of system utilities for Linux";
|
description = "A set of system utilities for Linux";
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,5 +35,6 @@ stdenv.mkDerivation {
|
||||||
homepage = http://www.gnu.org/software/cpio/;
|
homepage = http://www.gnu.org/software/cpio/;
|
||||||
description = "A program to create or extract from cpio archives";
|
description = "A program to create or extract from cpio archives";
|
||||||
platforms = stdenv.lib.platforms.all;
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
priority = 6; # resolves collision with gnutar's "libexec/rmt"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue