c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

flake.lock: Update (#771)

Browse source 
* 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>
This commit is contained in:
github-actions[bot] 2024-05-31 10:58:44 +02:00 committed by GitHub
parent 1242aebd14
commit 7e5419d46f
Failed to generate hash of commit
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.lock
View file

@ -21,11 +21,11 @@
"nixos-infra": { "nixos-infra": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714782417, "lastModified": 1716491399,
"narHash": "sha256-AhnsgqwOvK7Ftv1Sw9uzJGxov0cx9ygSjcKQSAWbiPg=", "narHash": "sha256-CtZkjtyIjk41CdWZ44x/Bznk5D9XgHD0b7lFM/UqB80=",
"owner": "NixOS", "owner": "NixOS",
"repo": "infra", "repo": "infra",
"rev": "0b39213973d7a4bab9f710dadb8ea1b14d206627", "rev": "37293ecb9e48e125b0837418711edbcaa7ffb1d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714635257, "lastModified": 1716509168,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -49,6 +49,21 @@
"type": "indirect" "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": { "npmlock2nix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -70,6 +85,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixos-infra": "nixos-infra", "nixos-infra": "nixos-infra",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-npmlock2nix": "nixpkgs-npmlock2nix",
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
} }
}, },

13
flake.nix
View file

@ -6,6 +6,8 @@
inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; 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.url = "github:nix-community/npmlock2nix";
inputs.npmlock2nix.flake = false; inputs.npmlock2nix.flake = false;
inputs.nixos-infra.url = "github:NixOS/infra"; inputs.nixos-infra.url = "github:NixOS/infra";
@ -13,6 +15,7 @@
outputs = { self outputs = { self
, nixpkgs , nixpkgs
, nixpkgs-npmlock2nix
, flake-utils , flake-utils
, npmlock2nix , npmlock2nix
, nixos-infra , nixos-infra
@ -20,7 +23,8 @@
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
(system: (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs { inherit system; };
pkgsNpmlock2nix = import nixpkgs-npmlock2nix {
inherit system; inherit system;
overlays = [ overlays = [
(self: super: { (self: super: {
@ -86,7 +90,12 @@
packages.default = packages.flake-info; packages.default = packages.flake-info;
packages.flake-info = import ./flake-info { inherit pkgs; }; 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; packages.nixosChannels = nixosChannelsFile;
devShells.default = mkDevShell { devShells.default = mkDevShell {