mjolnir: 1.4.1 -> 1.4.2
This commit is contained in:
parent
a24b5378d5
commit
49810cec5d
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mjolnir";
|
pname = "mjolnir";
|
||||||
version = "1.4.1";
|
version = "1.4.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "matrix-org";
|
owner = "matrix-org";
|
||||||
repo = "mjolnir";
|
repo = "mjolnir";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
|
sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -98,7 +98,7 @@ let
|
||||||
''
|
''
|
||||||
+ (lib.concatMapStrings (dependency:
|
+ (lib.concatMapStrings (dependency:
|
||||||
''
|
''
|
||||||
if [ ! -e "${dependency.name}" ]; then
|
if [ ! -e "${dependency.packageName}" ]; then
|
||||||
${composePackage dependency}
|
${composePackage dependency}
|
||||||
fi
|
fi
|
||||||
''
|
''
|
||||||
|
@ -257,8 +257,8 @@ let
|
||||||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||||
|
|
||||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(packageLock.dependencies !== undefined) {
|
if(packageLock.dependencies !== undefined) {
|
||||||
|
@ -390,7 +390,7 @@ let
|
||||||
buildNodePackage =
|
buildNodePackage =
|
||||||
{ name
|
{ name
|
||||||
, packageName
|
, packageName
|
||||||
, version
|
, version ? null
|
||||||
, dependencies ? []
|
, dependencies ? []
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
, production ? true
|
, production ? true
|
||||||
|
@ -409,7 +409,7 @@ let
|
||||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "${name}-${version}";
|
name = "${name}${if version == null then "" else "-${version}"}";
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ lib.optional (stdenv.isLinux) utillinux
|
++ lib.optional (stdenv.isLinux) utillinux
|
||||||
++ lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
|
@ -441,6 +441,14 @@ let
|
||||||
if [ -d "$out/lib/node_modules/.bin" ]
|
if [ -d "$out/lib/node_modules/.bin" ]
|
||||||
then
|
then
|
||||||
ln -s $out/lib/node_modules/.bin $out/bin
|
ln -s $out/lib/node_modules/.bin $out/bin
|
||||||
|
|
||||||
|
# Patch the shebang lines of all the executables
|
||||||
|
ls $out/bin/* | while read i
|
||||||
|
do
|
||||||
|
file="$(readlink -f "$i")"
|
||||||
|
chmod u+rwx "$file"
|
||||||
|
patchShebangs "$file"
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create symlinks to the deployed manual page folders, if applicable
|
# Create symlinks to the deployed manual page folders, if applicable
|
||||||
|
@ -471,7 +479,7 @@ let
|
||||||
buildNodeDependencies =
|
buildNodeDependencies =
|
||||||
{ name
|
{ name
|
||||||
, packageName
|
, packageName
|
||||||
, version
|
, version ? null
|
||||||
, src
|
, src
|
||||||
, dependencies ? []
|
, dependencies ? []
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
|
@ -489,7 +497,7 @@ let
|
||||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "node-dependencies-${name}-${version}";
|
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||||
|
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ lib.optional (stdenv.isLinux) utillinux
|
++ lib.optional (stdenv.isLinux) utillinux
|
||||||
|
@ -519,6 +527,7 @@ let
|
||||||
if [ -f ${src}/package-lock.json ]
|
if [ -f ${src}/package-lock.json ]
|
||||||
then
|
then
|
||||||
cp ${src}/package-lock.json .
|
cp ${src}/package-lock.json .
|
||||||
|
chmod 644 package-lock.json
|
||||||
fi
|
fi
|
||||||
''}
|
''}
|
||||||
|
|
||||||
|
@ -541,7 +550,7 @@ let
|
||||||
buildNodeShell =
|
buildNodeShell =
|
||||||
{ name
|
{ name
|
||||||
, packageName
|
, packageName
|
||||||
, version
|
, version ? null
|
||||||
, src
|
, src
|
||||||
, dependencies ? []
|
, dependencies ? []
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
|
@ -557,9 +566,10 @@ let
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeDependencies = buildNodeDependencies args;
|
nodeDependencies = buildNodeDependencies args;
|
||||||
|
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation ({
|
||||||
name = "node-shell-${name}-${version}";
|
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||||
|
|
||||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
|
@ -578,7 +588,7 @@ let
|
||||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||||
export PATH="${nodeDependencies}/bin:$PATH"
|
export PATH="${nodeDependencies}/bin:$PATH"
|
||||||
'';
|
'';
|
||||||
};
|
} // extraArgs);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||||
|
|
Loading…
Reference in a new issue