ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

pkgs/top-level/release.nix: Don't require Darwin to be supported

Browse Source
This commit is contained in:
Eelco Dolstra 2018-07-04 17:21:33 +02:00
parent 67d0a57ef9
commit 8d4068d9d1
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/scripts/all-tarballs.nix
View File

@ -6,13 +6,11 @@
$ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>' $ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>'
*/ */
removeAttrs (import ../../pkgs/top-level/release.nix import ../../pkgs/top-level/release.nix
{ # Don't apply ‘hydraJob’ to jobs, because then we can't get to the { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the
# dependency graph. # dependency graph.
scrubJobs = false; scrubJobs = false;
# No need to evaluate on i686. # No need to evaluate on i686.
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
}) limitedSupportedSystems = [];
[ # Remove jobs whose evaluation depends on a writable Nix store. }
"tarball" "unstable" "darwin-tested"
]

4
pkgs/top-level/make-tarball.nix
View File

@ -42,7 +42,7 @@ releaseTools.sourceTarball rec {
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
# Make sure that Nixpkgs does not use <nixpkgs> # Make sure that Nixpkgs does not use <nixpkgs>.
badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true)
if [[ -n $badFiles ]]; then if [[ -n $badFiles ]]; then
echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
@ -101,7 +101,7 @@ releaseTools.sourceTarball rec {
stopNest stopNest
header "checking find-tarballs.nix" header "checking find-tarballs.nix"
nix-instantiate --eval --strict --show-trace --json \ nix-instantiate --readonly-mode --eval --strict --show-trace --json \
./maintainers/scripts/find-tarballs.nix \ ./maintainers/scripts/find-tarballs.nix \
--arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json
nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l) nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l)

63
pkgs/top-level/release.nix
View File

@ -29,6 +29,8 @@ let
systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;
supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
jobs = jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
@ -37,7 +39,7 @@ let
manual = import ../../doc; manual = import ../../doc;
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; 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}"; { name = "nixpkgs-darwin-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs darwin channel"; meta.description = "Release-critical builds for the Nixpkgs darwin channel";
constituents = constituents =
@ -70,7 +72,7 @@ let
jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin
]; ];
}; } else null;
unstable = pkgs.releaseTools.aggregate unstable = pkgs.releaseTools.aggregate
{ name = "nixpkgs-${jobs.tarball.version}"; { name = "nixpkgs-${jobs.tarball.version}";
@ -81,65 +83,66 @@ let
jobs.manual jobs.manual
jobs.lib-tests jobs.lib-tests
jobs.stdenv.x86_64-linux jobs.stdenv.x86_64-linux
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
jobs.python.x86_64-darwin
jobs.python3.x86_64-linux jobs.python3.x86_64-linux
jobs.python3.x86_64-darwin
# Needed by travis-ci to test PRs # Needed by travis-ci to test PRs
jobs.nox.x86_64-linux jobs.nox.x86_64-linux
jobs.nox.x86_64-darwin
# Needed for support # Needed for support
jobs.nix-info.x86_64-linux 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-linux
jobs.nix-info-tested.x86_64-darwin
# Ensure that X11/GTK+ are in order. # Ensure that X11/GTK+ are in order.
jobs.thunderbird.x86_64-linux 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-linux
jobs.tests.cc-wrapper.x86_64-darwin
jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-linux
jobs.tests.cc-wrapper-gcc7.x86_64-darwin
jobs.tests.cc-wrapper-gcc8.x86_64-linux jobs.tests.cc-wrapper-gcc8.x86_64-linux
# broken see issue #40038 # 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-linux
jobs.tests.cc-wrapper-clang.x86_64-darwin
jobs.tests.cc-wrapper-libcxx.x86_64-linux 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-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-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-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-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-linux
jobs.tests.cc-wrapper-clang-5.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-5.x86_64-linux 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-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-linux
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-gcc.x86_64-linux
jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux
jobs.tests.stdenv-inputs.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.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin
] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; ];
}; };
stdenvBootstrapTools = with lib; stdenvBootstrapTools = with lib;
@ -152,7 +155,7 @@ let
dist test; dist test;
}) })
# darwin is special in this # darwin is special in this
// optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { // optionalAttrs supportDarwin {
x86_64-darwin = x86_64-darwin =
let let
bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };