From 179c504a66b82d6c70c4e5d3ff5fe330edecfd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 24 May 2017 20:29:38 +0200 Subject: [PATCH] lxd: 2.0.2 -> 2.12 (#25685) * Upgrades lxd to version 2.12 * Adds missing packages to path for lxd --- nixos/modules/virtualisation/lxd.nix | 2 +- pkgs/tools/admin/lxd/default.nix | 4 +- pkgs/tools/admin/lxd/deps.nix | 208 +++++++++++++-------------- 3 files changed, 103 insertions(+), 111 deletions(-) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 9d76b890872a..b1ff0337994e 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -45,7 +45,7 @@ in after = [ "systemd-udev-settle.service" ]; # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfs-progs ]; + path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 40647f73379b..cba686f9c4c1 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.0.2"; + version = "2.12"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; + sha256 = "1znqsf6iky21kddvl13bf0lsj65czabwysdbvha24lm16s51mv0p"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix index 7325100bb3ad..e0f591a23d1e 100644 --- a/pkgs/tools/admin/lxd/deps.nix +++ b/pkgs/tools/admin/lxd/deps.nix @@ -1,20 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "github.com/dustinkirkland/golang-petname"; fetch = { type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14"; + sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di"; }; } { @@ -22,44 +14,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v2"; - rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; - sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a622679ebd7a3b813862379232f645f8e690e43f"; - sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; - sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; - }; - } - { - goPackagePath = "gopkg.in/inconshreveable/log15.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/inconshreveable/log15.v2"; - rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; - sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; + sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; }; } { @@ -67,8 +23,35 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; - sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604"; + sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; + sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "ded68f7a9561c023e790de24279db7ebf473ea80"; + sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd"; + sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq"; }; } { @@ -76,8 +59,35 @@ fetch = { type = "git"; url = "https://github.com/pborman/uuid"; - rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; - sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + rev = "1b00554d822231195d1babd97ff4a781231955c9"; + sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "e7cb7fa329f456b3855136a2642b197bad7366ba"; + sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb"; + sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; + sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; }; } { @@ -90,21 +100,12 @@ }; } { - goPackagePath = "github.com/olekukonko/tablewriter"; + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; fetch = { type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; - sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; }; } { @@ -112,62 +113,53 @@ fetch = { type = "git"; url = "https://gopkg.in/lxc/go-lxc.v2"; - rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; - sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + rev = "8304875cc3423823032ec93556beee076c6ba687"; + sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk"; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + goPackagePath = "gopkg.in/tomb.v2"; fetch = { type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + url = "https://gopkg.in/tomb.v2"; + rev = "d5d1b5820637886def9eef33e03a27a9f166942c"; + sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"; }; } { - goPackagePath = "github.com/coreos/go-systemd"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; - sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + url = "https://gopkg.in/yaml.v2"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } { - goPackagePath = "github.com/dustinkirkland/golang-petname"; - fetch = { - type = "git"; - url = "https://github.com/dustinkirkland/golang-petname"; - rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; - sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; - }; + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; + sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; + }; } { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; - sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; - }; + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb"; + sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g"; + }; } { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; - sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "305f360aee30243660f32600b87c3c1eaa947187"; - sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; - }; + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; + }; } ]