From c772ecdf48d82d52cc43e72847eba773934d3ef9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 11:30:34 +0200 Subject: [PATCH 1/7] bean-add: 2017-01-20 -> 2017-04-06 --- 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 7535b6abf3c..667c159838a 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-2017-01-20"; + name = "bean-add-2017-04-06"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "752674259fb9512e076ef2048927fb791ad21507"; - sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61"; + rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024"; + sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93"; }; propagatedBuildInputs = with python3Packages; [ python ]; From 3759dc5a762ae78e18dbca85222e7aa88e2fb682 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 11:34:28 +0200 Subject: [PATCH 2/7] cortex: Remove package I removed cortex it is rather unmaintained. The last update (as of writing) was 8 months ago, there was no release ever. For a better alternative, have a look at `rtv`. --- pkgs/applications/misc/cortex/default.nix | 32 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/applications/misc/cortex/default.nix diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix deleted file mode 100644 index 42565ae7fa8..00000000000 --- a/pkgs/applications/misc/cortex/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchgit, python3 }: - -stdenv.mkDerivation { - name = "cortex-2015-08-23"; - - src = fetchgit { - url = "https://github.com/gglucas/cortex"; - rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639"; - sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg"; - }; - - buildInputs = [ stdenv python3 ]; - - prePatch = '' - substituteInPlace cortex --replace "/usr/bin/env python3" "${python3}/bin/python3" - ''; - - installPhase = '' - mkdir -p $out/bin - cp cortex $out/bin/ - chmod +x $out/bin/cortex - ''; - - meta = with stdenv.lib; { - homepage = "http://cortex.glacicle.org"; - description = "An ncurses reddit browser and monitor"; - license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with platforms; unix; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04319607ef..97e0b8a4b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13191,8 +13191,6 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; - cortex = callPackage ../applications/misc/cortex { }; - csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { From 12244f51f98ebf203a034cbe1364167f02749798 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 11:38:04 +0200 Subject: [PATCH 3/7] haxor-news: 0.4.1 -> 0.4.2 --- pkgs/applications/misc/haxor-news/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e925885f05f..d2acbbfea5b 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "0.4.1"; + version = "0.4.2"; name = "haxor-news-${version}"; src = fetchurl { url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; - sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr"; + sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs"; }; propagatedBuildInputs = with pythonPackages; [ @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { colorama requests2 pygments - prompt_toolkit_52 + prompt_toolkit six ]; From 7c8c7139dd08264634800810f3c5bdd68f0efc5a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 11:39:11 +0200 Subject: [PATCH 4/7] khal: 0.9.2 -> 0.9.5 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 8d7eeffad31..98dbb0cbf91 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,12 +3,12 @@ with python3Packages; buildPythonApplication rec { - version = "0.9.2"; + version = "0.9.5"; name = "khal-${version}"; src = fetchurl { url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; - sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"; + sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr"; }; LC_ALL = "en_US.UTF-8"; From 24e16e61c90345aa4953716927783c7a469b79c3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 11:41:37 +0200 Subject: [PATCH 5/7] mwic: 0.7.2 -> 0.7.3 --- pkgs/applications/misc/mwic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 7b9b04c66c8..2faf082197c 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.2"; + version = "0.7.3"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy"; + sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn"; }; makeFlags=["PREFIX=\${out}"]; From add585af11cad926c64e13f33556eed4606a2a1d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 12:28:49 +0200 Subject: [PATCH 6/7] sc-im: 0.5.0 -> 0.6.0 --- pkgs/applications/misc/sc-im/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 6d9e1c9fcf2..19fc62d1238 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.6.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61"; + sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; }; buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ]; From cca20a711452fef85fea09d0edaa1c35ea4d00aa Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 25 Apr 2017 12:30:54 +0200 Subject: [PATCH 7/7] vdirsyncer: 0.14.1 -> 0.15.0 --- 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 a5abc8bef83..d1fa9d5bea6 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.1"; + version = "0.15.0"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"; + sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; }; propagatedBuildInputs = with pythonPackages; [