Skip to content
This repository has been 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
base: 04005e5f71ad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 21517c60d948
Choose a head ref
  • 18 commits
  • 15 files changed
  • 12 contributors

Commits on Nov 19, 2018

  1. makemkv: 1.12.3 -> 1.14.0 

    Changes: https://www.makemkv.com/download/history.html

Since this derivation only support Linux on x86_64, set the platform
meta data accordingly.

(cherry picked from commit f528731)
    @danieldk @nyanloutre
    danieldk authored and nyanloutre committed Nov 19, 2018
    Copy the full SHA
    3aca7b8 View commit details
    Browse the repository at this point in the history

  2. makemkv: 1.14.0 -> 1.14.1 

    (cherry picked from commit 30bc36c)
    @nyanloutre
    nyanloutre committed Nov 19, 2018
    Copy the full SHA
    9071b93 View commit details
    Browse the repository at this point in the history

  3. chromium: 70.0.3538.102 -> 70.0.3538.110 

    CVE-2018-17479

(cherry picked from commit 7c79a0d)
    @bendlas
    bendlas committed Nov 19, 2018
    Copy the full SHA
    7fd9051 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. chromium: add jdk.jre to build dependencies for versions >= 72 

    thanks for finding out @volth
see NixOS/nixpkgs@6fba925

(cherry picked from commit bac76e8)
    @bendlas
    bendlas committed Nov 20, 2018
    Copy the full SHA
    c1427bf View commit details
    Browse the repository at this point in the history

  2. makemkv: using two URLs for src 

    This will prevent future failures due to the first URL being broken each
time a new version is released

See NixOS/nixpkgs#50437 (comment)
for details

(cherry picked from commit 05166dc)
    @nyanloutre
    nyanloutre committed Nov 20, 2018
    Copy the full SHA
    e24bc96 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50698 from nyanloutre/makemkv-update-18.09 

    [18.09] makemkv: 1.12.3 -> 1.14.1
    @c0bw3b
    c0bw3b committed Nov 20, 2018
    Copy the full SHA
    9feb8b7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #50839 from taku0/flashplayer-31.0.0.153 

    flashplayer: 31.0.0.122 -> 31.0.0.153
(cherry picked from commit d3bdf3f)
    @7c6f434c
    7c6f434c committed Nov 20, 2018
    Copy the full SHA
    f7da99c View commit details
    Browse the repository at this point in the history

  5. haskellPackages.generic-lens: apply patch to fix tests 

    (cherry picked from commit 550fe15)
    @twhitehead
    Nathan van Doorn authored and twhitehead committed Nov 20, 2018
    Copy the full SHA
    869d900 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #50806 from twhitehead/release-18.09 

    haskellPackages.generic-lens: apply patch to fix tests
    @peti
    peti committed Nov 20, 2018
    Copy the full SHA
    03dc647 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2018

  1. nixos/fontconfig: fix enable option of penultimate 

    (cherry picked from commit eea86c9)
    @jfrankenau @ttuegel
    jfrankenau authored and ttuegel committed Nov 21, 2018
    Copy the full SHA
    bfb89a3 View commit details
    Browse the repository at this point in the history

  2. movit: 1.5.1 -> 1.6.2, fix build after #49310 

    Fixes #49883

(cherry picked from commit 6daa193)
    @orivej @edolstra
    orivej authored and edolstra committed Nov 21, 2018
    Copy the full SHA
    29842ed View commit details
    Browse the repository at this point in the history

  3. linux: 4.4.163 -> 4.4.164 

    (cherry picked from commit e822b96)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018
    Copy the full SHA
    bb10644 View commit details
    Browse the repository at this point in the history

  4. linux: 4.9.137 -> 4.9.138 

    (cherry picked from commit 0e7dafe)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018
    Copy the full SHA
    c90a18b View commit details
    Browse the repository at this point in the history

  5. linux: 4.14.81 -> 4.14.82 

    (cherry picked from commit 3667a91)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018
    Copy the full SHA
    4215171 View commit details
    Browse the repository at this point in the history

  6. linux: 4.18.19 -> 4.18.20 

    (cherry picked from commit ff82d7c)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018
    Copy the full SHA
    d0193db View commit details
    Browse the repository at this point in the history

  7. linux: 4.19.2 -> 4.19.3 

    (cherry picked from commit 8f11b37)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018
    Copy the full SHA
    dfd23be View commit details
    Browse the repository at this point in the history

  8. Merge pull request #50877 from ttuegel/backport/50472 

    nixos/fontconfig: fix enable option of penultimate
    @ttuegel
    ttuegel committed Nov 21, 2018
    Copy the full SHA
    012b9e6 View commit details
    Browse the repository at this point in the history

  9. netdata: create missing /etc/netdata 

    Since netdata 1.11.0 updated in NixOS/nixpkgs#50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
    @Mic92
    Mic92 committed Nov 21, 2018
    Copy the full SHA
    21517c6 View commit details
    Browse the repository at this point in the history