diff options
| author | Domen Kožar <domen@dev.si> | 2016-11-17 15:14:52 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-11-17 15:15:42 +0100 |
| commit | 2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6 (patch) | |
| tree | e459230d9126a2593c88764df63bfeabaaad6f9a | |
| parent | 3d5a033c9629dd1a460a82c5f6448ede283c328c (diff) | |
| download | nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar.gz nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar.bz2 nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar.lz nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar.xz nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.tar.zst nixpkgs-2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6.zip | |
cloud-utils: 0.27 -> 0.29
We keep the existing hacks for growpart to work inside the initrd Fixes #15736 #17015
| -rw-r--r-- | nixos/modules/virtualisation/grow-partition.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/cloud-utils/default.nix | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index abc2e766959..5039118d78e 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -24,7 +24,7 @@ with lib; copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart + cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart ln -s sed $out/bin/gnused ''; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 8bba00b564d..af518e7efa9 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: stdenv.mkDerivation { - name = "cloud-utils-0.27"; + # NOTICE: if you bump this, make sure to run + # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops + name = "cloud-utils-0.29"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; - sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; + sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; }; - patches = [ ./growpart-util-linux-2.26.patch ]; + buildInputs = [ makeWrapper ]; buildPhase = '' mkdir -p $out/bin cp bin/growpart $out/bin/growpart sed -i 's|awk|gawk|' $out/bin/growpart sed -i 's|sed|gnused|' $out/bin/growpart + ln -s sed $out/bin/gnused + wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" ''; dontInstall = true; dontPatchShebangs = true; + dontStrip = true; meta = { platforms = stdenv.lib.platforms.unix; |