Unverified Commit 194d7897 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #230204 from Stunkymonkey/ariang-1.3.4 

ariang: 1.3.3 -> 1.3.4
parents 555e1468 090af8c1

pkgs/servers/ariang/default.nix

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

  };

}

pkgs/servers/ariang/node-composition.nix

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

pkgs/servers/ariang/node-deps.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/servers/ariang/update.sh

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