Skip to content
This repository has been 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: 7df7d37cac4b
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: a8546a078df9
Choose a head ref
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Jul 20, 2020

  1. Copy the full SHA
    c805f76 View commit details
  2. Copy the full SHA
    58c2a5f View commit details
  3. Merge pull request #93497 from r-ryantm/auto-update/cargo-outdated

    cargo-outdated: 0.9.10 -> 0.9.11
    ryantm authored Jul 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2029455 View commit details
  4. aerc: fix GOFLAGS (#93455)

    zowoq authored Jul 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    902987d View commit details
  5. oauth2_proxy: 5.1.1 -> 6.0.0 (#93121)

    The new release fixes one of the outstanding CVEs against oauth2_proxy:
    GHSA-5m6c-jp6f-2vcv.
    
    In addition, rename the owner and the project name to reflect the
    changes upstream (it now belongs to the oauth2-proxy organization, and
    the name is oauth2-proxy)
    knl authored Jul 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    53f42f2 View commit details
  6. Merge pull request #93498 from r-ryantm/auto-update/cargo-udeps

    cargo-udeps: 0.1.12 -> 0.1.13
    danieldk authored Jul 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a8546a0 View commit details
12 changes: 7 additions & 5 deletions nixos/modules/services/security/oauth2_proxy.nix
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ in

##############################################
# PROVIDER configuration
# Taken from: https://github.com/pusher/oauth2_proxy/blob/master/providers/providers.go
# Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go
provider = mkOption {
type = types.enum [
"google"
@@ -346,7 +346,9 @@ in
type = types.nullOr types.str;
default = null;
description = ''
An optional cookie domain to force cookies to.
Optional cookie domains to force cookies to (ie: `.yourcompany.com`).
The longest domain matching the request's host will be used (or the shortest
cookie domain if there is no match).
'';
example = ".yourcompany.com";
};
@@ -537,15 +539,15 @@ in
extraConfig = mkOption {
default = {};
description = ''
Extra config to pass to oauth2_proxy.
Extra config to pass to oauth2-proxy.
'';
};

keyFile = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
oauth2_proxy allows passing sensitive configuration via environment variables.
oauth2-proxy allows passing sensitive configuration via environment variables.
Make a file that contains lines like
OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com
and specify the path here.
@@ -577,7 +579,7 @@ in
serviceConfig = {
User = "oauth2_proxy";
Restart = "always";
ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}";
ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}";
EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;
};
};
6 changes: 2 additions & 4 deletions pkgs/applications/networking/mailreaders/aerc/default.nix
Original file line number Diff line number Diff line change
@@ -44,8 +44,6 @@ buildGoModule rec {

buildInputs = [ python3 notmuch ];

GOFLAGS="-tags=notmuch";

buildPhase = "
runHook preBuild
# we use make instead of go build
@@ -54,7 +52,7 @@ buildGoModule rec {

installPhase = ''
runHook preInstall
make PREFIX=$out install
make PREFIX=$out GOFLAGS="$GOFLAGS -tags=notmuch" install
wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath"
runHook postInstall
'';
@@ -73,4 +71,4 @@ buildGoModule rec {
license = licenses.mit;
platforms = platforms.unix;
};
}
}
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-udeps/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
version = "0.1.12";
version = "0.1.13";

src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
sha256 = "1hf2zkv3yd72kkvdwigms3wzchmh4i56ym3swpx35dij2h8g08mx";
sha256 = "0wxpzrcrdxlihzxzqmrhii5bfxknliqb4d5mka4k42x5vim8pq2f";
};

cargoSha256 = "0xb9fmcrsm47zkb26jw5rsi9wfz3jh19fbc74gnsrffdmfsd7mm2";
cargoSha256 = "0q1q7x1205a8dp35d4dds3mizl6y4d3rfc5gkarri1g189nrk5pl";

nativeBuildInputs = [ pkgconfig ];

8 changes: 4 additions & 4 deletions pkgs/servers/oauth2_proxy/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "oauth2-proxy";
version = "5.1.1";
version = "6.0.0";

src = fetchFromGitHub {
repo = pname;
owner = "pusher";
sha256 = "190k1v2c1f6vp9waqs01rlzm0jc3vrmsq1w1n0c2q2nfqx76y2wz";
owner = "oauth2-proxy";
sha256 = "0mbjg0d0w173xpq69frjdvgyx5k74pkrfx3phc3lq8snvhnf1c2n";
rev = "v${version}";
};

vendorSha256 = "01lf7xbhgn5l42ahym12vr1w00zx1qzy6sgwgcbvvxp48k0b271d";
vendorSha256 = "1hrk3h729kcc77fq44kiywmyzk5a78v7bm5d2yl76lfxxdcdric7";

doCheck = true;

6 changes: 3 additions & 3 deletions pkgs/tools/package-management/cargo-outdated/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-outdated";
version = "0.9.10";
version = "0.9.11";

src = fetchFromGitHub {
owner = "kbknapp";
repo = pname;
rev = "v${version}";
sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p";
sha256 = "11fdh24366czb3vv2szf5bl0mhsilwvpfc1h4qxq18z2dpb0y18m";
};

cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl";
cargoSha256 = "0sr3ijq6vh2269xav03d117kzmg68xiwqsq48xjdrsnn4dx5lizy";

nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]