libeufin: 0.9.3-dev.33 -> 0.11.2 (#271)

ngi-nix · Jun 7, 2024 · bdfc332 · bdfc332
1 parent 881d957
commit bdfc332
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 129 deletions.
diff --git a/pkgs/by-name/libeufin/deps/artifacts.nix b/pkgs/by-name/libeufin/deps/artifacts.nix
@@ -1,111 +1,118 @@
 [
+  # Iteration 1
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-call-logging-jvm/2.3.6/ktor-server-call-logging-jvm-2.3.6.jar";
-    sha256 = "sha256-2+0JE/yoKag8d8N2sfqRatXffpGn2pfvK/NINMgp4CQ=";
+    url = "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.12.7/jackson-databind-2.12.7.jar";
+    sha256 = "sha256-TtUCCKdkNH+4bnkwXTuRxopSMrIrdjIUaD2wfYi2xoc=";
   }
+  # Iteration 2
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-cors-jvm/2.3.6/ktor-server-cors-jvm-2.3.6.jar";
-    sha256 = "sha256-XLMYHGDhdKZp4D66H4F+IXpgvEtPvzfiTmK9fRVdsQw=";
+    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.10/kotlin-stdlib-common-1.9.10.jar";
+    sha256 = "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=";
+  }
+  {
+    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.19.0/atomicfu-0.19.0.jar";
+    sha256 = "sha256-BAJqx3zvZEde/enCOFVT8wRc2YoMmTS6u8wX293t9Xc=";
   }
