commit 179c504a66b82d6c70c4e5d3ff5fe330edecfd3b · pyrox.dev/nixpkgs

+1 -1

nixos/modules/virtualisation/lxd.nix

···

       45
       45
        
               after = [ "systemd-udev-settle.service" ];

     

       46
       46
        
       

     

       47
       47
        
               # TODO(wkennington): Add lvm2 and thin-provisioning-tools

     

       48
       48
       -
               path = with pkgs; [ acl rsync gnutar xz btrfs-progs ];

     

       48
       48
       +
               path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ];

     

       49
       49
        
       

     

       50
       50
        
               serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd";

     

       51
       51
        
               serviceConfig.Type = "simple";

+2 -2

pkgs/tools/admin/lxd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "lxd-${version}";

     

       5
       5
       -
         version = "2.0.2";

     

       5
       5
       +
         version = "2.12";

     

       6
       6
        
         rev = "lxd-${version}";

     

       7
       7
        
       

     

       8
       8
        
         goPackagePath = "github.com/lxc/lxd";

     
···

       11
       11
        
           inherit rev;

     

       12
       12
        
           owner = "lxc";

     

       13
       13
        
           repo = "lxd";

     

       14
       14
       -
           sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs";

     

       14
       14
       +
           sha256 = "1znqsf6iky21kddvl13bf0lsj65czabwysdbvha24lm16s51mv0p";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         goDeps = ./deps.nix;

+78 -86

pkgs/tools/admin/lxd/deps.nix

