diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 85d3c4e49f9..a0414786ba4 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.5"; + version = "2.7"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd"; + sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk"; }; buildInputs = [ diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 1c7fd62f8ec..cdde212275d 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }: +{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }: stdenv.mkDerivation rec { - version = "2016-06-02"; + version = "1.5"; name = "cli-visualizer-${version}"; - src = fetchgit { - url = "https://github.com/dpayne/cli-visualizer.git"; - rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e"; - sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw"; + src = fetchFromGitHub { + owner = "dpayne"; + repo = "cli-visualizer"; + rev = version; + sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; }; postPatch = '' diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix index 777a759177c..42565ae7fa8 100644 --- a/pkgs/applications/misc/cortex/default.nix +++ b/pkgs/applications/misc/cortex/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, python3 }: stdenv.mkDerivation { - name = "cortex-2014-08-01"; + name = "cortex-2015-08-23"; src = fetchgit { url = "https://github.com/gglucas/cortex"; - rev = "e749de6c21aae02386f006fd0401d22b9dcca424"; - sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c"; + rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639"; + sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg"; }; buildInputs = [ stdenv python3 ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e4074547d78..e925885f05f 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.3.1"; + version = "0.4.1"; name = "haxor-news-${version}"; src = fetchurl { - url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz"; - sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m"; + url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; + sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index a44f4bff83e..5206feb215c 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.0.9"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4"; + sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 8488a8e6842..e2af415e60a 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.10.0"; + version = "1.13.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45"; + sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf"; }; propagatedBuildInputs = with pythonPackages; [ + beautifulsoup4 + mailcap-fix tornado requests2 six diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index cb18278d1ed..75d08ec8188 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }: +{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }: -let - version = "0.2.1"; -in stdenv.mkDerivation rec { - + version = "0.4.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb"; + sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0"; }; - buildInputs = [ yacc ncurses libxml2 ]; + buildInputs = [ yacc ncurses libxml2 pkgconfig ]; buildPhase = '' cd src - sed "s,prefix=/usr,prefix=$out," Makefile - sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile + sed -i "s,prefix=/usr,prefix=$out," Makefile + sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile make export DESTDIR=$out diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 192e4406b6d..a184d31233c 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.3"; name = "weather-${version}"; src = fetchurl { url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz"; - sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0"; + sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546"; }; nativeBuildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 3afb7ce4b10..4e73a305ea4 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-10-03"; + name = "bean-add-2016-12-02"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "41deacc09b992db5eede34fefbfb2c0faeba1652"; - sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca"; + rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9"; + sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 2034c832294..72f6c5de8a1 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b12"; + version = "2.0b13"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z"; + sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5ed7d25667e..a246c7290a5 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,19 +1,17 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.0"; + version = "1.2"; name = "fava-${version}"; - src = fetchFromGitHub { - owner = "aumayr"; - repo = "fava"; - rev = "v${version}"; - sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka"; + src = fetchurl { + url = "https://github.com/beancount/fava/archive/v${version}.tar.gz"; + sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw"; }; assets = fetchzip { - url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; - sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc"; + url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; + sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp"; }; buildInputs = with python3Packages; [ pytest_30 ]; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 8ff4a1074e6..9393a978b07 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pipes-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2"; + sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb"; }; buildInputs = with pkgs; [ bash ]; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 28ca858440b..ccab31ce225 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotty-${version}"; - version = "0.0.10"; + version = "0.0.13"; rev = "v${version}"; goPackagePath = "github.com/yudai/gotty"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "yudai"; repo = "gotty"; - sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; + sha256 = "1hsfjyjjzr1zc9m8bnhid1ag6ipcbx59111y9p7k8az8jiyr112g"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index ba9b8b2d771..55ba6b9db55 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.2.0"; + version = "0.8.0"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0hgw3kx9rfdg394darms3vqcjm6xw6qrm8gnz54nahmyxnhrxnpp"; + sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5528def1ae5..949cb86d2c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30057,6 +30057,24 @@ EOF }; }; + mailcap-fix = buildPythonPackage rec { + name = "mailcap-fix-${version}"; + version = "1.0.1"; + + disabled = isPy36; # this fix is merged into python 3.6 + + src = pkgs.fetchurl { + url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz"; + sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i"; + }; + + meta = with stdenv.lib; { + description = "A patched mailcap module that conforms to RFC 1524"; + homepage = "https://github.com/michael-lazar/mailcap_fix"; + license = licenses.unlicense; + }; + }; + maildir-deduplicate = buildPythonPackage rec { name = "maildir-deduplicate-${version}"; version = "1.0.2";