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: 84f47bfe9ae8
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: 00115f2f9c7f
Choose a head ref
  • 6 commits
  • 3 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
    009d2d6 View commit details

  2. Merge pull request #81668 from obadz/backport-1909-zerotier-mac-fix 

    [19.09] nixos/zerotierone: prevent systemd from changing MAC address
    @obadz
    obadz authored 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
    416a23d View commit details

  3. maintainers: add jefflabonte 

    New maintainer for brave

(cherry picked from commit d5e52ad2301c5cc5783ae41749b17fface20a524)
Reason: my name is part of the maintainer list of brave
    @JeffLabonte
    JeffLabonte 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
    55c518c View commit details

  4. brave: add jefflabonte to maintainer list 

    Add new maintainer to brave

(cherry picked from commit 9a4a2eb)
Reason: Previous commit add jefflabonte to list of the maintainer, he
should be added to the package he tries to maintain
    @JeffLabonte
    JeffLabonte 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
    9e3996f View commit details

  5. brave: 1.3.118 -> 1.4.95 

    Update brave from 0.69.128 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

    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
    a9b1721 View commit details

  6. Merge pull request #81078 from JeffLabonte/release/19.09 

    [19.09] brave: 1.3.118 -> 1.4.95
    @worldofpeace
    worldofpeace authored 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
    00115f2 View commit details
Showing with 19 additions and 3 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +10 −0 nixos/modules/services/networking/zerotierone.nix
  3. +3 −3 pkgs/applications/networking/browsers/brave/default.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -2912,6 +2912,12 @@
githubId = 1198065;
name = "Jeffrey David Johnson";
};
jefflabonte = {
email = "grimsleepless@protonmail.com";
github = "jefflabonte";
githubId = 9425955;
name = "Jean-François Labonté";
};
jensbin = {
email = "jensbin+git@pm.me";
github = "jensbin";
10 changes: 10 additions & 0 deletions nixos/modules/services/networking/zerotierone.nix
View file
Original file line number Diff line number Diff line change
@@ -63,5 +63,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
'';
};
}
6 changes: 3 additions & 3 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 = "0.69.128";
version = "1.4.95";

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

dontConfigure = true;
@@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
contribute to your favorite creators automatically.
'';
license = licenses.mpl20;
maintainers = [ maintainers.uskudnik ];
maintainers = with maintainers; [ uskudnik rht jefflabonte ];
platforms = [ "x86_64-linux" ];
};
}