Merge pull request #230392 from hyshka/psitransfer-upgrade-v2.1.2

psitransfer: 2.0.1 -> 2.1.2
This commit is contained in:
Nick Cao 2023-05-07 12:42:38 +08:00 committed by GitHub
commit 1c246cb33f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 324 additions and 225 deletions

View File

@ -7,13 +7,12 @@
{ stdenv
, pkgs
, lib
, nodejs_14
, nodejs_18
, fetchzip
}:
let
# nodejs_16 fails with ENOTCACHED
nodejs = nodejs_14;
nodejs = nodejs_18;
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
@ -25,7 +24,7 @@ let
combined = psitransfer.override rec {
# version is not defined in source package.json
# version must also be maintained in node-packages.json for node2nix
version = "2.0.1";
version = "2.1.2";
# override node2nix package src to pull pre-built release of same version
src = fetchzip {

View File

@ -3,6 +3,7 @@
set -euo pipefail
node2nix \
--nodejs-18 \
--input node-packages.json \
--output node-packages.nix \
--composition node-composition.nix \

View File

@ -1,8 +1,8 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {

View File

@ -1,3 +1,3 @@
[
{ "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.0.1" }
{ "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.1.2" }
]

File diff suppressed because it is too large Load Diff