Merge branch 'master' into all-contributors/add-Varadraj75

Author: jonaslagoni

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:16.0.1-jdk-slim-buster
+FROM eclipse-temurin:17-jdk-jammy
 
 # Install updates
 RUN apt-get update -yq \
@@ -17,16 +17,14 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 
 # Install dotnet SDK
 RUN apt install apt-transport-https dirmngr gnupg ca-certificates -yq  \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-    && echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
     && apt update -yq  \
     && apt install mono-devel -yq
 
 # Install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 # Install Python
-RUN apt-get install -yq python
+RUN apt-get install -yq python3 python-is-python3
 
 # Install Kotlin
 RUN apt install -yq wget unzip  \
@@ -37,10 +35,8 @@ RUN apt install -yq wget unzip  \
 ENV PATH $PATH:/usr/lib/kotlinc/bin
 
 # Install PHP
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-    && echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list \
-    && apt-get update -yq \
-    && apt-get install -y php8.2
+RUN apt-get update -yq \
+    && apt-get install -yq php php-cli php-common php-xml php-mbstring php-curl
 
 # Setup library
-RUN apt-get install -yq chromium
+RUN apt-get install -yq chromium-browser

modelina-cli/package-lock.json

@@ -5,7 +5,6 @@ import { FormatHelpers } from '../../helpers/FormatHelpers';
 import {
   deriveCopy,
   deriveHash,
-  derivePartialEq,
   deriveEq,
   derivePartialOrd,
   deriveOrd
@@ -37,16 +36,20 @@ export abstract class RustRenderer<
   }
 
   renderMacro(model: ConstrainedMetaModel): string {
-    const derive: string[] = ['Serialize', 'Deserialize', 'Clone', 'Debug'];
+    const derive: string[] = [
+      'Serialize',
+      'Deserialize',
+      'Clone',
+      'Debug',
+      'PartialEq'
+    ];
+
     if (deriveHash(model)) {
       derive.push('Hash');
     }
     if (deriveCopy(model)) {
       derive.push('Copy');
     }
-    if (derivePartialEq(model)) {
-      derive.push('PartialEq');
-    }
     if (deriveEq(model)) {
       derive.push('Eq');
     }
@@ -56,6 +59,7 @@ export abstract class RustRenderer<
     if (deriveOrd(model)) {
       derive.push('Ord');
     }
+
     derive.sort();
     return `#[derive(${derive.join(', ')})]`;
   }