Skip to content

ariang: 1.3.3 -> 1.3.4 #230204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickCao merged 1 commit into from
May 6, 2023
Merged

ariang: 1.3.3 -> 1.3.4 #230204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions pkgs/servers/ariang/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down Expand Up @@ -57,5 +57,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}


2 changes: 1 addition & 1 deletion pkgs/servers/ariang/node-composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{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
4 changes: 2 additions & 2 deletions pkgs/servers/ariang/node-deps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
8 changes: 3 additions & 5 deletions pkgs/servers/ariang/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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