Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6464a3b4557e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdfb1f7d530b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 28, 2020

  1. brook: 20190601 -> 20200102

    @xrelkd
    xrelkd committed Jan 28, 2020
    Copy the full SHA
    6f5268e View commit details

  2. Merge pull request #78724 from xrelkd/update/brook 

    brook: 20190601 -> 20200102
    @marsam
    marsam authored Jan 28, 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
    cdfb1f7 View commit details
Showing with 64 additions and 18 deletions.
  1. +2 −2 pkgs/tools/networking/brook/default.nix
  2. +62 −16 pkgs/tools/networking/brook/deps.nix
4 changes: 2 additions & 2 deletions pkgs/tools/networking/brook/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
pname = "brook";
version = "20190601";
version = "20200102";

goPackagePath = "github.com/txthinking/brook";

src = fetchFromGitHub {
owner = "txthinking";
repo = pname;
rev = "v${version}";
sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk";
sha256 = "17h74p4apghljiyqjxgk6c4hqnyqs4lsn15gbysx26r4cvzglpx6";
};

goDeps = ./deps.nix;
78 changes: 62 additions & 16 deletions pkgs/tools/networking/brook/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.