Unverified Commit 1c246cb3 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

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

psitransfer: 2.0.1 -> 2.1.2
parents d45946b9 70670003

pkgs/servers/psitransfer/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -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 {

pkgs/servers/psitransfer/generate.sh

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
set -euo pipefail



node2nix \

  --nodejs-18 \

  --input node-packages.json \

  --output node-packages.nix \

  --composition node-composition.nix \

pkgs/servers/psitransfer/node-composition.nix

+2 −2
Original line number Diff line number Diff line 
# 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 {

pkgs/servers/psitransfer/node-packages.json

+1 −1
Original line number Diff line number Diff line 
[

  { "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.0.1" }

  { "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.1.2" }

]

pkgs/servers/psitransfer/node-packages.nix

+317 −218

File changed.

Preview size limit exceeded, changes collapsed.