public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23638 from grahamc/aarch64-linux

Browse Source 
nixpkgs: build aarch64-linux
This commit is contained in:
Eelco Dolstra 2017-03-08 16:13:58 +01:00 committed by GitHub
commit 7a08a44b52
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
, # The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
, # Strip most of attributes when evaluating to spare memory usage , # Strip most of attributes when evaluating to spare memory usage
scrubJobs ? true scrubJobs ? true
}: }:
@ -41,18 +41,23 @@ let
jobs.lib-tests jobs.lib-tests
jobs.stdenv.x86_64-linux jobs.stdenv.x86_64-linux
jobs.stdenv.i686-linux jobs.stdenv.i686-linux
jobs.stdenv.aarch64-linux
jobs.stdenv.x86_64-darwin jobs.stdenv.x86_64-darwin
jobs.linux.x86_64-linux jobs.linux.x86_64-linux
jobs.linux.i686-linux jobs.linux.i686-linux
jobs.linux.aarch64-linux
jobs.python.x86_64-linux jobs.python.x86_64-linux
jobs.python.i686-linux jobs.python.i686-linux
jobs.python.aarch4-linux
jobs.python.x86_64-darwin jobs.python.x86_64-darwin
jobs.python3.x86_64-linux jobs.python3.x86_64-linux
jobs.python3.i686-linux jobs.python3.i686-linux
jobs.python3.aarchh64-linux
jobs.python3.x86_64-darwin jobs.python3.x86_64-darwin
# Many developers use nix-repl # Many developers use nix-repl
jobs.nix-repl.x86_64-linux jobs.nix-repl.x86_64-linux
jobs.nix-repl.i686-linux jobs.nix-repl.i686-linux
jobs.nix-repl.aarch64-linux
jobs.nix-repl.x86_64-darwin jobs.nix-repl.x86_64-darwin
# Needed by travis-ci to test PRs # Needed by travis-ci to test PRs
jobs.nox.i686-linux jobs.nox.i686-linux
@ -61,6 +66,7 @@ let
# Ensure that X11/GTK+ are in order. # Ensure that X11/GTK+ are in order.
jobs.thunderbird.x86_64-linux jobs.thunderbird.x86_64-linux
jobs.thunderbird.i686-linux jobs.thunderbird.i686-linux
jobs.thunderbird.aarch64-linux
# Ensure that basic stuff works on darwin # Ensure that basic stuff works on darwin
jobs.git.x86_64-darwin jobs.git.x86_64-darwin
jobs.mysql.x86_64-darwin jobs.mysql.x86_64-darwin
@ -73,6 +79,9 @@ let
}) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) {
stdenvBootstrapTools.x86_64-linux = stdenvBootstrapTools.x86_64-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
}) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) {
stdenvBootstrapTools.aarch64-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
}) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) {
stdenvBootstrapTools.x86_64-darwin = stdenvBootstrapTools.x86_64-darwin =
let let