Merge pull request #149642 from r-ryantm/auto-update/os-prober
os-prober: 1.78 -> 1.79
This commit is contained in:
commit
b2ed7c36c1
2 changed files with 5 additions and 5 deletions
|
@ -53,12 +53,12 @@ let
|
|||
};
|
||||
# /etc/nixos/configuration.nix for the vm
|
||||
configFile = pkgs.writeText "configuration.nix" ''
|
||||
{config, pkgs, ...}: ({
|
||||
{config, pkgs, lib, ...}: ({
|
||||
imports =
|
||||
[ ./hardware-configuration.nix
|
||||
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
||||
];
|
||||
} // pkgs.lib.importJSON ${
|
||||
} // lib.importJSON ${
|
||||
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
|
||||
})
|
||||
'';
|
||||
|
@ -114,7 +114,7 @@ in {
|
|||
"${configFile}",
|
||||
"/etc/nixos/configuration.nix",
|
||||
)
|
||||
machine.succeed("nixos-rebuild boot >&2")
|
||||
machine.succeed("nixos-rebuild boot --show-trace >&2")
|
||||
|
||||
machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
|
||||
'';
|
||||
|
|
|
@ -11,14 +11,14 @@ lvm2 # lvs
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.78";
|
||||
version = "1.79";
|
||||
pname = "os-prober";
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "installer-team";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM=";
|
||||
sha256 = "sha256-ntwH5TIA18IOgYPkHMLU0EVykkHs6Z0wseYEPsU0KvQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
Loading…
Reference in a new issue