From ada640d340b15658eab38dc1c1d79924dd10e2d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 30 Aug 2019 17:23:05 +0200
Subject: [PATCH] Update flake.nix

---
 flake.lock | 21 +++++++--------------
 flake.nix  | 23 +++++++++--------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index dfbe5b29..93607577 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,28 +1,21 @@
 {
     "inputs": {
-        "nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557": {
-            "id": "nix",
+        "nix": {
             "inputs": {
                 "nixpkgs": {
-                    "id": "nixpkgs",
                     "inputs": {},
-                    "narHash": "sha256-5/HXWs25BLukwG9VaxmdmUf/9o79e32aW/tmhcWEbKk=",
-                    "nonFlakeInputs": {},
-                    "uri": "github:edolstra/nixpkgs/62ac6f7f504c8d3998558d9b269d22d26f13f1f0"
+                    "narHash": "sha256-TrLhI3xPkTTznE9gcMHhkHirGNN7N02zM4DxJ/U3WRs=",
+                    "uri": "github:edolstra/nixpkgs/24bf27fc215e8300877dfa1c426b9966bbfbd150"
                 }
             },
-            "narHash": "sha256-I9YtUO9Ia5CwiTFo4QzSYdZHO2G+BQ7sM4MSq29NDqc=",
-            "nonFlakeInputs": {},
-            "uri": "github:NixOS/nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557"
+            "narHash": "sha256-oj3c5cpfoiwoKEaevSfOLGdcyS3LynAZkM9tuUNWcdE=",
+            "uri": "github:NixOS/nix/80c36d4562af71a90c67b3adb886a1003834890e"
         },
         "nixpkgs": {
-            "id": "nixpkgs",
             "inputs": {},
-            "narHash": "sha256-5/HXWs25BLukwG9VaxmdmUf/9o79e32aW/tmhcWEbKk=",
-            "nonFlakeInputs": {},
-            "uri": "github:edolstra/nixpkgs/62ac6f7f504c8d3998558d9b269d22d26f13f1f0"
+            "narHash": "sha256-TrLhI3xPkTTznE9gcMHhkHirGNN7N02zM4DxJ/U3WRs=",
+            "uri": "github:edolstra/nixpkgs/24bf27fc215e8300877dfa1c426b9966bbfbd150"
         }
     },
-    "nonFlakeInputs": {},
     "version": 2
 }
diff --git a/flake.nix b/flake.nix
index 780b43cb..3ba5b3c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,25 +1,20 @@
 {
-  name = "hydra";
-
   description = "A Nix-based continuous build system";
 
-  epoch = 201906;
+  epoch = 201909;
 
-  inputs =
-    [ "nixpkgs"
-      "nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557"
-    ];
+  inputs.nix.uri = "nix/80c36d4562af71a90c67b3adb886a1003834890e";
 
-  outputs = inputs:
+  outputs = { self, nixpkgs, nix }@inputs:
     let
-      nix = inputs.nix.outputs.hydraJobs.build.x86_64-linux // {
-        perl-bindings = inputs.nix.outputs.hydraJobs.perlBindings.x86_64-linux;
+      nix = inputs.nix.hydraJobs.build.x86_64-linux // {
+        perl-bindings = inputs.nix.hydraJobs.perlBindings.x86_64-linux;
       };
     in rec {
 
       hydraJobs = import ./release.nix {
-        hydraSrc = inputs.self;
-        nixpkgs = inputs.nixpkgs;
+        hydraSrc = self;
+        nixpkgs = nixpkgs;
         inherit nix;
       };
 
@@ -31,8 +26,8 @@
       defaultPackage = packages.hydra;
 
       devShell = (import ./release.nix {
-        hydraSrc = inputs.self;
-        nixpkgs = inputs.nixpkgs;
+        hydraSrc = self;
+        nixpkgs = nixpkgs;
         shell = true;
         inherit nix;
       }).build.x86_64-linux;