Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pkgs/servers/psitransfer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions pkgs/servers/psitransfer/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set -euo pipefail

node2nix \
--nodejs-18 \
--input node-packages.json \
--output node-packages.nix \
--composition node-composition.nix \
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/psitransfer/node-composition.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/psitransfer/node-packages.json
Original file line number Diff line number Diff line change
@@ -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" }
]
Loading