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: 2a57fc65b0f2
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: e789f6f6e54a
Choose a head ref
  • 12 commits
  • 11 files changed
  • 5 contributors

Commits on Mar 24, 2018

  1. Merge #37262: snabb: 2016.04 -> 2018.01.2

    (cherry picked from commit 7110d4a)
    It didn't build before this commit.
    vcunat committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    a3be411 View commit details
  2. Merge #37702: telepathy-gabble: fix source URL

    (cherry picked from commit 902b3a1)
    vcunat committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    Copy the full SHA
    0d20e7d View commit details
  3. edk2: Reformat a bit for readability

    - Have only one sed expression per line
    - Put the important stuff closer to the command and not hidden in some
    continuation line. That is, don't do:
    
    sed \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <IMPORTANT STUFF>
    
    but:
    
    sed <IMPORTANT STUFF> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff>
    
    (cherry picked from commit 1d854b4)
    dezgeg committed Mar 24, 2018
    Copy the full SHA
    7a79af0 View commit details
  4. OVMF: Reformat a bit for readability

    - Use 'somePkg == null' instead of 'somePkg == false' which is more
      conventional in rest of Nixpkgs
    - Use lib.optionalString where applicable
    
    (cherry picked from commit 1645011)
    dezgeg committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    Copy the full SHA
    7527611 View commit details
  5. edk2, OVMF: Build on aarch64

    And also build in parallel.
    
    I don't understand why we manually tediously link every single directory
    from the source, but I don't want to investigate too much.
    
    (cherry picked from commit f59eab7)
    dezgeg committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    Copy the full SHA
    ad57d1e View commit details
  6. nixos/tests: Make simpleUefiGrub test work on AArch64

    Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...
    
    (cherry picked from commit e58624a)
    dezgeg committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    Copy the full SHA
    f45bc2b View commit details
  7. browserpass: 2.0.11 -> 2.0.13

    (cherry picked from commit 82f2c19)
    tadfisher authored and fpletz committed Mar 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    86508d4 View commit details
  8. browserpass: 2.0.13 -> 2.0.17

    (cherry picked from commit 8df9cf5)
    fpletz committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    4e67f89 View commit details
  9. openra: 20180218 -> 20180307

    (cherry picked from commit 204a029)
    fpletz committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    15e3aad View commit details
  10. docker: 18.02 -> 18.03

    (cherry picked from commit b072dcf)
    NeQuissimus committed Mar 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9d8c6c7 View commit details
  11. nixos/tests/installer: Give eval failure on unsupported boot methods

    (cherry picked from commit 3131daa)
    dezgeg committed Mar 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    be44525 View commit details
  12. ghc: Disable on AArch64

    For some reason compiling the proper GHC from the binary one eventually
    segfaults at some point.
    
    Since it has never worked, just disable it and investigate later.
    
    (cherry picked from commit a6425fc)
    dezgeg committed Mar 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e789f6f View commit details
Loading