From 7c2bc9b12ee3f64c73af1d20b5726ffad118d90c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 17 Jan 2022 18:37:40 +0100 Subject: [PATCH] Do not select an nncp-version in the overlay --- flake.lock | 14 ++++++-------- flake.nix | 4 ---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7f94df4..3c17c0c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1639844802, - "narHash": "sha256-+RzGn5Z+qs5JpO34rjoCJVZ0BMcuPDCiLRgclpvFoGw=", - "owner": "ehmry", + "lastModified": 1642130244, + "narHash": "sha256-/5FhZkZFQCRQIRFosUQW1zmDrsNHVOJIB/+XgRPHiPU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "dbf0c72627598a2eb09aed0ee1c330c195b1a240", + "rev": "bc59ba15b64d0a0ee1d1764f18b4f3480d2c3e5a", "type": "github" }, "original": { - "owner": "ehmry", - "ref": "nncp-update", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index 12ba00f..d5a702f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { description = "Development flake"; - inputs.nixpkgs.url = "github:ehmry/nixpkgs/nncp-update"; - outputs = { self, nixpkgs }: let systems = [ "aarch64-linux" "x86_64-linux" ]; @@ -12,8 +10,6 @@ overlay = final: prev: with prev; { - nncp = callPackage "${nixpkgs}/pkgs/tools/misc/nncp" { }; - git-annex-remote-nncp = nimPackages.buildNimPackage { pname = "git-annex-remote-nncp"; version = self.sourceInfo.lastModifiedDate; -- 2.38.5