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: 24bf8b393f7e
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: bc3a69760d69
Choose a head ref
  • 10 commits
  • 11 files changed
  • 4 contributors

Commits on Mar 13, 2020

  1. afl: Fix afl-qemu build by applying new patches 

    These patches are gathered from different sources,
such as https://patchwork.kernel.org/patch/10862231/ for the
`gettid` patch.
Another patch comes from the issue in the AFL repository.
The ultimate goal is to get these patches upstream as well,
so we don't keep these general patches only within nixos.

A PR is created against Google/AFL
google/AFL#79,
but it might take a while before it's landed, considering the history
of the project (there are more PRs open).

ZHF: #80379

Fixes issue #82232
    @Mindavi
    Mindavi committed Mar 13, 2020
    Copy the full SHA
    e6c68ed View commit details

  2. Merge pull request #82470 from Mindavi/backport/afl-glibc-bugfix 

    afl: Fix afl-qemu build by applying patches for glibc-2.30
    @Ma27
    Ma27 authored Mar 13, 2020
    Copy the full SHA
    e60df57 View commit details

  3. ocamlPackages.sedlex_2: fix build with OCaml ≥ 4.08 

    (cherry picked from commit e73a9e6)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    70d505b View commit details

  4. unison: move out of ocamlPackages 

    (cherry picked from commit 4adfbe6)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    748e889 View commit details

  5. ocamlPackages.wasm: disable for OCaml ≥ 4.08 

    (cherry picked from commit bab3588)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    dc38fbc View commit details

  6. ocamlPackages.ocf: disable for OCaml ≥ 4.08 

    (cherry picked from commit 4ce4db4)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    cc9c739 View commit details

  7. ocamlPackages.earlybird: disable for OCaml ≥ 4.08 

    (cherry picked from commit 4ada24a)
    @vbgl
    vbgl committed Mar 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bramswenson Bram Swenson
    GPG key ID: B3E8024CB71E21BA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b23eec8 View commit details

  8. ocamlPackages.earley: disable for OCaml ≥ 4.08 

    (cherry picked from commit bdcba83)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    423e25a View commit details

  9. OCaml: default to version 4.08 

    (cherry picked from commit 7b33cbd)
    @vbgl
    vbgl committed Mar 13, 2020
    Copy the full SHA
    6626072 View commit details

  10. ocamlPackages_latest.phylogenetics: dune2/fix meta 

    (cherry picked from commit fd9b40d)

cc #81160
    @bcdarwin @veprbl
    bcdarwin authored and veprbl committed Mar 13, 2020
    Copy the full SHA
    bc3a697 View commit details
Loading