Merge branch 'master' into staging
... to fix bugs in i686-linux removal.
This commit is contained in:
commit
67b6b7e46f
|
@ -340,7 +340,7 @@ other packages we like to have in the environment, all specified with `propagate
|
||||||
Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
|
Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
with import <nixpkgs>;
|
with import <nixpkgs> {};
|
||||||
with pkgs.python35Packages;
|
with pkgs.python35Packages;
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
|
|
@ -170,25 +170,8 @@ self: super: {
|
||||||
# https://github.com/jaspervdj/hakyll/issues/491
|
# https://github.com/jaspervdj/hakyll/issues/491
|
||||||
else dontCheck super.hakyll;
|
else dontCheck super.hakyll;
|
||||||
|
|
||||||
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
|
|
||||||
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
|
|
||||||
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
|
|
||||||
|
|
||||||
# FSEvents API is very buggy and tests are unreliable. See
|
|
||||||
# http://openradar.appspot.com/10207999 and similar issues.
|
|
||||||
# https://github.com/haskell-fswatch/hfsnotify/issues/62
|
|
||||||
fsnotify = if pkgs.stdenv.isDarwin
|
|
||||||
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
|
|
||||||
else dontCheck super.fsnotify;
|
|
||||||
|
|
||||||
double-conversion = if !pkgs.stdenv.isDarwin
|
double-conversion = if !pkgs.stdenv.isDarwin
|
||||||
then addExtraLibrary
|
then super.double-conversion
|
||||||
# https://github.com/bos/double-conversion/pull/17
|
|
||||||
(appendPatch super.double-conversion (pkgs.fetchpatch {
|
|
||||||
url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch";
|
|
||||||
sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9";
|
|
||||||
}))
|
|
||||||
pkgs.stdenv.cc.cc.lib
|
|
||||||
else addExtraLibrary (overrideCabal super.double-conversion (drv:
|
else addExtraLibrary (overrideCabal super.double-conversion (drv:
|
||||||
{
|
{
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -408,6 +408,17 @@ self: super: builtins.intersectAttrs super {
|
||||||
testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
|
testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
|
||||||
|
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
|
||||||
|
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
|
||||||
|
|
||||||
|
# FSEvents API is very buggy and tests are unreliable. See
|
||||||
|
# http://openradar.appspot.com/10207999 and similar issues.
|
||||||
|
# https://github.com/haskell-fswatch/hfsnotify/issues/62
|
||||||
|
fsnotify = if pkgs.stdenv.isDarwin
|
||||||
|
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
|
||||||
|
else dontCheck super.fsnotify;
|
||||||
|
|
||||||
hidapi = addExtraLibrary super.hidapi pkgs.libudev;
|
hidapi = addExtraLibrary super.hidapi pkgs.libudev;
|
||||||
|
|
||||||
hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
|
hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||||
, officialRelease ? false
|
, officialRelease ? false
|
||||||
# The platforms for which we build Nixpkgs.
|
# The platforms for which we build Nixpkgs.
|
||||||
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarchh64-linux" ]
|
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
|
||||||
, limitedSupportedSystems ? [ "i686-linux" ]
|
, limitedSupportedSystems ? [ "i686-linux" ]
|
||||||
# Strip most of attributes when evaluating to spare memory usage
|
# Strip most of attributes when evaluating to spare memory usage
|
||||||
, scrubJobs ? true
|
, scrubJobs ? true
|
||||||
|
@ -58,6 +58,7 @@ let
|
||||||
jobs.manual
|
jobs.manual
|
||||||
jobs.lib-tests
|
jobs.lib-tests
|
||||||
jobs.stdenv.x86_64-linux
|
jobs.stdenv.x86_64-linux
|
||||||
|
jobs.stdenv.i686-linux # most basic sanity check
|
||||||
jobs.stdenv.x86_64-darwin
|
jobs.stdenv.x86_64-darwin
|
||||||
jobs.linux.x86_64-linux
|
jobs.linux.x86_64-linux
|
||||||
jobs.python.x86_64-linux
|
jobs.python.x86_64-linux
|
||||||
|
|
Loading…
Reference in a new issue