From 774486a14954d81634b516eec002d1f9e2a7c203 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 13 Jun 2014 00:30:34 +0000
Subject: [PATCH 1/4] linux kernel: set VFIO_PCI_VGA to `y` for versions > 3.9

This allows to passthrough PCI video adapters to KVM virtual machines.
VFIO_PCI is set to `m` by default, which means this will not affect
non-users.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef061459191..e76ce5bfa9b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -326,6 +326,11 @@ with stdenv.lib;
   ''}
   VIRT_DRIVERS y
 
+  # Device virtualisation.
+  ${optionalString (versionAtLeast version "3.9") ''
+    VFIO_PCI_VGA? y
+  ''}
+
   # Media support.
   ${optionalString (versionAtLeast version "3.6") ''
     MEDIA_DIGITAL_TV_SUPPORT y

From 8cc5279b70fe4b93f98b021fafab54809ef95b3a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 23 Nov 2014 22:43:23 +0000
Subject: [PATCH 2/4] sylpheed: actually enable gpg support

---
 pkgs/applications/networking/mailreaders/sylpheed/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70d01f5df3e..0f8b4f00c8b 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
     ++ optional sslSupport openssl
     ++ optional gpgSupport gpgme;
 
-  configureFlags = optionalString sslSupport "--enable-ssl";
+  configureFlags = optional sslSupport "--enable-ssl"
+                ++ optional gpgSupport "--enable-gpgme";
 
   meta = {
     homepage = http://sylpheed.sraoss.jp/en/;

From b6646f7ba781fd5290b414aac499c4b835839209 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Jan 2015 10:53:38 +0000
Subject: [PATCH 3/4] nixos: make zsh use fcntl for locking history files by
 default

Without this zsh creates and then unlinks .lock files at each interactive
input line, which is inhumane with respect to disk.
---
 nixos/modules/programs/zsh/zsh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 39f9671316e..edde7a7a757 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -100,7 +100,7 @@ in
         export HISTSIZE=2000
         export HISTFILE=$HOME/.zsh_history
 
-        setopt HIST_IGNORE_DUPS SHARE_HISTORY
+        setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
       '';
 
     };

From e4859ddd95833388885c9d2e54f810e452dff4b6 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Jan 2015 20:32:48 +0000
Subject: [PATCH 4/4] qastools: add version 0.18.1

---
 pkgs/tools/audio/qastools/default.nix | 29 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/audio/qastools/default.nix

diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
new file mode 100644
index 00000000000..920f6913d09
--- /dev/null
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, alsaLib, udev, qt }:
+
+let
+  version = "0.18.1";
+in
+
+stdenv.mkDerivation {
+  name = "qastools-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qastools/qastools_${version}.tar.bz2";
+    sha256 = "1sac6a0j1881wgpv4491b2f4jnhqkab6xyldmcg1wfqb5qkdgzvg";
+  };
+
+  buildInputs = [
+    cmake alsaLib udev qt
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSALL_PREFIX=$out"
+    "-DALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Collection of desktop applications for ALSA configuration";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 383b5c3f171..de1c62f622c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2251,6 +2251,10 @@ let
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  qastools = callPackage ../tools/audio/qastools {
+    qt = qt4;
+  };
+
   qhull = callPackage ../development/libraries/qhull { };
 
   qjoypad = callPackage ../tools/misc/qjoypad { };