From 2269f1ec652e53a0ac7b30ca8a4f01f27c08b337 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 10 Nov 2019 19:34:34 +0100
Subject: [PATCH] Flake simplification

---
 flake.nix    | 4 +---
 packages.nix | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5a35770..1233661 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,6 @@
 
   outputs = { self, nixpkgs, dhall-haskell, genode-depot }:
     let
-      nixpkgs' = import nixpkgs;
       systems = [ "x86_64-genode" ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
@@ -22,8 +21,7 @@
 
       packages = forAllSystems (system:
         import ./packages.nix {
-          inherit system;
-          nixpkgs = nixpkgs';
+          inherit system nixpkgs;
         });
 
       checks = forAllSystems (system:
diff --git a/packages.nix b/packages.nix
index 3d08bd2..4344648 100644
--- a/packages.nix
+++ b/packages.nix
@@ -2,17 +2,17 @@
 #
 # SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
 
-{ system ? "x86_64-genode", nixpkgs ? import <nixpkgs>, extraOverlays ? [ ] }:
+{ system, nixpkgs }:
 
 let
   toolchainOverlay = import ./toolchain-overlay;
   # Overlay of toolchain patches
 
-  super = nixpkgs {
+  super = import nixpkgs {
     # Evaluate an overlayed Nixpkgs for a Genode target
     localSystem = "x86_64-linux";
     crossSystem = "x86_64-genode";
-    overlays = [ toolchainOverlay ] ++ extraOverlays;
+    overlays = [ toolchainOverlay ];
   };
 
   inherit (super) callPackage;