vdo: 8.2.2.2 -> 8.3.0.71

NixOS · Aug 23, 2024 · 9366ef0 · 9366ef0
1 parent f5fa4e0
commit 9366ef0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
@@ -98,11 +98,11 @@ in {
  copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
  done
  substituteInPlace $out/bin/vdorecover --replace "${pkgs.bash}/bin/bash" "/bin/sh"
- substituteInPlace $out/bin/adaptLVMVDO.sh --replace "${pkgs.bash}/bin/bash" "/bin/sh"
+ substituteInPlace $out/bin/adaptlvm --replace "${pkgs.bash}/bin/bash" "/bin/sh"
  '';
 
  extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)''
- ls ${pkgs.vdo}/bin/ | grep -vE '(adaptLVMVDO|vdorecover)' | while read BIN; do
+ ls ${pkgs.vdo}/bin/ | grep -vE '(adaptlvm|vdorecover)' | while read BIN; do
  $out/bin/$(basename $BIN) --help > /dev/null
  done
  '';

diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
  pname = "vdo";
- version = "8.2.2.2";
+ version = "8.3.0.71";
 
  src = fetchFromGitHub {
  owner = "dm-vdo";
  repo = pname;
  rev = version;
- hash = "sha256-+2w9jzJemI2xr+i/Jd5TIBZ/o8Zv+Ett0fbJbkOD7KI=";
+ hash = "sha256-FZerMUzth43p5jvKQalyYcW+mrl6SLjS8GrivY2qWkI=";
  };
 
  nativeBuildInputs = [
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;
 
  postInstall = ''
- installShellCompletion --bash $out/bash_completion.d/*
- rm -r $out/bash_completion.d
+ installShellCompletion --bash $out/usr/share/bash-completion/completions/*
+ rm -rv $out/usr
 
  wrapPythonPrograms
  '';