diff options
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r-- | pkgs/top-level/release.nix | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f78152a8931c4..81f0874ca12da 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,6 +25,8 @@ let systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; + supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; + jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; @@ -33,7 +35,7 @@ let manual = import ../../doc; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; - darwin-tested = pkgs.releaseTools.aggregate + darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = @@ -66,7 +68,7 @@ let jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin ]; - }; + } else null; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -77,65 +79,66 @@ let jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux - jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.python.x86_64-linux - jobs.python.x86_64-darwin jobs.python3.x86_64-linux - jobs.python3.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.x86_64-linux - jobs.nox.x86_64-darwin # Needed for support jobs.nix-info.x86_64-linux - jobs.nix-info.x86_64-darwin jobs.nix-info-tested.x86_64-linux - jobs.nix-info-tested.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux - # Ensure that basic stuff works on darwin - jobs.git.x86_64-darwin - jobs.mariadb.x86_64-darwin - jobs.vim.x86_64-darwin - # Ensure that UI stuff works on darwin - jobs.inkscape.x86_64-darwin - jobs.qt5.qtmultimedia.x86_64-darwin jobs.tests.cc-wrapper.x86_64-linux - jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper-gcc7.x86_64-linux - jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc8.x86_64-linux # broken see issue #40038 - # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-linux - jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux - jobs.tests.cc-wrapper-libcxx.x86_64-darwin jobs.tests.cc-wrapper-clang-39.x86_64-linux - jobs.tests.cc-wrapper-clang-39.x86_64-darwin jobs.tests.cc-wrapper-libcxx-39.x86_64-linux - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.cc-wrapper-clang-4.x86_64-linux - jobs.tests.cc-wrapper-clang-4.x86_64-darwin jobs.tests.cc-wrapper-libcxx-4.x86_64-linux - jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin jobs.tests.cc-wrapper-clang-5.x86_64-linux - jobs.tests.cc-wrapper-clang-5.x86_64-darwin jobs.tests.cc-wrapper-libcxx-5.x86_64-linux - jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.cc-wrapper-clang-6.x86_64-linux - jobs.tests.cc-wrapper-clang-6.x86_64-darwin jobs.tests.cc-wrapper-libcxx-6.x86_64-linux - jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux + ] + ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.optionals supportDarwin [ + jobs.stdenv.x86_64-darwin + jobs.python.x86_64-darwin + jobs.python3.x86_64-darwin + jobs.nox.x86_64-darwin + jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-darwin + jobs.git.x86_64-darwin + jobs.mariadb.x86_64-darwin + jobs.vim.x86_64-darwin + jobs.inkscape.x86_64-darwin + jobs.qt5.qtmultimedia.x86_64-darwin + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-gcc7.x86_64-darwin + # jobs.tests.cc-wrapper-gcc8.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.cc-wrapper-clang-4.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin + jobs.tests.cc-wrapper-clang-5.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin + jobs.tests.cc-wrapper-clang-6.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ]; }; stdenvBootstrapTools = with lib; @@ -148,7 +151,7 @@ let dist test; }) # darwin is special in this - // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { + // optionalAttrs supportDarwin { x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; |