From 2afdfc0445b8bd682063c2b53b0350a46afe80f8 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <olivier@librepush.net>
Date: Wed, 8 May 2024 11:44:21 +0100
Subject: [PATCH] Update flake and make nixpkgs a top-level input

---
 flake.lock | 31 +++++++++++--------------------
 flake.nix  |  8 ++++++--
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index c18c20f..364c28c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,9 @@
   "nodes": {
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1698420672,
@@ -20,34 +22,23 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
-        "path": "/nix/store/mrqyw5xdivdymj83v5d9jzzs2ifmw8h0-source",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
-        "path": "/nix/store/mrqyw5xdivdymj83v5d9jzzs2ifmw8h0-source",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
-        "type": "path"
+        "lastModified": 1714971268,
+        "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "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 13c2217..50881d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,12 @@
   description = "Matrix Monzo bot";
 
   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 }:
@@ -18,7 +22,7 @@
 
         buildInputs = with pkgs; [
           openssl
-          pkgconfig
+          pkg-config
         ];
       };