diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index c604bfe953071..4cca1f4f8e71d 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -1,19 +1,19 @@ -{ lib +{ lib ? pkgs.lib , stdenv , pkgs , fetchFromGitHub -, nodejs ? pkgs.nodejs_14 +, nodejs ? pkgs.nodejs_18 }: stdenv.mkDerivation rec { pname = "ariang"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; rev = version; - hash = "sha256-kh2XdsrZhR0i+vUhTrzXu5z5Ahv9otNEEjqlCUnVmqE="; + hash = "sha256-jprx1JIh+Q0Cv2NkLj9dMnGr+nR/0T08N02gXGknC1Q="; }; buildPhase = @@ -57,5 +57,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - - diff --git a/pkgs/servers/ariang/node-composition.nix b/pkgs/servers/ariang/node-composition.nix index 68f9f64e6cf32..c9f115c87bc81 100644 --- a/pkgs/servers/ariang/node-composition.nix +++ b/pkgs/servers/ariang/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { 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 { diff --git a/pkgs/servers/ariang/node-deps.nix b/pkgs/servers/ariang/node-deps.nix index 58d5b1f8ca46a..9dd1b63bf1607 100644 --- a/pkgs/servers/ariang/node-deps.nix +++ b/pkgs/servers/ariang/node-deps.nix @@ -8874,8 +8874,8 @@ let args = { name = "ariang"; packageName = "ariang"; - version = "1.3.3"; - src = ../../../../../../../../nix/store/3pp4ryp6vbl4bgx2g5qzqjwfzs689v1k-source; + version = "1.3.4"; + src = ../../../../../../../../nix/store/rhbjvs607bgp8gcyp2czg18r5ygwjpl6-source; dependencies = [ (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ diff --git a/pkgs/servers/ariang/update.sh b/pkgs/servers/ariang/update.sh index 8a47163b8118e..b3920e3409afe 100755 --- a/pkgs/servers/ariang/update.sh +++ b/pkgs/servers/ariang/update.sh @@ -11,21 +11,19 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -update-source-version ariang 0 0000000000000000000000000000000000000000000000000000000000000000 +update-source-version ariang 0 sha256-0000000000000000000000000000000000000000000= update-source-version ariang "$latestVersion" # use patched source store_src="$(nix-build . -A ariang.src --no-out-link)" -echo $store_src cd "$(dirname "${BASH_SOURCE[0]}")" node2nix \ - --nodejs-14 \ + --nodejs-18 \ --development \ --node-env ../../development/node-packages/node-env.nix \ --output ./node-deps.nix \ --input "$store_src/package.json" \ --lock "$store_src/package-lock.json" \ - --composition ./node-composition.nix \ - ; + --composition ./node-composition.nix