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: 65eab104a34d
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: 24cd23aa3084
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Jul 27, 2020

  1. buildkit: 0.7.1 -> 0.7.2

    @marsam
    marsam committed Jul 27, 2020
    Copy the full SHA
    3884532 View commit details

Commits on Jul 29, 2020

  1. .github/workflows/wait-ofborg.yml: 260 -> 360

    @zowoq
    zowoq committed Jul 29, 2020
    Copy the full SHA
    e0742ab View commit details

  2. Merge pull request #94121 from zowoq/ofborg-wait 

    .github/workflows/wait-ofborg.yml: 260 -> 360
    @Mic92
    Mic92 authored Jul 29, 2020
    Copy the full SHA
    f50f947 View commit details

  3. conmon: 2.0.19 -> 2.0.20 

    https://github.com/containers/conmon/releases/tag/v2.0.20
    @zowoq
    zowoq committed Jul 29, 2020
    Copy the full SHA
    8649a86 View commit details

  4. Merge pull request #94131 from marsam/update-buildkit 

    buildkit: 0.7.1 -> 0.7.2
    @marsam
    marsam authored Jul 29, 2020
    Copy the full SHA
    24cd23a View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 .github/workflows/wait-ofborg.yml
  2. +2 −2 pkgs/applications/virtualization/conmon/default.nix
  3. +3 −3 pkgs/development/tools/buildkit/default.nix
2 changes: 1 addition & 1 deletion .github/workflows/wait-ofborg.yml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
run: |
# wait for ~30min...
# ..in future a better fix would be to make ofborg mark CI as pending right away.
for i in $(seq 260); do
for i in $(seq 360); do
res=$(curl --silent \
-H "Accept: application/vnd.github.antiope-preview+json" \
-H "Authorization: token ${GITHUB_TOKEN}" \
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/conmon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@

stdenv.mkDerivation rec {
pname = "conmon";
version = "2.0.19";
version = "2.0.20";

src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "005sz8aimbfm12d99q79yvsqczxbvbbgc725pavcbly3k1qva207";
sha256 = "1f09wx5k98fa55r73y5v0sgf2lha675xhk40piyf0b7zqknl6lya";
};

nativeBuildInputs = [ pkg-config ];
6 changes: 3 additions & 3 deletions pkgs/development/tools/buildkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "buildkit";
version = "0.7.1";
version = "0.7.2";

goPackagePath = "github.com/moby/buildkit";
subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
@@ -11,10 +11,10 @@ buildGoPackage rec {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws";
sha256 = "0kn2ad0rh3xlcxjxslkyrfxhv3cx88996nhxn86605x1mybxb2iq";
};

buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ];

meta = with stdenv.lib; {
description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";