From bc11ab22a3654c09fc956114efe471cc40f98fc2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Jun 2019 12:09:18 +0200 Subject: [PATCH] Update flake.nix --- flake.lock | 18 +++++++++--------- flake.nix | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 3b733fc8..fa4dec65 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,20 @@ { - "nonFlakeRequires": {}, - "requires": { + "inputs": { "nix": { - "contentHash": "sha256-rUM0KiuCRHv8WKBOfv4XKOu7WP8nsYdPdnTPZFBzjyc=", - "requires": { + "inputs": { "nixpkgs": { - "contentHash": "sha256-vy2UmXQM66aS/Kn2tCtjt9RwxfBvV+nQVb5tJQFwi8E=", - "uri": "github:edolstra/nixpkgs/a4d896e89932e873c4117908d558db6210fa3b56" + "narHash": "sha256-rMiWaLXkhizEEMEeMDutUl0Y/c+VEjfjvMkvBwvuQJU=", + "uri": "github:edolstra/nixpkgs/eeeffd24cd7e407cfaa99e98cfbb8f93bf4cc033" } }, - "uri": "github:NixOS/nix/3cecf3f39c5c580ed6d0c5f0bcbb09dcc53dfae4" + "narHash": "sha256-Gu5o0nUsQHthWNXGQ3iZviecgNGcEKY+4R0okapfZ54=", + "uri": "github:NixOS/nix/507c150034256117cd56e31944feedb8f2f3ff3e" }, "nixpkgs": { - "contentHash": "sha256-vy2UmXQM66aS/Kn2tCtjt9RwxfBvV+nQVb5tJQFwi8E=", - "uri": "github:edolstra/nixpkgs/a4d896e89932e873c4117908d558db6210fa3b56" + "narHash": "sha256-rMiWaLXkhizEEMEeMDutUl0Y/c+VEjfjvMkvBwvuQJU=", + "uri": "github:edolstra/nixpkgs/eeeffd24cd7e407cfaa99e98cfbb8f93bf4cc033" } }, + "nonFlakeInputs": {}, "version": 1 } diff --git a/flake.nix b/flake.nix index 09d0bc92..c25b92b2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,15 +5,15 @@ epoch = 2019; - requires = [ "nixpkgs" "nix" ]; + inputs = [ "nixpkgs" "nix" ]; - provides = deps: rec { + outputs = inputs: rec { hydraJobs = import ./release.nix { - hydraSrc = deps.self; - nixpkgs = deps.nixpkgs; - nix = deps.nix.provides.hydraJobs.build.x86_64-linux // { - perl-bindings = deps.nix.provides.hydraJobs.perlBindings.x86_64-linux; + hydraSrc = inputs.self; + nixpkgs = inputs.nixpkgs; + nix = inputs.nix.outputs.hydraJobs.build.x86_64-linux // { + perl-bindings = inputs.nix.outputs.hydraJobs.perlBindings.x86_64-linux; }; }; @@ -22,8 +22,8 @@ defaultPackage = packages.hydra; devShell = (import ./release.nix { - hydraSrc = deps.self; - nixpkgs = deps.nixpkgs; + hydraSrc = inputs.self; + nixpkgs = inputs.nixpkgs; shell = true; }).build.x86_64-linux;