4 files changed, 43 insertions, 6 deletions
diff --git a/overlays/patches/emacs/overlay/hydra/default.nix b/overlays/patches/emacs/overlay/hydra/default.nix
index da4eb56c7fa2..97d015f8ed4d 100644
--- a/overlays/patches/emacs/overlay/hydra/default.nix
+++ b/overlays/patches/emacs/overlay/hydra/default.nix
@@ -21,12 +21,12 @@ let
     inputs = {
       src = {
         type = "git";
-        value = "git://github.com/nix-community/emacs-overlay.git";
+        value = "https://github.com/nix-community/emacs-overlay.git";
         emailresponsible = false;
       };
       nixpkgs = {
         type = "git";
-        value = "git://github.com/NixOS/nixpkgs.git ${nixpkgsRelease}";
+        value = "https://github.com/NixOS/nixpkgs.git ${nixpkgsRelease}";
         emailresponsible = false;
       };
     };
@@ -41,11 +41,23 @@ let
     };
 
     stable = mkJobset {
-      nixpkgsRelease = "nixos-21.05";
+      nixpkgsRelease = "nixos-22.05";
       nixFile = "emacsen.nix";
       descriptionNote = "emacs";
     };
 
+    unstable-cross = mkJobset {
+      nixpkgsRelease = "nixos-unstable";
+      nixFile = "emacsen-cross.nix";
+      descriptionNote = "emacs cross builds";
+    };
+
+    stable-cross = mkJobset {
+      nixpkgsRelease = "nixos-22.05";
+      nixFile = "emacsen-cross.nix";
+      descriptionNote = "emacs cross builds";
+    };
+
     unstable-pkgs = mkJobset {
       nixpkgsRelease = "nixos-unstable";
       nixFile = "packages.nix";
diff --git a/overlays/patches/emacs/overlay/hydra/emacsen-cross.nix b/overlays/patches/emacs/overlay/hydra/emacsen-cross.nix
new file mode 100644
index 000000000000..a3be23ab2bad
--- /dev/null
+++ b/overlays/patches/emacs/overlay/hydra/emacsen-cross.nix
@@ -0,0 +1,25 @@
+{ nixpkgs }:
+let
+  crossTargets = [ "aarch64-multiplatform" ];
+  pkgs = import nixpkgs {
+    overlays = [
+      (import ../default.nix)
+    ];
+  };
+  inherit (pkgs) lib;
+in
+lib.fold lib.recursiveUpdate { }
+  (builtins.map
+    (target:
+      let
+        targetPkgs = pkgs.pkgsCross.${target};
+      in
+      lib.mapAttrs' (name: job: lib.nameValuePair "${name}-${target}" job)
+        ({
+          inherit (targetPkgs) emacsUnstable emacsUnstable-nox;
+          inherit (targetPkgs) emacsGit emacsGit-nox;
+          inherit (targetPkgs) emacsPgtk;
+        } // lib.optionalAttrs (lib.hasAttr "libgccjit" targetPkgs) {
+          inherit (targetPkgs) emacsNativeComp emacsGitNativeComp emacsPgtkNativeComp;
+        }))
+    crossTargets)
diff --git a/overlays/patches/emacs/overlay/hydra/emacsen.nix b/overlays/patches/emacs/overlay/hydra/emacsen.nix
index 7207c9688ad2..d5278f13e80e 100644
--- a/overlays/patches/emacs/overlay/hydra/emacsen.nix
+++ b/overlays/patches/emacs/overlay/hydra/emacsen.nix
@@ -12,5 +12,5 @@ in {
   inherit (pkgs) emacsGit emacsGit-nox;
   inherit (pkgs) emacsPgtk;
 } // lib.optionalAttrs (lib.hasAttr "libgccjit" pkgs) {
-  inherit (pkgs) emacsGcc emacsPgtkGcc;
+  inherit (pkgs) emacsNativeComp emacsGitNativeComp emacsPgtkNativeComp;
 }
diff --git a/overlays/patches/emacs/overlay/hydra/spec.json b/overlays/patches/emacs/overlay/hydra/spec.json
index 36fa387544d7..6c3a62461f27 100644
--- a/overlays/patches/emacs/overlay/hydra/spec.json
+++ b/overlays/patches/emacs/overlay/hydra/spec.json
@@ -13,12 +13,12 @@
   "inputs": {
     "src": {
       "type": "git",
-      "value": "git://github.com/nix-community/emacs-overlay.git",
+      "value": "https://github.com/nix-community/emacs-overlay.git master",
       "emailresponsible": false
     },
     "nixpkgs": {
       "type": "git",
-      "value": "git://github.com/NixOS/nixpkgs.git nixos-unstable",
+      "value": "https://github.com/NixOS/nixpkgs.git nixos-unstable",
       "emailresponsible": false
     }
   }