diff options
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/ansible/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/awslogs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/mycli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/nxproxy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/swiftclient/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 10 |
6 files changed, 45 insertions, 13 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 6ae089ac1d9..73d1929c703 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -63,8 +63,8 @@ in rec { }; ansible_2_7 = generic { - version = "2.7.2"; - sha256 = "1q0yxba57m18rfpc3syvj7vyqsb35081h6s33qr6h0jf3r9pj3d0"; + version = "2.7.4"; + sha256 = "0p1n6yyc632522fl2r247p0jg4mncc7z4hqngzbh1zxq3dcb12s9"; }; ansible2 = ansible_2_7; diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index c4dbb39cdd8..d2b6a5dca9f 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "awslogs"; - version = "0.10"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; rev = "${version}"; - sha256 = "18s3xxdhhbz96mgj9ipgyrdcax3p9gy8gpmr0rblw8g0grj31dsp"; + sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc"; }; doCheck = false; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index d01dca45959..a4f4910a334 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.17.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "11d3ssjifms6bid77jk06zl5wl3srihijmv5kggxa0w2l59y8h9m"; + sha256 = "0x5vzl4vvirqy03fnjwkamhzrqkknlajamwz1rmbnqh4bfmijh9m"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index b29d80e159b..45ec8bb72e3 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "nxproxy-${version}"; - version = "3.5.99.16"; + version = "3.5.99.17-1"; src = fetchurl { - sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; + sha256 = "18a7cvjnaf50lf1cc5axx9jmi8n9g75d2i5y4s6q9r3phpwyp918"; url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix new file mode 100644 index 00000000000..ae8e5cac68c --- /dev/null +++ b/pkgs/tools/admin/swiftclient/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonApplication, fetchPypi, requests, six, pbr }: + +buildPythonApplication rec { + pname = "python-swiftclient"; + version = "3.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv"; + }; + + propagatedBuildInputs = [ requests six pbr ]; + + # For the tests the following requirements are needed: + # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt + # + # The ones missing in nixpkgs (currently) are: + # - hacking + # - keystoneauth + # - oslosphinx + # - stestr + # - reno + # - openstackdocstheme + doCheck = false; + + meta = with lib; { + homepage = https://github.com/openstack/python-swiftclient; + description = "Python bindings to the OpenStack Object Storage API"; + license = licenses.asl20; + maintainers = with maintainers; [ c0deaddict ]; + }; +} diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 69f6e056b73..317646501ca 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -11,14 +11,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.0pre20170419"; + version = "1.9.0"; name = "tigervnc-${version}"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - sha256 = "1y3fn7dwlkm7ilqn8bwyqj3bw7s7clnv7d4jml4wyvfihzz9j90b"; - rev = "v1.7.90"; + rev = "v1.9.0"; + sha256 = "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"; }; inherit fontDirectories; @@ -63,13 +63,13 @@ stdenv.mkDerivation rec { --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled - make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES + make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES popd ''; postInstall = '' pushd unix/xserver/hw/vnc - make TIGERVNC_SRCDIR=`pwd`/../.. install + make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install popd rm -f $out/lib/xorg/protocol.txt |