gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-12-18 15:26:12 +00:00
committed by GitHub
parent 45cb9c42e4 f103b80dfb
commit 7a850a35a5
23 changed files with 1113 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/lib/test-driver/src/test_driver/machine/__init__.py
+32
View File
@@ -292,12 +292,18 @@ class Machine:
return self.booted and self.connected
def log(self, msg: str) -> None:
"""
Log a message to console.
"""
self.logger.log(msg, {"machine": self.name})
def log_serial(self, msg: str) -> None:
self.logger.log_serial(msg, self.name)
def nested(self, msg: str, attrs: dict[str, str] = {}) -> _GeneratorContextManager:
"""
Get nested logger, optionally with extra attributes.
"""
my_attrs = {"machine": self.name}
my_attrs.update(attrs)
return self.logger.nested(msg, my_attrs)
@@ -357,6 +363,9 @@ class Machine:
retry(check_active, timeout)
def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]:
"""
Get a dictionary of systemd unit properties, as obtained via `systemctl show`.
"""
status, lines = self.systemctl(f'--no-pager show "{unit}"', user)
if status != 0:
raise RequestedAssertionFailed(
@@ -384,6 +393,9 @@ class Machine:
property: str,
user: str | None = None,
) -> str:
"""
Get the string value of a single systemd unit property
"""
status, lines = self.systemctl(
f'--no-pager show "{unit}" --property="{property}"',
user,
@@ -431,6 +443,9 @@ class Machine:
return self.execute(f"systemctl {q}")
def require_unit_state(self, unit: str, require_state: str = "active") -> None:
"""
Assert that the current state of a unit has a specific value. The default state is "active".
"""
with self.nested(
f"checking if unit '{unit}' has reached state '{require_state}'"
):
@@ -648,6 +663,10 @@ class Machine:
return output
def wait_for_shutdown(self) -> None:
"""
Wait for the VM to power off. This does *not* initiate a shutdown;
that's usually done via `shutdown()`.
"""
if not self.booted:
return
@@ -687,6 +706,9 @@ class Machine:
raise TimeoutError
def get_tty_text(self, tty: str) -> str:
"""
Get the output printed to a given TTY.
"""
status, output = self.execute(
f"fold -w$(stty -F /dev/tty{tty} size | awk '{{print $2}}') /dev/vcs{tty}"
)
@@ -785,12 +807,22 @@ class Machine:
retry(port_is_closed, timeout)
def start_job(self, jobname: str, user: str | None = None) -> tuple[int, str]:
"""
Start systemd service.
"""
return self.systemctl(f"start {jobname}", user)
def stop_job(self, jobname: str, user: str | None = None) -> tuple[int, str]:
"""
Stop systemd service.
"""
return self.systemctl(f"stop {jobname}", user)
def connect(self) -> None:
"""
Wait for a connection to the guest root shell
"""
def shell_ready(timeout_secs: int) -> bool:
"""We sent some data from the backdoor service running on the guest
to indicate that the backdoor shell is ready.
pkgs/build-support/ocaml/dune.nix
+9 -5
View File
@@ -37,10 +37,10 @@ lib.extendMkDerivation {
in
if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then
throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
throw "${finalAttrs.pname}-${finalAttrs.version} is not available for OCaml ${ocaml.version}"
else
{
name = "ocaml${ocaml.version}-${pname}-${version}";
name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
strictDeps = true;
@@ -58,14 +58,14 @@ lib.extendMkDerivation {
buildPhase =
args.buildPhase or ''
runHook preBuild
dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
dune build -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
runHook postBuild
'';
installPhase =
args.installPhase or ''
runHook preInstall
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${finalAttrs.pname} \
${
if lib.versionAtLeast Dune.version "2.9" then
"--docdir $out/share/doc --mandir $out/share/man"
@@ -78,11 +78,15 @@ lib.extendMkDerivation {
checkPhase =
args.checkPhase or ''
runHook preCheck
dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
dune runtest -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
runHook postCheck
'';
meta = (args.meta or { }) // {
# TODO: ocaml.meta.platforms is where the compiler can run
# Package's meta.platforms are where the compiler can target.
#
# See: rustc.targetPlatforms
platforms = args.meta.platforms or ocaml.meta.platforms;
};
};
pkgs/by-name/gh/ghostfolio/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.222.0";
version = "2.223.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-pMkmjGRdJjkEDMf9k7QqYIwkUX9LaeovQYG2i+vmOtE=";
hash = "sha256-qgIwAfcDP2TDQvg5Q92RDHm7HSv4KT16hsoaz8ux7fg=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-7Xf3Yn4fC+Jjc/UFu+cg9cVwiYK/VMasZwPOIJu771o=";
npmDepsHash = "sha256-KSKqybqVw2BG/WKuVRyNsneLYyedVeyCvNBLIREx7MQ=";
nativeBuildInputs = [
prisma
pkgs/by-name/ht/htop-vim/package.nix
-91
View File
@@ -1,91 +0,0 @@
{
lib,
fetchFromGitHub,
fetchpatch2,
stdenv,
autoreconfHook,
pkg-config,
ncurses,
libcap,
libnl,
sensorsSupport ? stdenv.hostPlatform.isLinux,
lm_sensors,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
systemdLibs,
}:
assert systemdSupport -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
pname = "htop-vim";
version = "3.4.0";
src = fetchFromGitHub {
owner = "htop-dev";
repo = "htop-vim";
rev = version;
hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs";
};
patches = [
(fetchpatch2 {
name = "vim-keybindings.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/vim-keybindings.patch?h=htop-vim&id=d10f022b3ca1207200187a55f5b116a5bd8224f7";
hash = "sha256-fZDTA2dCOmXxUYD6Wm41q7TxL7fgQOj8a/8yJC7Zags=";
})
];
# upstream removed pkg-config support and uses dlopen now
postPatch =
let
libnlPath = lib.getLib libnl;
in
lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace configure.ac \
--replace-fail /usr/include/libnl3 ${lib.getDev libnl}/include/libnl3
substituteInPlace linux/LibNl.c \
--replace-fail libnl-3.so ${libnlPath}/lib/libnl-3.so \
--replace-fail libnl-genl-3.so ${libnlPath}/lib/libnl-genl-3.so
'';
nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
buildInputs = [
ncurses
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libcap
libnl
]
++ lib.optional sensorsSupport lm_sensors
++ lib.optional systemdSupport systemdLibs;
configureFlags = [
"--enable-unicode"
"--sysconfdir=/etc"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"--enable-affinity"
"--enable-capabilities"
"--enable-delayacct"
]
++ lib.optional sensorsSupport "--enable-sensors";
postFixup =
let
optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop";
in
lib.optionalString (!stdenv.hostPlatform.isStatic) ''
${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"}
${optionalPatch systemdSupport "${systemdLibs}/lib/libsystemd.so"}
'';
meta = {
description = "Interactive process viewer, with vim-style keybindings";
homepage = "https://aur.archlinux.org/packages/htop-vim";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ thiagokokada ];
mainProgram = "htop";
};
}
pkgs/by-name/ht/htop/package.nix
+18 -7
View File
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
fetchpatch2,
stdenv,
autoreconfHook,
pkg-config,
@@ -11,21 +12,28 @@
lm_sensors,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
systemdLibs,
withVimKeys ? false,
}:
assert systemdSupport -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
pname = "htop";
stdenv.mkDerivation (finalAttrs: {
pname = "htop" + lib.optionalString withVimKeys "-vim";
version = "3.4.1";
src = fetchFromGitHub {
owner = "htop-dev";
repo = "htop";
tag = version;
tag = finalAttrs.version;
hash = "sha256-fVqQwXbJus2IVE1Bzf3yJJpKK4qcZN/SCTX1XYkiHhU=";
};
patches = lib.optional withVimKeys (fetchpatch2 {
name = "vim-keybindings.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/vim-keybindings.patch?h=htop-vim&id=d10f022b3ca1207200187a55f5b116a5bd8224f7";
hash = "sha256-fZDTA2dCOmXxUYD6Wm41q7TxL7fgQOj8a/8yJC7Zags=";
});
# upstream removed pkg-config support and uses dlopen now
postPatch =
let
@@ -72,16 +80,19 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Interactive process viewer";
homepage = "https://htop.dev";
description =
"Interactive process viewer" + lib.optionalString withVimKeys ", with vim-style keybindings";
homepage =
if withVimKeys then "https://aur.archlinux.org/packages/htop-vim" else "https://htop.dev";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
rob
relrod
SuperSandro2000
thiagokokada
];
changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog";
changelog = "https://github.com/htop-dev/htop/blob/${finalAttrs.version}/ChangeLog";
mainProgram = "htop";
};
}
})
pkgs/by-name/os/osu-lazer-bin/package.nix
+4 -4
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.1209.0";
version = "2025.1218.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
hash = "sha256-qzmW9STCoIoz2+UGkybvB9AE536r3VghMahPFT020to=";
hash = "sha256-uuzXmpGvFucNwRXTcI2p5pEnDthXUo3ycMOEtm7cAhQ=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
hash = "sha256-421KNsV4Nb3JSjJb0OMkdAEsb/YnI/st7Vio29WAtZs=";
hash = "sha256-0+5DilSzSdXSq9XevqH/tXdjVuMOaNk5Ve04o6oXIQo=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
hash = "sha256-42Fx3CxLcW97cxRXXCqPJ8NzRBnpi62IjxGLnSRkO4g=";
hash = "sha256-9TLdClS9+bDt0/cONsQjB5nUmis+rWOo5JAtw4oeGU0=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
pkgs/by-name/os/osu-lazer/deps.json
Generated
+6 -6
View File
@@ -596,13 +596,13 @@
},
{
"pname": "ppy.LocalisationAnalyser",
"version": "2024.802.0",
"hash": "sha256-vyRWbdPUp5n8hJPJReU9LUy2o/bwwLT1po9f2M16tMA="
"version": "2025.1208.0",
"hash": "sha256-klogAaNxpEVJKd1NcySgTUwv5WwrvaUXBRypj5wKX5Y="
},
{
"pname": "ppy.LocalisationAnalyser.Tools",
"version": "2024.802.0",
"hash": "sha256-bniBSY8rS005OHO/ixn2NFM0/KIMiawHyMSXhlAEqwc="
"version": "2025.1208.0",
"hash": "sha256-diVAckS1zNyVE1UGkbiu9jH/25j/c+Ad5XC3EjdLDsg="
},
{
"pname": "ppy.ManagedBass",
@@ -641,8 +641,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2025.1125.0",
"hash": "sha256-jJHpti142HgEBFhTDl5iThM05mQypVEF0J7JIVskVQ0="
"version": "2025.1215.0",
"hash": "sha256-u2xGoDYxVxqoRXLqcyN4r97HA1f9vqoVFJMmqMOd5vk="
},
{
"pname": "ppy.osuTK.NS20",
pkgs/by-name/os/osu-lazer/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.1209.0";
version = "2025.1218.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = "${version}-lazer";
hash = "sha256-uxC+3M2KMnG292Ab1Sa/QnkxQXNogSqE7Tij/moDzkE=";
hash = "sha256-/gVzw1itPiEEoqTQSNCAgYpkN6cNT8PARYj2MKb4wNc=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
pkgs/by-name/re/redpanda-client/package.nix
+3 -3
View File
@@ -7,12 +7,12 @@
stdenv,
}:
let
version = "25.3.1";
version = "25.3.2";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-/TodUIBsby4ewoyU72/5jHoBDoFHsSHqjJI7vtBlELU=";
sha256 = "sha256-mUIFPTh1VgXOfD6te0uHrhdGs00J0Hu6MXcR3g/6cZ8=";
};
in
buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-6iyHM7SWqorjjebmZEJKzUU1w0waTywAY//UcfikdAo=";
vendorHash = "sha256-N/UCN0U/vTfYq91m3ehhtRvNxeoaGsLYQtnBUUZsU5U=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/development/compilers/corretto/11.nix
+10 -5
View File
@@ -1,6 +1,6 @@
{
fetchFromGitHub,
gradle_7,
gradle_8,
jdk11,
lib,
stdenv,
@@ -19,20 +19,25 @@ let
testers
;
jdk = jdk11;
gradle = gradle_7;
gradle = gradle_8;
extraConfig = [
# jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix)
# because of several compile errors. We need to include this parameter for
# Corretto, too.
"--disable-warnings-as-errors"
];
version = "11.0.26.4.1";
version = "11.0.29.7.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-11";
rev = version;
hash = "sha256-buJlSvmyOVeMwaP9oDcHhG+Sabr1exf0nRUt4O7MaIY=";
hash = "sha256-/VlV8tAo1deOZ5Trc4VlLNtpjWx352qUGZmfVbj7HuU=";
};
};
in
corretto
corretto.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
./corretto11-gradle8.patch
];
})
pkgs/development/compilers/corretto/17.nix
+10 -8
View File
@@ -1,7 +1,7 @@
{
fetchFromGitHub,
fetchurl,
gradle_7,
gradle_8,
jdk17,
lib,
stdenv,
@@ -20,13 +20,13 @@ let
testers
;
jdk = jdk17;
gradle = gradle_7;
version = "17.0.14.7.1";
gradle = gradle_8;
version = "17.0.17.10.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-17";
rev = version;
hash = "sha256-ohQrguEJ8QvTaNjyQxKFujGhXNxCQTGkLILurzD7cy0=";
hash = "sha256-Z8+g5jXjcWNTYU9Xvze7scu348okMauGMhSZwX1sS9w=";
};
};
in
@@ -35,9 +35,11 @@ corretto.overrideAttrs (
# Corretto17 has incorporated this patch already so it fails to apply.
# We thus skip it here.
# See https://github.com/corretto/corretto-17/pull/158
patches = lib.remove (fetchurl {
url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
}) (prev.patches or [ ]);
patches =
lib.remove (fetchurl {
url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
}) (prev.patches or [ ])
++ [ ./corretto17-gradle8.patch ];
}
)
pkgs/development/compilers/corretto/21.nix
+10 -6
View File
@@ -1,7 +1,6 @@
{
corretto21,
fetchFromGitHub,
gradle_7,
gradle_8,
jdk21,
lib,
stdenv,
@@ -20,14 +19,19 @@ let
testers
;
jdk = jdk21;
gradle = gradle_7;
version = "21.0.6.7.1";
gradle = gradle_8;
version = "21.0.9.11.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-21";
rev = version;
hash = "sha256-kF7Quf8bU5scfunmwfEYLkje/jEJOx7CFnBIUWCovzI=";
hash = "sha256-d62rXVgVlOM3M18c8GioFtMi/GhmCEMLQwy/EWAJW7I=";
};
};
in
corretto
corretto.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
./corretto21-gradle8.patch
];
})
pkgs/development/compilers/corretto/corretto11-gradle8.patch
+337
View File
@@ -0,0 +1,337 @@
diff --git a/build.gradle b/build.gradle
index a589bb568..6e0164562 100644
--- a/build.gradle
+++ b/build.gradle
@@ -240,7 +240,7 @@ project(':prebuild') {
def generateToolMain = "build.tools.generatecacerts.GenerateCacerts"
task copyToolSrc(type: Copy) {
- description 'Copy utility tool source to the project root'
+ description = 'Copy utility tool source to the project root'
from fileTree("$rootDir/make/jdk/src/classes") {
include 'build/tools/generatecacerts/*'
}
@@ -250,7 +250,7 @@ project(':prebuild') {
task buildTool(type: JavaCompile) {
dependsOn copyToolSrc
source = fileTree(dir: preBuildSrc, include: '**/*.java')
- destinationDir = file(classPath)
+ destinationDirectory = file(classPath)
classpath = files(classPath)
}
@@ -260,7 +260,7 @@ project(':prebuild') {
description = 'Generate Cacerts from JDK source'
classpath = files(classPath)
- main = generateToolMain
+ mainClass = generateToolMain
args = [jdkCaDir, project.caCerts]
}
@@ -291,9 +291,9 @@ project(':openjdksrc') {
* Compresses a snapshot of the source code used to perform the build.
*/
task sourceDistributionTarball(type: Tar) {
- description 'Assemble source files required for building and distributing Corretto.'
- compression Compression.GZIP
- archiveName sourceTar
+ description = 'Assemble source files required for building and distributing Corretto.'
+ compression = Compression.GZIP
+ archiveFileName = sourceTar
from fileTree(rootDir) {
include 'LICENSE',
'ADDITIONAL_LICENSE_INFO',
diff --git a/installers/linux/al2/spec/build.gradle b/installers/linux/al2/spec/build.gradle
index 598d658de..b99e94d83 100644
--- a/installers/linux/al2/spec/build.gradle
+++ b/installers/linux/al2/spec/build.gradle
@@ -62,8 +62,8 @@ task inflateRpmSpec {
task copySourceTar(type: Tar) {
dependsOn project.configurations.compile, inflateRpmSpec
- compression Compression.GZIP
- archiveName project.configurations.compile.singleFile.name
+ compression = Compression.GZIP
+ archiveFileName = project.configurations.compile.singleFile.name
from("$buildDir") {
include "java-${project.version.major}-amazon-corretto.spec"
into 'rpm'
@@ -121,8 +121,8 @@ task inflateRpmSpecModular {
task copySourceTarModular(type: Tar) {
dependsOn project.configurations.compile, inflateRpmSpecModular
- compression Compression.GZIP
- archiveName project.configurations.compile.singleFile.name
+ compression = Compression.GZIP
+ archiveFileName = project.configurations.compile.singleFile.name
from("$buildDir") {
include "java-${project.version.major}-amazon-corretto-modular.spec"
into 'rpm'
diff --git a/installers/linux/alpine/tar/build.gradle b/installers/linux/alpine/tar/build.gradle
index 4867205e5..0c850d15f 100644
--- a/installers/linux/alpine/tar/build.gradle
+++ b/installers/linux/alpine/tar/build.gradle
@@ -143,9 +143,9 @@ task createTestImage(type: Exec) {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -155,9 +155,9 @@ task packageTestImage(type: Tar) {
task packageDebugSymbols(type: Tar) {
dependsOn packageTestImage
- description 'Package debug symbols'
- archiveName "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package debug symbols'
+ archiveFileName = "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -167,12 +167,12 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn bundleThirdPartyBinaries
dependsOn importAmazonCacerts
- archiveName "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include 'ADDITIONAL_LICENSE_INFO'
include 'ASSEMBLY_EXCEPTION'
@@ -196,7 +196,7 @@ task packageBuildResults(type: Tar) {
// See https://github.com/corretto/corretto-11/issues/129
from(jdkResultingImage) {
include 'legal/**'
- fileMode 0444
+ fileMode = 0444
}
into "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}"
}
diff --git a/installers/linux/universal/deb/build.gradle b/installers/linux/universal/deb/build.gradle
index 565cd7c2b..f2cc09982 100644
--- a/installers/linux/universal/deb/build.gradle
+++ b/installers/linux/universal/deb/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -57,22 +57,22 @@ def jinfoName = ".${jdkInstallationDirName}.jinfo"
ospackage {
// Valid version must start with a digit and only contain [A-Za-z0-9.+:~-]
// See http://manpages.ubuntu.com/manpages/artful/en/man5/deb-version.5.html
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- maintainer "${packageInfo.maintainer}"
- packageGroup 'java'
- priority 'optional'
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_deb
- multiArch SAME
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ maintainer = "${packageInfo.maintainer}"
+ packageGroup = 'java'
+ priority = 'optional'
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_deb
+ multiArch = SAME
}
/**
@@ -129,13 +129,13 @@ task inflateJinfoTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkDeb(type: Deb) {
- description 'Create the DEB package for Corretto JDK'
+ description = 'Create the DEB package for Corretto JDK'
dependsOn inflateDebScriptTemplate
dependsOn inflateJinfoTemplate
- packageName jdkPackageName
- packageDescription "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
- summary "Amazon Corretto ${project.version.major} development environment"
+ packageName = jdkPackageName
+ packageDescription = "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
+ summary = "Amazon Corretto ${project.version.major} development environment"
postInstall file("$buildRoot/scripts/postin_jdk.sh")
preUninstall file("$buildRoot/scripts/preun_jdk.sh")
diff --git a/installers/linux/universal/rpm/build.gradle b/installers/linux/universal/rpm/build.gradle
index c309c8ddb..346bcc21e 100644
--- a/installers/linux/universal/rpm/build.gradle
+++ b/installers/linux/universal/rpm/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -51,20 +51,20 @@ def jdkBinaryDir = "${buildRoot}/${project.correttoJdkArchiveName}"
def jdkPackageName = "java-${project.version.major}-amazon-corretto-devel"
ospackage {
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_redline
- os LINUX
- type BINARY
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_redline
+ os = LINUX
+ type = BINARY
}
/**
@@ -101,14 +101,14 @@ task inflateRpmScriptTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkRpm(type: Rpm) {
- description 'Create the RPM package for Corretto JDK'
+ description = 'Create the RPM package for Corretto JDK'
dependsOn inflateRpmScriptTemplate
- packageName jdkPackageName
- packageDescription packageInfo.description
- summary "Amazon Corretto ${project.version.major} development environment"
- packageGroup 'Development/Tools'
+ packageName = jdkPackageName
+ packageDescription = packageInfo.description
+ summary = "Amazon Corretto ${project.version.major} development environment"
+ packageGroup = 'Development/Tools'
// Remove after https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/401 is merged and released
- sourcePackage "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
+ sourcePackage = "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
prefix(jdkHome)
postInstall file("$buildRoot/scripts/postin_java.sh")
diff --git a/installers/linux/universal/tar/build.gradle b/installers/linux/universal/tar/build.gradle
index 72236d92c..e825a7594 100644
--- a/installers/linux/universal/tar/build.gradle
+++ b/installers/linux/universal/tar/build.gradle
@@ -85,7 +85,7 @@ task copySource(type: Exec) {
"${project.rootDir}/", buildRoot
}
-/**
+/**
* Scan the patches folder for any .patch that needs
* to be applied before start building.
*/
@@ -106,7 +106,7 @@ task configureBuild(type: Exec) {
workingDir "$buildRoot"
def isArmv7 = project.hasProperty("armv7") ? Boolean.valueOf("${project.getProperty('armv7')}") : false
- def zlibFlag = isArmv7 ? "--with-zlib=bundled" : "--with-zlib=system"
+ def zlibFlag = isArmv7 ? "--with-zlib=bundled" : "--with-zlib=system"
// Platform specific flags
def command = ['bash', 'configure',
@@ -156,9 +156,9 @@ task createTestImage(type: Exec) {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "${project.correttoTestImageArchiveName}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "${project.correttoTestImageArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -166,10 +166,10 @@ task packageTestImage(type: Tar) {
}
task packageDebugSymbols(type: Tar) {
- description 'Package debug results'
+ description = 'Package debug results'
dependsOn packageTestImage
- archiveName "${project.correttoDebugSymbolsArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoDebugSymbolsArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -179,11 +179,11 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn bundleThirdPartyBinaries
- archiveName "${project.correttoJdkArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoJdkArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include 'ADDITIONAL_LICENSE_INFO'
include 'ASSEMBLY_EXCEPTION'
@@ -209,7 +209,7 @@ task packageBuildResults(type: Tar) {
// See https://github.com/corretto/corretto-11/issues/129
from("${jdkResultingImage}/legal") {
include '**'
- fileMode 0444
+ fileMode = 0444
into "${project.correttoJdkArchiveName}/legal"
}
}
pkgs/development/compilers/corretto/corretto17-gradle8.patch
+290
View File
@@ -0,0 +1,290 @@
diff --git a/build.gradle b/build.gradle
index f678379aa..62df526d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -231,7 +231,7 @@ project(':prebuild') {
def generateToolMain = "build.tools.generatecacerts.GenerateCacerts"
task copyToolSrc(type: Copy) {
- description 'Copy utility tool source to the project root'
+ description = 'Copy utility tool source to the project root'
from fileTree("$rootDir/make/jdk/src/classes") {
include 'build/tools/generatecacerts/*'
}
@@ -241,7 +241,7 @@ project(':prebuild') {
task buildTool(type: JavaCompile) {
dependsOn copyToolSrc
source = fileTree(dir: preBuildSrc, include: '**/*.java')
- destinationDir = file(classPath)
+ destinationDirectory = file(classPath)
classpath = files(classPath)
}
@@ -282,9 +282,9 @@ project(':openjdksrc') {
* Compresses a snapshot of the source code used to perform the build.
*/
task sourceDistributionTarball(type: Tar) {
- description 'Assemble source files required for building and distributing Corretto.'
- compression Compression.GZIP
- archiveName sourceTar
+ description = 'Assemble source files required for building and distributing Corretto.'
+ compression = Compression.GZIP
+ archiveFileName = sourceTar
from fileTree(rootDir) {
include 'LICENSE',
'ADDITIONAL_LICENSE_INFO',
diff --git a/installers/linux/al2/spec/build.gradle b/installers/linux/al2/spec/build.gradle
index a5a1b9a7c..201283213 100644
--- a/installers/linux/al2/spec/build.gradle
+++ b/installers/linux/al2/spec/build.gradle
@@ -62,8 +62,8 @@ task inflateRpmSpec {
task copySourceTar(type: Tar) {
dependsOn project.configurations.compile, inflateRpmSpec
- compression Compression.GZIP
- archiveName project.configurations.compile.singleFile.name
+ compression = Compression.GZIP
+ archiveFileName = project.configurations.compile.singleFile.name
from("$buildDir") {
include "java-${project.version.major}-amazon-corretto.spec"
into 'rpm'
diff --git a/installers/linux/alpine/tar/build.gradle b/installers/linux/alpine/tar/build.gradle
index d0f95bd42..60bc9d40a 100644
--- a/installers/linux/alpine/tar/build.gradle
+++ b/installers/linux/alpine/tar/build.gradle
@@ -132,9 +132,9 @@ task bundleThirdPartyBinaries {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -143,9 +143,9 @@ task packageTestImage(type: Tar) {
task packageDebugSymbols(type: Tar) {
dependsOn packageTestImage
- description 'Package debug symbols'
- archiveName "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package debug symbols'
+ archiveFileName = "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -155,12 +155,12 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn executeBuild
dependsOn bundleThirdPartyBinaries
- archiveName "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include 'ADDITIONAL_LICENSE_INFO'
include 'ASSEMBLY_EXCEPTION'
diff --git a/installers/linux/universal/deb/build.gradle b/installers/linux/universal/deb/build.gradle
index 118ad0b74..54f7e0c50 100644
--- a/installers/linux/universal/deb/build.gradle
+++ b/installers/linux/universal/deb/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -54,22 +54,22 @@ def jinfoName = ".${jdkInstallationDirName}.jinfo"
ospackage {
// Valid version must start with a digit and only contain [A-Za-z0-9.+:~-]
// See http://manpages.ubuntu.com/manpages/artful/en/man5/deb-version.5.html
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- maintainer "${packageInfo.maintainer}"
- packageGroup 'java'
- priority 'optional'
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_deb
- multiArch SAME
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ maintainer = "${packageInfo.maintainer}"
+ packageGroup = 'java'
+ priority = 'optional'
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_deb
+ multiArch = SAME
}
/**
@@ -124,13 +124,13 @@ task inflateJinfoTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkDeb(type: Deb) {
- description 'Create the DEB package for Corretto JDK'
+ description = 'Create the DEB package for Corretto JDK'
dependsOn inflateDebScriptTemplate
dependsOn inflateJinfoTemplate
- packageName jdkPackageName
- packageDescription "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
- summary "Amazon Corretto ${project.version.major} development environment"
+ packageName = jdkPackageName
+ packageDescription = "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
+ summary = "Amazon Corretto ${project.version.major} development environment"
postInstall file("$buildRoot/scripts/postin_jdk.sh")
preUninstall file("$buildRoot/scripts/preun_jdk.sh")
diff --git a/installers/linux/universal/rpm/build.gradle b/installers/linux/universal/rpm/build.gradle
index 2883b16ac..ed914b679 100644
--- a/installers/linux/universal/rpm/build.gradle
+++ b/installers/linux/universal/rpm/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -48,20 +48,20 @@ def jdkBinaryDir = "${buildRoot}/${project.correttoJdkArchiveName}"
def jdkPackageName = "java-${project.version.major}-amazon-corretto-devel"
ospackage {
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_redline
- os LINUX
- type BINARY
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_redline
+ os = LINUX
+ type = BINARY
}
/**
@@ -97,14 +97,14 @@ task inflateRpmScriptTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkRpm(type: Rpm) {
- description 'Create the RPM package for Corretto JDK'
+ description = 'Create the RPM package for Corretto JDK'
dependsOn inflateRpmScriptTemplate
- packageName jdkPackageName
- packageDescription packageInfo.description
- summary "Amazon Corretto ${project.version.major} development environment"
- packageGroup 'Development/Tools'
+ packageName = jdkPackageName
+ packageDescription = packageInfo.description
+ summary = "Amazon Corretto ${project.version.major} development environment"
+ packageGroup = 'Development/Tools'
// Remove after https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/401 is merged and released
- sourcePackage "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
+ sourcePackage = "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
prefix(jdkHome)
postInstall file("$buildRoot/scripts/postin_java.sh")
diff --git a/installers/linux/universal/tar/build.gradle b/installers/linux/universal/tar/build.gradle
index 17491d830..9ec3280e6 100644
--- a/installers/linux/universal/tar/build.gradle
+++ b/installers/linux/universal/tar/build.gradle
@@ -122,9 +122,9 @@ task bundleThirdPartyBinaries {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "${project.correttoTestImageArchiveName}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "${project.correttoTestImageArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -132,10 +132,10 @@ task packageTestImage(type: Tar) {
}
task packageDebugSymbols(type: Tar) {
- description 'Package debug results'
+ description = 'Package debug results'
dependsOn packageTestImage
- archiveName "${project.correttoDebugSymbolsArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoDebugSymbolsArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -145,11 +145,11 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn bundleThirdPartyBinaries
- archiveName "${project.correttoJdkArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoJdkArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include 'ADDITIONAL_LICENSE_INFO'
include 'ASSEMBLY_EXCEPTION'
@@ -175,7 +175,7 @@ task packageBuildResults(type: Tar) {
// See https://github.com/corretto/corretto-11/issues/129
from("${jdkResultingImage}/legal") {
include '**'
- fileMode 0444
+ fileMode = 0444
into "${project.correttoJdkArchiveName}/legal"
}
}
pkgs/development/compilers/corretto/corretto21-gradle8.patch
+340
View File
@@ -0,0 +1,340 @@
diff --git a/build.gradle b/build.gradle
index 61d5c8f8b48..2102e8921bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -257,7 +257,7 @@ project(':prebuild') {
def generateToolMain = "build.tools.generatecacerts.GenerateCacerts"
task copyToolSrc(type: Copy) {
- description 'Copy utility tool source to the project root'
+ description = 'Copy utility tool source to the project root'
from fileTree("$rootDir/make/jdk/src/classes") {
include 'build/tools/generatecacerts/*'
}
@@ -267,7 +267,7 @@ project(':prebuild') {
task buildTool(type: JavaCompile) {
dependsOn copyToolSrc
source = fileTree(dir: preBuildSrc, include: '**/*.java')
- destinationDir = file(classPath)
+ destinationDirectory = file(classPath)
classpath = files(classPath)
}
@@ -280,7 +280,7 @@ project(':prebuild') {
// See commit for [JDK-8275252](https://github.com/corretto/corretto-jdk/commit/bd2b41dd7062c50f3aaebec2137d5fdd9546c120)
jvmArgs = ['-Dkeystore.pkcs12.certProtectionAlgorithm=NONE', '-Dkeystore.pkcs12.macAlgorithm=NONE']
- main = generateToolMain
+ mainClass = generateToolMain
args = [jdkCaDir, project.caCerts]
}
@@ -311,9 +311,9 @@ project(':openjdksrc') {
* Compresses a snapshot of the source code used to perform the build.
*/
task sourceDistributionTarball(type: Tar) {
- description 'Assemble source files required for building and distributing Corretto.'
- compression Compression.GZIP
- archiveName sourceTar
+ description = 'Assemble source files required for building and distributing Corretto.'
+ compression = Compression.GZIP
+ archiveFileName = sourceTar
def sourceTarRootFiles = ['LICENSE',
'ADDITIONAL_LICENSE_INFO',
'README',
diff --git a/installers/linux/al2/spec/build.gradle b/installers/linux/al2/spec/build.gradle
index 1df0004cbac..1b5dd56d7fd 100644
--- a/installers/linux/al2/spec/build.gradle
+++ b/installers/linux/al2/spec/build.gradle
@@ -63,8 +63,8 @@ task inflateRpmSpec {
task copySourceTar(type: Tar) {
dependsOn project.configurations.compile, inflateRpmSpec
- compression Compression.GZIP
- archiveName project.configurations.compile.singleFile.name
+ compression = Compression.GZIP
+ archiveFileName = project.configurations.compile.singleFile.name
from("$buildDir") {
include "java-${project.version.major}-amazon-corretto.spec"
into 'rpm'
diff --git a/installers/linux/alpine/tar/build.gradle b/installers/linux/alpine/tar/build.gradle
index 5b88041eebb..5b0c05f81d0 100644
--- a/installers/linux/alpine/tar/build.gradle
+++ b/installers/linux/alpine/tar/build.gradle
@@ -131,9 +131,9 @@ task bundleThirdPartyBinaries {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -142,9 +142,9 @@ task packageTestImage(type: Tar) {
task packageDebugSymbols(type: Tar) {
dependsOn packageTestImage
- description 'Package debug symbols'
- archiveName "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ description = 'Package debug symbols'
+ archiveFileName = "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -154,12 +154,12 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn executeBuild
dependsOn bundleThirdPartyBinaries
- archiveName "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include project.rootFiles
}
@@ -178,7 +178,7 @@ task packageBuildResults(type: Tar) {
// See https://github.com/corretto/corretto-11/issues/129
from(jdkResultingImage) {
include 'legal/**'
- fileMode 0444
+ fileMode = 0444
}
into "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}"
}
diff --git a/installers/linux/universal/deb/build.gradle b/installers/linux/universal/deb/build.gradle
index 4daf46e8b14..3376e3c58d1 100644
--- a/installers/linux/universal/deb/build.gradle
+++ b/installers/linux/universal/deb/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -57,22 +57,22 @@ def jinfoName = ".${jdkInstallationDirName}.jinfo"
ospackage {
// Valid version must start with a digit and only contain [A-Za-z0-9.+:~-]
// See http://manpages.ubuntu.com/manpages/artful/en/man5/deb-version.5.html
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- maintainer "${packageInfo.maintainer}"
- packageGroup 'java'
- priority 'optional'
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_deb
- multiArch SAME
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ maintainer = "${packageInfo.maintainer}"
+ packageGroup = 'java'
+ priority = 'optional'
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_deb
+ multiArch = SAME
}
/**
@@ -127,13 +127,13 @@ task inflateJinfoTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkDeb(type: Deb) {
- description 'Create the DEB package for Corretto JDK'
+ description = 'Create the DEB package for Corretto JDK'
dependsOn inflateDebScriptTemplate
dependsOn inflateJinfoTemplate
- packageName jdkPackageName
- packageDescription "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
- summary "Amazon Corretto ${project.version.major} development environment"
+ packageName = jdkPackageName
+ packageDescription = "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
+ summary = "Amazon Corretto ${project.version.major} development environment"
postInstall file("$buildRoot/scripts/postin_jdk.sh")
preUninstall file("$buildRoot/scripts/preun_jdk.sh")
@@ -191,13 +191,13 @@ task generateJdkDeb(type: Deb) {
// See https://github.com/corretto/corretto-11/issues/129
from("${jdkBinaryDir}/legal") {
into "${jdkHome}/legal"
- fileMode 0444
+ fileMode = 0444
}
if (!project.excludeReadmeJavaSE) {
from("${jdkBinaryDir}/README.JAVASE") {
into jdkHome
- fileMode 0444
+ fileMode = 0444
}
}
diff --git a/installers/linux/universal/rpm/build.gradle b/installers/linux/universal/rpm/build.gradle
index 50f55bb52c0..fbbe8f44bca 100644
--- a/installers/linux/universal/rpm/build.gradle
+++ b/installers/linux/universal/rpm/build.gradle
@@ -20,7 +20,7 @@
*/
plugins {
- id 'nebula.ospackage' version 'latest.release'
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
}
dependencies {
@@ -51,20 +51,20 @@ def jdkBinaryDir = "${buildRoot}/${project.correttoJdkArchiveName}"
def jdkPackageName = "java-${project.version.major}-amazon-corretto-devel"
ospackage {
- version project.version.upstream
- release project.version.revision
-
- url "${packageInfo.url}"
- vendor "${packageInfo.vendor}"
- packager "${packageInfo.packager}"
- license "${packageInfo.license}"
- buildHost "${packageInfo.buildHost}"
- user 'root'
- permissionGroup 'root'
- epoch 1
- arch arch_redline
- os LINUX
- type BINARY
+ version = project.version.upstream
+ release = project.version.revision
+
+ url = "${packageInfo.url}"
+ vendor = "${packageInfo.vendor}"
+ packager = "${packageInfo.packager}"
+ license = "${packageInfo.license}"
+ buildHost = "${packageInfo.buildHost}"
+ user = 'root'
+ permissionGroup = 'root'
+ epoch = 1
+ arch = arch_redline
+ os = LINUX
+ type = BINARY
}
/**
@@ -100,14 +100,14 @@ task inflateRpmScriptTemplate(type: Copy) {
* distributions folder.
*/
task generateJdkRpm(type: Rpm) {
- description 'Create the RPM package for Corretto JDK'
+ description = 'Create the RPM package for Corretto JDK'
dependsOn inflateRpmScriptTemplate
- packageName jdkPackageName
- packageDescription packageInfo.description
- summary "Amazon Corretto ${project.version.major} development environment"
- packageGroup 'Development/Tools'
+ packageName = jdkPackageName
+ packageDescription = packageInfo.description
+ summary = "Amazon Corretto ${project.version.major} development environment"
+ packageGroup = 'Development/Tools'
// Remove after https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/401 is merged and released
- sourcePackage "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
+ sourcePackage = "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
prefix(jdkHome)
postInstall file("$buildRoot/scripts/postin_java.sh")
@@ -146,13 +146,13 @@ task generateJdkRpm(type: Rpm) {
// See https://github.com/corretto/corretto-11/issues/129
from("${jdkBinaryDir}/legal") {
into "${jdkHome}/legal"
- fileMode 0444
+ fileMode = 0444
}
if (!project.excludeReadmeJavaSE) {
from("${jdkBinaryDir}/README.JAVASE") {
into jdkHome
- fileMode 0444
+ fileMode = 0444
}
}
}
diff --git a/installers/linux/universal/tar/build.gradle b/installers/linux/universal/tar/build.gradle
index be5be844e38..0480a6a34c9 100644
--- a/installers/linux/universal/tar/build.gradle
+++ b/installers/linux/universal/tar/build.gradle
@@ -121,9 +121,9 @@ task bundleThirdPartyBinaries {
task packageTestImage(type: Tar) {
dependsOn createTestImage
- description 'Package test results'
- archiveName "${project.correttoTestImageArchiveName}.tar.gz"
- compression Compression.GZIP
+ description = 'Package test results'
+ archiveFileName = "${project.correttoTestImageArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(testResultingImage) {
include '**'
}
@@ -131,10 +131,10 @@ task packageTestImage(type: Tar) {
}
task packageDebugSymbols(type: Tar) {
- description 'Package debug results'
+ description = 'Package debug results'
dependsOn packageTestImage
- archiveName "${project.correttoDebugSymbolsArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoDebugSymbolsArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(jdkResultingImage) {
include 'bin/*.diz'
include 'lib/*.diz'
@@ -144,11 +144,11 @@ task packageDebugSymbols(type: Tar) {
}
task packageBuildResults(type: Tar) {
- description 'Compresses the JDK image and puts the results in build/distributions.'
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
dependsOn packageDebugSymbols
dependsOn bundleThirdPartyBinaries
- archiveName "${project.correttoJdkArchiveName}.tar.gz"
- compression Compression.GZIP
+ archiveFileName = "${project.correttoJdkArchiveName}.tar.gz"
+ compression = Compression.GZIP
from(buildRoot) {
include project.rootFiles
into project.correttoJdkArchiveName
@@ -169,7 +169,7 @@ task packageBuildResults(type: Tar) {
// See https://github.com/corretto/corretto-11/issues/129
from("${jdkResultingImage}/legal") {
include '**'
- fileMode 0444
+ fileMode = 0444
into "${project.correttoJdkArchiveName}/legal"
}
}
pkgs/development/libraries/libva/utils.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
version = "2.22.0";
version = "2.23.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
sha256 = "sha256-CmhdhNNRO2j8lH7awp9YiKWMvV17GTBsXdrNY06jT2w=";
sha256 = "sha256-losxOPCrLCjtRKJ8RuwkjRllYYtJluKhscNfdxpC/xg=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-matter-server/default.nix
+8 -11
View File
@@ -7,6 +7,7 @@
replaceVars,
buildNpmPackage,
python,
home-assistant-chip-wheels,
# build
setuptools,
@@ -36,31 +37,27 @@
}:
let
version = "8.1.1";
version = "8.1.2";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "python-matter-server";
tag = version;
hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA=";
hash = "sha256-vnI57h/aesnaDYorq1PzcMCLmV0z0ZBJvMg4Nzh1Dtc=";
};
paaCerts = stdenvNoCC.mkDerivation rec {
paaCerts = stdenvNoCC.mkDerivation {
pname = "matter-server-paa-certificates";
version = "1.4.0.0";
inherit (home-assistant-chip-wheels) version src;
src = fetchFromGitHub {
owner = "project-chip";
repo = "connectedhomeip";
rev = "refs/tags/v${version}";
hash = "sha256-uJyStkwynPCm1B2ZdnDC6IAGlh+BKGfJW7tU4tULHFo=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp $src/credentials/development/paa-root-certs/* $out/
cp connectedhomeip/credentials/development/paa-root-certs/* $out/
runHook postInstall
'';
pkgs/development/python-modules/teslemetry-stream/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "teslemetry-stream";
version = "0.7.10";
version = "0.8.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Teslemetry";
repo = "python-teslemetry-stream";
tag = "v${version}";
hash = "sha256-2ZKoDb5ZKo27qHTyUmyDa2LlhcyJTkQByrJotY/qw4o=";
hash = "sha256-R3POLWYSinnFbmy80XWreAhTOojd8Kr8UL709rOoOto=";
};
build-system = [ setuptools ];
pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+5 -5
View File
@@ -48,9 +48,9 @@
};
cmake = {
version = "0.7.1";
version = "0.7.2";
url = "github:uyha/tree-sitter-cmake";
hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";
hash = "sha256-mR+gA7eWigC2zO1gMHzOgRagsfK1y/NBsn3mAOqR35A=";
};
comment = {
@@ -603,9 +603,9 @@
};
slint = {
version = "0-unstable-2025-07-13";
url = "github:slint-ui/tree-sitter-slint/96bc969d20ff347030519184ea2467f4046a524d";
hash = "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=";
version = "0-unstable-2025-12-09";
url = "github:slint-ui/tree-sitter-slint/10fb0f188d7950400773c06ba6c31075866e14bf";
hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
};
smithy = {
pkgs/os-specific/linux/kernel/common-config.nix
+10 -4
View File
@@ -561,16 +561,17 @@ let
# Enable CEC over DisplayPort
DRM_DP_CEC = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
# Required for Nova
# FIXME: remove after https://gitlab.freedesktop.org/drm/rust/kernel/-/commit/3d3352e73a55a4ccf110f8b3419bbe2fbfd8a030 lands
RUST_FW_LOADER_ABSTRACTIONS = whenAtLeast "6.12" yes;
}
//
lib.optionalAttrs
(stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")
{
# Enable Hyper-V guest stuff
HYPERV = lib.mkMerge [
(whenOlder "6.18" module)
(whenAtLeast "6.18" yes)
];
HYPERV = whenAtLeast "6.18" yes;
# Enable Hyper-V Synthetic DRM Driver
DRM_HYPERV = whenAtLeast "5.14" module;
# And disable the legacy framebuffer driver when we have the new one
@@ -931,6 +932,7 @@ let
BPF_EVENTS = yes;
FUNCTION_PROFILER = yes;
RING_BUFFER_BENCHMARK = no;
FUNCTION_GRAPH_RETVAL = whenAtLeast "6.5" yes;
};
perf = {
@@ -1407,6 +1409,10 @@ let
# Enable generic kernel watch queues
# See https://docs.kernel.org/core-api/watch_queue.html
WATCH_QUEUE = yes;
# Enable coreboot firmware drivers.
# While these are called CONFIG_GOOGLE_*, they apply to coreboot systems in general.
GOOGLE_FIRMWARE = yes;
}
//
lib.optionalAttrs
pkgs/os-specific/linux/kernel/kernels-org.json
+8 -8
View File
@@ -1,7 +1,7 @@
{
"testing": {
"version": "6.18-rc7",
"hash": "sha256:03k1kj4bqg3bn0p4lzkbz0yqj1p50v2yr94lrld8rrkbwdawxx3r",
"version": "6.19-rc1",
"hash": "sha256:1jfcm4m2xbglirn8qdvhb3675fln9cjfva3v9hhs6a4qqqx2396f",
"lts": false
},
"6.1": {
@@ -25,18 +25,18 @@
"lts": true
},
"6.12": {
"version": "6.12.62",
"hash": "sha256:04rcnr7bgrqqfj62l31mxx553bjdalr5f46xjbcmvawgmj2wdqhk",
"version": "6.12.63",
"hash": "sha256:1cvxvwlmnqw71nf6nizf0hpp710a8dsczz5bjwy3i55qwkzwa0lm",
"lts": true
},
"6.17": {
"version": "6.17.12",
"hash": "sha256:1mlqirjzyx3zvvm87gf7slj2d5gdpp13vw91dgbfk54iz6b08y22",
"version": "6.17.13",
"hash": "sha256:1fgdy9j90yfd4c2yqdciasdhda14pbfrpzkgriin2r6i7bf04s0i",
"lts": false
},
"6.18": {
"version": "6.18.1",
"hash": "sha256:1m955svk1sfmhpw5wpkhg1dpnxmwsnpdqnivmw8alaniy3rqp9yh",
"version": "6.18.2",
"hash": "sha256:0smrmbnlhfivw2kx689wd52aff80gf0gw9wqz4s2nja9nyx6p32m",
"lts": false
}
}
pkgs/servers/home-assistant/custom-components/frigate/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
buildHomeAssistantComponent rec {
owner = "blakeblackshear";
domain = "frigate";
version = "5.11.0";
version = "5.13.0";
src = fetchFromGitHub {
owner = "blakeblackshear";
repo = "frigate-hass-integration";
tag = "v${version}";
hash = "sha256-cXjf5e4gbkvRS43xnpmL1lSaSvhts4eMetEqTP/RCOo=";
hash = "sha256-etYPrWa4xzfFm1QQuxh+rJqeoQ3P/nITM6GxJA/tPAA=";
};
dependencies = [ hass-web-proxy-lib ];
pkgs/top-level/all-packages.nix
+2
View File
@@ -1056,6 +1056,8 @@ with pkgs;
}
);
htop-vim = htop.override { withVimKeys = true; };
inherit (callPackages ../tools/networking/iroh/default.nix { })
iroh-relay
iroh-dns-server