From dcf651b468fc960d381033743302c1ddcd85a826 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 6 Aug 2017 10:18:36 +0200 Subject: [PATCH 1/4] docs: fix error in nix expression --- doc/languages-frameworks/python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3c9df2e6e82..6f09962094d 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -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`. ```nix -with import ; +with import {}; with pkgs.python35Packages; buildPythonPackage rec { From 8e16cee25630e8a1f953d10d7537d2ce5e7b0880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 6 Aug 2017 10:38:44 +0200 Subject: [PATCH 2/4] double-conversion: remove patch superseeded by ghc patch https://github.com/NixOS/nixpkgs/pull/27584 --- pkgs/development/haskell-modules/configuration-common.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c3670613387..9f8eceff0a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -182,13 +182,7 @@ self: super: { else dontCheck super.fsnotify; double-conversion = if !pkgs.stdenv.isDarwin - then addExtraLibrary - # 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 + then super.double-conversion else addExtraLibrary (overrideCabal super.double-conversion (drv: { postPatch = '' From 71bebd52547f4486816fd320bb3dc6314f139e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 6 Aug 2017 10:41:23 +0200 Subject: [PATCH 3/4] {fs,h}notify: move to configuration-nix.nix --- .../haskell-modules/configuration-common.nix | 11 ----------- .../development/haskell-modules/configuration-nix.nix | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f8eceff0a0..0d2f235862f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -170,17 +170,6 @@ self: super: { # https://github.com/jaspervdj/hakyll/issues/491 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 then super.double-conversion else addExtraLibrary (overrideCabal super.double-conversion (drv: diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4dce5d59d4a..196e8f01d4d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -408,6 +408,17 @@ self: super: builtins.intersectAttrs super { 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; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; From a5e135ef7c227427578f997b741940ef1c19f166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Aug 2017 10:53:26 +0200 Subject: [PATCH 4/4] release.nix: fix a typo from #27923, build stdenv The typo removed also all aarch64-linux on Hydra. --- pkgs/top-level/release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3b45035d114..90f1c92d8e0 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -11,7 +11,7 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false # 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" ] # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true @@ -58,6 +58,7 @@ let jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux + jobs.stdenv.i686-linux # most basic sanity check jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.python.x86_64-linux