ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-05 18:36:16 -07:00
commit fbfdc139d6
6 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/quassel.nix
View File

@ -3,7 +3,7 @@
with lib;
let
quassel = pkgs.quasselDaemon_qt5;
quassel = pkgs.kde4.quasselDaemon;
cfg = config.services.quassel;
user = if cfg.user != null then cfg.user else "quassel";
in

16
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -7,6 +7,7 @@ use File::Path;
use File::stat;
use File::Copy;
use File::Slurp;
use File::Temp;
require List::Compare;
use POSIX;
use Cwd;
@ -506,14 +507,9 @@ my $efiDiffer = $efiTarget ne $prevGrubState->efi;
my $efiMountPointDiffer = $efiSysMountPoint ne $prevGrubState->efiMountPoint;
my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
# install a symlink so that grub can detect the boot drive when set
# as the root directory
if (! -l "$bootPath/boot") {
if (-e "$bootPath/boot") {
unlink "$bootPath/boot";
}
symlink ".", "$bootPath/boot";
}
# install a symlink so that grub can detect the boot drive
my $tmpDir = File::Temp::tempdir(CLEANUP => 1) or die "Failed to create temporary space";
symlink "$bootPath", "$tmpDir/boot" or die "Failed to symlink $tmpDir/boot";
# install non-EFI GRUB
if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
@ -521,10 +517,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
next if $dev eq "nodev";
print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
if ($grubTarget eq "") {
system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", Cwd::abs_path($dev)) == 0
system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)) == 0
or die "$0: installation of GRUB on $dev failed\n";
} else {
system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
or die "$0: installation of GRUB on $dev failed\n";
}
}

5
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -2,13 +2,12 @@
, daemon ? false # build Quassel daemon
, client ? false # build Quassel client
, withKDE ? stdenv.isLinux # enable KDE integration
, ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, kdelibs ? null # optional
, useQt5 ? false
, phonon_qt5, libdbusmenu_qt5
, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }:
, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2, qca-qt5 }:
assert stdenv.isLinux;
@ -33,7 +32,7 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake makeWrapper ]
++ (if useQt5 then [ qt.base ] else [ qt ])
++ (if useQt5 then [ qt.base qca-qt5 ] else [ qt qca2 ])
++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else [])
++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else [])
++ lib.optional withKDE kdelibs

4
pkgs/development/libraries/libvirt/default.nix
View File

@ -5,7 +5,7 @@
, pythonPackages, perlPackages
}:
let version = "1.2.12"; in
let version = "1.2.17"; in
assert version == pythonPackages.libvirt.version;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://libvirt.org/sources/${name}.tar.gz";
sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg";
sha256 = "1b9gs3fj6bv9ig3kqmip2ivvsprymi6sslrvp82sw3srn0hayzp0";
};
buildInputs = [

4
pkgs/tools/security/gnupg/21.nix
View File

@ -13,11 +13,11 @@ with stdenv.lib;
assert x11Support -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-2.1.5";
name = "gnupg-2.1.6";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m";
sha256 = "1zcj5vsrc64zyq7spnx2xlxlq6wxaf5bilpf6gbkp7qr8barlnay";
};
postPatch = stdenv.lib.optionalString stdenv.isLinux ''

4
pkgs/top-level/python-packages.nix
View File

@ -15358,11 +15358,11 @@ let
libvirt = pkgs.stdenv.mkDerivation rec {
name = "libvirt-python-${version}";
version = "1.2.12";
version = "1.2.17";
src = pkgs.fetchurl {
url = "http://libvirt.org/sources/python/${name}.tar.gz";
sha256 = "17w4mpsp4pxhbzs128ig3gxp12rr0j41mxch8i11dqjrjy7l6bs3";
sha256 = "1v9nkfik75bmcrdqzc8al8qf0dsaw56fzfv2kr8s4058290dplzl";
};
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];