From b1d2c49f96ad6db31c197c67e7fbc1e81284aa3a Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 8 May 2024 20:34:52 +0100 Subject: [PATCH] Fix flake and make nixpkgs top-level so it can follow --- flake.lock | 27 ++++++++------------------- flake.nix | 8 ++++++-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 12dab10..c10d688 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1654608517, @@ -20,36 +22,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654845941, - "narHash": "sha256-uXulXu4BQ9ch1ItV0FlL2Ns8X83m6unT5h/0X//VRLQ=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7b3e907a6fef935794b5049c2c57c519853deb90", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1654845941, - "narHash": "sha256-uXulXu4BQ9ch1ItV0FlL2Ns8X83m6unT5h/0X//VRLQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7b3e907a6fef935794b5049c2c57c519853deb90", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-23.11", "type": "indirect" } }, "root": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index 2cc16dc..cc78b3b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,12 @@ description = "QuickPeep Search Engine Flake for Nix"; inputs = { + nixpkgs.url = "nixpkgs/nixos-23.11"; utils.url = "github:numtide/flake-utils"; - naersk.url = "github:nix-community/naersk"; + naersk = { + url = "github:nix-community/naersk"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, utils, naersk }: @@ -17,7 +21,7 @@ root = ./.; buildInputs = with pkgs; [ openssl - pkgconfig + pkg-config ]; nativeBuildInputs = with pkgs; [