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: d8b7b590c7b1
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: 2ddb7a2056cf
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on Apr 20, 2020

  1. birdtray: 1.7.0 -> 1.8.0

    @oxalica
    oxalica committed Apr 20, 2020
    Copy the full SHA
    4ab8a6e View commit details

  2. kmon: 1.0.1 -> 1.1.0

    @misuzu
    misuzu committed Apr 20, 2020
    Copy the full SHA
    dc28779 View commit details

  3. cni: 0.7.0 -> 0.7.1 

    https://github.com/containernetworking/cni/releases/tag/v0.7.1
    @zowoq
    zowoq committed Apr 20, 2020
    Copy the full SHA
    7448089 View commit details

  4. cni-plugins: 0.8.4 -> 0.8.5 

    https://github.com/containernetworking/plugins/releases/tag/v0.8.5
    @zowoq
    zowoq committed Apr 20, 2020
    Copy the full SHA
    202b87c View commit details

Commits on Apr 21, 2020

  1. Merge pull request #85641 from zowoq/cni 

    cni: 0.7.0 -> 0.7.1, cni-plugins: 0.8.4 -> 0.8.5
    @marsam
    marsam authored Apr 21, 2020
    Copy the full SHA
    77317be View commit details

  2. Merge pull request #85621 from misuzu/kmon-update 

    kmon: 1.0.1 -> 1.1.0
    @marsam
    marsam authored Apr 21, 2020
    Copy the full SHA
    49d6a72 View commit details

  3. Merge pull request #85605 from oxalica/bump/birdtray 

    birdtray: 1.7.0 -> 1.8.0
    @marsam
    marsam authored Apr 21, 2020
    Copy the full SHA
    2ddb7a2 View commit details
13 changes: 4 additions & 9 deletions pkgs/applications/misc/birdtray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,29 +7,24 @@
, qtbase
, qttools
, qtx11extras
, sqlite
}:

mkDerivation rec {
pname = "birdtray";
version = "1.7.0";
version = "1.8.0";

src = fetchFromGitHub {
owner = "gyunaev";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "0wj2lq5bz1p0cf6yj43v3ifxschcrh5amwx30wqw2m4bb8syzjw1";
rev = version;
sha256 = "15d0gz889vf9b2a046m93s5kdi6lw2sqjd5gaxgjkjrs20x5vr18";
};

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
qtbase qtx11extras sqlite
qtbase qttools qtx11extras
];

installPhase = ''
install -Dm755 birdtray $out/bin/birdtray
'';

meta = with lib; {
description = "Mail system tray notification icon for Thunderbird";
homepage = "https://github.com/gyunaev/birdtray";
9 changes: 5 additions & 4 deletions pkgs/applications/networking/cluster/cni/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoPackage }:

buildGoPackage rec {
pname = "cni";
version = "0.7.0";
version = "0.7.1";

src = fetchFromGitHub {
owner = "containernetworking";
repo = pname;
rev = "v${version}";
sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz";
};

goPackagePath = "github.com/containernetworking/cni";
meta = with stdenv.lib; {

meta = with lib; {
description = "Container Network Interface - networking for Linux containers";
license = licenses.asl20;
homepage = "https://github.com/containernetworking/cni";
210 changes: 0 additions & 210 deletions pkgs/applications/networking/cluster/cni/plugins-deps.nix
View file

This file was deleted.

28 changes: 15 additions & 13 deletions pkgs/applications/networking/cluster/cni/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoPackage }:

buildGoPackage rec {
pname = "cni-plugins";
version = "0.8.4";
version = "0.8.5";

src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "02kz6y3klhbriybsskn4hmldwli28cycnp2klsm2x0y9c73iczdp";
sha256 = "17c8pvpn0dpda6ah7irr9hhd8sk7mnm32zv72nc5pxg1xvfpaipi";
};

goDeps = ./plugins-deps.nix;
goPackagePath = "github.com/containernetworking/plugins";

subPackages = [
"plugins/meta/bandwidth"
"plugins/meta/firewall"
"plugins/meta/flannel"
"plugins/meta/portmap"
"plugins/meta/sbr"
"plugins/meta/tuning"
"plugins/ipam/dhcp"
"plugins/ipam/host-local"
"plugins/ipam/static"
"plugins/main/bridge"
"plugins/main/host-device"
"plugins/main/ipvlan"
"plugins/main/loopback"
"plugins/main/macvlan"
"plugins/main/ptp"
"plugins/main/vlan"
"plugins/ipam/dhcp"
"plugins/ipam/host-local"
"plugins/ipam/static"
"plugins/meta/bandwidth"
"plugins/meta/firewall"
"plugins/meta/flannel"
"plugins/meta/portmap"
"plugins/meta/sbr"
"plugins/meta/tuning"
];

meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team";
homepage = "https://github.com/containernetworking/plugins";
6 changes: 3 additions & 3 deletions pkgs/tools/system/kmon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "kmon";
version = "1.0.1";
version = "1.1.0";

src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "0kmkcs13cccmjjfbl25bs3m54zcjcs38fiv84q0vy09a4dnx3gn8";
sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx";
};

cargoSha256 = "0l1yq9k6lyk0ww1nzk93axylgrwipkmmqh9r6fq4a31wjlblrkkb";
cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1";

nativeBuildInputs = [ python3 ];