From 43de89c70b9f68b7d1e50ac303b29e3cfed9f280 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Sun, 21 Nov 2021 20:39:07 +0100 Subject: [PATCH] Let naersk follow nixpkgs --- flake.lock | 19 ++++--------------- flake.nix | 6 ++++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index b2fa497..3df7290 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1636968630, @@ -20,19 +22,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1636976544, - "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", - "path": "/nix/store/ha4ld6wd29q1igjmhjdvkvbxpxxxxbxf-source", - "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1637186689, "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=", @@ -51,7 +40,7 @@ "root": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index 631756e..0cfa1f5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,17 @@ { inputs = { - naersk.url = "github:nmattia/naersk/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; utils.url = "github:numtide/flake-utils"; + naersk = { + url = "github:nmattia/naersk/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, utils, naersk }: let pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ naersk.overlay ]; }; - # naersk-lib = builtins.trace naersk nixpkgs.legacyPackages.x86_64-linux.callPackage naersk { }; naersk-lib = pkgs.naersk; in rec {