diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-01-06 07:25:05 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-01-06 08:29:41 -0500 |
| commit | 19f6edbfb805822a533a696cb1f23f55ece30931 (patch) | |
| tree | 3bd881a84db9b16883ee73c7e6f70104307ea84f /pkgs/top-level/release.nix | |
| parent | c90be3dd3aac96a328062b6d379a0fd75d255aff (diff) | |
| download | nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar.gz nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar.bz2 nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar.lz nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar.xz nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.tar.zst nixpkgs-19f6edbfb805822a533a696cb1f23f55ece30931.zip | |
top-level/release.nix: make Darwin builds do more
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4f58e002d88..4795fa21a90 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -45,6 +45,10 @@ let jobs.thunderbird.i686-linux jobs.glib-tested.x86_64-linux # standard glib doesn't do checks jobs.glib-tested.i686-linux + # Ensure that basic stuff works on darwin + jobs.git.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.vim.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; @@ -55,10 +59,24 @@ let { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; stdenvBootstrapTools.x86_64-darwin = - { inherit (import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }) dist test; }; + let + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; + in { + # Lightweight distribution and test + inherit (bootstrap) dist test; + # Test a full stdenv bootstrap from the bootstrap tools definition + inherit (bootstrap.test-pkgs) stdenv; + }; } // (mapTestOn ((packagePlatforms pkgs) // rec { + # TODO: most (but possibly not all) of the jobs specified here are unnecessary now that we have release-lib.nix + # traversing all packages and looking at their meta.platform attributes. Someone who's better at this than I am + # should go through these and kill the ones that are safe to kill. + # + # <niksnut> note that all that " = linux" stuff in release.nix is legacy, from before we had meta.platforms + # <copumpkin> niksnut: so should I just kill all the obsolete jobs in release.nix? + # <niksnut> I don't know if they're all covered abcde = linux; aspell = all; atlas = linux; |