From 7e5419d46fa4c379a1b27ada5fa7ba7837268cd7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 10:58:44 +0200
Subject: [PATCH] flake.lock: Update (#771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* flake.lock: Update

Flake lock file updates:

• Updated input 'nixos-infra':
    'github:NixOS/infra/0b39213973d7a4bab9f710dadb8ea1b14d206627' (2024-05-04)
  → 'github:NixOS/infra/37293ecb9e48e125b0837418711edbcaa7ffb1d0' (2024-05-23)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02)
  → 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092' (2024-05-24)

* flake: pin nixpkgs for npmlock2nix

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
---
 flake.lock | 28 ++++++++++++++++++++++------
 flake.nix  | 13 +++++++++++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index dbc0a36..6f73955 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
     "nixos-infra": {
       "flake": false,
       "locked": {
-        "lastModified": 1714782417,
-        "narHash": "sha256-AhnsgqwOvK7Ftv1Sw9uzJGxov0cx9ygSjcKQSAWbiPg=",
+        "lastModified": 1716491399,
+        "narHash": "sha256-CtZkjtyIjk41CdWZ44x/Bznk5D9XgHD0b7lFM/UqB80=",
         "owner": "NixOS",
         "repo": "infra",
-        "rev": "0b39213973d7a4bab9f710dadb8ea1b14d206627",
+        "rev": "37293ecb9e48e125b0837418711edbcaa7ffb1d0",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714635257,
-        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
+        "lastModified": 1716509168,
+        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
+        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
         "type": "github"
       },
       "original": {
@@ -49,6 +49,21 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-npmlock2nix": {
+      "locked": {
+        "lastModified": 1636623366,
+        "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
+        "type": "indirect"
+      }
+    },
     "npmlock2nix": {
       "flake": false,
       "locked": {
@@ -70,6 +85,7 @@
         "flake-utils": "flake-utils",
         "nixos-infra": "nixos-infra",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-npmlock2nix": "nixpkgs-npmlock2nix",
         "npmlock2nix": "npmlock2nix"
       }
     },
diff --git a/flake.nix b/flake.nix
index bc82396..15c9c02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,8 @@
 
   inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
+  # https://github.com/nix-community/npmlock2nix/blob/master/nix/sources.json
+  inputs.nixpkgs-npmlock2nix.url = "nixpkgs/c5ed8beb478a8ca035f033f659b60c89500a3034";
   inputs.npmlock2nix.url = "github:nix-community/npmlock2nix";
   inputs.npmlock2nix.flake = false;
   inputs.nixos-infra.url = "github:NixOS/infra";
@@ -13,6 +15,7 @@
 
   outputs = { self
             , nixpkgs
+            , nixpkgs-npmlock2nix
             , flake-utils
             , npmlock2nix
             , nixos-infra
@@ -20,7 +23,8 @@
     flake-utils.lib.eachDefaultSystem
       (system:
         let
-          pkgs = import nixpkgs {
+          pkgs = import nixpkgs { inherit system; };
+          pkgsNpmlock2nix = import nixpkgs-npmlock2nix {
             inherit system;
             overlays = [
               (self: super: {
@@ -86,7 +90,12 @@
 
           packages.default = packages.flake-info;
           packages.flake-info = import ./flake-info { inherit pkgs; };
-          packages.frontend = import ./frontend { inherit pkgs nixosChannels version; };
+          packages.frontend = import ./frontend {
+            pkgs = pkgs // {
+              inherit (pkgsNpmlock2nix) npmlock2nix;
+            };
+            inherit nixosChannels version;
+          };
           packages.nixosChannels = nixosChannelsFile;
 
           devShells.default = mkDevShell {