Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab42edccc2d5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c51a4801f475
Choose a head ref
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Oct 8, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    gregberge Greg Bergé
    Copy the full SHA
    6473d9f View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0edddb8 View commit details

Commits on Oct 17, 2019

  1. iperf3: update musl patch

    Mic92 committed Oct 17, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fa2e8fc View commit details
  2. Merge pull request #70753 from kampka/matrix-appservice-slack

    matrix-appservice-slack: init at 1.0.1
    WilliButz authored Oct 17, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c51a480 View commit details
25 changes: 25 additions & 0 deletions pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ pkgs, nodejs, stdenv, lib, ... }:

let

packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));

nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
in
nodePackages."${packageName}".override {
nativeBuildInputs = [ pkgs.makeWrapper ];

postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-slack" \
--add-flags "$out/lib/node_modules/matrix-appservice-slack/lib/app.js"
'';

meta = with lib; {
description = "A Matrix <--> Slack bridge";
maintainers = with maintainers; [ kampka ];
license = licenses.asl20;
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix

node2nix \
--nodejs-10 \
--node-env ../../../development/node-packages/node-env.nix \
--development \
--input package.json \
--output node-packages.nix \
--composition node-composition.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file has been generated by node2nix 1.7.0. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:

let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
Loading