From 799c46e6e71a6079b7a0c149093dee1a5c19751d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 5 Jul 2015 16:50:48 -0700 Subject: [PATCH 1/5] libvirt: 1.2.12 -> 1.2.17 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9c9bf40b8e8..31cd0bac421 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -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 = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04321c9cca9..ac8a5aa8f92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15352,11 +15352,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 ]; From fe705a664cc59172be17c048583bd05286f096c1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 5 Jul 2015 16:51:03 -0700 Subject: [PATCH 2/5] gnupg: 2.1.5 -> 2.1.6 --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 34561c3c33d..8ef96d4d14e 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -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 '' From 06f1e2c61e54e5eee3ff7d953cb4bb84a7de30e8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 5 Jul 2015 16:52:56 -0700 Subject: [PATCH 3/5] quassel: Add dependency on qca for crypto --- pkgs/applications/networking/irc/quassel/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 5aeafab79e3..a8bd2e801b9 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -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 From c61d048427719d6e0c131f58825331df0a9d4ccc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 5 Jul 2015 16:53:42 -0700 Subject: [PATCH 4/5] nixos/quassel: Temporarily switch back to qt4 since qt5 tls in quassel is broken --- nixos/modules/services/networking/quassel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 005eb7bd761..579d62884c7 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -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 From cb343e7be6445a643a22992871a76e4911af2c49 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 5 Jul 2015 18:34:45 -0700 Subject: [PATCH 5/5] nixos/install-grub: Fix symlink installation for boot filesystems which don't support symlinking Some filesystems like fat32 don't support symlinking and need to be supported on /boot as an efi system partition. Instead of creating the symlink directly in boot, create the symlink in a temporary directory which has to support symlinking. --- .../system/boot/loader/grub/install-grub.pl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index e8cd45e8221..c4b1abc8cb0 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -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"; } }