From 9d6702cf2b81f5d0ef9d628d99e8deb45f84b454 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 22 Jun 2023 13:08:42 +0100
Subject: [PATCH] eval-config: remove compatibility shims

20.03 and 22.03 are both deprecated.
---
 eval-config.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/eval-config.nix b/eval-config.nix
index c30d88c7..4b713030 100644
--- a/eval-config.nix
+++ b/eval-config.nix
@@ -42,24 +42,14 @@ let
     };
   };
 
-  libExtended = lib.extend (self: super: {
-    # Added in nixpkgs #136909, adds forward compatibility until 22.03 is deprecated.
-    literalExpression = super.literalExpression or super.literalExample;
-    literalDocBook = super.literalDocBook or super.literalExample;
-  });
-
-  eval = libExtended.evalModules (builtins.removeAttrs args [ "lib" "inputs" "pkgs" "system" ] // {
+  eval = lib.evalModules (builtins.removeAttrs args [ "lib" "inputs" "pkgs" "system" ] // {
     modules = modules ++ [ argsModule pkgsModule ] ++ baseModules;
     specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
   });
-
-  # Was moved in nixpkgs #82751, so both need to be handled here until 20.03 is deprecated.
-  # https://github.com/NixOS/nixpkgs/commits/dcdd232939232d04c1132b4cc242dd3dac44be8c
-  _module = eval._module or eval.config._module;
 in
 
 {
-  inherit (_module.args) pkgs;
+  inherit (eval._module.args) pkgs;
   inherit (eval) options config;
 
   system = eval.config.system.build.toplevel;