diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 04ea4b2..216ebfd 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 '.#hydraJobs' + --flake '.#packages' diff --git a/.gitignore b/.gitignore index f52b5d5..5351c15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .direnv/ -result* +result +result-man diff --git a/flake.nix b/flake.nix index ef67f6b..a18e81f 100644 --- a/flake.nix +++ b/flake.nix @@ -42,17 +42,5 @@ }; 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; }; } diff --git a/pkgs/enigma.nix b/pkgs/enigma.nix index 1b9a5bf..6366a11 100644 --- a/pkgs/enigma.nix +++ b/pkgs/enigma.nix @@ -42,8 +42,5 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = { - mainProgram = "enigma"; - inherit (jdk.meta) platforms; - }; + meta.mainProgram = "enigma"; }) diff --git a/pkgs/jaspersoft-studio-community.nix b/pkgs/jaspersoft-studio-community.nix index 9ff0a69..3dbecc2 100644 --- a/pkgs/jaspersoft-studio-community.nix +++ b/pkgs/jaspersoft-studio-community.nix @@ -58,9 +58,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { }) ]; - meta = { - mainProgram = "jaspersoft-studio-community"; - inherit (temurin-bin-17.meta) platforms; - hydraPlatforms = [ ]; - }; + meta.mainProgram = "jaspersoft-studio-community"; }) diff --git a/pkgs/openwebstart.nix b/pkgs/openwebstart.nix index 8281fb1..d949272 100644 --- a/pkgs/openwebstart.nix +++ b/pkgs/openwebstart.nix @@ -69,8 +69,5 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = { - mainProgram = "openwebstart-settings"; - inherit (openjdk8.meta) platforms; - }; + meta.mainProgram = "openwebstart-settings"; }) diff --git a/pkgs/vineflower.nix b/pkgs/vineflower.nix index ea6fe75..e399891 100644 --- a/pkgs/vineflower.nix +++ b/pkgs/vineflower.nix @@ -28,8 +28,5 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = { - mainProgram = "vineflower"; - inherit (jre_headless.meta) platforms; - }; + meta.mainProgram = "vineflower"; })