Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f306e09bb8f1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b428d8c0912
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on May 29, 2019

  1. matrix-synapse: 0.95.5 -> 0.95.5.1 

    This version is needed for compatibility with 1.0.0 and the new v4 rooms.

Also, enable systemd support based on host OS.
    @peterhoeg
    peterhoeg committed May 29, 2019
    Copy the full SHA
    adddf54 View commit details

  2. nixos/syncthing: run init only if devices or folders are set

    @Lassulus
    Lassulus committed May 29, 2019
    Copy the full SHA
    87e9e65 View commit details

Commits on May 30, 2019

  1. Merge pull request #62157 from Lassulus/syncthing-fix 

    nixos/syncthing: run init only if a devices or folders are set
    @matthewbauer
    matthewbauer authored May 30, 2019
    Copy the full SHA
    0a2b971 View commit details

  2. Merge pull request #62203 from peterhoeg/u/matrix 

    matrix-synapse: 0.95.5 -> 0.95.5.1
    @peterhoeg
    peterhoeg authored May 30, 2019
    Copy the full SHA
    4b428d8 View commit details
Showing with 6 additions and 4 deletions.
  1. +3 −1 nixos/modules/services/networking/syncthing.nix
  2. +3 −3 pkgs/servers/matrix-synapse/default.nix
4 changes: 3 additions & 1 deletion nixos/modules/services/networking/syncthing.nix
View file
Original file line number Diff line number Diff line change
@@ -426,7 +426,9 @@ in {
'';
};
};
syncthing-init = {
syncthing-init = mkIf (
cfg.declarative.devices != {} || cfg.declarative.folders != {}
) {
after = [ "syncthing.service" ];
wantedBy = [ "multi-user.target" ];

6 changes: 3 additions & 3 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, python3
, enableSystemd ? true
, enableSystemd ? stdenv.isLinux
}:

with python3.pkgs;
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "0.99.5";
version = "0.99.5.1";

src = fetchPypi {
inherit pname version;
sha256 = "0f50nfddrd4zxyv27wn9k5fxhqqa9kgvk2ijby0pgf61b054dhfn";
sha256 = "17iyy6hq6m0mcb5r8zwzw90qqfn6w4b9l87snlfrry8gzwjjwncz";
};

patches = [