From 87650525ce2027698fae192eefd952c84ad98376 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:31:02 +0100 Subject: [PATCH 1/9] bean-add: 2016-12-02 -> 2017-01-20 --- pkgs/applications/office/beancount/bean-add.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 4e73a305ea4..7535b6abf3c 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2016-12-02"; + name = "bean-add-2017-01-20"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9"; - sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09"; + rev = "752674259fb9512e076ef2048927fb791ad21507"; + sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61"; }; propagatedBuildInputs = with python3Packages; [ python ]; From 1017489b9691792bc338793a66612f8a896eebd1 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:33:43 +0100 Subject: [PATCH 2/9] buku: 2.7 -> 2.8 --- pkgs/applications/misc/buku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0414786ba4..85d8180983e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -2,14 +2,14 @@ }: with pythonPackages; buildPythonApplication rec { - version = "2.7"; + version = "2.8"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk"; + sha256 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm"; }; buildInputs = [ From f370cbbfdf996d67fcda2f9291d320672e5d13b6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:43:19 +0100 Subject: [PATCH 3/9] hstr: 1.19 -> 1.22 --- pkgs/applications/misc/hstr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index e2290ac01e8..78f3c2f391b 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, ncurses }: let - version = "1.19"; + version = "1.22"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n"; + sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; }; buildInputs = [ readline ncurses ]; From 83d09a333667fb379c5180b8dca12125b8f762df Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:45:58 +0100 Subject: [PATCH 4/9] http-prompt: 0.8.0 -> 0.9.1 --- pkgs/tools/networking/http-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 55ba6b9db55..6f2ca8fc5ba 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.8.0"; + version = "0.9.1"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30"; + sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06"; }; propagatedBuildInputs = with pythonPackages; [ From 7620ea63b9eacf865271b5842560ec871f84c316 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:51:05 +0100 Subject: [PATCH 5/9] khal: 0.8.4 -> 0.9.2 --- pkgs/applications/misc/khal/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 0e93418255e..8d7eeffad31 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,13 +3,12 @@ with python3Packages; buildPythonApplication rec { - # Reenable tests for 0.9.0, they are broken at the moment: #15981 - version = "0.8.4"; + version = "0.9.2"; name = "khal-${version}"; src = fetchurl { url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; - sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f"; + sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"; }; LC_ALL = "en_US.UTF-8"; From 3de22bb760e5ac3d5e93fb648e56fea25e809b59 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:55:27 +0100 Subject: [PATCH 6/9] khard: 0.11.1 -> 0.11.3 From the README of khard: # vobject version is pinned to 0.9.2 for now because of bug # https://github.com/eventable/vobject/issues/39 This is why we explicitely pin the dependency "vobject" via a new python package in the expression here. --- pkgs/applications/misc/khard/default.nix | 32 +++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 2a6329b48d7..da6dece237e 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,39 @@ -{ stdenv, fetchurl, glibcLocales, python3Packages }: +{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: +let + vobject = python3Packages.buildPythonPackage rec { + version = "0.9.2"; + name = "vobject-${version}"; + + src = fetchFromGitHub { + owner = "eventable"; + repo = "vobject"; + sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; + rev = version; + }; + + disabled = python3Packages.isPyPy; + + propagatedBuildInputs = with python3Packages; [ dateutil ]; + + checkPhase = "${python3Packages.python.interpreter} tests.py"; + + meta = with stdenv.lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = [ maintainers.matthiasbeyer ]; + }; + }; +in python3Packages.buildPythonApplication rec { - version = "0.11.1"; + version = "0.11.3"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27"; + sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69"; }; # setup.py reads the UTF-8 encoded readme. From f9d7d29fa939eeba39d5aa497b9703e60a016eab Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 14:18:53 +0100 Subject: [PATCH 7/9] sqlitebrowser: 3.8.0 -> 3.9.1 --- pkgs/development/tools/database/sqlitebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 338f3323d94..8290b57d41b 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.9.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; + sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; buildInputs = [ qt4 sqlite cmake ]; From b96a2fdd1b4ccec7839c75cd150530cf2cfc3897 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 14:21:52 +0100 Subject: [PATCH 8/9] vdirsyncer: 0.14.0 -> 0.14.1 --- pkgs/tools/misc/vdirsyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index e32e58fcded..a5abc8bef83 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.14.0"; + version = "0.14.1"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898"; + sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"; }; propagatedBuildInputs = with pythonPackages; [ From 92f66c252033c1a4afd4e78bc00ef8d000819cf4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 18 Feb 2017 12:12:22 +0100 Subject: [PATCH 9/9] khard: 0.11.3 -> 0.11.4 --- pkgs/applications/misc/khard/default.nix | 30 ++---------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index da6dece237e..3a87e854dc1 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,39 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: -let - vobject = python3Packages.buildPythonPackage rec { - version = "0.9.2"; - name = "vobject-${version}"; - - src = fetchFromGitHub { - owner = "eventable"; - repo = "vobject"; - sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; - rev = version; - }; - - disabled = python3Packages.isPyPy; - - propagatedBuildInputs = with python3Packages; [ dateutil ]; - - checkPhase = "${python3Packages.python.interpreter} tests.py"; - - meta = with stdenv.lib; { - description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; - license = licenses.asl20; - maintainers = [ maintainers.matthiasbeyer ]; - }; - }; -in python3Packages.buildPythonApplication rec { - version = "0.11.3"; + version = "0.11.4"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69"; + sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r"; }; # setup.py reads the UTF-8 encoded readme.