public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
This commit is contained in:
Vladimír Čunát
2013-03-02 10:41:53 +01:00
parent 97b24ed95a a920c50cfb
commit 26af997d41
101 changed files with 2221 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/lib/meta.nix
+1 -1
View File
@@ -43,6 +43,6 @@ rec {
/* Increase the nix-env priority of the package, i.e., this
version/variant of the package will be preferred.
*/
hiPrio = drv: addMetaAttrs { priority = "110"; } drv;
hiPrio = drv: addMetaAttrs { priority = "-10"; } drv;
}