Unverified Commit d57e4a39 authored by Tomodachi94's avatar Tomodachi94 Committed by GitHub
Browse files

fastddsgen: 4.2.0 -> 4.3.0, drop patches (#494895)

parents 8f5d7234 b89cc44f

pkgs/by-name/fa/fastddsgen/493-addendum.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
    Fix gradle error

    

    https://docs.gradle.org/9.1.0/userguide/validation_problems.html#private_method_must_not_be_annotated



diff --git a/build.gradle b/build.gradle

index c6d537e..9029aae 100644

--- a/build.gradle

+++ b/build.gradle

@@ -69,7 +69,7 @@ public abstract class InstallPath extends DefaultTask {

      * Install Task Action that copies the script and jar files

      */

     @TaskAction

-    private void install() {

+    public void install() {

         if (Os.isFamily(Os.FAMILY_WINDOWS)) {

             final String install_path = (path != null && !path.isEmpty()) ? path : "C:\\Program Files\\fastddsgen\\";

pkgs/by-name/fa/fastddsgen/deps.json

+58 −33
Original line number Diff line number Diff line
@@ -21,44 +21,69 @@ 
   "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=",

   "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU="

  },

  "org/antlr#antlr4-master/4.13.0": {

   "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8="

  },

  "org/antlr#antlr4-runtime/4.13.0": {

   "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=",

   "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8="

  },

  "org/antlr#antlr4/4.13.0": {

   "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=",

   "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k="

  },

  "org/apiguardian#apiguardian-api/1.1.0": {

   "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=",

   "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE="

  },

  "org/junit/jupiter#junit-jupiter-api/5.5.2": {

   "jar": "sha256-JJov29OTGYfAKY0AygjtJISW4PwR4EY8CMT4LgzHmxw=",

   "pom": "sha256-dqFdgNhYehpaOlsULSzrNzBPvZEZi6QlSG5X920IiGA="

  },

  "org/junit/jupiter#junit-jupiter-engine/5.5.2": {

   "jar": "sha256-bXd9qYduLvegM26PCY+NdKWmT4EKo6Si9fO3Zs6Xg3s=",

   "pom": "sha256-Ay/vTiVjCE05fq5IGjiAEPRDQBr2JSv9N312MH9vi/4="

  },

  "org/junit/platform#junit-platform-commons/1.5.2": {

   "jar": "sha256-/ESv38DyDIXnGmbnlDKBrvO8Hg/WLS1po2y2kB5oLBA=",

   "pom": "sha256-O9DU3tYyqK+MpYf7Z2QBnedxsda8uJrNViQ1oQCfqto="

  },

  "org/junit/platform#junit-platform-engine/1.5.2": {

   "jar": "sha256-/yC6StjADvF7rvnFVRL5wC2aaHQPfxrAGppqoCOZMfg=",

   "pom": "sha256-LUuVVVwh4IXrwd299C156x1VZA3Bk7G35hACQP0vGJ8="

  "org/antlr#antlr4-master/4.13.2": {

   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="

  },

  "org/antlr#antlr4-runtime/4.13.2": {

   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",

   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="

  },

  "org/antlr#antlr4/4.13.2": {

   "jar": "sha256-5vCxDSrSBvM4r+FoZ/xHFItnKdbjomDqKDebkfA6Nlc=",

   "pom": "sha256-gJ7klwbc42dJiLq/ytNrPFoOL9XPoKUSCRA5Y+hXJhs="

  },

  "org/apiguardian#apiguardian-api/1.1.2": {

   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",

   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",

   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="

  },

  "org/junit#junit-bom/5.14.1": {

   "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",

   "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="

  },

  "org/junit/jupiter#junit-jupiter-api/5.14.1": {

   "jar": "sha256-FvFvDDwe+XrbgwSEGUZp7ZaDtDTObzj+OgG9KQaubFk=",

   "module": "sha256-HqGu5CCahEG/xHY0pqTWaNN/EHLJwk1y4znUcSjmHaI=",

   "pom": "sha256-l4D8P9mTDQcs9gyFmJl286lLgBStYZGLdQqMiPG3THM="

  },

  "org/junit/jupiter#junit-jupiter-engine/5.14.1": {

   "jar": "sha256-30SqGNBc7RP6aDbKIUwiTK8//95N8g6c5936+1ydAvg=",

   "module": "sha256-5atm8Uf7UmGRL5hwCi+EbAUqGumalvqK25oF+JzuajE=",

   "pom": "sha256-tEleIOlqHWjoGA7m2QCdJ8QujM8zUr2X3QGe87VZGxw="

  },

  "org/junit/jupiter#junit-jupiter-params/5.14.1": {

   "jar": "sha256-wHbjII28Ix0et+LZaVeMMUwWWPoaKcyPBEfIBPKTJ/o=",

   "module": "sha256-/LLdLoK/0NxV5iKeEF6APkq0s7khNi7nbyMT0Lf2vUc=",

   "pom": "sha256-UpQwRppD+ZAI/Em4+p8CjYa+aWvqubNt3rOqleGdBrY="

  },

  "org/junit/jupiter#junit-jupiter/5.14.1": {

   "jar": "sha256-S7MGsRm8a4fIdNXOuqJajClWslSMsMakHop1a9HcYyc=",

   "module": "sha256-aATtQZjfYJXpg3OSCieY4Xrh4JLqyLzHco1KjGuX3Ss=",

   "pom": "sha256-JgudHCrOu1X3sOutbcSgD4JpT030o4DGgMLDt4clJmY="

  },

  "org/junit/platform#junit-platform-commons/1.14.1": {

   "jar": "sha256-OaHyR6ujNGvgtORtuzwJAxwM/K0RHX2ZBHlbkX6MHHo=",

   "module": "sha256-SuQSly6ZIp5QFsuYmrio5gGHRdA4kM7DfcBAr4f0dIA=",

   "pom": "sha256-AFNyKBaiOCD49xkGajg8/6LbksfbUhEok8nEc790Bhg="

  },

  "org/junit/platform#junit-platform-engine/1.14.1": {

   "jar": "sha256-qJMQ3WndmscDHbmZfcq5oUgVEvpUYHfkIZzvouKH68c=",

   "module": "sha256-EyNTFL5HT0GAeK3pdyMBWxaR7uN25Ce+j4GfBUCV5CY=",

   "pom": "sha256-REQYxkZ2Eo3MTsfMtmbIChg3cKXZ8eQ/gxD3kTwR3cA="

  },

  "org/junit/platform#junit-platform-launcher/1.14.1": {

   "jar": "sha256-w6L9iZpsGZZGeIVFD4o5C/XKmaJGG1WJF+OjjXHqB7c=",

   "module": "sha256-eI2j5KuAQTvLYylRt/cNtrhRrynQskIowFIcKue1cAI=",

   "pom": "sha256-5AYKI9RxXTF6it+vKcZC1O+pgxhANROv0u7pklwAJYs="

  },

  "org/openjdk/nashorn#nashorn-core/15.4": {

   "jar": "sha256-b4FuhN/WOoHU6qeCnAgze7r/PsaD/zv2u9kNAXoA3G8=",

   "pom": "sha256-aan3ueR+zPR7vO5yGtT7A5yn2bZQF05thgKq23flrCM="

  },

  "org/opentest4j#opentest4j/1.2.0": {

   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",

   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="

  "org/opentest4j#opentest4j/1.3.0": {

   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",

   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",

   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="

  },

  "org/ow2#ow2/1.5": {

   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="

pkgs/by-name/fa/fastddsgen/package.nix

+5 −25
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  makeWrapper,

  fetchFromGitHub,

  fetchpatch2,

  gradle,

  openjdk,

  testers,
@@ -11,37 +10,18 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "fastddsgen";

  version = "4.2.0";

  version = "4.3.0";



  src = fetchFromGitHub {

    owner = "eProsima";

    repo = "Fast-DDS-Gen";

    tag = "v${finalAttrs.version}";

    # Version 4.3.0 has an extra .0 in the git tag.

    # TODO Remove .0 for later releases if needed.

    tag = "v${finalAttrs.version}.0";

    fetchSubmodules = true;

    hash = "sha256-weGS340MvPitWMgWx1cWTgYgGcQfJSTUus8EcBob7hY=";

    hash = "sha256-yh92JYJFJVp2/rDpz9eAUlNDhtRoRHgCIRYfrADfA/c=";

  };



  patches = [

    # Note: PR is not yet merged

    # Select commit from https://github.com/eProsima/IDL-Parser/pull/179

    (fetchpatch2 {

      url = "https://github.com/eProsima/IDL-Parser/commit/801ed2f671322c0134b8db180529c9a400d5ed2b.patch";

      stripLen = 1;

      extraPrefix = "thirdparty/idl-parser/";

      includes = [ "thirdparty/idl-parser/build.gradle" ];

      hash = "sha256-OzywQ02yaMnya+536DeHWeKwZefI4meYqmZcp3onwR8=";

    })



    # Note: PR is not yet merged

    # Select commit from https://github.com/eProsima/Fast-DDS-Gen/pull/493

    (fetchpatch2 {

      url = "https://github.com/eProsima/Fast-DDS-Gen/commit/b1b66d587f38d4fd6227aa1969c3a10c2095ae7d.patch";

      hash = "sha256-qVp9Xk8og8Ga2BMiqt2BFM0lAtDnmmwzteceievfcXE=";

    })



    ./493-addendum.patch

  ];



  nativeBuildInputs = [

    gradle

    openjdk