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: f253fc13eccf
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: e93a63bd30df
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 25, 2020

  1. libvncserver: 0.9.12 -> 0.9.13 (security)

    @wamserma
    wamserma committed Jun 25, 2020
    Copy the full SHA
    74c2722 View commit details

Commits on Jun 26, 2020

  1. netdata: 1.22.1 -> 1.23.0

    @RaghavSood
    RaghavSood committed Jun 26, 2020
    Copy the full SHA
    9a5e9d4 View commit details

Commits on Jun 27, 2020

  1. Merge pull request #91616 from RaghavSood/netdata/1.23.0 

    netdata: 1.22.1 -> 1.23.0
    @danieldk
    danieldk authored Jun 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: FD56C4EF292AFBF0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c56708e View commit details

  2. Merge pull request #91516 from wamserma/bump-libvncserver 

    libvncserver: 0.9.12 -> 0.9.13 (security)
    @7c6f434c
    7c6f434c authored Jun 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: FD56C4EF292AFBF0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e93a63b View commit details
Showing with 9 additions and 20 deletions.
  1. +3 −14 pkgs/development/libraries/libvncserver/default.nix
  2. +2 −2 pkgs/tools/system/netdata/default.nix
  3. +4 −4 pkgs/tools/system/netdata/go.d.plugin.nix
17 changes: 3 additions & 14 deletions pkgs/development/libraries/libvncserver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,28 +7,17 @@ let
s = # Generated upstream information
rec {
pname = "libvncserver";
version = "0.9.12";
version = "0.9.13";
url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum
sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum
};
in
stdenv.mkDerivation {
inherit (s) pname version;
src = fetchzip {
inherit (s) url sha256;
};
patches = [
(fetchpatch {
name = "CVE-2018-20750.patch";
url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch";
sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm";
})
(fetchpatch {
name = "CVE-2019-15681.patch";
url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch";
sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s";
})
];

nativeBuildInputs = [ cmake ];
buildInputs = [
libjpeg openssl libgcrypt libpng
4 changes: 2 additions & 2 deletions pkgs/tools/system/netdata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ with stdenv.lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
version = "1.22.1";
version = "1.23.0";
pname = "netdata";

src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "1hliv4d3pa8c3inz0bcl6nngfmp8vwnvh7smbwqiq7isfjijbpr6";
sha256 = "04x53hr2d086y4q990h7lazaykaizb5g45nmfvahqzxj72b0hvdf";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
8 changes: 4 additions & 4 deletions pkgs/tools/system/netdata/go.d.plugin.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "netdata-go.d.plugin";
version = "0.18.0";
version = "0.19.2";

src = fetchFromGitHub {
owner = "netdata";
repo = "go.d.plugin";
rev = "v${version}";
sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b";
sha256 = "03a67kvhickzg96jvzxhg1jih48m96rl4mkg0wgmbi7a676dl7lq";
};

vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj";
vendorSha256 = "0mmnkkzpv8lmxn11idikddmjinxv1y823ny0wxp271agiinyfpn8";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

@@ -26,4 +26,4 @@ buildGoModule rec {
license = licenses.gpl3;
maintainers = [ maintainers.lethalman ];
};
}
}