tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
netlify-cli: refactor
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
authored by
panda2134
Robert Hensing
and committed by
Robert Hensing
2ff4e9ea
669067ed
+2
-5
pkgs/development/web/netlify-cli/default.nix
+2
-5
pkgs/development/web/netlify-cli/default.nix
···
1
1
{ callPackage, fetchFromGitHub, lib, pkgs }:
2
2
let
3
3
nodePackages = import ./composition.nix { inherit pkgs; };
4
-
meta = (lib.importJSON ./netlify-cli.json);
4
+
sourceInfo = (lib.importJSON ./netlify-cli.json);
5
5
in
6
6
nodePackages.package.override {
7
7
preRebuild = ''
8
8
export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"
9
9
'';
10
10
src = fetchFromGitHub {
11
-
owner = meta.owner;
12
-
repo = meta.repo;
13
-
rev = meta.rev;
14
-
sha256 = meta.sha256;
11
+
inherit (sourceInfo) owner repo rev sha256;
15
12
};
16
13
bypassCache = true;
17
14
reconstructLock = true;
+1
-1
pkgs/development/web/netlify-cli/generate.sh
+1
-1
pkgs/development/web/netlify-cli/generate.sh
···
2
2
set -eu -o pipefail
3
3
cd "$( dirname "${BASH_SOURCE[0]}" )"
4
4
rm -f ./node-env.nix
5
-
src="$(nix-build --expr 'let pkgs = import ../../../.. {}; lib = import ../../../../lib; meta = (lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub {owner = meta.owner; repo = meta.repo; rev = meta.rev; sha256 = meta.sha256;}')"
5
+
src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev sha256; }')"
6
6
echo $src
7
7
node2nix \
8
8
--input $src/package.json \