diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/virtualization')
5 files changed, 168 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index f62fdd2f78fb..6ed545deb677 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.14.1"; + version = "1.15.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; + sha256 = "0p0z12b6z00sxzjfsvb37czgczrsi61klr5azan0f8wf32x6wc28"; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index 54f1f492487d..c79c2e7cb353 100644 --- a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,8 +8,8 @@ let binPath = stdenv.lib.makeBinPath [ in buildGoPackage rec { name = "distrobuilder-${version}"; - version = "2018_10_04"; - rev = "d2329be9569d45028a38836186d2353b8ddfe1ca"; + version = "2019_10_07"; + rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; goPackagePath = "github.com/lxc/distrobuilder"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "1sn1wif86p089kr6zq83k81hjd1d73kamnawc2p0k0vd0w91d3v4"; + sha256 = "0k59czgasy4d58bkrin6hvgmh7y3nf177lwd0y4g47af27bgnyc4"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix index e4c65946551d..7f79d8931fcc 100644 --- a/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix +++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix @@ -1,12 +1,57 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "b6dbe470e10224a23b2f69db0d4449bc6627ece6"; + sha256 = "1959kzmjijpll6432da84rmzgd7p3yyqdq9chyxnm8318pr5znji"; + }; + } + { goPackagePath = "github.com/flosch/pongo2"; fetch = { type = "git"; url = "https://github.com/flosch/pongo2"; - rev = "24195e6d38b06020d7a92c7b11960cf2e7cad2f2"; - sha256 = "1cbg3ya8l2v34gcxnd73nvzpfpx8kzkbiv0kpgaxqpcqjhanhgj9"; + rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "043cb4b8af871b49563291e32c66bb84378a60ac"; + sha256 = "03jarnkaf42xgfamb0jlya4c1cyk8gnxhcd21m3fx145vz4px398"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "54ea459691466cfb630ccc276723fe3963f3e9d5"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "dc520c910ea91354b3ae131bbb029270e4fc1af4"; + sha256 = "1ph05pkbq0ggdab152f7hjlc758nkrw22fqgslnf1nvggadjkvqs"; }; } { @@ -14,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + rev = "ae1634f6a98965ded3b8789c626cb4e0bd78c3de"; + sha256 = "0nw0mdcs75ghr9a5asrk9a7yc00703yvv4xf6wyd3z44ihs4hrjv"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941"; + sha256 = "0zfs69q7f5xlkqhd4wzjc8gfdisahapz5g94sa8lzr5b4jg9ycbw"; }; } { @@ -23,8 +77,17 @@ fetch = { type = "git"; url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d597bd98acac068193d341983326a3"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + rev = "e65537c515d77e35697c471d6c2755375cb3adc4"; + sha256 = "119806fhl4isbxc3g52335jgiv6cddfbapr1absd4v4kkq55i5qh"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "73c17a9b9528eb3ce857b782a2816c0cda581e62"; + sha256 = "0l0m5zi2mf649knxgmch1cblz3a3xiny1c9ki2241phkpwzspjq1"; }; } { @@ -32,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/lxc/lxd"; - rev = "5507ca02c639b378290402c7d33911a90caa4f9e"; - sha256 = "08h6ycnq43zhkzlrfvk656d1xqjbxhz6dpqmzcmrkb3pw0h0f8hg"; + rev = "fd924cb85d99475f9a0349208a8d7d0f30bdb6f0"; + sha256 = "1v246x0bi6ljkfjfjkfjbfh0imfbps2zd0m55cxdsl8y96pfx1hs"; + }; + } + { + goPackagePath = "github.com/mudler/docker-companion"; + fetch = { + type = "git"; + url = "https://github.com/mudler/docker-companion"; + rev = "6a693e9b9eaf2cd08ba628350613f2e08e9af57d"; + sha256 = "06ch1xhfd62dwkmh1z0ihifpmvgnki97k8s7gzivincy80xj0xpc"; }; } { @@ -41,8 +113,26 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "3670dca80da881cddd5377fb9496daaabb8dec9f"; + sha256 = "0h01adrajbl3h0yx3bkig79ap9n6ikz90cpszhqwvgr63a0xbn13"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "07a84ee7412e7a28663d92930a1d46f81b124ee1"; + sha256 = "00hms8fnbhxb5lir3ykhl5lf1n2yqxddmd47cxp6d5ziv6k5swc8"; }; } { @@ -50,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"; - sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy"; + rev = "2d7544ebdeb5f926805c57af8dccc6c359de28d4"; + sha256 = "04b2bq8g948mn020l4cwhdnqffag29r21x2nyyg6cjqj306gs4vs"; }; } { @@ -59,8 +149,53 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; - sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; + rev = "24fa6976df40757dce6aea913e7b81ade90530e1"; + sha256 = "0rf6prz6gl0l1b3wijzdgq887cdwigvzxvz6gqbm5l8pkq3fx1m9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "da137c7871d730100384dbcf36e6f8fa493aef5b"; + sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; + sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "gopkg.in/antchfx/htmlquery.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/antchfx/htmlquery.v1"; + rev = "b8d36292614567671decfe6f96c7b8c432d3249b"; + sha256 = "1rsvngqlqyg86g1ff59zmrkn7s8b3c2vpl533amwcv5s2h8npmxy"; }; } { diff --git a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 012090ba079d..7251b418d4e0 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -7,21 +7,22 @@ stdenv.mkDerivation rec { name = "google-compute-engine-oslogin-${version}"; - version = "1.4.3"; + version = "1.5.3"; + # from packages/google-compute-engine-oslogin/packaging/debian/changelog src = fetchFromGitHub { - repo = "compute-image-packages"; owner = "GoogleCloudPlatform"; - rev = "2ccfe80f162a01b5b7c3316ca37981fc8b3fc32a"; - sha256 = "036g7609ni164rmm68pzi47vrywfz2rcv0ad67gqf331pvlr92x1"; + repo = "compute-image-packages"; + rev = "20190522"; + sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; }; - sourceRoot = "source/google_compute_engine_oslogin"; + sourceRoot = "source/packages/google-compute-engine-oslogin"; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace utils/oslogin_utils.cc --replace /bin/bash ${stdenv.shell} + substituteInPlace compat.h --replace /bin/bash ${stdenv.shell} ''; buildInputs = [ curl.dev pam ]; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; description = "OS Login Guest Environment for Google Compute Engine"; diff --git a/nixpkgs/pkgs/tools/virtualization/mininet/default.nix b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix index a2f4b1650876..0ee27d36e0af 100644 --- a/nixpkgs/pkgs/tools/virtualization/mininet/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix @@ -8,8 +8,8 @@ let pyEnv = python.withPackages(ps: [ ps.setuptools ]); in stdenv.mkDerivation rec { - name = "mininet-${version}"; - version = "2.3.0d4"; + pname = "mininet"; + version = "2.3.0d6"; outputs = [ "out" "py" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "mininet"; repo = "mininet"; rev = version; - sha256 = "02hsqa7r5ykj8m1ycl32xwn1agjrw78wkq87xif0dl2vkzln41i4"; + sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x"; }; buildFlags = [ "mnexec" ]; @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Emulator for rapid prototyping of Software Defined Networks"; license = { - fullName = "Mininet 2.3.0d4 License"; + fullName = "Mininet 2.3.0d6 License"; }; + platforms = platforms.linux; homepage = https://github.com/mininet/mininet; maintainers = with maintainers; [ teto ]; }; |