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: 6b5f85a62c44
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: 504f993df9a5
Choose a head ref
  • 6 commits
  • 6 files changed
  • 3 contributors

Commits on Oct 28, 2020

  1. snmp_exporter: 0.17.0 -> 0.18.0 

    (cherry picked from commit 01c937f)
    @Frostman @lheckemann
    Frostman authored and lheckemann committed Oct 28, 2020
    Copy the full SHA
    e58039a View commit details

  2. prometheus-snmp-exporter: 0.18.0 -> 0.19.0 

    https://github.com/prometheus/snmp_exporter/releases/tag/v0.19.0
(cherry picked from commit 1c90c5b)
    @WilliButz @lheckemann
    WilliButz authored and lheckemann committed Oct 28, 2020
    Copy the full SHA
    ae6f01d View commit details

  3. element-web: 1.7.10 -> 1.7.12 

    https://github.com/vector-im/element-web/releases/tag/v1.7.11
https://github.com/vector-im/element-web/releases/tag/v1.7.12
(cherry picked from commit 135f6b6)
    @Ma27
    Ma27 committed Oct 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    00f3a33 View commit details

  4. element-desktop: 1.7.10 -> 1.7.12 

    https://github.com/vector-im/element-desktop/releases/tag/v1.7.11
https://github.com/vector-im/element-desktop/releases/tag/v1.7.12
(cherry picked from commit 9d5c765)
    @Ma27
    Ma27 committed Oct 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e416746 View commit details

  5. matrix-synapse: 1.21.2 -> 1.22.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.22.0
(cherry picked from commit 2e2eea4)
    @Ma27
    Ma27 committed Oct 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e39c1f4 View commit details

  6. matrix-synapse: make dependency for hiredis optional 

    This is only needed for replication which isn't even supported by the
current NixOS module.

(cherry picked from commit ff94877)
    @Ma27
    Ma27 committed Oct 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    504f993 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.10",
"version": "1.7.12",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "10.1.1",
"electronVersion": "10.1.3",
"files": [
"package.json",
{
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View file
Original file line number Diff line number Diff line change
@@ -4394,11 +4394,11 @@
};
}
{
name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
path = fetchurl {
name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz";
sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561";
};
}
{
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.10";
version = "1.7.12";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "06ygqfhbsld4s274kakb6a5nx75jki44r8lwk3n0pi5mnkn626gl";
sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";
};
electron = electron_8;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-web.nix
View file
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.10";
version = "1.7.12";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1xcvydjpdp6cy5g0da5yaa49gjxsmf4hsyi2q4l3p8qvs4qajn0r";
sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";
};

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

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

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.21.2";
version = "1.22.0";

src = fetchPypi {
inherit pname version;
sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528";
sha256 = "0dl4a5zirrjabbfibl9vj4zb16md11kqkz2v9l299gxbwwvzqc39";
};

patches = [
@@ -68,7 +69,8 @@ in buildPythonApplication rec {
typing-extensions
authlib
pyjwt
] ++ lib.optional enableSystemd systemd;
] ++ lib.optional enableSystemd systemd
++ lib.optional enableRedis hiredis;

checkInputs = [ mock parameterized openssl ];

@@ -77,6 +79,7 @@ in buildPythonApplication rec {
passthru.tests = { inherit (nixosTests) matrix-synapse; };

checkPhase = ''
${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';

4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/prometheus/snmp-exporter.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
pname = "snmp_exporter";
version = "0.17.0";
version = "0.19.0";

goPackagePath = "github.com/prometheus/snmp_exporter";

src = fetchFromGitHub {
owner = "prometheus";
repo = "snmp_exporter";
rev = "v${version}";
sha256 = "0s2vgcpxannyl1zllc3ixww02832s53zijws64lhd8mxrylqvpcp";
sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6";
};

buildInputs = [ net-snmp ];