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: 52c3a80050d0
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: ea073a17b1b1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jun 29, 2020

  1. mtail: 3.0.0-rc35 -> 3.0.0-rc36

    @bbigras
    bbigras committed Jun 29, 2020
    Copy the full SHA
    e8f8394 View commit details

  2. nixpkgs-unstable channel: don't depend on the metrics job 

    This reverts commit c23e9e1.

At this moment the benchmarking machine ("t2a") is unreachable from
outside due to IPv6 issues.  (the "t4a" and "t4b" builders as well)
But even generally I can't see why this job should block channels,
provided that it won't remain broken over long term.
    @vcunat
    vcunat committed Jun 29, 2020
    Copy the full SHA
    e0f4ee7 View commit details

  3. Merge pull request #91747 from bbigras/mtail 

    mtail: 3.0.0-rc35 -> 3.0.0-rc36
    @danieldk
    danieldk authored Jun 29, 2020
    Copy the full SHA
    ea073a1 View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −3 pkgs/servers/monitoring/mtail/default.nix
  2. +0 −1 pkgs/top-level/release.nix
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/mtail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "mtail";
version = "3.0.0-rc35";
version = "3.0.0-rc36";

src = fetchFromGitHub {
owner = "google";
repo = "mtail";
rev = "v${version}";
sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd";
sha256 = "1xdpjzcr143f7430wl9l6zzq9yhbkirr3fbfw60f10zpglrcx8a4";
};

vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5";
vendorSha256 = "02fnvy897cygmipc5snza556qihjwrp1lf9qi9f5dzarphd6d0pw";
subPackages = [ "cmd/mtail" ];

preBuild = ''
1 change: 0 additions & 1 deletion pkgs/top-level/release.nix
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,6 @@ let
meta.description = "Release-critical builds for the Nixpkgs unstable channel";
constituents =
[ jobs.tarball
jobs.metrics
jobs.manual
jobs.lib-tests
jobs.stdenv.x86_64-linux