From 6481bdb9d74fb92f75e0fd58fdeebadff016947f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Nov 2021 18:42:48 +0100 Subject: [PATCH] nixos: Remove obsolete make-disk-image workaround make-disk-image landed in the stable branch, so there's no need to import it from github --- images/nixos/image.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/images/nixos/image.nix b/images/nixos/image.nix index 6e0706d..227039b 100644 --- a/images/nixos/image.nix +++ b/images/nixos/image.nix @@ -1,13 +1,7 @@ { pkgs ? import {} }: let - # Contents attributes are not on stable yet, so we temporarily vendor make-disk-image. - # Use this line instead when 21.05 is out: - #makeDiskImage = import "${pkgs.path}/nixos/lib/make-disk-image.nix"; - makeDiskImage = import (pkgs.fetchurl { - url = "https://github.com/NixOS/nixpkgs/raw/6f21ae7a626cee022f5c20eacaaf934281e806c0/nixos/lib/make-disk-image.nix"; - sha256 = "0ggx659i9grw3pzjmpklspp4h3b9dywcjdyh00gjxfvrylyf4qn9"; - }); + makeDiskImage = import "${pkgs.path}/nixos/lib/make-disk-image.nix"; evalConfig = import "${pkgs.path}/nixos/lib/eval-config.nix"; config = (evalConfig { modules = [ (import ./qemu-system-configuration.nix) ]; -- 2.38.5