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: b7c795d58871
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 9bdbd595db01
Choose a head ref
  • 6 commits
  • 14 files changed
  • 4 contributors

Commits on Nov 30, 2018

  1. Merge branch 'release-18.09' into staging-18.09

    @vcunat
    vcunat committed Nov 30, 2018
    Copy the full SHA
    57081c2 View commit details
    Browse the repository at this point in the history

  2. Re-revert "Merge staging-18.09 into release-18.09" 

    This reverts commit 3d63c05.
This should fix #51281 (after merged to release-18.09),
but we would better re-check for similar problems.
    @vcunat
    vcunat committed Nov 30, 2018
    Copy the full SHA
    420db06 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Merge branch 'staging-18.09' into release-18.09 

    On x86_64-linux this looks good, only R fails tests on Hydra,
but I've been unable to reproduce that failure locally,
so let me not delay the CVE fixes.
    @vcunat
    vcunat committed Dec 3, 2018
    Copy the full SHA
    c395d62 View commit details
    Browse the repository at this point in the history

  2. nixos.tests.keymap: use new name of the colemak/en-latin9 keymap 

    Commit df6d40f renamed colemak/en-latin9 to
colemak/colemak, but the keymap test wasn't adjusted to refer to the new path.

(cherry picked from commit 74598ca)
    @delroth @vcunat
    delroth authored and vcunat committed Dec 3, 2018
    Copy the full SHA
    b7162eb View commit details
    Browse the repository at this point in the history

  3. jpeginfo: init at 1.6.1 

    jpeginfo prints information and tests integrity of JPEG/JFIF files.

(cherry picked from commit 84a2463)
    @bjornfor
    bjornfor committed Dec 3, 2018
    Copy the full SHA
    d45a0d7 View commit details
    Browse the repository at this point in the history

  4. chrome-token-signing: fix path to opensc-pkcs11 

    (cherry picked from commit 4cf1d88)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Dec 3, 2018
    Copy the full SHA
    9bdbd59 View commit details
    Browse the repository at this point in the history