From e2398a2361d1f3c2f6e46ff6cb3b5f92f39a21a2 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sun, 28 Jun 2015 02:22:48 +0300 Subject: [PATCH 1/2] qutebrowser: update to git master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qutebrowser is actively developed, sticking to stable versions doesn’t make any sense. Also fixed formatting. --- .../browsers/qutebrowser/default.nix | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index d97f36f1151..f0c411f4570 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2}: +{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }: -let version = "0.2.1"; in +let version = "0.3-pre"; 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.gpl3Plus; + src = fetchgit { + url = "https://github.com/The-Compiler/qutebrowser.git"; + rev = "f31f254d9bf3ffd4ef95089f4924e5c45d8c0f78"; + sha256 = "0virh71q9qyh7ggk5p6h3gjv30gr2jn8am6yq8xzbslchck0rkcr"; + }; + + # 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.gpl3Plus; }; } From f49e9ce1bee0f0b20dd5ece0e5b8f527c583c64c Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sun, 28 Jun 2015 02:38:01 +0300 Subject: [PATCH 2/2] qutebrowser: Add @jagajaga as a maintainer --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index f0c411f4570..f93ec35db34 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -23,5 +23,6 @@ buildPythonPackage { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }