From 83904ca3e69b6e0da1009814a1a41226153a5764 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 5 Nov 2019 16:00:56 +0100
Subject: [PATCH] Update flake

---
 flake.lock   | 10 +++++-----
 flake.nix    | 17 +++++++----------
 packages.nix |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index c943301..c4bfe37 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,14 +16,14 @@
                 }
             },
             "narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=",
-            "originalUri": "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake",
-            "uri": "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
+            "originalUri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
+            "uri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
         },
         "nixpkgs": {
             "inputs": {},
-            "narHash": "sha256-v6oDxjvJ7c0BWZJ/fd4L1gtnctQvkkFjL41lEt37vLg=",
-            "originalUri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake",
-            "uri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake&rev=28f37882fbb71230d6947af244a34cd3d42b280a"
+            "narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=",
+            "originalUri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git",
+            "uri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec"
         }
     },
     "version": 3
diff --git a/flake.nix b/flake.nix
index 9fc2014..bd27d8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,17 +4,13 @@
   description = "Genode package overlay";
 
   inputs = {
-    nixpkgs = {
-      uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake";
-      flake = false;
-    };
-
-    dhall-haskell = { uri = "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake"; };
-
+    nixpkgs.uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git";
+    dhall-haskell.uri =
+      "git+https://github.com/dhall-lang/dhall-haskell?ref=flake";
   };
 
   outputs = { self, nixpkgs, dhall-haskell }:
-    let fullPkgs = import ./packages.nix { inherit nixpkgs; };
+    let fullPkgs = import ./packages.nix { nixpkgs = import nixpkgs; };
     in {
 
       packages = with fullPkgs; {
@@ -22,7 +18,7 @@
           genode-base-linux solo5;
       };
 
-      defaultPackage = self.packages.solo5;
+      defaultPackage = self.packages.genode-os;
 
       hydraJobs = {
         build.x86_64 = {
@@ -35,6 +31,7 @@
         };
       };
 
-      checks = self.hydraJobs.tests.x86_64.nova.solo5;
+      checks = { inherit (self.hydraJobs.tests.x86_64.nova) pci; };
     };
 }
+
diff --git a/packages.nix b/packages.nix
index 37e3262..826a8de 100644
--- a/packages.nix
+++ b/packages.nix
@@ -27,9 +27,9 @@ let
   toolchainOverlay = import ./toolchain-overlay;
   # Overlay of toolchain patches
 
-in { nixpkgs, extraOverlays ? [ ] }:
+in { nixpkgs ? import <nixpkgs>, extraOverlays ? [ ] }:
 
-import nixpkgs {
+nixpkgs {
   # Evaluate an overlayed Nixpkgs for a Genode target
   localSystem = "x86_64-linux";
   crossSystem = "x86_64-genode";