Unverified Commit 273b32ab authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #230991 from winterqt/add-npm-root 

npmHooks.npmConfigHook: add npmRoot option
parents 7a53a30c a8c39f77

pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ npmConfigHook() { 
    export NIX_NODEJS_BUILDNPMPACKAGE=1

    export prefetchNpmDeps="@prefetchNpmDeps@"



    if [ -n "${npmRoot-}" ]; then

      pushd "$npmRoot"

    fi



    echo "Configuring npm"



    export HOME="$TMPDIR"
@@ -105,6 +109,10 @@ npmConfigHook() { 
    rm "$CACHE_MAP_PATH"

    unset CACHE_MAP_PATH



    if [ -n "${npmRoot-}" ]; then

      popd

    fi



    echo "Finished npmConfigHook"

}

pkgs/tools/audio/botamusique/default.nix

+26 −40
Original line number Diff line number Diff line 
{ pkgs

, lib

{ lib

, stdenv

, fetchFromGitHub

, python3Packages

, ffmpeg

, makeWrapper

, nixosTests

, nodejs

, npmHooks

, fetchNpmDeps



# For the update script

, coreutils

, curl

, nix-prefetch-git

, prefetch-npm-deps

, jq

, nodePackages

, writeShellScript

}:

let

  nodejs = pkgs.nodejs_14;

  nodeEnv = import ../../../development/node-packages/node-env.nix {

    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;

    inherit pkgs nodejs;

    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;

  };

  botamusiqueNodePackages = import ./node-packages.nix {

    inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;

    inherit nodeEnv;

  };



  srcJson = lib.importJSON ./src.json;

  src = fetchFromGitHub {

    owner = "azlux";
@@ -33,19 +25,23 @@ let 
    inherit (srcJson) rev sha256;

  };



  nodeDependencies = (botamusiqueNodePackages.shell.override (old: {

    src = src + "/web";

  })).nodeDependencies;



  # Python needed to instantiate the html templates

  buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);

in



stdenv.mkDerivation rec {

  pname = "botamusique";

  version = srcJson.version;



  inherit src;



  npmDeps = fetchNpmDeps {

    src = "${src}/web";

    hash = srcJson.npmDepsHash;

  };



  npmRoot = "web";



  patches = [

    # botamusique by default resolves relative state paths by first checking

    # whether it exists in the working directory, then falls back to using the
@@ -67,9 +63,12 @@ stdenv.mkDerivation rec { 
      --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"

  '';



  NODE_OPTIONS = "--openssl-legacy-provider";



  nativeBuildInputs = [

    makeWrapper

    nodejs

    npmHooks.npmConfigHook

    python3Packages.wrapPython

  ];
@@ -91,9 +90,6 @@ stdenv.mkDerivation rec { 
    # Generates artifacts in ./static

    (

      cd web

      ln -s ${nodeDependencies}/lib/node_modules ./node_modules

      export PATH="${nodeDependencies}/bin:$PATH"



      npm run build

    )
@@ -118,36 +114,26 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  passthru.updateScript = pkgs.writeShellScript "botamusique-updater" ''

    export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq nodePackages.node2nix ]}

  passthru.updateScript = writeShellScript "botamusique-updater" ''

    export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq prefetch-npm-deps ]}

    set -ex



    OWNER=azlux

    REPO=botamusique

    VERSION=$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')

    VERSION="$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')"



    nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \

      jq > ${toString ./src.json } \

      jq > "${toString ./src.json}" \

        --arg version "$VERSION" \

        '.version |= $version'

    path=$(jq '.path' -r < ${toString ./src.json})

    path="$(jq '.path' -r < "${toString ./src.json}")"



    tmp=$(mktemp -d)

    tmp="$(mktemp -d)"

    trap 'rm -rf "$tmp"' exit



    # botamusique doesn't have a version in its package.json

    # But that's needed for node2nix

    jq < "$path"/web/package.json > "$tmp/package.json" \

      --arg version "$VERSION" \

      '.version |= $version'



    node2nix \

      --input "$tmp"/package.json \

      --lock "$path"/web/package-lock.json \

      --no-copy-node-env \

      --development \

      --composition /dev/null \

      --output ${toString ./node-packages.nix}

    npmHash="$(prefetch-npm-deps $path/web/package-lock.json)"

    jq '. + { npmDepsHash: "'"$npmHash"'" }' < "${toString ./src.json}" > "$tmp/src.json"

    mv "$tmp/src.json" "${toString ./src.json}"

  '';



  passthru.tests = {

pkgs/tools/audio/botamusique/node-packages.nix

deleted100644 → 0
+0 −5237

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/tools/audio/botamusique/src.json

+2 −1
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ 
  "fetchSubmodules": false,

  "deepClone": false,

  "leaveDotGit": false,

  "version": "7.2.2"

  "version": "7.2.2",

  "npmDepsHash": "sha256-IzEO7TFqIZUkhNGf0pnHbK/WFexF27RPD9lkYvmFmDw="

}