+  # Iteration 3
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-content-negotiation-jvm/2.3.6/ktor-server-content-negotiation-jvm-2.3.6.jar";
-    sha256 = "sha256-8MKiz4jyiUBSJ0tN3ADbZk2pvDmRjuVxm8jVyepIcVk=";
+    url = "https://repo.maven.apache.org/maven2/com/github/ajalt/clikt/clikt-jvm/4.2.2/clikt-jvm-4.2.2.jar";
+    sha256 = "sha256-DEkQ6MU/TtWj11g0+RcrnrGcfDAL4vFljvgKiRdWLjE=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-status-pages-jvm/2.3.6/ktor-server-status-pages-jvm-2.3.6.jar";
-    sha256 = "sha256-t+5eJAjoPi5+SiErANGoUiYV4JPZaUSINI/mk3rez5g=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-call-logging-jvm/2.3.9/ktor-server-call-logging-jvm-2.3.9.jar";
+    sha256 = "sha256-8ReX1t//aPCf/ZIIWS6DZG8u4tFmn50dj5bNEn1UbEU=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-test-host-jvm/2.3.6/ktor-server-test-host-jvm-2.3.6.jar";
-    sha256 = "sha256-hrtQZChQiW2Io+VGGv3CcmTMKn5DR9i/CCSum8brQrQ=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-cors-jvm/2.3.9/ktor-server-cors-jvm-2.3.9.jar";
+    sha256 = "sha256-VQPmblnQ7lMqTPylNPXq3U4Py8NNrPVl9gwWUl9bqlk=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-host-common-jvm/2.3.6/ktor-server-host-common-jvm-2.3.6.jar";
-    sha256 = "sha256-q8FRK1MwK4/J3I2fDKGYZrXjjYduo9gVCF7uqvfal4s=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-content-negotiation-jvm/2.3.9/ktor-server-content-negotiation-jvm-2.3.9.jar";
+    sha256 = "sha256-9KdgPmXbnRtkXOQz2XHQxAc3umraSs9DZFaEJw8dAO8=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-core-jvm/2.3.6/ktor-server-core-jvm-2.3.6.jar";
-    sha256 = "sha256-UNG4jOCN5nOn4gvJ+LCU+MSi4lPTh8vjdiqIgwf8Uz0=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-status-pages-jvm/2.3.9/ktor-server-status-pages-jvm-2.3.9.jar";
+    sha256 = "sha256-n3Lh38EPziT/6vWd+67e1YTo6zxeTKd/cD4zUFsw7iQ=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-netty-jvm/2.3.6/ktor-server-netty-jvm-2.3.6.jar";
-    sha256 = "sha256-mpZbiQdcyn15humQi8qUBvK/nySUIQRJTj8i1YahFMI=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-forwarded-header-jvm/2.3.9/ktor-server-forwarded-header-jvm-2.3.9.jar";
+    sha256 = "sha256-/IoV82DN/+/ywjgP9rZILCLgAEPg4Jcpqj/VZm7xXj4=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-serialization-kotlinx-json-jvm/2.3.6/ktor-serialization-kotlinx-json-jvm-2.3.6.jar";
-    sha256 = "sha256-E9rhtl841ROH5xaro1/EQ/MDipJkpB5KmJI8L8/ssAQ=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-test-host-jvm/2.3.9/ktor-server-test-host-jvm-2.3.9.jar";
+    sha256 = "sha256-PfVriXUzxE7cOQd4DoK5kjiuwZUveoW0Bhje+LWkXps=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-serialization-kotlinx-json/2.3.6/ktor-serialization-kotlinx-json-2.3.6.jar";
-    sha256 = "sha256-yV9zY97ZcooTqT7WWOl1IRtBhPC4+cF8Kbz3WqM+sBA=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-host-common-jvm/2.3.9/ktor-server-host-common-jvm-2.3.9.jar";
+    sha256 = "sha256-ZnjXBW4NHIGuejYjV1WnQifdwJ2/ZYf4bsiJtOSEzSo=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-client-cio-jvm/2.3.6/ktor-client-cio-jvm-2.3.6.jar";
-    sha256 = "sha256-HRkrjyUR+7vBmmALl2AAW/JnF6I2FpB4ARqUREXL8Zk=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-core-jvm/2.3.9/ktor-server-core-jvm-2.3.9.jar";
+    sha256 = "sha256-e9modsIMbJSlqOQtavgrBZP6B0YeQPIEkKAeYPgoqO4=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-client-core-jvm/2.3.6/ktor-client-core-jvm-2.3.6.jar";
-    sha256 = "sha256-F8RqVqEoxU3JiRYL1th7UQHoxkuAGpG05DMuwpmw68s=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-server-netty-jvm/2.3.9/ktor-server-netty-jvm-2.3.9.jar";
+    sha256 = "sha256-FntLW+0rNoGKJj0F1qpLD4Bv/Ic7ToJQmMh1Z9XeLU0=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-websocket-serialization-jvm/2.3.6/ktor-websocket-serialization-jvm-2.3.6.jar";
-    sha256 = "sha256-UHi9+14OjX/t0PDp0gAfWQkJfyGf6IbmHUoX+d57VG4=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-serialization-kotlinx-json-jvm/2.3.9/ktor-serialization-kotlinx-json-jvm-2.3.9.jar";
+    sha256 = "sha256-8njCQLvzHVd89tlh4pworJXgt8Eadr8HhS6G2aBGV9Q=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-events-jvm/2.3.6/ktor-events-jvm-2.3.6.jar";
-    sha256 = "sha256-0RummxrxV7hz4nNHnrKRz4zY/R0Efi0z4w4+rO1RlFI=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-serialization-kotlinx-jvm/2.3.9/ktor-serialization-kotlinx-jvm-2.3.9.jar";
+    sha256 = "sha256-euEM1OzG2axbSaE9LVS+nEWSwU57m/TagGfkeGW+L2g=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-websockets-jvm/2.3.6/ktor-websockets-jvm-2.3.6.jar";
-    sha256 = "sha256-vTxhH8EYZc5QqoPKx3hApDVNqCevbT+GJHKrLseTYRU=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-client-cio-jvm/2.3.9/ktor-client-cio-jvm-2.3.9.jar";
+    sha256 = "sha256-SuFHjJWrOAnjrMkuwBNx4sqWKUnuFNm1VvbBmlr+Rdo=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-http-cio-jvm/2.3.6/ktor-http-cio-jvm-2.3.6.jar";
-    sha256 = "sha256-rbVL7tt2UPJV+7wzxklpnxBBZAsKek3B2TJtGL+n4WE=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-client-core-jvm/2.3.9/ktor-client-core-jvm-2.3.9.jar";
+    sha256 = "sha256-eMjFnRnlvx27SOI4svssmOtn2MSyh97Xa8fwmJFhpHw=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-network-tls-jvm/2.3.6/ktor-network-tls-jvm-2.3.6.jar";
-    sha256 = "sha256-elp6iWFcH9voEKN3BywJyRxa5x7+PfE4QaNTAFh04mU=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-websocket-serialization-jvm/2.3.9/ktor-websocket-serialization-jvm-2.3.9.jar";
+    sha256 = "sha256-jBCWBmWwSj67G/c3tYz/bWV58vHKKUtQdPO1buewn3c=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-http-jvm/2.3.6/ktor-http-jvm-2.3.6.jar";
-    sha256 = "sha256-N0avjwFDE7/7BwENwZ/xqRXW7Sb2ww+kpIiH8AGAe0Q=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-serialization-jvm/2.3.9/ktor-serialization-jvm-2.3.9.jar";
+    sha256 = "sha256-NMC5ioiIY7KVWZWB1aTSgRaeLwIePRX8CVAkEzg24q8=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-test-dispatcher-jvm/2.3.6/ktor-test-dispatcher-jvm-2.3.6.jar";
-    sha256 = "sha256-C8nubEVHNSgcVzgHL9bU5tq7nHmHqqokDwltUuZ4SDo=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-events-jvm/2.3.9/ktor-events-jvm-2.3.9.jar";
+    sha256 = "sha256-QGw59U3lHZQ+8LTcLthWTh2dAvoBXeL6BWI4AML2HIM=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-network-jvm/2.3.6/ktor-network-jvm-2.3.6.jar";
-    sha256 = "sha256-GzefLtjx6jj2U4yf0EaMY1Sv/Z70uLU38bAv+Ma9/zE=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-websockets-jvm/2.3.9/ktor-websockets-jvm-2.3.9.jar";
+    sha256 = "sha256-rlniIJf1vDfrBWpf4NarGVKiVGjVfuSNCKlTsEmsOMo=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-utils-jvm/2.3.6/ktor-utils-jvm-2.3.6.jar";
-    sha256 = "sha256-AI2ez6gSg9XvoGyO8zlrGSvLrBcETG+NbzGeMP4fyyM=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-http-cio-jvm/2.3.9/ktor-http-cio-jvm-2.3.9.jar";
+    sha256 = "sha256-rgF0pMgUvtrXgVgRUwvo9q748C9DobzDQFdJ545M0nE=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-io-jvm/2.3.6/ktor-io-jvm-2.3.6.jar";
-    sha256 = "sha256-782fRFGsgA6eQALr11j2Yn/0/oTLnoCoxiIgkE0kQCE=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-network-tls-jvm/2.3.9/ktor-network-tls-jvm-2.3.9.jar";
+    sha256 = "sha256-LZZLZ9uwkrzDdTBH1kMlYOWLCmiG4rA57jG4c3y/Fb0=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-client-apache-jvm/2.3.6/ktor-client-apache-jvm-2.3.6.jar";
-    sha256 = "sha256-Ww2uKnJDUqSslSjsKYaoHdPMoJcCgJlZ20YsN8qm8vg=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-http-jvm/2.3.9/ktor-http-jvm-2.3.9.jar";
+    sha256 = "sha256-dqYd7yephR18Yt14IeKf+a+ipj1INBW9FkMj3n7jSeE=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20/kotlin-stdlib-jdk7-1.8.20.jar";
-    sha256 = "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-test-dispatcher-jvm/2.3.9/ktor-test-dispatcher-jvm-2.3.9.jar";
+    sha256 = "sha256-hy09SmOD6qA+O1szMJuP7MFKPGsK7bqPVtgLwy0OyYM=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20/kotlin-stdlib-jdk8-1.8.20.jar";
-    sha256 = "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-network-jvm/2.3.9/ktor-network-jvm-2.3.9.jar";
+    sha256 = "sha256-VUVPmTFzkbxW3l4lhpKWw4KTCgrqpolfeozdCdV0Lws=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-slf4j/1.7.1/kotlinx-coroutines-slf4j-1.7.1.jar";
-    sha256 = "sha256-+7QMp+VaeAF/6siXGAvmT1YqLreBxqP2ybsv+I2SIj8=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-utils-jvm/2.3.9/ktor-utils-jvm-2.3.9.jar";
+    sha256 = "sha256-mH/r2kVD7/sdDg1ZBbLut7t3fJ9DLjnRIkFTxcbyNfE=";
   }
   {
-    url = "https://repo.maven.apache.org/maven2/com/github/ajalt/clikt/clikt-jvm/4.2.1/clikt-jvm-4.2.1.jar";
-    sha256 = "sha256-799fw436KVOi4Zlc7LoNwoGqs1OF1ZX+BCFVFYxhZH8=";
+    url = "https://repo.maven.apache.org/maven2/io/ktor/ktor-io-jvm/2.3.9/ktor-io-jvm-2.3.9.jar";
+    sha256 = "sha256-SevXoWUuOsqfBGLQVK90nd+tj2z1q3LViiw3nLTwFQE=";
   }
   {
     url = "https://repo.maven.apache.org/maven2/com/github/ajalt/mordant/mordant-jvm/2.2.0/mordant-jvm-2.2.0.jar";
@@ -119,12 +126,9 @@
     url = "https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.5.2/markdown-0.5.2.jar";
     sha256 = "sha256-HGsba7nOgwSLhkiZCsHTQnv6z+vI5Y4y7pBD3dDcOio=";
   }
+  # Iteration 4
   {
-    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.10/kotlin-stdlib-common-1.9.10.jar";
-    sha256 = "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=";
-  }
-  {
-    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.19.0/atomicfu-0.19.0.jar";
-    sha256 = "sha256-BAJqx3zvZEde/enCOFVT8wRc2YoMmTS6u8wX293t9Xc=";
+    url = "https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-slf4j/1.7.1/kotlinx-coroutines-slf4j-1.7.1.jar";
+    sha256 = "sha256-+7QMp+VaeAF/6siXGAvmT1YqLreBxqP2ybsv+I2SIj8=";
   }
 ]
diff --git a/pkgs/by-name/libeufin/deps/default.nix b/pkgs/by-name/libeufin/deps/default.nix
@@ -6,10 +6,7 @@
   src,
   patches,
   gradle,
-  fetchurl,
   stdenv,
-  fetchgit,
-  writeText,
   symlinkJoin,
   perl,
   callPackage,
@@ -32,12 +29,18 @@
         | sh
 
       # Work around naming issues. Remove "-gradleXX" from filename.
-      mv $out/org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.20/kotlin-gradle-plugin-1.9.20{-gradle81,}.jar
-      mv $out/org/jetbrains/kotlin/kotlin-serialization/1.9.20/kotlin-serialization-1.9.20{-gradle81,}.jar
+      mv $out/org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.23/kotlin-gradle-plugin-1.9.23{-gradle82,}.jar
+      mv $out/org/jetbrains/kotlin/kotlin-serialization/1.9.23/kotlin-serialization-1.9.23{-gradle82,}.jar
     '';
-    outputHashMode = "recursive";
-    outputHash = "sha256-0zHxaLGuRxvswtcd5LQpDS56cizygnT92KteEO8UWR4=";
     outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash =
+      {
+        aarch64-linux = "sha256-bP38VcA6HxgkuXUUiQxXiGBgk9A+/jcMlpK1Z1Edo/0=";
+        x86_64-linux = "sha256-ir5fC6EJKoyvyDsBLdKt/7Wb9nhVFWTW4XBUTYIJZy8=";
+      }
+      .${stdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
   # For dependencies that are still missing, we fetch them individually from Maven
   artifactsMeta = import ./artifacts.nix;

diff --git a/pkgs/by-name/libeufin/package.nix b/pkgs/by-name/libeufin/package.nix
@@ -6,24 +6,22 @@
   python3,
   jdk17_headless,
   gradle-packages,
-  perl,
   writeText,
-  git,
 }: let
   pname = "libeufin";
-  version = "0.9.3-dev.33";
+  version = "0.11.2";
   src = fetchgit {
     url = "https://git.taler.net/libeufin.git/";
     rev = "v${version}";
-    hash = "sha256-BGxlmK4u914byOt/4FGnw5wGZtxhQmfhQHSJY+C8YqY=";
+    hash = "sha256-7w5G8F/XWsWJwkpQQ8GqDA9u6HLV+X9N2RJHn+yXihs=";
     fetchSubmodules = true;
     leaveDotGit = true; # Required for correct submodule fetching
     # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules)
     # Save the HEAD short commit hash in a file so it can be retrieved later for versioning.
     postFetch = ''
       (
         cd $out
-        git rev-parse --short HEAD > ./util/src/main/resources/HEAD.txt
+        git rev-parse --short HEAD > ./common/src/main/resources/HEAD.txt
         rm -rf .git
       )
     '';

diff --git a/pkgs/by-name/libeufin/read-HEAD-hash-from-file.patch b/pkgs/by-name/libeufin/read-HEAD-hash-from-file.patch
@@ -11,7 +11,7 @@ index 632f7c52..9cd52a1e 100644
      exec {
 -        commandLine 'git', 'rev-parse', '--short', 'HEAD'
 +        // Generated during src.postFetch
-+        commandLine 'cat', "${projectDir}/util/src/main/resources/HEAD.txt"
++        commandLine 'cat', "${projectDir}/common/src/main/resources/HEAD.txt"
          standardOutput = stdout
      }
      def gitHash = stdout.toString().trim()