Revert "chore: update to autofirma 1.8.3"

This reverts commit 0647459.
nix-community · Jun 18, 2024 · 801bd6b · 801bd6b
1 parent d2209be
commit 801bd6b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 85 deletions.
diff --git a/nix/autofirma/default.nix b/nix/autofirma/default.nix
@@ -12,14 +12,14 @@
   runtimeShell
 }: let
   pname = "autofirma";
-  version = "1.8.3";
+  version = "1.8.2";
   jmulticard-src = stdenv.mkDerivation {
     name = "jmulticard-src";
     src = fetchFromGitHub {
       owner = "ctt-gob-es";
       repo = "jmulticard";
-      rev = "v1.9";
-      hash = "sha256-lMkQ+2oL37voZ7NpsxGJm9qDGWEsi6WQDRy9GFsIX10=";
+      rev = "v1.8";
+      hash = "sha256-sCqMK4FvwRHsGIB6iQVyqrx0+EDiUfQSAsPqmDq2Giw=";
     };
     patches = [
       ./patches/jmulticard/javaversion.patch
@@ -37,12 +37,11 @@
       name = "clienteafirma-external";
       owner = "ctt-gob-es";
       repo = "clienteafirma-external";
-      rev = "c674ad5b07c66907994f63ba73ca61c9c49c8d2c";
-      hash = "sha256-b4z9uDcPj+bBhqB2caaal9vpMErVCHx/IMJKJuhtU2c=";
+      rev = "v1.0.5";
+      hash = "sha256-cCH4iOvtAZ+9VsHG+MrfU5DkJ+cvXZvDTRDIamuBZZw=";
     };
     patches = [
       ./patches/clienteafirma-external/javaversion.patch
-      ./patches/clienteafirma-external/afirma-lib-oro-version.patch
     ];
     dontBuild = true;
     installPhase = ''
@@ -58,15 +57,14 @@
       owner = "ctt-gob-es";
       repo = "clienteafirma";
       rev = "v${version}";
-      hash = "sha256-GQyj3QuWIHTkYwdJ4oKVsG923YG9mCUXfhqdIvEWNMA=";
+      hash = "sha256-YtGtTeWDWwCCIikxs6Cyrypb0EBX2Q2sa3CBCmC6kK8=";
     };
     patches = [
       ./patches/clienteafirma/detect_java_version.patch
       ./patches/clienteafirma/pr-367.patch
       ./patches/clienteafirma/javaversion.patch
       ./patches/clienteafirma/certutilpath.patch
       ./patches/clienteafirma/pom.patch
-      ./patches/clienteafirma/afirma-core-pom.patch
     ];
     dontBuild = true;
     installPhase = ''
@@ -180,7 +178,6 @@
           cp -dpR ${clienteafirma-src} ./clienteafirma
           chmod +w -R clienteafirma
           cd clienteafirma
-
           mvn clean install -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" -Denv=dev -DskipTests
           mvn clean package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" -Denv=install -DskipTests
 
@@ -227,21 +224,20 @@
     startupNotify = true;
     startupWMClass = "autofirma";
   });
-in thisPkg
-# in buildFHSEnv {
-#   name = pname;
-#   inherit meta;
-#   targetPkgs = (pkgs: [
-#     firefox
-#     pkgs.nss
-#   ]);
-#   runScript = lib.getExe thisPkg;
-#   extraInstallCommands = ''
-#     mkdir -p "$out/share/applications"
-#     cp "${desktopItem}/share/applications/"* $out/share/applications
-
-#     mkdir -p $out/etc/firefox/pref
-#     ln -s ${thisPkg}/etc/firefox/pref/AutoFirma.js $out/etc/firefox/pref/AutoFirma.js
-#     ln -s ${thisPkg}/bin/autofirma-setup $out/bin/autofirma-setup
-#   '';
-# }
+in buildFHSEnv {
+  name = pname;
+  inherit meta;
+  targetPkgs = (pkgs: [
+    firefox
+    pkgs.nss
+  ]);
+  runScript = lib.getExe thisPkg;
+  extraInstallCommands = ''
+    mkdir -p "$out/share/applications"
+    cp "${desktopItem}/share/applications/"* $out/share/applications
+
+    mkdir -p $out/etc/firefox/pref
+    ln -s ${thisPkg}/etc/firefox/pref/AutoFirma.js $out/etc/firefox/pref/AutoFirma.js
+    ln -s ${thisPkg}/bin/autofirma-setup $out/bin/autofirma-setup
+  '';
+}
diff --git a/nix/autofirma/patches/clienteafirma-external/afirma-lib-oro-version.patch b/nix/autofirma/patches/clienteafirma-external/afirma-lib-oro-version.patch
diff --git a/nix/autofirma/patches/clienteafirma/afirma-core-pom.patch b/nix/autofirma/patches/clienteafirma/afirma-core-pom.patch
diff --git a/nix/autofirma/patches/clienteafirma/pom.patch b/nix/autofirma/patches/clienteafirma/pom.patch
@@ -1,39 +1,7 @@
 diff --git a/pom.xml b/pom.xml
-index 7d6ca9813..5f7589bba 100644
+index e0eb3e668..aede118bb 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -51,7 +51,7 @@
-
- 	<properties>
- 		<clienteafirma.version>1.8.3</clienteafirma.version>
--		<jmulticard.version>1.8</jmulticard.version>
-+		<jmulticard.version>1.9</jmulticard.version>
- 		<afirma.lib.itex.version>1.6</afirma.lib.itex.version>
- 		<spongycastle.version>1.58.0.0</spongycastle.version>
- 		<afirma.legible.version>1_8_3</afirma.legible.version>
-@@ -91,19 +91,19 @@
- 			<dependency>
- 				<groupId>es.gob.afirma.lib</groupId>
- 				<artifactId>afirma-lib-jmimemagic</artifactId>
--				<version>0.0.7</version>
-+				<version>0.0.8</version>
- 			</dependency>
-
- 			<dependency>
- 				<groupId>es.gob.afirma.lib</groupId>
- 				<artifactId>afirma-lib-oro</artifactId>
--				<version>0.0.7</version>
-+				<version>0.0.8</version>
- 			</dependency>
-
- 			<dependency>
- 				<groupId>es.gob.afirma.lib</groupId>
- 				<artifactId>afirma-lib-juniversalchardet</artifactId>
--				<version>0.0.7</version>
-+				<version>0.0.8</version>
- 			</dependency>
-
- 			<dependency>
 @@ -206,8 +206,8 @@
  						<groupId>org.apache.maven.plugins</groupId>
  						<artifactId>maven-compiler-plugin</artifactId>