diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/x11spice/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/admin/pulumi/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/mbuffer/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/pgmetrics/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pspg/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/smokeping/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/package-management/nfpm/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/security/duo-unix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/fprintd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 4 |
12 files changed, 68 insertions, 26 deletions
diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix new file mode 100644 index 00000000000..513149049fa --- /dev/null +++ b/pkgs/tools/X11/x11spice/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig +, xorg, gtk2, spice, spice-protocol +}: + +stdenv.mkDerivation rec { + pname = "x11spice"; + version = "2019-08-20"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "spice"; + repo = "x11spice"; + rev = "51d2a8ba3813469264959bb3ba2fc6fe08097be6"; + sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ + xorg.libxcb xorg.xcbutil xorg.utilmacros + gtk2 spice spice-protocol + ]; + + NIX_LDFLAGS = "-lpthread"; + + meta = with stdenv.lib; { + description = '' + x11spice will enable a running X11 desktop to be available + via a Spice server + ''; + homepage = https://gitlab.freedesktop.org/spice/x11spice; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index a7199c66547..3d92bfd3682 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "1.1.0"; + version = "1.3.4"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { x86_64-linux = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224"; + sha256 = "1scs2msmg6ba91ri9al3299xnq8gq63clbqq1n03karf6ys2jnvi"; }; x86_64-darwin = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg"; + sha256 = "0k3hfrcwa5sgg8mgmxp2xfykrshyp4bv77d3y8758zm7xqmmjg69"; }; }; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 07ba47dda4d..1afefc71465 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "6.5"; + version = "7.0"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a"; + sha256 = "0ynh7wrgpnmwah9r2ll32dmicdivz13ijjxg2vj1qcaxgy0b5ivm"; }; buildInputs = [ diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 44b00adf5c1..7edfb280e43 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,18 +3,19 @@ } : stdenv.mkDerivation rec { - version = "20190725"; + version = "20191016"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91"; + sha256 = "05xyvmbs2x5gbj2njgg7hsj3alb5dh96xhab0w0qkhb58x2i1hld"; }; buildInputs = [ openssl ]; + doCheck = true; meta = { - homepage = http://www.maier-komor.de/mbuffer.html; + homepage = "http://www.maier-komor.de/mbuffer.html"; description = "A tool for buffering data streams with a large set of unique features"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ tokudan ]; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 0e42dd392d7..bfacb713567 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "1zjcchgpmp2a0ir8rzrfjpn4pcjiy4kawh2pbmszmqfzw1mkh762"; + sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs"; }; modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb"; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 099c5598958..ca769be02d8 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,24 +2,22 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.0.4"; + version = "2.1.8"; src = fetchFromGitHub { owner = "okbob"; - repo = "pspg"; + repo = pname; rev = version; - sha256 = "1xiyshz56qpx3bv0mzx73rqr7wmyamyj8jbqdv05wjb72npkjmzl"; + sha256 = "0nfc1cv2l2v1rav5jj7jz5wyb2df5l3iwrvvpkvxxpv3qll8kcfv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnugrep ncurses readline ]; - preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://github.com/okbob/pspg; + homepage = "https://github.com/okbob/pspg"; description = "Postgres Pager"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 0ff6a3baa59..ad49c5e6c32 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy"; + sha256 = "1g7rhgp405v7q9xx44k6jn3py4v73a9qjwhai6l459wdywdz1n3n"; }; # test-utils coredumps so don't run those diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 0c9079240d0..6a816615e9c 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://oss.oetiker.ch/smokeping; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index b1f3c553bf1..9198e6d5ab6 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "nfpm"; - version = "0.13.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli"; + sha256 = "0d92wwmvyk6sn3z61y1n9w4wydafra941s0cpbnkc7c9qkxiwwnb"; }; - modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w"; + modSha256 = "04hcg1n8f1wxz7n1k91nfspkd1ca7v5xf4hjj3wiw55vmykzcsm5"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { description = "A simple deb and rpm packager written in Go"; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 49ceacadcb7..2cf9b92745f 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "11467kk8blg777vss0hsgz6k8f5m43p50zqs7yhx2sgbh9ygnn6y"; + sha256 = "097i2dsnbndpnyc4nx1j76qkx1bxwwlxnzmp1h3j4raghddgiq0g"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index ab2de77b6b1..41a00306f69 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -12,6 +12,8 @@ , nss , pam , systemd +, autoreconfHook +, gtk-doc }: stdenv.mkDerivation rec { @@ -33,6 +35,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig + autoreconfHook # Drop with above patch + gtk-doc # Drop with above patch ]; buildInputs = [ diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 306bd0574c9..07fcf0eca8b 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0mj0y2hrl7yp8mfjgi68gvbravgwp5v58hhcclr49mdjnr4v6i9x"; + sha256 = "0dqnxzfdic3v10rr8k83zfbv7qc3yanajd81a0amzs778sqp7x9f"; }; dontUnpack = true; |