From 6eddd4c2a0ba37ee9bb79f0a93be61e0d5002059 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 7 Nov 2022 23:38:51 +0300 Subject: [PATCH] nix: use overlays instead of deprecated overlay --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 13 ++++++++----- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 5230800..4f40549 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1659190188, @@ -18,23 +33,8 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" - } - }, - "utils": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 92284e5..4ae4d21 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - utils.url = "github:numtide/flake-utils"; + flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, utils }: + outputs = { self, nixpkgs, flake-utils }: let inherit (builtins) fromTOML readFile substring; @@ -22,11 +22,14 @@ }; in { - overlay = final: prev: { - vnetod = final.callPackage mkVnetod { }; + overlays = rec { + vnetod = final: prev: { + vnetod = final.callPackage mkVnetod { }; + }; + default = vnetod; }; } - // utils.lib.eachDefaultSystem (system: + // flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; };