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: cd0cd946f37c
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: 513c52147f14
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 16, 2018

  1. qemu: 2.11.1 -> 2.11.2

    This is a bugfix release that also allows (more) Spectre migitations.
    In particular for CVE-2018-3639 (Spectre v4).
    CVE-2018-7550 is also addressed,
    andir committed Aug 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    e2a633c View commit details

Commits on Aug 17, 2018

  1. Merge pull request #45136 from andir/18.03/qemu

    [18.03] qemu: 2.11.1 -> 2.11.2
    andir authored Aug 17, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b3432db View commit details
  2. knot-dns: 2.6.8 -> 2.6.9 (maintenance)

    https://lists.nic.cz/pipermail/knot-dns-users/2018-August/001442.html
    Nixpkgs master will be getting 2.7.1 instead.
    vcunat committed Aug 17, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    513c521 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/virtualization/qemu/default.nix
  2. +2 −2 pkgs/servers/dns/knot-dns/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@

with stdenv.lib;
let
version = "2.11.1";
sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr";
version = "2.11.2";
sha256 = "17xz3j17sndz1z8hl3qcci50bz4qk6xb60hy1f61486jhx2vhbyw";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
4 changes: 2 additions & 2 deletions pkgs/servers/dns/knot-dns/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
name = "knot-dns-${version}";
version = "2.6.8";
version = "2.6.9";

src = fetchurl {
url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15";
sha256 = "6329e540e3ce2a9a3a2439705c06e3c8b26e6a434f8d22f542a6c9dd3ea165f4";
};

outputs = [ "bin" "out" "dev" ];