Skip to content
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
base: d164d7eb8973
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7666310ebfd6
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 10, 2018

  1. openbsm: fix linux build 

    See https://hydra.nixos.org/build/80705916

To fix the linux build the patch `bsm-add-audit_token_to_pid.patch`
mustn't be applied during Linux builds, only for Darwin as it's an
Apple-only fix.

The compiler failure occurred because `audit_token_t` is part of
`<mach/mach.h>` which is not available on Linux.

Addresses #45960

(cherry picked from commit 080b2fd)
    @Ma27 @timokau
    Ma27 authored and timokau committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    cde1ede View commit details
    Browse the repository at this point in the history

  2. pythonPackages.mahotas: fix build, move expression 

    See https://hydra.nixos.org/build/80828287

Moves `mahotas` out of `python-packages.nix` into its own file and fixes
broken test cases by skipping them using nosetest's `@nottest`
annotation.

These tests broke from time to time in a sandbox and are therefore
considered impure.

Addresses #45960

(cherry picked from commit ee897b6)
    @Ma27 @timokau
    Ma27 authored and timokau committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    7666310 View commit details
    Browse the repository at this point in the history