mariadb-connector-java: remove

was upstreamed in nixpkgs a while ago
epics-extensions · Feb 21, 2025 · 05e5aad · 05e5aad
1 parent 1a2725e
commit 05e5aad
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/nixos/modules/archiver-appliance.nix b/nixos/modules/archiver-appliance.nix
@@ -288,7 +288,7 @@ in {
 
         # We use the mariadb connecter, since it supports UNIX socket connection,
         # which allows us not not store the password in plaintext in the config.
-        "${pkgs.epnix.mariadb_jdbc}/share/java/mariadb-java-client.jar"
+        "${pkgs.mariadb-connector-java}/share/java/mariadb-java-client.jar"
 
         # Dependencies of the mariadb connector, for UNIX sockets:
         "${pkgs.jna}/share/java/jna.jar"

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -113,7 +113,6 @@ in
 
       # Other utilities
 
-      mariadb_jdbc = callPackage ./epnix/tools/mariadb_jdbc {};
       # Needed by support/opcua
       open62541_1_3 = callPackage ./epnix/tools/open62541_1_3 {};
 

diff --git a/pkgs/epnix/tools/mariadb_jdbc/default.nix b/pkgs/epnix/tools/mariadb_jdbc/default.nix