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: bc30b9d4ccce
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: f80bada223c3
Choose a head ref
  • 12 commits
  • 8 files changed
  • 5 contributors

Commits on Sep 23, 2020

  1. fierce: fix build 

    because we're playing with its install requirements, add a
pythonImportsCheck to give us a chance to discover brokenness. technically
this isn't a realistic test of end user behaviour as this is really an
application, not a python module, but it seems to have a pretty stable
import name of `fierce`, so it works.

(cherry picked from commit 1aa888b)
    @risicle
    risicle committed Sep 23, 2020
    Copy the full SHA
    2e19fee View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. python3.pkgs.pysdl2: fix build 

    Update patches after version bump.

(cherry picked from commit d82e165)
    @povik
    povik committed Sep 24, 2020
    Copy the full SHA
    b3db371 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. rpm-ostree: 2020.4 -> 2020.5 

    (cherry picked from commit 7db8abb)
    @freezeboy @jtojnar
    freezeboy authored and jtojnar committed Sep 25, 2020
    Copy the full SHA
    bb76286 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #98579 from risicle/ris-fierce-fix-r20.09 

    [20.09] fierce: fix build
    @risicle
    risicle committed Sep 25, 2020
    Copy the full SHA
    883b340 View commit details
    Browse the repository at this point in the history

  3. wireshark: 3.2.5 -> 3.2.7 

    https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html
https://www.wireshark.org/docs/relnotes/wireshark-3.2.6.html
(cherry picked from commit 5a1c55f)
    @TredwellGit @Ma27
    TredwellGit authored and Ma27 committed Sep 25, 2020
    Copy the full SHA
    82eb369 View commit details
    Browse the repository at this point in the history

  4. pciutils: fix build on darwin 

    Add IOKit to macOS prereqs, and patch Makefile to use $CC

(cherry picked from commit 00bf15f)
    @r-burns
    r-burns committed Sep 25, 2020
    Copy the full SHA
    113c22d View commit details
    Browse the repository at this point in the history

  5. libkml: fix tests on darwin 

    Darwin tests require rpath setup for libs in build dir

(cherry picked from commit 357014e)
    @r-burns
    r-burns committed Sep 25, 2020
    Copy the full SHA
    3c3346e View commit details
    Browse the repository at this point in the history

  6. aragorn: fix build on darwin 

    Use environment-specified $CC for C compiler

(cherry picked from commit 6cc2d3e)
    @r-burns
    r-burns committed Sep 25, 2020
    Copy the full SHA
    3345d53 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #98678 from povik/20.09-pysdl2-fix 

    [20.09] python3.pkgs.pysdl2: fix build
    @risicle
    risicle committed Sep 25, 2020
    Copy the full SHA
    0ed8c8f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #98780 from r-burns/backport-pciutils 

    [20.09] pciutils: fix build on darwin
    @risicle
    risicle committed Sep 25, 2020
    Copy the full SHA
    2f5cbdb View commit details
    Browse the repository at this point in the history

  9. Merge pull request #98782 from r-burns/backport-libkml 

    [20.09] libkml: fix tests on darwin
    @risicle
    risicle committed Sep 25, 2020
    Copy the full SHA
    1c6dc9e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #98783 from r-burns/backport-aragorn 

    [20.09] aragorn: fix build on darwin
    @risicle
    risicle committed Sep 25, 2020
    Copy the full SHA
    f80bada View commit details
    Browse the repository at this point in the history