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: a84a302732e8
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: ef450efb9df5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 21, 2018

  1. haskellPackages.x509-system: Override based on the host, not target p… 

    …latform

There were many reverts back and forth, but it ultimately appears that I
am the source of this mistake. I clarified the comment so as not to
confuse myself or anyone else.
    @Ericson2314
    Ericson2314 committed Sep 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    0x4A6F
    GPG key ID: 8DEDBA5BE07080E1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    45c637d View commit details

  2. Merge pull request #47097 from obsidiansystems/fix-x509-system 

    haskellPackages.x509-system: Override based on the host, not target platform for 18.09
    @Ericson2314
    Ericson2314 authored Sep 21, 2018
    Copy the full SHA
    ef450ef View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/haskell-modules/configuration-nix.nix
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -126,9 +126,9 @@ self: super: builtins.intersectAttrs super {
# the system-fileio tests use canonicalizePath, which fails in the sandbox
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;

# Prevents needing to add security_tool as a build tool to all of x509-system's
# dependencies.
x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
# Prevents needing to add `security_tool` as a run-time dependency for
# everything using x509-system to give access to the `security` executable.
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
postPatch = (drv.postPatch or "") + ''