diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/eksctl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/backup/diskrsync/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/backup/diskrsync/deps.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/tinc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/notary/default.nix | 2 |
7 files changed, 44 insertions, 14 deletions
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 71573356ee80..253306586532 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0lfg7im43bslbg23xajdh0nhy4lj3y70gncxgqzfklb1ax0953r2"; + sha256 = "1aw69kcb2wx832hdfbx0944wwvdn5jbpr164pv6z0bxqzc0yi2kv"; }; modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3"; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 97d876da1279..b2ef04dcffc7 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "diskrsync"; - version = "unstable-2018-02-03"; + version = "unstable-2019-01-02"; src = fetchFromGitHub { owner = "dop251"; repo = pname; - rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730"; - sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn"; + rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139"; + sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs"; }; goPackagePath = "github.com/dop251/diskrsync"; diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix index 684100968e88..8045737164b1 100644 --- a/pkgs/tools/backup/diskrsync/deps.nix +++ b/pkgs/tools/backup/diskrsync/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { goPackagePath = "github.com/dop251/spgz"; fetch = { type = "git"; url = "https://github.com/dop251/spgz"; - rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5"; - sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx"; + rev = "b86304a2b188"; + sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7"; }; } { @@ -14,8 +14,35 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; - sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; + rev = "9756ffdc2472"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "eb5bcb51f2a3"; + sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "97732733099d"; + sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } ] diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 48b1b0764c51..7249a6cdaad7 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ import ./base.nix rec { - rev = "stable_release_${version}"; + rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609"; version = "2.40.1"; sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj"; } diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 35259dada3db..1b949108c54a 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -61,6 +61,9 @@ stdenv.mkDerivation rec { # Manually expand literal "$(out)", which have failed to expand sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ -i "$out/etc/systemd/system/configure-printer@.service" + + substituteInPlace $out/etc/udev/rules.d/70-printers.rules \ + --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer" ''; meta = { diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index cf4a2bad78b9..e331916626e3 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.35"; + version = "1.0.36"; pname = "tinc"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"; + sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 17473b639881..f1a61adabbb6 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild cd go/src/github.com/theupdateframework/notary - make client GITCOMMIT=${gitcommit} + SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} runHook postBuild ''; |