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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 703b378e34d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eeaca3104814
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 13, 2021

  1. darwin.hfs: mark broken

    @holymonson
    holymonson committed Jan 13, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5f6e651 View commit details

  2. darwin.libauto: mark broken and drop stdenv.lib

    @holymonson
    holymonson committed Jan 13, 2021
    Copy the full SHA
    b9be150 View commit details

Commits on Jan 16, 2021

  1. Merge pull request #108651 from holymonson/mark-broken 

    darwin: explicitly mark broken for failed building apple packages
    @veprbl
    veprbl authored Jan 16, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eeaca31 View commit details
Showing with 11 additions and 3 deletions.
  1. +6 −0 pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix
  2. +5 −3 pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
6 changes: 6 additions & 0 deletions pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,10 @@ appleDerivation {
mkdir -p $out/include/hfs
cp core/*.h $out/include/hfs
'';

meta = {
# Seems nobody wants its binary, so we didn't implement building.
broken = !headersOnly;
platforms = lib.platforms.darwin;
};
}
8 changes: 5 additions & 3 deletions pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, appleDerivation, libdispatch, Libsystem }:
{ lib, stdenv, appleDerivation, libdispatch, Libsystem }:

appleDerivation {
# these are included in the pure libc
buildInputs = stdenv.lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ];
buildInputs = lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ];

buildPhase = ''
cp ${./auto_dtrace.h} ./auto_dtrace.h
@@ -79,6 +79,8 @@ appleDerivation {
'';

meta = {
platforms = stdenv.lib.platforms.darwin;
# libauto is only used by objc4/pure.nix , but objc4 is now using the impure approach, so we don't bother to fix this.
broken = true;
platforms = lib.platforms.darwin;
};
}