diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
| commit | 3462fe27d9232c6e7e3472dc7fcc4c1561f9166d (patch) | |
| tree | 5de7964838367fd02aef2b55ac7cb3e67ab7ddf9 /pkgs/top-level/release.nix | |
| parent | 84a15876a3a9f92b6ba53a7ac18a7fd96f405bf9 (diff) | |
| parent | 2e7c7dad92f4967c90c37a59894a301e2d073daf (diff) | |
| download | nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.gz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.bz2 nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.lz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.xz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.zst nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d18c1dbd2e7..3437f620c74 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -71,6 +71,7 @@ let jobs.transmission-gtk.x86_64-darwin # Tests + /* jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin @@ -79,6 +80,7 @@ let jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.patch-shebangs.x86_64-darwin + */ ]; } else null; @@ -104,6 +106,7 @@ let jobs.thunderbird.x86_64-linux jobs.unar.x86_64-linux + /* jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc8.x86_64-linux @@ -124,6 +127,7 @@ let jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux jobs.tests.patch-shebangs.x86_64-linux + */ ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools ++ lib.optionals supportDarwin [ @@ -138,6 +142,7 @@ let 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 @@ -154,6 +159,7 @@ let jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.patch-shebangs.x86_64-darwin + */ ]; }; |