From 504e9ded2eed761530cf1a73638b633abf2bc43f Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Mon, 1 Sep 2025 02:02:47 -0700 Subject: [PATCH] feat: cross compiler riscv64 support --- .../versions/5.2.15-stage1-passthrough.nix | 5 ++++ .../bash/versions/5.2.15-stage1.nix | 5 ++++ .../versions/2.41-stage1-passthrough.nix | 5 ++++ .../binutils/versions/2.41-stage1.nix | 10 +++++++ .../versions/1.0.8-stage1-passthrough.nix | 5 ++++ .../bzip2/versions/1.0.8-stage1.nix | 5 ++++ .../versions/9.4-stage1-passthrough.nix | 5 ++++ .../coreutils/versions/9.4-stage1.nix | 5 ++++ .../versions/3.10-stage1-passthrough.nix | 5 ++++ .../diffutils/versions/3.10-stage1.nix | 5 ++++ .../versions/4.9.0-stage1-passthrough.nix | 5 ++++ .../findutils/versions/4.9.0-stage1.nix | 5 ++++ .../versions/5.2.2-stage1-passthrough.nix | 5 ++++ .../foundation/gawk/versions/5.2.2-stage1.nix | 5 ++++ .../foundation/gcc/versions/13.2.0-stage1.nix | 5 ++++ .../foundation/gcc/versions/13.2.0-stage2.nix | 17 +++++------- .../versions/13.2.0-stage3-passthrough.nix | 5 ++++ .../foundation/gcc/versions/13.2.0-stage3.nix | 15 ++++------- .../foundation/gcc/versions/13.2.0-stage4.nix | 20 +++++++------- .../versions/2.38-stage1-passthrough.nix | 15 +++++++++++ .../foundation/glibc/versions/2.38-stage1.nix | 26 +++++++++++++++++++ .../versions/3.11-stage1-passthrough.nix | 5 ++++ .../gnugrep/versions/3.11-stage1.nix | 5 ++++ .../versions/4.4.1-stage1-passthrough.nix | 5 ++++ .../gnumake/versions/4.4.1-stage1.nix | 5 ++++ .../versions/2.7-stage1-passthrough.nix | 5 ++++ .../gnupatch/versions/2.7-stage1.nix | 5 ++++ .../versions/4.9-stage1-passthrough.nix | 5 ++++ .../foundation/gnused/versions/4.9-stage1.nix | 5 ++++ .../versions/1.35-stage1-passthrough.nix | 5 ++++ .../gnutar/versions/1.35-stage1.nix | 5 ++++ .../gzip/versions/1.13-stage1-passthrough.nix | 5 ++++ .../foundation/gzip/versions/1.13-stage1.nix | 5 ++++ .../versions/6.5.6-stage1-passthrough.nix | 10 +++++++ .../linux-headers/versions/6.5.6-stage1.nix | 5 ++++ .../python/versions/3.12.0-stage1.nix | 10 +++++++ .../xz/versions/5.4.3-stage1-passthrough.nix | 5 ++++ .../foundation/xz/versions/5.4.3-stage1.nix | 5 ++++ .../foundation/zlib/versions/1.3-stage1.nix | 10 +++++++ 39 files changed, 253 insertions(+), 30 deletions(-) diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix index 8250901..da2e9c6 100644 --- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix @@ -39,6 +39,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix index f09bda6..20391a4 100644 --- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix +++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix @@ -37,6 +37,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix index 2d22845..743341d 100644 --- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix index 14adafe..f5a6a21 100644 --- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix +++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix @@ -96,6 +96,16 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "x86_64-linux"; + target = "riscv64-linux"; + } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix index f568285..e0ae93e 100644 --- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix index d8aa667..7be52de 100644 --- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix +++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix @@ -40,6 +40,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix index 78a2d65..34b972f 100644 --- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix index 7c318d1..fffa0a7 100644 --- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix +++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix @@ -47,6 +47,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix index c6bbd76..9a69e7e 100644 --- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix index 7b8bf7d..766900a 100644 --- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix +++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix index cbe508c..b2ea1e7 100644 --- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix index 579c4f0..fdee6e4 100644 --- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix +++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix index 0962d6e..831e27d 100644 --- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix index 58de03b..a5bd9eb 100644 --- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix +++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix index 4d90d77..d2957fe 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix @@ -95,6 +95,11 @@ in host = "x86_64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "x86_64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix index add9240..3b76ad1 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix @@ -26,17 +26,9 @@ let ../patches/libstdc++-target.patch ]; - ldLinux = - if platform.target.double == "aarch64-linux" then - "ld-linux-aarch64.so.1" - else if platform.target.double == "x86_64-linux" then - "ld-linux-x86-64.so.2" - else - "ld-linux.so.2"; - gccFlags = [ "-Wl,-dynamic-linker" - "-Wl,${config.deps.target.target.glibc.package}/lib/${ldLinux}" + "-Wl,${config.deps.target.target.glibc.dynamicLinker}" "-B${config.deps.target.target.glibc.package}/lib" ]; @@ -99,6 +91,11 @@ in host = "x86_64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "x86_64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; @@ -186,7 +183,7 @@ in env = { CC = "gcc -Wl,-dynamic-linker"; CXX = "g++ -Wl,-dynamic-linker"; - CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${config.deps.target.target.glibc.package}/lib/${ldLinux} -B${config.deps.target.target.glibc.package}/lib"; + CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${config.deps.target.target.glibc.dynamicLinker} -B${config.deps.target.target.glibc.package}/lib"; LDFLAGS_FOR_TARGET = "-L$(pwd)/${platform.target.triple}/libgcc -L${config.deps.target.target.glibc.package}/lib"; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix index 1ad7d92..1d1a1b0 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix @@ -39,6 +39,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix index f37984e..9c49070 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix @@ -26,18 +26,13 @@ let ../patches/libstdc++-target.patch ]; - ldLinux = - if platform.target.double == "aarch64-linux" then - "ld-linux-aarch64.so.1" - else if platform.target.double == "x86_64-linux" then - "ld-linux-x86-64.so.2" - else - "ld-linux.so.2"; - gccFlags = [ "-Wl,-dynamic-linker" - "-Wl,${config.deps.host.host.glibc.package}/lib/${ldLinux}" + "-Wl,${config.deps.host.host.glibc.dynamicLinker}" "-B${config.deps.host.host.glibc.package}/lib" + ] + ++ lib.lists.when (config.platform.target == "riscv64-linux") [ + "-L${config.package.outPath}/lib" ]; configureFlags = [ @@ -186,7 +181,7 @@ in }; env = { - CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${config.deps.host.host.glibc.package}/lib/${ldLinux}"; + CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${config.deps.host.host.glibc.dynamicLinker}"; LIBRARY_PATH = "${config.deps.host.host.glibc.package}/lib"; LDFLAGS_FOR_TARGET = "-L$(pwd)/${platform.target.triple}/libgcc -L${config.deps.host.host.glibc.package}/lib"; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix index 4dd6871..fe06412 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix @@ -22,18 +22,13 @@ let ../patches/libstdc++-target.patch ]; - ldLinux = - if platform.target.double == "aarch64-linux" then - "ld-linux-aarch64.so.1" - else if platform.target.double == "x86_64-linux" then - "ld-linux-x86-64.so.2" - else - "ld-linux.so.2"; - gccFlags = [ "-Wl,-dynamic-linker" - "-Wl,${config.deps.host.host.glibc.package}/lib/${ldLinux}" + "-Wl,${config.deps.host.host.glibc.dynamicLinker}" "-B${config.deps.host.host.glibc.package}/lib" + ] + ++ lib.lists.when (config.platform.target == "riscv64-linux") [ + "-L${config.package.outPath}/lib" ]; configureFlags = [ @@ -91,6 +86,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; @@ -161,7 +161,7 @@ in }; env = { - CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${"${config.deps.host.host.glibc.package}/lib/${ldLinux}"}"; + CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${config.deps.host.host.glibc.dynamicLinker}"; LIBRARY_PATH = "${config.deps.host.host.glibc.package}/lib"; }; diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix index 231af2f..cfc5409 100644 --- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix @@ -20,6 +20,14 @@ let }; in { + options = { + dynamicLinker = lib.options.create { + type = lib.types.string; + default = "ld-linux-x86-64.so.2"; + description = "The dynamic linker/loader to be used."; + }; + }; + config = { meta = { description = "The GNU C Library."; @@ -38,8 +46,15 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; + dynamicLinker = package.dynamicLinker; + builder = builders.passthrough.extend { settings = { derivation = package.package; diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix index 983b5ac..fb72a44 100644 --- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix +++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix @@ -18,6 +18,14 @@ let }; in { + options = { + dynamicLinker = lib.options.create { + type = lib.types.string; + default = "ld-linux-x86-64.so.2"; + description = "The dynamic linker/loader to be used."; + }; + }; + config = { meta = { description = "The GNU C Library."; @@ -36,6 +44,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; @@ -88,6 +101,19 @@ in }; }; + dynamicLinker = + "${config.package.outPath}/lib/" + + ( + if platform.target.double == "x86_64-linux" then + "ld-linux-x86-64.so.2" + else if platform.target.double == "aarch64-linux" then + "ld-linux-aarch64.so.1" + else if platform.target.double == "riscv64-linux" then + "ld-linux-riscv64-lp64d.so.1" + else + "ld-linux.so.2" + ); + phases = { unpack = '' tar xf ${config.src} diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix index 9f462b3..d3ac739 100644 --- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix index c5dc2c9..105565e 100644 --- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix +++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix index 1f0e718..1475922 100644 --- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix index 82f081c..c268399 100644 --- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix +++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix @@ -41,6 +41,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix index 675b969..4cecae7 100644 --- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix index c0005de..fd0988d 100644 --- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix +++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix index 907fe64..04db097 100644 --- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix index 5ed241b..2d4445b 100644 --- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix +++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix index b348012..e45d75f 100644 --- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix index ea4f6fe..34a5a39 100644 --- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix +++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix index 85b31c3..bffb0bd 100644 --- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix @@ -38,6 +38,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix index f3980cd..a2d2dd0 100644 --- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix +++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix @@ -36,6 +36,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix index 18cf1ae..de14449 100644 --- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix @@ -25,6 +25,16 @@ in host = "x86_64-linux"; target = "x86_64-linux"; } + { + build = "aarch64-linux"; + host = "aarch64-linux"; + target = "aarch64-linux"; + } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix index 59fcf91..1615006 100644 --- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix +++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix @@ -30,6 +30,11 @@ in host = "x86_64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "x86_64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix index 89bcbbd..b9359bd 100644 --- a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix +++ b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix @@ -35,6 +35,16 @@ in host = "x86_64-linux"; target = "x86_64-linux"; } + { + build = "aarch64-linux"; + host = "aarch64-linux"; + target = "aarch64-linux"; + } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix index 0f0e589..760a435 100644 --- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix +++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix @@ -41,6 +41,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.passthrough.extend { diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix index b754ac1..2b8ca78 100644 --- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix +++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix @@ -39,6 +39,11 @@ in host = "aarch64-linux"; target = "aarch64-linux"; } + { + build = "x86_64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic; diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix index f956091..79e9620 100644 --- a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix +++ b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix @@ -31,6 +31,16 @@ in host = "x86_64-linux"; target = "x86_64-linux"; } + { + build = "aarch64-linux"; + host = "aarch64-linux"; + target = "aarch64-linux"; + } + { + build = "riscv64-linux"; + host = "riscv64-linux"; + target = "riscv64-linux"; + } ]; builder = builders.basic;