From 41e6300319d6cccc4508ce11bceff46f398ed096 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 2 Nov 2024 16:16:18 +0800 Subject: [PATCH] chore(dev): use shellHook --- .envrc | 7 ------- flake.lock | 12 ++++++------ flake.nix | 7 ++++++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.envrc b/.envrc index 4ef3088..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1,8 +1 @@ use flake - -nix build nixpkgs#dbip-city-lite --no-link -nix build nixpkgs#dbip-asn-lite --no-link - -export IP_CHECKER_CITY_DB=$(nix eval nixpkgs#dbip-city-lite.mmdb --raw) -export IP_CHECKER_ASN_DB=$(nix eval nixpkgs#dbip-asn-lite.mmdb --raw) -export IP_CHECKER_MODE=dev diff --git a/flake.lock b/flake.lock index 7eafe56..539e40c 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb88700..3196942 100644 --- a/flake.nix +++ b/flake.nix @@ -38,13 +38,18 @@ checks.formatting = treefmtEval.config.build.check inputs.self; ### nix develop - devShells.default = pkgs.mkShell { + devShells.default = pkgs.mkShellNoCC { nativeBuildInputs = with pkgs; [ go nodePackages.prettier nodejs pnpm ]; + shellHook = '' + export IP_CHECKER_CITY_DB=${pkgs.dbip-city-lite.mmdb} + export IP_CHECKER_ASN_DB=${pkgs.dbip-asn-lite.mmdb} + export IP_CHECKER_MODE=dev + ''; }; } );