From dcbfbff1adb982bf2f44af7583e45d8b470ae19f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 18 Aug 2020 17:35:13 -0400
Subject: [PATCH 1/2] nixos-disintegration: Remove the disabled `showManual`
 option

The option has been removed.

https://github.com/NixOS/nixpkgs/commit/aebf9a4709215c230e5841d60e2bce6aa6627ac8
---
 modules/_nixos-disintegration/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/_nixos-disintegration/default.nix b/modules/_nixos-disintegration/default.nix
index 85a3d6b8..c8562764 100644
--- a/modules/_nixos-disintegration/default.nix
+++ b/modules/_nixos-disintegration/default.nix
@@ -20,7 +20,6 @@
       # And here the installation-device profile is a bit annoying.
       # Let's ultra-diable the documentation and nixos manual.
       documentation.enable            = lib.mkOverride 10 false;
-      services.nixosManual.showManual = lib.mkOverride 10 false;
     }
   ];
 }

From 1ba61f1860283efe0e2898956441356fe6302163 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 18 Aug 2020 17:45:03 -0400
Subject: [PATCH 2/2] release-tools: Remove usage of removed option

Recent changes in Nixpkgs makes it more strict.

This is a change that wasn't caught as needed from the migration to
structured options for device infos.
---
 lib/release-tools.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/release-tools.nix b/lib/release-tools.nix
index 0241a0be..acad34d9 100644
--- a/lib/release-tools.nix
+++ b/lib/release-tools.nix
@@ -39,7 +39,6 @@
         config = lib.mkMerge [
           config
           {
-            mobile.device.info = {};
             mobile.system.type = "none";
             mobile.hardware.soc = {
               x86_64-linux = "generic-x86_64";