ldgallery: update generation script and regenerate Nix expressions
This commit is contained in:
parent
3e385dc285
commit
26642f208b
|
@ -24,11 +24,7 @@ node2nix \
|
||||||
--input ./package.json \
|
--input ./package.json \
|
||||||
--lock ./package-lock.json \
|
--lock ./package-lock.json \
|
||||||
--output node-packages.nix \
|
--output node-packages.nix \
|
||||||
--composition node-composition.nix
|
--composition node-composition.nix \
|
||||||
|
--no-copy-node-env
|
||||||
|
|
||||||
rm package.json package-lock.json
|
rm package.json package-lock.json
|
||||||
|
|
||||||
# Temporary quickfix to accomodate for the util-linux package rename.
|
|
||||||
# See https://github.com/svanderburg/node2nix/issues/213
|
|
||||||
git restore :/pkgs/development/node-packages/node-env.nix
|
|
||||||
sed -i 's/utillinux/util-linux/g' node-composition.nix
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# This file has been generated by node2nix 1.8.0. Do not edit!
|
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit pkgs nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
import ./node-packages.nix {
|
import ./node-packages.nix {
|
||||||
inherit (pkgs) fetchurl fetchgit;
|
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||||
inherit nodeEnv;
|
inherit nodeEnv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file has been generated by node2nix 1.8.0. Do not edit!
|
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||||
|
|
||||||
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
|
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
|
||||||
|
|
||||||
let
|
let
|
||||||
sources = {
|
sources = {
|
||||||
|
@ -13252,7 +13252,7 @@ let
|
||||||
];
|
];
|
||||||
buildInputs = globalBuildInputs;
|
buildInputs = globalBuildInputs;
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://ldgallery.pacien.org/;
|
homepage = "https://ldgallery.pacien.org/";
|
||||||
license = "AGPL-3";
|
license = "AGPL-3";
|
||||||
};
|
};
|
||||||
production = false;
|
production = false;
|
||||||
|
@ -13266,4 +13266,16 @@ in
|
||||||
tarball = nodeEnv.buildNodeSourceDist args;
|
tarball = nodeEnv.buildNodeSourceDist args;
|
||||||
package = nodeEnv.buildNodePackage args;
|
package = nodeEnv.buildNodePackage args;
|
||||||
shell = nodeEnv.buildNodeShell args;
|
shell = nodeEnv.buildNodeShell args;
|
||||||
|
nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
|
||||||
|
src = stdenv.mkDerivation {
|
||||||
|
name = args.name + "-package-json";
|
||||||
|
src = nix-gitignore.gitignoreSourcePure [
|
||||||
|
"*"
|
||||||
|
"!package.json"
|
||||||
|
"!package-lock.json"
|
||||||
|
] args.src;
|
||||||
|
dontBuild = true;
|
||||||
|
installPhase = "mkdir -p $out; cp -r ./* $out;";
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue