From 5bb480bf8f0faa39fe0d1296d1b8fadb59c9ef07 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 24 Nov 2024 22:44:54 +0000
Subject: [PATCH 1/2] nixos/java: format with nixfmt-rfc-style

---
 nixos/modules/programs/java.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix
index 784add809682..24f72b206fdc 100644
--- a/nixos/modules/programs/java.nix
+++ b/nixos/modules/programs/java.nix
@@ -1,7 +1,12 @@
 # This module provides JAVA_HOME, with a different way to install java
 # system-wide.
 
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.programs.java;
@@ -28,9 +33,7 @@ in
         '';
       };
 
-      package = lib.mkPackageOption pkgs "jdk" {
-        example = "jre";
-      };
+      package = lib.mkPackageOption pkgs "jdk" { example = "jre"; };
 
       binfmt = lib.mkEnableOption "binfmt to execute java jar's and classes";
 

From 0c2a7f8159ce0f2b5f59e05f5f82d9e69ae049fd Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 24 Nov 2024 22:47:26 +0000
Subject: [PATCH 2/2] OWNERS: add Java team as owner of Java module

It is within our scope.

The general team consensus seems to be that it is in a similar position
to nix-ld: in-tree users should migrate away from it, but out-of-tree
users can use it as a workaround, in place of a wrapper.
---
 ci/OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index d67e6b019b8c..5cc815b326c2 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -218,6 +218,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /doc/languages-frameworks/java.section.md @NixOS/java
 /doc/languages-frameworks/gradle.section.md @NixOS/java
 /doc/languages-frameworks/maven.section.md @NixOS/java
+/nixos/modules/programs/java.nix @NixOS/java
 /pkgs/top-level/java-packages.nix @NixOS/java
 
 # Jetbrains