From 9ce7b1a8d6ec82953b8dd74539cf319ff949904c Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 28 Feb 2024 12:10:10 +0100 Subject: [PATCH] Add support for s390x Signed-off-by: Sascha Grunert --- .cirrus.yml | 3 +++ nix/default-s390x.nix | 7 +++++++ nix/nixpkgs.json | 10 +++++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 nix/default-s390x.nix diff --git a/.cirrus.yml b/.cirrus.yml index f03db87c..a8aca35d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -151,6 +151,9 @@ static_binary_task: - name: "Static riscv64 binary" env: TARGET: default-riscv64.nix + - name: "Static s390x binary" + env: + TARGET: default-s390x.nix build_script: | set -ex diff --git a/nix/default-s390x.nix b/nix/default-s390x.nix new file mode 100644 index 00000000..dc80f086 --- /dev/null +++ b/nix/default-s390x.nix @@ -0,0 +1,7 @@ +(import ./nixpkgs.nix { + crossSystem = { + config = "s390x-unknown-linux-gnu"; + }; + overlays = [ (import ./overlay.nix) ]; +}).callPackage ./derivation.nix +{ } diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 862eec81..93b5f999 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "8353344d3236d3fda429bb471c1ee008857d3b7c", - "date": "2023-08-15T09:25:12+02:00", - "path": "/nix/store/r7sblbzjhxfl07r4l3nywhaprk3486zx-nixpkgs", - "sha256": "02431z7g8zmjrmqpmsxsnzz4r91cdl3a2sdz6kiqpsjalnlbxbv5", - "hash": "sha256-Za++qKVK6ovjNL9poQZtLKRM/re663pxzbJ+9M4Pgwg=", + "rev": "f4f097b65b336b1f4cdf947b7fbe076bd2a69126", + "date": "2024-02-28T11:07:01+01:00", + "path": "/nix/store/4blmmjaibdghqzk1wa8la3w9afvyldpq-nixpkgs", + "sha256": "0r1kbfbh3rbpl4w7rvyxyl3q6nchnmmd6bjwsqbz0gbsrsly7vbg", + "hash": "sha256-b+3jqc56PfAX1lwu02q1kFmDB/Xd73w4oXflAZdbM2Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false,