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: e037231f7655
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: 0a70d65fd471
Choose a head ref
  • 12 commits
  • 9 files changed
  • 7 contributors

Commits on Jun 21, 2018

  1. 18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod… 

    …e 4 and update both qrencode and google-authenticator
    Sander Hollaar committed Jun 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eaa6c3d View commit details

Commits on Jun 27, 2018

  1. Disable fortify and stackprotector hardening for spl/zfs. 

    Linux 4.16 introduces a stackprotector detection script that returns
different results for the kernel compilation run and the spl/zfs
compilation run, as the setting for hardening are different. This
results in a broken ABI between spl/zfs and the compiled kernel,
breaking ZFS. Also disabling the fortify and stackprotector hardening,
as we do for the kernel, fixes that.

(cherry picked from commit 43a737b)
    @clefru
    clefru committed Jun 27, 2018
    Copy the full SHA
    ee2fab6 View commit details

  2. Merge pull request #42654 from clefru/zfs-cherry 

    Disable fortify and stackprotector hardening for spl/zfs.
    @Mic92
    Mic92 authored Jun 27, 2018
    Copy the full SHA
    a4e1e9c View commit details

Commits on Jun 29, 2018

  1. Merge pull request #42339 from ookhoi/18.03-google-authenticator-fail… 

    …ed-to-use-libqrencode

18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod…
    @matthewbauer
    matthewbauer authored Jun 29, 2018
    Copy the full SHA
    2e0ea4e View commit details

  2. python36: fix version in identifier 

    (cherry picked from commit 780959c)
    @dirn @FRidh
    dirn authored and FRidh committed Jun 29, 2018
    Copy the full SHA
    a50a942 View commit details

  3. firefox-bin: 60.0.2 -> 61.0 

    (cherry picked from commit 33cbdec)
    @taku0 @vcunat
    taku0 authored and vcunat committed Jun 29, 2018
    Copy the full SHA
    1dad2f2 View commit details

  4. nss: 3.36.4 -> 3.38 

    (cherry picked from commit 4927422)
    @taku0 @vcunat
    taku0 authored and vcunat committed Jun 29, 2018
    Copy the full SHA
    0648462 View commit details

  5. firefox: 60.0.2 -> 61.0 

    (cherry picked from commit ce6cd30)
    @taku0 @vcunat
    taku0 authored and vcunat committed Jun 29, 2018
    Copy the full SHA
    5bc60f4 View commit details

  6. firefox-esr: 52.8.1esr -> 52.9.0esr, 60.0.2esr -> 60.1.0esr 

    (cherry picked from commit 9662c68)
    @taku0 @vcunat
    taku0 authored and vcunat committed Jun 29, 2018
    Copy the full SHA
    d9e184b View commit details

  7. Merge branch 'release-18.03' into staging-18.03

    @vcunat
    vcunat committed Jun 29, 2018
    Copy the full SHA
    1732e01 View commit details

  8. Merge #42729: firefox updates (critical security) 

    The commits are really cherry-picked from the PR.
    @vcunat
    vcunat committed Jun 29, 2018
    Copy the full SHA
    4af706b View commit details

  9. Merge branch 'staging-18.03' into release-18.03 

    Firefox-related security updates.
    @vcunat
    vcunat committed Jun 29, 2018
    Copy the full SHA
    0a70d65 View commit details