Unverified Commit ef895f6b authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

Merge pull request #173239 from jojosch/mjolnir-update 

mjolnir: 1.4.1 -> 1.4.2
parents 7b3000f1 050e0aa6

nixos/tests/matrix/mjolnir.nix

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import ../make-test-python.nix ( 
            enable_registration = true;

            enable_registration_without_verification = true;

            registration_shared_secret = "supersecret-registration";

            enable_registration_without_verification = true;



            listeners = [ {

              # The default but tls=false

pkgs/servers/mjolnir/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


stdenv.mkDerivation rec {

  pname = "mjolnir";

  version = "1.4.1";

  version = "1.4.2";



  src = fetchFromGitHub {

    owner = "matrix-org";

    repo = "mjolnir";

    rev = "v${version}";

    sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";

    sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM=";

  };



  nativeBuildInputs = [

pkgs/servers/mjolnir/node-composition.nix

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

    inherit system;

pkgs/servers/mjolnir/node-deps.nix

+276 −192

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/servers/mjolnir/node-env.nix

+21 −11
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ let 
      ''

      + (lib.concatMapStrings (dependency:

        ''

          if [ ! -e "${dependency.name}" ]; then

          if [ ! -e "${dependency.packageName}" ]; then

              ${composePackage dependency}

          fi

        ''
@@ -390,7 +390,7 @@ let 
  buildNodePackage =

    { name

    , packageName

    , version

    , version ? null

    , dependencies ? []

    , buildInputs ? []

    , production ? true
@@ -409,7 +409,7 @@ let 
      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];

    in

    stdenv.mkDerivation ({

      name = "${name}-${version}";

      name = "${name}${if version == null then "" else "-${version}"}";

      buildInputs = [ tarWrapper python nodejs ]

        ++ lib.optional (stdenv.isLinux) utillinux

        ++ lib.optional (stdenv.isDarwin) libtool
@@ -441,6 +441,14 @@ let 
        if [ -d "$out/lib/node_modules/.bin" ]

        then

            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



        # Create symlinks to the deployed manual page folders, if applicable
@@ -471,7 +479,7 @@ let 
  buildNodeDependencies =

    { name

    , packageName

    , version

    , version ? null

    , src

    , dependencies ? []

    , buildInputs ? []
@@ -489,7 +497,7 @@ let 
      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];

    in

      stdenv.mkDerivation ({

        name = "node-dependencies-${name}-${version}";

        name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";



        buildInputs = [ tarWrapper python nodejs ]

          ++ lib.optional (stdenv.isLinux) utillinux
@@ -519,6 +527,7 @@ let 
            if [ -f ${src}/package-lock.json ]

            then

                cp ${src}/package-lock.json .

                chmod 644 package-lock.json

            fi

          ''}
@@ -541,7 +550,7 @@ let 
  buildNodeShell =

    { name

    , packageName

    , version

    , version ? null

    , src

    , dependencies ? []

    , buildInputs ? []
@@ -557,9 +566,10 @@ let 


    let

      nodeDependencies = buildNodeDependencies args;

      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];

    in

    stdenv.mkDerivation {

      name = "node-shell-${name}-${version}";

    stdenv.mkDerivation ({

      name = "node-shell-${name}${if version == null then "" else "-${version}"}";



      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;

      buildCommand = ''
@@ -578,7 +588,7 @@ let 
        export NODE_PATH=${nodeDependencies}/lib/node_modules

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

      '';

    };

    } // extraArgs);

in

{

  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;