aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/tools/virtualization
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/virtualization')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix4
6 files changed, 16 insertions, 16 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
index 08d37a1d53bc..d6dad6433e7a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils
-, utillinux
+, util-linux
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [
apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils
- utillinux
+ util-linux
]}
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 19766fb5ba9d..4c37054f4a05 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "amazon-ecs-cli";
- version = "1.18.1";
+ version = "1.20.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
- sha256 = "1q0qsvxwz6mgslwzwslddxxv45v9wmlbbkxgyfz3dfkw6n6d1a2s";
+ sha256 = "11cw2hk48x66wlsg5bzay95l2pgncwnawzj4xmqmbchhhvphrvxr";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}";
- sha256 = "0hik88z5xm1pw6a3mxa6zpghdv47s6bg56srxv4azjinzdi59s3b";
+ sha256 = "1f4yq04sgwkj2p0j598a8vc54dzihmqvg9daa6mxnqj403ln0rg1";
}
else throw "Architecture not supported";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
index aff00519a2dc..00f8ed89a2bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
@@ -83,8 +83,8 @@ in with localPython.pkgs; buildPythonApplication rec {
];
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
- mv $out/bin/eb_completion.bash $out/etc/bash_completion.d
+ mkdir -p $out/share/bash-completion/completions
+ mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
index 34f2bc9e1909..be62ace4797b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -4,7 +4,7 @@
, bash
, bashInteractive
, systemd
-, utillinux
+, util-linux
, boto
, setuptools
, distro
@@ -31,14 +31,14 @@ buildPythonApplication rec {
substituteInPlace "$file" \
--replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
- --replace /sbin/hwclock "${utillinux}/bin/hwclock"
+ --replace /sbin/hwclock "${util-linux}/bin/hwclock"
# SELinux tool ??? /sbin/restorecon
done
substituteInPlace google_config/udev/64-gce-disk-removal.rules \
--replace /bin/sh "${bash}/bin/sh" \
- --replace /bin/umount "${utillinux}/bin/umount" \
- --replace /usr/bin/logger "${utillinux}/bin/logger"
+ --replace /bin/umount "${util-linux}/bin/umount" \
+ --replace /usr/bin/logger "${util-linux}/bin/logger"
'';
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
index 94a19c5375ea..badd25b4e248 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
@@ -1,4 +1,4 @@
-{ substituteAll, perlPackages, shadow, utillinux }:
+{ substituteAll, perlPackages, shadow, util-linux }:
substituteAll {
name = "nixos-container";
@@ -7,10 +7,10 @@ substituteAll {
src = ./nixos-container.pl;
perl = "${perlPackages.perl}/bin/perl -I${perlPackages.FileSlurp}/${perlPackages.perl.libPrefix}";
su = "${shadow.su}/bin/su";
- inherit utillinux;
+ utillinux = util-linux;
postInstall = ''
- t=$out/etc/bash_completion.d
+ t=$out/share/bash-completion/completions
mkdir -p $t
cp ${./nixos-container-completion.sh} $t/nixos-container
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
index d57a054a8b72..61da0d86e33b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "rootlesskit";
- version = "0.10.0";
+ version = "0.11.1";
goPackagePath = "github.com/rootless-containers/rootlesskit";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "rootlesskit";
rev = "v${version}";
- sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr";
+ sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
};
meta = with lib; {