cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #230204 from Stunkymonkey/ariang-1.3.4

Browse source 
ariang: 1.3.3 -> 1.3.4
This commit is contained in:
Nick Cao 2023-05-06 22:06:34 +08:00 committed by GitHub
commit 194d7897e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/ariang/default.nix
View file

@ -1,19 +1,19 @@
{ lib { lib ? pkgs.lib
, stdenv , stdenv
, pkgs , pkgs
, fetchFromGitHub , fetchFromGitHub
, nodejs ? pkgs.nodejs_14 , nodejs ? pkgs.nodejs_18
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ariang"; pname = "ariang";
version = "1.3.3"; version = "1.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mayswind"; owner = "mayswind";
repo = "AriaNg"; repo = "AriaNg";
rev = version; rev = version;
hash = "sha256-kh2XdsrZhR0i+vUhTrzXu5z5Ahv9otNEEjqlCUnVmqE="; hash = "sha256-jprx1JIh+Q0Cv2NkLj9dMnGr+nR/0T08N02gXGknC1Q=";
}; };
buildPhase = buildPhase =
@ -57,5 +57,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

2
pkgs/servers/ariang/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

4
pkgs/servers/ariang/node-deps.nix
View file

@ -8874,8 +8874,8 @@ let
args = { args = {
name = "ariang"; name = "ariang";
packageName = "ariang"; packageName = "ariang";
version = "1.3.3"; version = "1.3.4";
src = ../../../../../../../../nix/store/3pp4ryp6vbl4bgx2g5qzqjwfzs689v1k-source; src = ../../../../../../../../nix/store/rhbjvs607bgp8gcyp2czg18r5ygwjpl6-source;
dependencies = [ dependencies = [
(sources."@gulp-sourcemaps/identity-map-2.0.1" // { (sources."@gulp-sourcemaps/identity-map-2.0.1" // {
dependencies = [ dependencies = [

8
pkgs/servers/ariang/update.sh
View file

@ -11,21 +11,19 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then
exit 0 exit 0
fi fi
update-source-version ariang 0 0000000000000000000000000000000000000000000000000000000000000000 update-source-version ariang 0 sha256-0000000000000000000000000000000000000000000=
update-source-version ariang "$latestVersion" update-source-version ariang "$latestVersion"
# use patched source # use patched source
store_src="$(nix-build . -A ariang.src --no-out-link)" store_src="$(nix-build . -A ariang.src --no-out-link)"
echo $store_src
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"
node2nix \ node2nix \
--nodejs-14 \ --nodejs-18 \
--development \ --development \
--node-env ../../development/node-packages/node-env.nix \ --node-env ../../development/node-packages/node-env.nix \
--output ./node-deps.nix \ --output ./node-deps.nix \
--input "$store_src/package.json" \ --input "$store_src/package.json" \
--lock "$store_src/package-lock.json" \ --lock "$store_src/package-lock.json" \
--composition ./node-composition.nix \ --composition ./node-composition.nix
;