Unverified Commit 524488f4 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

pkl: 0.29.1 -> 0.31.1 (#494791)

parents ffc18bfa c1eb08d0

pkgs/by-name/pk/pkl/deps.json

+1211 −359

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/pk/pkl/package.nix

+17 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  gradle,

  gradle_9,

  temurin-bin-21,

  kotlin,

  nix-update-script,
@@ -12,18 +12,19 @@ 
}:

let

  jdk = temurin-bin-21;

  gradle = gradle_9;

  gradleOverlay = gradle.override { java = jdk; };

  kotlinOverlay = kotlin.override { jre = jdk; };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "pkl";

  version = "0.29.1";

  version = "0.31.1";



  src = fetchFromGitHub {

    owner = "apple";

    repo = "pkl";

    tag = finalAttrs.version;

    hash = "sha256-vel4Il/muHd4wqV5tfMPwBHoxgei8vPcnk2kS2/XG3I=";

    hash = "sha256-6oY1F1I6xDq8TzYCOGi2Mc+nm/mxc13G/rvjJx4twLQ=";

    leaveDotGit = true;

    postFetch = ''

      pushd $out
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (replaceVars ./fix_kotlin_classpath.patch { gradle = gradle.unwrapped; })

    ./disable_gradle_codegen_tests.patch

    ./disable_bad_tests.patch

    ./repair_org.msgpack-msgpack-core_lockfiles.patch

  ];



  nativeBuildInputs = [
@@ -52,11 +54,22 @@ stdenv.mkDerivation (finalAttrs: { 
    data = ./deps.json;

  };



  doCheck = !(stdenv.hostPlatform.isDarwin);

  # On aarch64-darwin, no artifact for idea:ideaIC:2025.2.3 is available

  doCheck = !(stdenv.hostPlatform.isDarwin) && !(stdenv.hostPlatform.isAarch64);



  # build only the cli binary to work around this issue:

  # "Failed to query the value of task ':pkl-internal-intellij-plugin:initializeIntellijPlatformPlugin' property 'latestPluginVersion'."

  gradleBuildTask = "pkl-cli:build";



  gradleFlags = [

    "-x"

    "spotlessCheck"

    # disable the checks to work around this issue:

    # Could not determine the dependencies of task ':pkl-cli:check'.

    # > Could not create task ':pkl-cli:testStartJavaExecutableJdk17'.

    #    > Cannot find a Java installation on your machine (Linux 6.18.13 amd64) matching: {languageVersion=17, vendor=any vendor, implementation=vendor-specific, nativeImageCapable=false}. Toolchain auto-provisioning is not enabled.

    "-x"

    "check"

    "-DreleaseBuild=true"

    "-Dorg.gradle.java.home=${jdk}"

    "-Porg.gradle.java.installations.auto-download=false"

pkgs/by-name/pk/pkl/repair_org.msgpack-msgpack-core_lockfiles.patch

0 → 100644
+52 −0
Original line number Diff line number Diff line 
From daede858a1568224b06033b256300c8f86db973e Mon Sep 17 00:00:00 2001

From: Matei Dibu <contact@mateidibu.dev>

Date: Fri, 27 Feb 2026 14:13:40 +0200

Subject: [PATCH] fix: repair org.msgpack:msgpack-core lockfiles



---

 pkl-commons-test/gradle.lockfile  | 2 +-

 pkl-config-java/gradle.lockfile   | 2 +-

 pkl-config-kotlin/gradle.lockfile | 2 +-

 3 files changed, 3 insertions(+), 3 deletions(-)



diff --git a/pkl-commons-test/gradle.lockfile b/pkl-commons-test/gradle.lockfile

index a1c9514e..a9021ca2 100644

--- a/pkl-commons-test/gradle.lockfile

+++ b/pkl-commons-test/gradle.lockfile

@@ -47,6 +47,6 @@ org.junit.platform:junit-platform-commons:1.14.0=apiDependenciesMetadata,compile

 org.junit.platform:junit-platform-engine:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath

 org.junit:junit-bom:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

-org.msgpack:msgpack-core:0.9.8=compileClasspath

+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile

index fa2fbd37..ebf64def 100644

--- a/pkl-config-java/gradle.lockfile

+++ b/pkl-config-java/gradle.lockfile

@@ -79,7 +79,7 @@ org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplem

 org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath

 org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath

 org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

-org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,pklCodegenJava,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.organicdesign:Paguro:3.10.3=pklCodegenJava,runtimeClasspath,testRuntimeClasspath

 org.snakeyaml:snakeyaml-engine:2.10=pklCodegenJava,runtimeClasspath,testRuntimeClasspath

diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile

index 2bdeb136..0fd4d516 100644

--- a/pkl-config-kotlin/gradle.lockfile

+++ b/pkl-config-kotlin/gradle.lockfile

@@ -78,7 +78,7 @@ org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplem

 org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath

 org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath

 org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

-org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

 org.organicdesign:Paguro:3.10.3=pklCodegenKotlin,testRuntimeClasspath

 org.snakeyaml:snakeyaml-engine:2.10=pklCodegenKotlin,testRuntimeClasspath

-- 

2.53.0