From d814d48b9c4679b0dc734a2c0974e7b6014ad7a1 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 30 Dec 2024 11:41:55 +0100 Subject: [PATCH 1/3] fix: ignore all result links --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5351c15..f52b5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .direnv/ -result -result-man +result* From e971b6f07a63fe58d28d0f139b0a9081fce71c90 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 30 Dec 2024 11:46:38 +0100 Subject: [PATCH 2/3] fix(flake): export hydraJobs and use them in ci --- .forgejo/workflows/build.yml | 2 +- flake.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 216ebfd..04ea4b2 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -33,4 +33,4 @@ jobs: --systems 'x86_64-linux' \ --option accept-flake-config true \ --option allow-import-from-derivation false \ - --flake '.#packages' + --flake '.#hydraJobs' diff --git a/flake.nix b/flake.nix index a18e81f..ef67f6b 100644 --- a/flake.nix +++ b/flake.nix @@ -42,5 +42,17 @@ }; formatter = forEachSystem (system: (pkgsFor system).nixfmt-rfc-style); + + hydraJobs = + let + ciSystem = "x86_64-linux"; + isBuildable = + name: drv: + (!drv ? meta.hydraPlatforms) + || lib.any (lib.meta.platformMatch { system = ciSystem; }) drv.meta.hydraPlatforms; + + packages = self.packages.${ciSystem}; + in + lib.filterAttrs isBuildable packages; }; } From bbcfc7babd9fc854e961e6422e61ea5ab7f09423 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 30 Dec 2024 11:48:17 +0100 Subject: [PATCH 3/3] fix: define platforms for all packages --- pkgs/enigma.nix | 5 ++++- pkgs/jaspersoft-studio-community.nix | 6 +++++- pkgs/openwebstart.nix | 5 ++++- pkgs/vineflower.nix | 5 ++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/enigma.nix b/pkgs/enigma.nix index 6366a11..1b9a5bf 100644 --- a/pkgs/enigma.nix +++ b/pkgs/enigma.nix @@ -42,5 +42,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta.mainProgram = "enigma"; + meta = { + mainProgram = "enigma"; + inherit (jdk.meta) platforms; + }; }) diff --git a/pkgs/jaspersoft-studio-community.nix b/pkgs/jaspersoft-studio-community.nix index 3dbecc2..9ff0a69 100644 --- a/pkgs/jaspersoft-studio-community.nix +++ b/pkgs/jaspersoft-studio-community.nix @@ -58,5 +58,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { }) ]; - meta.mainProgram = "jaspersoft-studio-community"; + meta = { + mainProgram = "jaspersoft-studio-community"; + inherit (temurin-bin-17.meta) platforms; + hydraPlatforms = [ ]; + }; }) diff --git a/pkgs/openwebstart.nix b/pkgs/openwebstart.nix index d949272..8281fb1 100644 --- a/pkgs/openwebstart.nix +++ b/pkgs/openwebstart.nix @@ -69,5 +69,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta.mainProgram = "openwebstart-settings"; + meta = { + mainProgram = "openwebstart-settings"; + inherit (openjdk8.meta) platforms; + }; }) diff --git a/pkgs/vineflower.nix b/pkgs/vineflower.nix index e399891..ea6fe75 100644 --- a/pkgs/vineflower.nix +++ b/pkgs/vineflower.nix @@ -28,5 +28,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta.mainProgram = "vineflower"; + meta = { + mainProgram = "vineflower"; + inherit (jre_headless.meta) platforms; + }; })