git.iko.soy/obelisk
on master help sign in
Better names
commit5718d06a25167539c4eb7956297ca2c740c26bce authorAriel Nunez <ingenieroariel@gmail.com> dateWed 8 Jan 2020, 19:11 (7 years ago) parent5af2b3b
3 files changed+9−8
compare with master
unifiedsplit
everywhere.nix → all-builds.nix+2−1 test.nix → all-tests.nix+2−2 release.nix+5−5
everywhere.nix → all-builds.nixrenamed+2−1
@@ -3,11 +3,12 @@
33 iosSdkVersion = "10.2";
44 }
55, local-self ? import ./. self-args
6−, cacheBuildSystems ? [ "x86_64-linux" "x86_64-darwin" ]
6+, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
77}:
88
99let
1010 inherit (local-self.nixpkgs) lib runCommand nix;
11+ cacheBuildSystems = supportedSystems;
1112
1213 obeliskPackagesCommon = [
1314 "obelisk-frontend"
test.nix → all-tests.nixrenamed+2−2
@@ -1,5 +1,5 @@
11{
2− supportedPlatforms ? [ builtins.currentSystem ]
2+ supportedSystems ? [ builtins.currentSystem ]
33}:
44let
55 nginxRoot = "/run/nginx";
@@ -8,7 +8,7 @@ let
88 pkgs = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/archive/3de5266.tar.gz) {};
99 sshKeys = import (pkgs.path + /nixos/tests/ssh-keys.nix) pkgs;
1010 make-test = import (pkgs.path + /nixos/tests/make-test-python.nix);
11− obelisk-everywhere = (import ./everywhere.nix { cacheBuildSystems = supportedPlatforms; }).metaCache;
11+ obelisk-everywhere = (import ./all-builds.nix { inherit supportedSystems; }).x86_64-linux.cache;
1212 snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
1313 snakeOilPublicKey = sshKeys.snakeOilPublicKey;
1414in
release.nix+5−5
@@ -1,8 +1,8 @@
11{
2− supportedPlatforms ? [ "x86_64-linux" "x86_64-darwin" ]
2+ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
33}:
4−let
5− obelisk-everywhere = import ./everywhere.nix { cacheBuildSystems = supportedPlatforms; };
6−in obelisk-everywhere // {
7− test = import ./test.nix;
4+{
5+ recurseForDerivations = true;
6+ build = import ./all-builds.nix { inherit supportedSystems; };
7+ test = import ./all-tests.nix { inherit supportedSystems; };
88}