diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 8aa191c0f3c2..e75076e53d1c 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "3.4"; + version = "3.6"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0"; + sha256 = "1639sf200n9rxgkvvhlhnrjsb7vn42p1fl1rx562axh3vpr6j4c4"; }; nativeBuildInputs = [ @@ -33,7 +33,9 @@ with python3.pkgs; buildPythonApplication rec { # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ - --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" + --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \ + --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \ + --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; installPhase = '' diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index c82e5026ff18..b37a6ad732fe 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -20,6 +20,8 @@ buildPythonApplication rec { six ]; + doCheck = false; + checkInputs = [ mock ]; checkPhase = '' diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 3c4f409d18f1..6b62b418d786 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, readline, ncurses }: -let - version = "1.23"; -in stdenv.mkDerivation rec { - - name = "hstr-${version}"; + name = "hstr-${version}"; + version = "1.24"; src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv"; + sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 3a87e854dc1f..5f3ac3d93c44 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.11.4"; + version = "0.12.2"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r"; + sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j"; }; # setup.py reads the UTF-8 encoded readme. @@ -19,7 +19,9 @@ python3Packages.buildPythonApplication rec { configobj vobject argparse - pyyaml + ruamel_yaml + ruamel_base + unidecode ]; # Fails; but there are no tests anyway. diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index af8d00b59bfb..787ce7231f30 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -26,6 +26,6 @@ buildGoPackage rec { homepage = https://github.com/McKael/madonctl; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 2faf082197c8..e6ac35d19a0c 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.3"; + version = "0.7.4"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn"; + sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; }; makeFlags=["PREFIX=\${out}"]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index c093a7516031..e664a5a75274 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.6.0"; + version = "0.7.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; + sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildPhase = '' cd src + sed 's/LDLIBS += -lm/& -lncurses/' -i Makefile + sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \ -e "\|^#LDLIBS += -lxlsreader| s|^#|| " \ -e "\|^#CFLAGS += -DXLS| s|^#|| " \ diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index ae2bab64187d..622f6e147524 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchPypi, pythonPackages }: buildPythonApplication rec { - version = "1.3.0"; + version = "1.4.0"; pname = "sigal"; src = fetchPypi { inherit version pname; - sha256 = "0ycyrap4rc0yrjagi5c5fs5gpw9whvkli656syfpj99dq1q9q1d0"; + sha256 = "0da0n8jhjp2swr18zga87xc77r8c7qwqf5sp222ph9sn3yyyc35i"; }; buildInputs = with pythonPackages; [ pytest ]; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9cee31b01eb7..9eec315217cb 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-10-31"; + name = "bean-add-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2"; - sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh"; + rev = "660c657f295b019d8dbc26375924eb17bf654341"; + sha256 = "0vzff2hdng8ybwd5frflhxpak0yqg0985p1dy7vpvhr8kbqqzwdz"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index e63e13a218e7..89f1821981fc 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share your terminal as a web application"; homepage = https://github.com/yudai/gotty; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index f1493630a2a5..061a6c58d237 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "v0.9.10"; + version = "v0.9.11"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = version; - sha256 = "1fh0s5zhx8ps760w0yxjv682lhahz1j63i0gdwvvr5vnvyx6c40d"; + sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 382b69722a42..ad5b259eb77a 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.16.3"; + version = "0.16.4"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"; + sha256 = "03wva48bgv1ad3df6plc9b8xxh6k8bcaxrhlzwh81c9mzn5bspzv"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index fd7caf927653..b1f83c8b2161 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.11.0"; + version = "0.11.1"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip"; + sha256 = "0gi76wcn6lxkd74ljpbyhr7ylhq6sm8z7h66dnfmpsw4nhw49178"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f39e8b0d36e..8cc378ddbfab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15509,11 +15509,11 @@ in { ruamel_yaml = buildPythonPackage rec { name = "ruamel.yaml-${version}"; - version = "0.13.7"; + version = "0.15.35"; src = pkgs.fetchurl { url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz"; - sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h"; + sha256 = "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd"; }; # Tests cannot load the module to test