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: d8d9a520b37b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66504c067147
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 9, 2019

  1. haskellPackages.xattr: fix build with attr-2.4.48 (see ##53716)

    @pSub
    pSub committed Mar 9, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CEF2BBFE18BD0E67
    Learn about vigilant mode
    Copy the full SHA
    57afc59 View commit details

Commits on Mar 15, 2019

  1. Merge pull request #57129 from NixOS/fix-haskellPackages-xattr 

    haskellPackages.xattr: fix build with attr-2.4.48 (see #53716)
    @pSub
    pSub authored Mar 15, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CEF2BBFE18BD0E67
    Learn about vigilant mode
    Copy the full SHA
    66504c0 View commit details
Showing with 19 additions and 0 deletions.
  1. +3 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +16 −0 pkgs/development/haskell-modules/patches/xattr-fix-build.patch
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1237,4 +1237,7 @@ self: super: {
};
}) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));

# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
16 changes: 16 additions & 0 deletions pkgs/development/haskell-modules/patches/xattr-fix-build.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/System/Xattr.hsc b/System/Xattr.hsc
index adaf9cb..9b49996 100644
--- a/System/Xattr.hsc
+++ b/System/Xattr.hsc
@@ -45,11 +45,7 @@ module System.Xattr
where

#include <sys/types.h>
-#ifdef __APPLE__
#include <sys/xattr.h>
-#else
-#include <attr/xattr.h>
-#endif

import Data.Functor ((<$>))
import Foreign.C