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: 1e925e1545b2
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: ab018f754bc9
Choose a head ref
  • 9 commits
  • 4 files changed
  • 8 contributors

Commits on Apr 8, 2020

  1. cawbird: 1.0.4 -> 1.0.5 

    (cherry picked from commit 6be41c6)
    @schmittlauch
    schmittlauch committed Apr 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6d49593 View commit details

Commits on Apr 9, 2020

  1. unit: 1.14.0 -> 1.15.0 

    (cherry picked from commit 3815de8)
    @r-ryantm @ajs124
    r-ryantm authored and ajs124 committed Apr 9, 2020
    Copy the full SHA
    4efd728 View commit details

  2. unit: 1.15.0 -> 1.16.0 

    (cherry picked from commit 5dbe01a)
    @Izorkin @ajs124
    Izorkin authored and ajs124 committed Apr 9, 2020
    Copy the full SHA
    56eb406 View commit details

Commits on Apr 10, 2020

  1. tor-browser-bundle-bin: 9.0.7 -> 9.0.9 

    https://blog.torproject.org/new-release-tor-browser-909
https://blog.torproject.org/new-release-tor-browser-908
(cherry picked from commit 85e4f2d)
    @andriokha
    andriokha committed Apr 10, 2020
    Copy the full SHA
    c713b1b View commit details

  2. Merge pull request #84893 from andriokha/tor-browser-bundle-bin-9.0.9… 

    …-release-20.03

[20.03] tor-browser-bundle-bin: 9.0.7 -> 9.0.9
    @joachifm
    joachifm authored Apr 10, 2020
    Copy the full SHA
    f372211 View commit details

  3. Merge pull request #84891 from schmittlauch/cawbird1.0.5-backport 

    [backport] cawbird: 1.0.4 -> 1.0.5
    @worldofpeace
    worldofpeace authored Apr 10, 2020
    Copy the full SHA
    c2d5fe8 View commit details

  4. nixos/network-interfaces: assertion for DHCP on bridges 

    Assert that the user doesn't have a bridge configured while
networking.useDHCP is true. Due to new behaviour of dhcpcd [0], this
would result in the bridge not getting an address via DHCP, regardless
of wether it has networking.interfaces.<name?>.useDHCP set or not.

[0] https://roy.marples.name/archives/dhcpcd-discuss/0002621.html
    @erictapen
    erictapen committed Apr 10, 2020
    Copy the full SHA
    54ad186 View commit details

  5. Merge pull request #84840 from helsinki-systems/backport/20.03/unit 

    [20.03] unit: 1.14.0 -> 1.16.0
    @bhipple
    bhipple authored Apr 10, 2020
    Copy the full SHA
    f19157d View commit details

  6. Merge pull request #84221 from erictapen/dhcpcd-error-on-bridges 

    [20.03] nixos/network-interfaces: Assert that bridges can get an address via DHCP
    @worldofpeace
    worldofpeace authored Apr 10, 2020
    Copy the full SHA
    ab018f7 View commit details
11 changes: 11 additions & 0 deletions nixos/modules/tasks/network-interfaces.nix
View file
Original file line number Diff line number Diff line change
@@ -976,6 +976,17 @@ in
Temporary addresses are only needed when IPv6 is enabled.
'';
})) ++ [
{
assertion = cfg.useDHCP -> cfg.bridges == {};
message = ''
There are the bridges [ ${builtins.toString (builtins.attrNames cfg.bridges)} ] configured while `networking.useDHCP` is enabled.
dhcpcd doesn't give IPv4 addresses to bridges by default anymore,
so you have to set `networking.useDHCP = false` and then whitelist
every interface you need DHCP on with
`networking.interfaces.<name?>.useDHCP = true`.
'';
}
] ++ [
{
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
message = "Invalid value given to the networking.hostId option.";
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -90,19 +90,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "9.0.7";
version = "9.0.9";

lang = "en-US";

srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "11pgafa2lgj35s6kacy1b7pnzjg3ckqjxg0pf0aywxvc2qr3syv1";
sha256 = "0ws4s0jn559j1ih60wqspxvr5wpqww29kzk0xzzbr56wfyahp4fg";
};

i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "1mjz41n53gxpaxx7jdxk226f085v23kwr31m20vv4ar4vxfa42d8";
sha256 = "0sv73jlv0qwlkxgqkmqg1flsa9lbkxa4yahny5wrfgsbw74xibkl";
};
};
in
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cawbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@
}:

stdenv.mkDerivation rec {
version = "1.0.4";
version = "1.0.5";
pname = "cawbird";

src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "sha256:1gqi7bn08b9cjpb0mgs6bk1a2npdfhn56ckps95nck0jyqzfbnir";
sha256 = "sha256:0prrrkgmnm78sq2c6yvy86qb3lcl51d250q7gvmqili2ffnjmamf";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/servers/http/unit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,14 +17,14 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "1.14.0";
version = "1.16.0";
pname = "unit";

src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w";
sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l";
};

patches = [