From ab6363f6cb92b3de9015f665bea6f87e2be7fb4c Mon Sep 17 00:00:00 2001 From: quapka Date: Sat, 21 Jun 2025 15:13:34 +0200 Subject: Autoformat with Neoformat --- flake.nix | 126 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 70 insertions(+), 56 deletions(-) diff --git a/flake.nix b/flake.nix index e476541..ac41b2d 100644 --- a/flake.nix +++ b/flake.nix @@ -689,62 +689,76 @@ } ); - buildReader = { jdkVersion ? pkgs.jdk17_headless }: with pkgs; gradle2nix.builders.${system}.buildGradlePackage rec { - pname = "ECTesterReader"; - version = "0.3.3"; - lockFile = ./gradle.lock; - buildJdk = pkgs.jdk_headless; - gradleBuildFlags = [ ":reader:uberJar" ]; - src = ./.; - - installPhase = '' - mkdir -p $out - cp -r reader/build $out - ''; - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - makeWrapper \ - ${jdk_headless}/bin/java $out/bin/${pname} \ - --add-flags "-Dstdout.encoding=UTF8 -Dstderr.encoding=UTF8 -jar $out/build/libs/${pname}.jar" - ''; - }; - - buildApplet = { jdkVersion ? pkgs.jdk8_headless }: with pkgs; gradle2nix.builders.${system}.buildGradlePackage rec { - pname = "applet"; - # since the gradle target builds applets for multiple JC SDKs, the - # single version cannot reflet that - version = "0.3.3"; - lockFile = ./gradle.lock; - buildJdk = jdkVersion; - gradleBuildFlags = [ ":applet:buildJavaCard" ]; - src = ./.; - - installPhase = '' - mkdir --parents $out - cp --recursive applet/build/* $out - ''; - - nativeBuildInputs = [ makeWrapper ]; - }; - - buildCommon = { jdkVersion ? pkgs.jdk17_headless }: with pkgs; gradle2nix.builders.${system}.buildGradlePackage rec { - pname = "common"; - version = "0.3.3"; - lockFile = ./gradle.lock; - buildJdk = jdkVersion; - gradleBuildFlags = [ ":common:build" ]; - src = ./.; - - installPhase = '' - mkdir --parents $out - cp --recursive common/build/* $out - ''; + buildReader = + { + jdkVersion ? pkgs.jdk17_headless, + }: + with pkgs; + gradle2nix.builders.${system}.buildGradlePackage rec { + pname = "ECTesterReader"; + version = "0.3.3"; + lockFile = ./gradle.lock; + buildJdk = pkgs.jdk_headless; + gradleBuildFlags = [ ":reader:uberJar" ]; + src = ./.; + + installPhase = '' + mkdir -p $out + cp -r reader/build $out + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + makeWrapper \ + ${jdk_headless}/bin/java $out/bin/${pname} \ + --add-flags "-Dstdout.encoding=UTF8 -Dstderr.encoding=UTF8 -jar $out/build/libs/${pname}.jar" + ''; + }; - nativeBuildInputs = [ makeWrapper ]; - }; + buildApplet = + { + jdkVersion ? pkgs.jdk8_headless, + }: + with pkgs; + gradle2nix.builders.${system}.buildGradlePackage rec { + pname = "applet"; + # since the gradle target builds applets for multiple JC SDKs, the + # single version cannot reflet that + version = "0.3.3"; + lockFile = ./gradle.lock; + buildJdk = jdkVersion; + gradleBuildFlags = [ ":applet:buildJavaCard" ]; + src = ./.; + + installPhase = '' + mkdir --parents $out + cp --recursive applet/build/* $out + ''; + + nativeBuildInputs = [ makeWrapper ]; + }; + buildCommon = + { + jdkVersion ? pkgs.jdk17_headless, + }: + with pkgs; + gradle2nix.builders.${system}.buildGradlePackage rec { + pname = "common"; + version = "0.3.3"; + lockFile = ./gradle.lock; + buildJdk = jdkVersion; + gradleBuildFlags = [ ":common:build" ]; + src = ./.; + + installPhase = '' + mkdir --parents $out + cp --recursive common/build/* $out + ''; + + nativeBuildInputs = [ makeWrapper ]; + }; defaultVersion = # Default version is the last one, aka the newest that we fetched @@ -831,8 +845,8 @@ function = buildECTesterStandalone; }; - reader = buildReader {}; - common = buildCommon {}; + reader = buildReader { }; + common = buildCommon { }; appletAll = pkgs.buildEnv { name = "applets"; paths = [ -- cgit v1.2.3-70-g09d2