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

Commits on Jun 22, 2020

  1. moodle: 3.8.2 -> 3.8.3 

    (cherry picked from commit 865f214)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Jun 22, 2020
    Copy the full SHA
    d30ddfd View commit details

Commits on Jun 27, 2020

  1. libvncserver: 0.9.12 -> 0.9.13 (security) 

    (cherry picked from commit 74c2722)
    @wamserma
    wamserma committed Jun 27, 2020
    Copy the full SHA
    8fbacd2 View commit details

Commits on Jun 28, 2020

  1. Merge pull request #91664 from wamserma/bump-libvncserver-20.03 

    [20.03] libvncserver: 0.9.12 -> 0.9.13 (security, backport)
    @nh2
    nh2 authored Jun 28, 2020
    Copy the full SHA
    b82f8b3 View commit details

  2. Merge pull request #91280 from aanderse/moodle 

    moodle: 3.8.2 -> 3.8.3 [20.03 backport]
    @aanderse
    aanderse authored Jun 28, 2020
    Copy the full SHA
    f82e9b8 View commit details
Showing with 5 additions and 16 deletions.
  1. +3 −14 pkgs/development/libraries/libvncserver/default.nix
  2. +2 −2 pkgs/servers/web-apps/moodle/default.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/servers/web-apps/moodle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:

let
version = "3.8.2";
version = "3.8.3";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53";
sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1";
};

phpConfig = writeText "config.php" ''