From d9085b845ea0c8c0faf0d4b8144462bbf2f6ed6a Mon Sep 17 00:00:00 2001
From: Erik Hahn <erik_hahn@gmx.de>
Date: Tue, 23 Jun 2015 03:27:12 +0200
Subject: [PATCH 1/2] pypeg2: init at 2.15.1

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1469bfcbcfd7..cf8e91ee1874 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16043,5 +16043,21 @@ let
     };
   };
 
+  pypeg2 = buildPythonPackage rec {
+    version = "2.15.1";
+    name = "pypeg2-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyPEG2/pyPEG2-${version}.tar.gz";
+      sha256 = "f4814a5f9c84bbb0794bef8d2a5871f4aed25366791c55e2162681873ad8bd21";
+    };
+
+    meta = {
+      description = "PEG parser interpreter in Python";
+      homepage = http://fdik.org/pyPEG;
+      license = licenses.gpl2;
+    };
+  };
+
 
 }; in pythonPackages

From 006e7ae04e8b99020f192310a77eccd93e841633 Mon Sep 17 00:00:00 2001
From: Erik Hahn <erik_hahn@gmx.de>
Date: Tue, 23 Jun 2015 03:25:25 +0200
Subject: [PATCH 2/2] qutebrowser: init at 0.2.1

---
 .../browsers/qutebrowser/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/qutebrowser/default.nix

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
new file mode 100644
index 000000000000..da514c614b03
--- /dev/null
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2}:
+
+let version = "0.2.1"; in
+
+buildPythonPackage {
+  name = "qutebrowser-${version}";
+  namePrefix = "";
+  
+  src = fetchurl {
+    url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
+    sha256 = "b741a1a0336b8d36133603a3318d1c4c63c9abf50212919200cd2ae665b07111";
+    };
+    # Needs tox
+    doCheck = false;
+
+    propagatedBuildInputs = [
+      python pyyaml pyqt5 jinja2 pygments pypeg2
+    ];
+    
+    meta = {
+      homepage = https://github.com/The-Compiler/qutebrowser;
+      description = "Keyboard-focused browser with a minimal GUI";
+      license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada3e3bd1f75..d74550f2c791 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12299,6 +12299,10 @@ let
     gst_plugins_bad = null;
   };
 
+  qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {
+    inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
+  };
+
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
     fltk = fltk13;