···

       1
       1
       +
       # This file was generated by https://github.com/kamilchm/go2nix v1.2.0

     

       1
       2
        
       [

     

       2
       3
        
         {

     

       3
       3
       -
           goPackagePath = "gopkg.in/yaml.v2";

     

       4
       4
       +
           goPackagePath = "github.com/dustinkirkland/golang-petname";

     

       4
       5
        
           fetch = {

     

       5
       6
        
             type = "git";

     

       6
       6
       -
             url = "https://gopkg.in/yaml.v2";

     

       7
       7
       -
             rev = "a83829b6f1293c91addabc89d0571c246397bbf4";

     

       8
       8
       -
             sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";

     

       9
       9
       -
           };

     

       10
       10
       -
         }

     

       11
       11
       -
         {

     

       12
       12
       -
           goPackagePath = "golang.org/x/crypto";

     

       13
       13
       -
           fetch = {

     

       14
       14
       -
             type = "git";

     

       15
       15
       -
             url = "https://go.googlesource.com/crypto";

     

       16
       16
       -
             rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";

     

       17
       17
       -
             sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";

     

       7
       7
       +
             url = "https://github.com/dustinkirkland/golang-petname";

     

       8
       8
       +
             rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14";

     

       9
       9
       +
             sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di";

     

       18
       10
        
           };

     

       19
       11
        
         }

     

       20
       12
        
         {

     
···

       22
       14
        
           fetch = {

     

       23
       15
        
             type = "git";

     

       24
       16
        
             url = "https://github.com/golang/protobuf";

     

       25
       25
       -
             rev = "59b73b37c1e45995477aae817e4a653c89a858db";

     

       26
       26
       -
             sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";

     

       17
       17
       +
             rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";

     

       18
       18
       +
             sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";

     

       27
       19
        
           };

     

       28
       20
        
         }

     

       29
       21
        
         {

     

       30
       30
       -
           goPackagePath = "gopkg.in/tomb.v2";

     

       22
       22
       +
           goPackagePath = "github.com/gorilla/mux";

     

       31
       23
        
           fetch = {

     

       32
       24
        
             type = "git";

     

       33
       33
       -
             url = "https://gopkg.in/tomb.v2";

     

       34
       34
       -
             rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";

     

       35
       35
       -
             sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";

     

       25
       25
       +
             url = "https://github.com/gorilla/mux";

     

       26
       26
       +
             rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604";

     

       27
       27
       +
             sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz";

     

       36
       28
        
           };

     

       37
       29
        
         }

     

       38
       30
        
         {

     
···

       40
       32
        
           fetch = {

     

       41
       33
        
             type = "git";

     

       42
       34
        
             url = "https://github.com/gorilla/websocket";

     

       43
       43
       -
             rev = "a622679ebd7a3b813862379232f645f8e690e43f";

     

       44
       44
       -
             sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";

     

       45
       45
       -
           };

     

       46
       46
       -
         }

     

       47
       47
       -
         {

     

       48
       48
       -
           goPackagePath = "github.com/syndtr/gocapability";

     

       49
       49
       -
           fetch = {

     

       50
       50
       -
             type = "git";

     

       51
       51
       -
             url = "https://github.com/syndtr/gocapability";

     

       52
       52
       -
             rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852";

     

       53
       53
       -
             sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l";

     

       35
       35
       +
             rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";

     

       36
       36
       +
             sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";

     

       54
       37
        
           };

     

       55
       38
        
         }

     

       56
       39
        
         {

     

       57
       57
       -
           goPackagePath = "gopkg.in/inconshreveable/log15.v2";

     

       40
       40
       +
           goPackagePath = "github.com/mattn/go-colorable";

     

       58
       41
        
           fetch = {

     

       59
       42
        
             type = "git";

     

       60
       60
       -
             url = "https://gopkg.in/inconshreveable/log15.v2";

     

       61
       61
       -
             rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";

     

       62
       62
       -
             sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";

     

       43
       43
       +
             url = "https://github.com/mattn/go-colorable";

     

       44
       44
       +
             rev = "ded68f7a9561c023e790de24279db7ebf473ea80";

     

       45
       45
       +
             sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc";

     

       63
       46
        
           };

     

       64
       47
        
         }

     

       65
       48
        
         {

     

       66
       66
       -
           goPackagePath = "github.com/gorilla/mux";

     

       49
       49
       +
           goPackagePath = "github.com/mattn/go-sqlite3";

     

       67
       50
        
           fetch = {

     

       68
       51
        
             type = "git";

     

       69
       69
       -
             url = "https://github.com/gorilla/mux";

     

       70
       70
       -
             rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5";

     

       71
       71
       -
             sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9";

     

       52
       52
       +
             url = "https://github.com/mattn/go-sqlite3";

     

       53
       53
       +
             rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd";

     

       54
       54
       +
             sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq";

     

       72
       55
        
           };

     

       73
       56
        
         }

     

       74
       57
        
         {

     
···

       76
       59
        
           fetch = {

     

       77
       60
        
             type = "git";

     

       78
       61
        
             url = "https://github.com/pborman/uuid";

     

       79
       79
       -
             rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";

     

       80
       80
       -
             sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";

     

       62
       62
       +
             rev = "1b00554d822231195d1babd97ff4a781231955c9";

     

       63
       63
       +
             sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";

     

       81
       64
        
           };

     

       82
       65
        
         }

     

       83
       66
        
         {

     

       84
       84
       -
           goPackagePath = "gopkg.in/flosch/pongo2.v3";

     

       67
       67
       +
           goPackagePath = "github.com/syndtr/gocapability";

     

       85
       68
        
           fetch = {

     

       86
       69
        
             type = "git";

     

       87
       87
       -
             url = "https://gopkg.in/flosch/pongo2.v3";

     

       88
       88
       -
             rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";

     

       89
       89
       -
             sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";

     

       70
       70
       +
             url = "https://github.com/syndtr/gocapability";

     

       71
       71
       +
             rev = "e7cb7fa329f456b3855136a2642b197bad7366ba";

     

       72
       72
       +
             sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1";

     

       90
       73
        
           };

     

       91
       74
        
         }

     

       92
       75
        
         {

     

       93
       93
       -
           goPackagePath = "github.com/olekukonko/tablewriter";

     

       76
       76
       +
           goPackagePath = "golang.org/x/crypto";

     

       94
       77
        
           fetch = {

     

       95
       78
        
             type = "git";

     

       96
       96
       -
             url = "https://github.com/olekukonko/tablewriter";

     

       97
       97
       -
             rev = "cca8bbc0798408af109aaaa239cbd2634846b340";

     

       98
       98
       -
             sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48";

     

       79
       79
       +
             url = "https://go.googlesource.com/crypto";

     

       80
       80
       +
             rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb";

     

       81
       81
       +
             sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c";

     

       99
       82
        
           };

     

       100
       83
        
         }

     

       101
       84
        
         {

     

       102
       102
       -
           goPackagePath = "github.com/mattn/go-sqlite3";

     

       85
       85
       +
           goPackagePath = "golang.org/x/net";

     

       103
       86
        
           fetch = {

     

       104
       87
        
             type = "git";

     

       105
       105
       -
             url = "https://github.com/mattn/go-sqlite3";

     

       106
       106
       -
             rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";

     

       107
       107
       -
             sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";

     

       88
       88
       +
             url = "https://go.googlesource.com/net";

     

       89
       89
       +
             rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";

     

       90
       90
       +
             sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";

     

       108
       91
        
           };

     

       109
       92
        
         }

     

       110
       93
        
         {

     

       111
       111
       -
           goPackagePath = "gopkg.in/lxc/go-lxc.v2";

     

       94
       94
       +
           goPackagePath = "gopkg.in/flosch/pongo2.v3";

     

       112
       95
        
           fetch = {

     

       113
       96
        
             type = "git";

     

       114
       114
       -
             url = "https://gopkg.in/lxc/go-lxc.v2";

     

       115
       115
       -
             rev = "8f9e220b36393c03854c2d224c5a55644b13e205";

     

       116
       116
       -
             sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip";

     

       97
       97
       +
             url = "https://gopkg.in/flosch/pongo2.v3";

     

       98
       98
       +
             rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";

     

       99
       99
       +
             sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";

     

       117
       100
        
           };

     

       118
       101
        
         }

     

       119
       102
        
         {

     

       120
       120
       -
           goPackagePath = "github.com/mattn/go-runewidth";

     

       103
       103
       +
           goPackagePath = "gopkg.in/inconshreveable/log15.v2";

     

       121
       104
        
           fetch = {

     

       122
       105
        
             type = "git";

     

       123
       123
       -
             url = "https://github.com/mattn/go-runewidth";

     

       124
       124
       -
             rev = "d6bea18f789704b5f83375793155289da36a3c7f";

     

       125
       125
       -
             sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";

     

       106
       106
       +
             url = "https://gopkg.in/inconshreveable/log15.v2";

     

       107
       107
       +
             rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";

     

       108
       108
       +
             sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";

     

       126
       109
        
           };

     

       127
       110
        
         }

     

       128
       111
        
         {

     

       129
       129
       -
           goPackagePath = "github.com/coreos/go-systemd";

     

       112
       112
       +
           goPackagePath = "gopkg.in/lxc/go-lxc.v2";

     

       130
       113
        
           fetch = {

     

       131
       114
        
             type = "git";

     

       132
       132
       -
             url = "https://github.com/coreos/go-systemd";

     

       133
       133
       -
             rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1";

     

       134
       134
       -
             sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28";

     

       115
       115
       +
             url = "https://gopkg.in/lxc/go-lxc.v2";

     

       116
       116
       +
             rev = "8304875cc3423823032ec93556beee076c6ba687";

     

       117
       117
       +
             sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk";

     

       135
       118
        
           };

     

       136
       119
        
         }

     

       137
       120
        
         {

     

       138
       138
       -
           goPackagePath = "github.com/dustinkirkland/golang-petname";

     

       121
       121
       +
           goPackagePath = "gopkg.in/tomb.v2";

     

       139
       122
        
           fetch = {

     

       140
       123
        
             type = "git";

     

       141
       141
       -
             url = "https://github.com/dustinkirkland/golang-petname";

     

       142
       142
       -
             rev = "2182cecef7f257230fc998bc351a08a5505f5e6c";

     

       143
       143
       -
             sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl";

     

       124
       124
       +
             url = "https://gopkg.in/tomb.v2";

     

       125
       125
       +
             rev = "d5d1b5820637886def9eef33e03a27a9f166942c";

     

       126
       126
       +
             sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10";

     

       144
       127
        
           };

     

       145
       128
        
         }

     

       146
       129
        
         {

     

       147
       147
       -
           goPackagePath = "github.com/gorilla/context";

     

       130
       130
       +
           goPackagePath = "gopkg.in/yaml.v2";

     

       148
       131
        
           fetch = {

     

       149
       132
        
             type = "git";

     

       150
       150
       -
             url = "https://github.com/gorilla/context";

     

       151
       151
       -
             rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";

     

       152
       152
       -
             sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";

     

       133
       133
       +
             url = "https://gopkg.in/yaml.v2";

     

       134
       134
       +
             rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";

     

       135
       135
       +
             sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";

     

       153
       136
        
           };

     

       154
       137
        
         }

     

       155
       138
        
         {

     

       156
       156
       -
           goPackagePath = "github.com/mattn/go-colorable";

     

       157
       157
       -
           fetch = {

     

       158
       158
       -
             type = "git";

     

       159
       159
       -
             url = "https://github.com/mattn/go-colorable";

     

       160
       160
       -
             rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";

     

       161
       161
       -
             sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";

     

       162
       162
       -
           };

     

       139
       139
       +
             goPackagePath = "github.com/gosexy/gettext";

     

       140
       140
       +
             fetch = {

     

       141
       141
       +
               type = "git";

     

       142
       142
       +
               url = "https://github.com/gosexy/gettext";

     

       143
       143
       +
               rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";

     

       144
       144
       +
               sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";

     

       145
       145
       +
             };

     

       146
       146
       +
         }

     

       147
       147
       +
         {

     

       148
       148
       +
             goPackagePath = "github.com/olekukonko/tablewriter";

     

       149
       149
       +
             fetch = {

     

       150
       150
       +
               type = "git";

     

       151
       151
       +
               url = "https://github.com/olekukonko/tablewriter";

     

       152
       152
       +
               rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb";

     

       153
       153
       +
               sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g";

     

       154
       154
       +
             };

     

       163
       155
        
         }

     

       164
       156
        
         {

     

       165
       165
       -
           goPackagePath = "github.com/gosexy/gettext";

     

       166
       166
       -
           fetch = {

     

       167
       167
       -
             type = "git";

     

       168
       168
       -
             url = "https://github.com/gosexy/gettext";

     

       169
       169
       -
             rev = "305f360aee30243660f32600b87c3c1eaa947187";

     

       170
       170
       -
             sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09";

     

       171
       171
       -
           };

     

       157
       157
       +
             goPackagePath = "github.com/mattn/go-runewidth";

     

       158
       158
       +
             fetch = {

     

       159
       159
       +
               type = "git";

     

       160
       160
       +
               url = "https://github.com/mattn/go-runewidth";

     

       161
       161
       +
               rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";

     

       162
       162
       +
               sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";

     

       163
       163
       +
             };

     

       172
       164
        
         }

     

       173
       165
        
       ]