Merge branch 'nixos-23.05' into updated-ca-gateway

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "A Nix flake containing EPICS-related modules and packages";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
   inputs.bash-lib = {
     url = "github:minijackson/bash-lib";
     inputs.nixpkgs.follows = "nixpkgs";

ioc/tests/cross/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   crossSystem,
+  system-name,
   ...
 }: let
   inherit (pkgs) epnixLib;
@@ -19,7 +20,7 @@
   emulator = pkgs.lib.replaceStrings ["\""] ["\\\""] (hostPlatform.emulator pkgs);
 in
   pkgs.nixosTest {
-    name = "cross-for-${system}";
+    name = "cross-for-${system-name}";
     meta.maintainers = with epnixLib.maintainers; [minijackson];
 
     nodes.machine = {};

ioc/tests/default.nix

@@ -14,14 +14,16 @@ with pkgs.lib;
     in
       nameValuePair
       "cross-for-${system-name}"
-      (import ./cross/default.nix (args // {inherit crossSystem;}));
+      (import ./cross/default.nix (args // {inherit crossSystem system-name;}));
 
     systemsToCheck = with systems.examples; [
       # Maybe one day...
       #mingwW64
 
       # IFC1410
-      ppc64
+      # This is commented out now, due to an issue from Qemu
+      # The tests don't pass, but they run on actual hardware
+      #ppc64
 
       powernv
 

nixos/modules/archiver-appliance.nix

@@ -288,9 +288,8 @@ in {
         "${pkgs.epnix.mariadb_jdbc}/share/java/mariadb-java-client.jar"
 
         # Dependencies of the mariadb connector, for UNIX sockets:
-        # TODO: use the nixpkgs version when we switch to NixOS 23.05
-        "${pkgs.epnix.jna}/share/java/jna.jar"
-        "${pkgs.epnix.jna}/share/java/jna-platform.jar"
+        "${pkgs.jna}/share/java/jna.jar"
+        "${pkgs.jna}/share/java/jna-platform.jar"
       ];
 
       user = "archappl";

nixos/tests/phoebus/olog.nix

@@ -19,6 +19,9 @@
           # not open-source. But as we're using it run tests, not exposing
           # any service, this should be fine.
           "elasticsearch"
+
+          # MongoDB also uses the SSPL.
+          "mongodb"
         ];
 
       networking.firewall.allowedTCPPorts = [8181];

pkgs/default.nix

@@ -59,7 +59,6 @@ with prev;
 
       # Other utilities
 
-      jna = callPackage ./epnix/tools/jna {};
       mariadb_jdbc = callPackage ./epnix/tools/mariadb_jdbc {};
 
       # EPNix specific packages

pkgs/epnix/epics-base/default.nix

@@ -8,12 +8,12 @@
   fetchpatch,
   version,
   hash,
-  readline,
   local_config_site ? {},
   local_release ? {},
 }:
 with lib; let
   older = versionOlder version;
+  atLeast = versionAtLeast version;
 
   generateConf = (epnixLib.formats.make {}).generate;
 
@@ -37,11 +37,19 @@ in
       inherit hash;
     };
 
-    patches = optionals (older "7.0.5") [
-      # Support "undefine MYVAR" in convertRelease.pl
-      # Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
-      ./handle-make-undefine-variable.patch
-    ];
+    patches =
+      (optionals (atLeast "7.0.0") [
+        # From: https://github.com/epics-base/epics-base/pull/395
+        (fetchpatch {
+          url = "https://github.com/epics-base/epics-base/commit/d87fd0db0124faf450cff93226ae6a2cc02f02bf.patch";
+          hash = "sha256-BQWFOPCfRjSowDSAbqe8ClqEWT1OtfbgRh4k5jmAjpU=";
+        })
+      ])
+      ++ (optionals (older "7.0.5") [
+        # Support "undefine MYVAR" in convertRelease.pl
+        # Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
+        ./handle-make-undefine-variable.patch
+      ]);
 
     # "build" as in Nix terminology (the build machine)
     build_config_site =