diff --git a/pins/iohk-nix-src.json b/pins/iohk-nix-src.json index 7ce8f3e..c56cb40 100644 --- a/pins/iohk-nix-src.json +++ b/pins/iohk-nix-src.json @@ -1,7 +1,7 @@ { "url": "https://github.com/input-output-hk/iohk-nix", - "rev": "4608304d2e02f0f8384d3aa7b7d89ffd2929dab7", - "date": "2019-05-15T17:20:14+08:00", - "sha256": "0kcaw0dan3gq7gigymgi96sgn46ibw6mgq5phz24jczn5ghsiai0", + "rev": "878d54831829175c5b2100f8df842ad466c015f7", + "date": "2019-05-16T16:19:30+08:00", + "sha256": "02ig850r3bdns1fzlf91bv04wvqibb53x58scildsz5fil1q9hyc", "fetchSubmodules": false } diff --git a/pins/nixpkgs-src.json b/pins/nixpkgs-src.json index a542a1e..5a68efd 100644 --- a/pins/nixpkgs-src.json +++ b/pins/nixpkgs-src.json @@ -1,7 +1,7 @@ { "url": "https://github.com/input-output-hk/nixpkgs", - "rev": "c96f5924811f5a8576c9f03d3a630c491fbaf7a3", - "date": "2019-05-10T15:32:41+08:00", - "sha256": "0iagdz0q37ffkpzyh2f21wjb7x4gx257adlranchzc43460x65c1", + "rev": "4d29a3148c22967a440badbe7168f55efde4fa8f", + "date": "2019-05-16T16:13:21+08:00", + "sha256": "0lcibrzxdhmz4dk8d39vnhrwjvqf1k8djwwy7pvkg3bq23sw9mgd", "fetchSubmodules": false } diff --git a/release.nix b/release.nix index 3cb554f..41c5cf6 100644 --- a/release.nix +++ b/release.nix @@ -3,10 +3,13 @@ let # fetch nixpkgs. iohk hydra doesn't provide , so we'll have to use # a pinned one. - pkgs = importPinned "nixpkgs" {}; + pkgs = importPinned "nixpkgs" { }; # cross system settings mingwW64 = pkgs.lib.systems.examples.mingwW64; + arm32 = pkgs.lib.systems.examples.raspberryPi; + arm64 = pkgs.lib.systems.examples.aarch64-multiplatform; + js = pkgs.lib.systems.examples.ghcjs; # import iohk-nix with the same pin as the nixpkgs above. config = { allowUnfree = false; inHydra = true; allowUnsupportedSystem = true; }; @@ -23,6 +26,15 @@ let x86_64-mingw32 = importPinned "iohk-nix" { inherit config; nixpkgsJsonOverride = ./pins/nixpkgs-src.json; system = "x86_64-linux"; crossSystem = mingwW64; }; + arm32-linux = importPinned "iohk-nix" + { inherit config; nixpkgsJsonOverride = ./pins/nixpkgs-src.json; system = "x86_64-linux"; crossSystem = arm32; }; + + arm64-linux = importPinned "iohk-nix" + { inherit config; nixpkgsJsonOverride = ./pins/nixpkgs-src.json; system = "x86_64-linux"; crossSystem = arm64; }; + + js-ghcjs = importPinned "iohk-nix" + { inherit config; nixpkgsJsonOverride = ./pins/nixpkgs-src.json; system = "x86_64-linux"; crossSystem = js; }; + # jobs contain a key -> value mapping that tells hydra which # derivations to build. There are some predefined helpers in # https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support/release @@ -47,6 +59,9 @@ let # linux -> win32 # Note: we want to build the cross-compiler. As such we want something from the buildPackages! "${mingwW64.config}-ghc864".x86_64-linux = x86_64-mingw32.pkgs.buildPackages.haskell.compiler.ghc864; + "${arm32.config}-ghc864".x86_64-linux = arm32-linux.pkgs.buildPackages.haskell.compiler.ghc864; + "${arm64.config}-ghc864".x86_64-linux = arm64-linux.pkgs.buildPackages.haskell.compiler.ghc864; + "${js.config}-ghc864".x86_64-linux = js-ghcjs.pkgs.buildPackages.haskell.compiler.ghc864; }; in jobs