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: 899cf4ba2927
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: 87cc49a3fe64
Choose a head ref
  • 9 commits
  • 6 files changed
  • 4 contributors

Commits on Mar 4, 2020

  1. nixos/zerotierone: prevent systemd from changing MAC address 

    (cherry picked from commit 27b8253)
    @danielfullmer @obadz
    danielfullmer authored and obadz committed Mar 4, 2020
    Copy the full SHA
    01a02cc View commit details

  2. Merge pull request #81669 from obadz/backport-2003-zerotier-mac-fix 

    [20.03] nixos/zerotierone: prevent systemd from changing MAC address
    @obadz
    obadz authored Mar 4, 2020
    Copy the full SHA
    201a5d8 View commit details

  3. lollypop: add missing deps 

    We need the GIO_EXTRA_MODULE from glib-networking

(cherry picked from commit c10c96b)
    @worldofpeace
    worldofpeace committed Mar 4, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    0ebcfef View commit details

  4. lollypop: 1.2.16 -> 1.2.23 

    (cherry picked from commit 5d31a94)
    @worldofpeace
    worldofpeace committed Mar 4, 2020
    Copy the full SHA
    5a1a248 View commit details

  5. ephemeral: 6.2.1 -> 6.3.0 

    https://github.com/cassidyjames/ephemeral/releases/tag/6.3.0
(cherry picked from commit 0e82b0e)
    @worldofpeace
    worldofpeace committed Mar 4, 2020
    Copy the full SHA
    bd49b6f View commit details

  6. pantheon.elementary-files: 4.4.0 -> 4.4.1 

    https://github.com/elementary/files/releases/tag/4.4.1
(cherry picked from commit 7f7977e)
    @worldofpeace
    worldofpeace committed Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b37fcf9 View commit details

  7. pantheon.wingpanel-indicator-nightlight: 2.0.2 -> 2.0.3 

    https://github.com/elementary/wingpanel-indicator-nightlight/releases/tag/2.0.3
(cherry picked from commit 9dc1cc5)
    @worldofpeace
    worldofpeace committed Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    20c553b View commit details

  8. brave: 1.3.118 -> 1.4.95 

    Update brave from 1.3.118 to 1.4.95

(cherry picked from commit fa166b7)
Reason: Browser should be kept up-to-date for security reasons.
    @JeffLabonte
    JeffLabonte committed Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bf8a421 View commit details

  9. Merge pull request #81082 from JeffLabonte/release/20.03-brave_1.3.11… 

    …8_to_1.4.95

[20.03] brave: 1.3.118 -> 1.4.95
    @worldofpeace
    worldofpeace authored Mar 4, 2020
    Copy the full SHA
    87cc49a View commit details
10 changes: 10 additions & 0 deletions nixos/modules/services/networking/zerotierone.nix
View file
Original file line number Diff line number Diff line change
@@ -67,5 +67,15 @@ in
networking.firewall.allowedUDPPorts = [ cfg.port ];

environment.systemPackages = [ cfg.package ];

# Prevent systemd from potentially changing the MAC address
environment.etc."systemd/network/50-zerotier.link".text = ''
[Match]
OriginalName=zt*

[Link]
AutoNegotiation=false
MACAddressPolicy=none
'';
};
}
12 changes: 10 additions & 2 deletions pkgs/applications/audio/lollypop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,14 +12,18 @@
, desktop-file-utils
, totem-pl-parser
, gobject-introspection
, glib-networking
, gdk-pixbuf
, glib
, pango
, wrapGAppsHook
, lastFMSupport ? true
, youtubeSupport ? true
}:

python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.2.16";
version = "1.2.23";

format = "other";
doCheck = false;
@@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w";
sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47";
};

nativeBuildInputs = [
@@ -42,6 +46,9 @@ python3.pkgs.buildPythonApplication rec {
];

buildInputs = with gst_all_1; [
gdk-pixbuf
glib
glib-networking
gst-libav
gst-plugins-bad
gst-plugins-base
@@ -50,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
gstreamer
gtk3
libsoup
pango
totem-pl-parser
] ++ lib.optional lastFMSupport libsecret;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,11 +82,11 @@ in

stdenv.mkDerivation rec {
pname = "brave";
version = "1.3.118";
version = "1.4.95";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1pmz10h35fm54453h7m0qiynyfpfmwaicmwzs41c4h8xavqgr6mb";
sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
};

dontConfigure = true;
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/ephemeral/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@

stdenv.mkDerivation rec {
pname = "ephemeral";
version = "6.2.1";
version = "6.3.0";

src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg";
sha256 = "0h159szljvphs2hvagxwv6nncx46q0mvr4ylhl2nimap9jvss91n";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@

stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.4.0";
version = "4.4.1";

repoName = "files";

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg";
sha256 = "0s874qnqbx20vyp2z2rhz3z8py0dm21v26xc0h6hyc2gfz4s3jcg";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
version = "2.0.2";
version = "2.0.3";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph";
sha256 = "1ihg5iz69jgcbyzdkcc2fqmr5l34h2d1jjsx7y86ag1jvhljb82r";
};

passthru = {