diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/virtualization/distrobuilder/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/virtualization/distrobuilder/deps.nix | 54 |
4 files changed, 56 insertions, 21 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 71d4abd9ca4..86287779792 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, python +{ stdenv, fetchurl, fetchpatch, flex, bison, python , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -82,7 +82,16 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation ''; - patches = [ ./fix-bash-completion.patch ]; + patches = [ + ./fix-bash-completion.patch + # This patch makes grub compatible with the XFS sparse inode + # feature introduced by xfsprogs-4.16. + # to be removed in grub-2.03 + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; + sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; + }) + ]; configureFlags = [ "--enable-grub-mount" ] # dep of os-prober ++ optional zfsSupport "--enable-libzfs" diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 6720d5ae2e0..8b8991db86c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-07-31T02-28-53Z"; + version = "2018-12-05T22-59-07Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1918yl5d92y4ij9d1v738pf574rwb6a911rjpmaj9awhrz8qa2bg"; + sha256 = "01vjgs96sb792rggc7da9fzbpam5pyr7x9zd4r8wv6jc6xnv7n3x"; }; goPackagePath = "github.com/minio/mc"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 2286faf4d1b..54f1f492487 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,8 +8,8 @@ let binPath = stdenv.lib.makeBinPath [ in buildGoPackage rec { name = "distrobuilder-${version}"; - version = "2018_06_29"; - rev = "e5acd73f81ad37151f3a2088fde650cea9b6a7e6"; + version = "2018_10_04"; + rev = "d2329be9569d45028a38836186d2353b8ddfe1ca"; goPackagePath = "github.com/lxc/distrobuilder"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "19rc11s0paqga72jr8bziixihfv7dlkszmfk6xkg0349hzdg0gac"; + sha256 = "1sn1wif86p089kr6zq83k81hjd1d73kamnawc2p0k0vd0w91d3v4"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix index 56ff3c0cc12..e4c65946551 100644 --- a/pkgs/tools/virtualization/distrobuilder/deps.nix +++ b/pkgs/tools/virtualization/distrobuilder/deps.nix @@ -1,12 +1,30 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "24195e6d38b06020d7a92c7b11960cf2e7cad2f2"; + sha256 = "1cbg3ya8l2v34gcxnd73nvzpfpx8kzkbiv0kpgaxqpcqjhanhgj9"; + }; + } + { goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; + sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "089d3ea4e4d597bd98acac068193d341983326a3"; + sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; }; } { @@ -14,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/lxc/lxd"; - rev = "a81aac803bc22dcb14982b80dce005444e2b22f1"; - sha256 = "1pjwgh6551mjzkdzmvxx065sxxn8ixb3vdq2i6g1pyb56h5hnayi"; + rev = "5507ca02c639b378290402c7d33911a90caa4f9e"; + sha256 = "08h6ycnq43zhkzlrfvk656d1xqjbxhz6dpqmzcmrkb3pw0h0f8hg"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + rev = "059132a15dd08d6704c67711dae0cf35ab991756"; + sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; }; } { @@ -32,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"; + sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy"; }; } { @@ -41,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; + sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; }; } { @@ -55,13 +73,21 @@ }; } { + goPackagePath = "gopkg.in/robfig/cron.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/robfig/cron.v2"; + rev = "be2e0b0deed5a68ffee390b4583a13aff8321535"; + sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y"; + }; + } + { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] - |