tjh.dev
cloud-utils: 0.27 -> 0.29
We keep the existing hacks for growpart to work
inside the initrd
Fixes #15736 #17015
+1
-1
nixos/modules/virtualisation/grow-partition.nix
+1
-1
nixos/modules/virtualisation/grow-partition.nix
···
24
24
copy_bin_and_libs ${pkgs.gnused}/bin/sed
25
25
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
26
26
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
27
-
cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart
27
+
cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
28
28
ln -s sed $out/bin/gnused
29
29
'';
30
30
+10
-5
pkgs/tools/misc/cloud-utils/default.nix
+10
-5
pkgs/tools/misc/cloud-utils/default.nix
···
1
-
{ stdenv, fetchurl }:
1
+
{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }:
2
2
3
3
stdenv.mkDerivation {
4
-
name = "cloud-utils-0.27";
4
+
# NOTICE: if you bump this, make sure to run
5
+
# $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
6
+
name = "cloud-utils-0.29";
5
7
src = fetchurl {
6
-
url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz";
7
-
sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd";
8
+
url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz";
9
+
sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy";
8
10
};
9
-
patches = [ ./growpart-util-linux-2.26.patch ];
11
+
buildInputs = [ makeWrapper ];
10
12
buildPhase = ''
11
13
mkdir -p $out/bin
12
14
cp bin/growpart $out/bin/growpart
13
15
sed -i 's|awk|gawk|' $out/bin/growpart
14
16
sed -i 's|sed|gnused|' $out/bin/growpart
17
+
ln -s sed $out/bin/gnused
18
+
wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin"
15
19
'';
16
20
dontInstall = true;
17
21
dontPatchShebangs = true;
22
+
dontStrip = true;
18
23
19
24
meta = {
20
25
platforms = stdenv.lib.platforms.unix;