epics-extensions · minijackson · Dec 9, 2024 · Dec 9, 2024 · Dec 9, 2024 · Dec 9, 2024
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
@@ -19,6 +19,7 @@ jobs:
       matrix:
         branch:
           - master
+          - nixos-24.11
           - nixos-24.05
     permissions:
       contents: write # to create branch

diff --git a/docs/conf.py b/docs/conf.py
@@ -79,6 +79,10 @@
 # -- Options for the Nix domain ----------------------------------------------
 
 nix_options_json_files = ["./nixos-options.json"]
+# Sphinx 7.4.0, the display of the hierarchy of objects in the TOC changed,
+# and sphinxcontrib-nixdomain doesn't support it,
+# so we just display the full option path in the TOC
+nix_toc_display_full_path = True
 
 
 def nix_linkcode_resolve(path: str) -> str:

diff --git a/docs/index.rst b/docs/index.rst
@@ -58,7 +58,7 @@ which is considered unstable,
 meaning breaking changes might happen without notice.
 
 EPNix also has release branches,
-such as ``nixos-24.05``,
+such as ``nixos-24.11``,
 tied to the nixpkgs release branches,
 where breaking changes are forbidden.
 

diff --git a/docs/nixos-services/tutorials/archiver-appliance.rst b/docs/nixos-services/tutorials/archiver-appliance.rst
@@ -61,8 +61,8 @@ Fill the file with these lines:
    {
      description = "Configuration for running Archiver Appliance in a VM";
 
-     inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-     inputs.epnix.url = "github:epics-extensions/EPNix/nixos-24.05";
+     inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+     inputs.epnix.url = "github:epics-extensions/EPNix/nixos-24.11";
 
      outputs = { self, nixpkgs, epnix }: {
        nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {

diff --git a/docs/nixos-services/user-guides/pre-requisites.rst b/docs/nixos-services/user-guides/pre-requisites.rst
@@ -21,8 +21,8 @@ For example:
 
     {
       # ...
-      inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-   +  inputs.epnix.url = "github:epics-extensions/EPNix/nixos-24.05";
+      inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+   +  inputs.epnix.url = "github:epics-extensions/EPNix/nixos-24.11";
 
       # ...
       outputs = {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "A Nix flake containing EPICS-related modules and packages";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     bash-lib = {
       url = "github:minijackson/bash-lib";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -71,8 +71,6 @@
           ];
         };
       };
-
-      devShell = self.devShells.${system}.default;
     };
   in
     # Not eachDefaultSystem right now, because `nix flake check` tries to
@@ -126,7 +124,6 @@
       };
 
       templates.default = self.templates.top;
-      defaultTemplate = self.templates.default;
 
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
     };

diff --git a/nixos/modules/channel-finder/recceiver.nix b/nixos/modules/channel-finder/recceiver.nix
@@ -7,8 +7,8 @@
 }: let
   cfg = config.services.recceiver;
 
-  pkg = pkgs.python3Packages.recceiver;
-  python = pkgs.python3.withPackages (
+  pkg = pkgs.python311Packages.recceiver;
+  python = pkgs.python311.withPackages (
     ps: [
       ps.recceiver
       ps.twisted

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -76,12 +76,17 @@ in
 
       channel-finder-service = callPackage ./epnix/tools/channel-finder/service {};
 
-      inherit (final.python3Packages) lewis pyepics;
+      # Lewis needs Python < 3.12
+      inherit (final.python311Packages) lewis;
+
+      inherit (final.python3Packages) pyepics;
       inherit (callPackage ./epnix/tools/lewis/lib.nix {}) mkLewisSimulator;
 
       pcas = callPackage ./epnix/tools/pcas {};
 
-      phoebus = callPackage ./epnix/tools/phoebus/client {};
+      phoebus = callPackage ./epnix/tools/phoebus/client {
+        openjfx = prev.openjfx21;
+      };
       phoebus-alarm-server = callPackage ./epnix/tools/phoebus/alarm-server {};
       phoebus-alarm-logger = callPackage ./epnix/tools/phoebus/alarm-logger {};
       phoebus-archive-engine = callPackage ./epnix/tools/phoebus/archive-engine {};

diff --git a/pkgs/docs/default.nix b/pkgs/docs/default.nix
@@ -92,7 +92,7 @@
 in
   stdenvNoCC.mkDerivation {
     pname = "epnix-docs";
-    version = "24.05";
+    version = "24.11";
 
     src = ../../docs;
 

diff --git a/pkgs/epnix/tools/channel-finder/recceiver/default.nix b/pkgs/epnix/tools/channel-finder/recceiver/default.nix
@@ -1,6 +1,7 @@
 {
   epnixLib,
   buildPythonPackage,
+  pythonAtLeast,
   fetchFromGitHub,
   python,
   setuptools-scm,
@@ -13,6 +14,10 @@ buildPythonPackage rec {
   version = "1.6";
   pyproject = true;
 
+  # Should be fixed by https://github.com/ChannelFinder/recsync/pull/88
+  # but the patch doesn't apply cleanly
+  disabled = pythonAtLeast "3.12";
+
   src = fetchFromGitHub {
     owner = "ChannelFinder";
     repo = "recsync";

diff --git a/pkgs/epnix/tools/lewis/default.nix b/pkgs/epnix/tools/lewis/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  pythonAtLeast,
   fetchFromGitHub,
   approvaltests,
   setuptools,
@@ -18,6 +19,9 @@ buildPythonPackage rec {
   version = "1.3.1";
   pyproject = true;
 
+  # Due to mrjob, which is needed by approvaltests
+  disabled = pythonAtLeast "3.12";
+
   src = fetchFromGitHub {
     owner = "ess-dmsc";
     repo = "lewis";

diff --git a/pkgs/epnix/tools/phoebus/client/default.nix b/pkgs/epnix/tools/phoebus/client/default.nix
@@ -34,7 +34,7 @@ in
       (epnix.phoebus-setup-hook.override {
         jdk = jdk.override {
           enableJavaFX = true;
-          openjfx = openjfx.override {
+          openjfx_jdk = openjfx.override {
             withWebKit = true;
           };
         };

diff --git a/pkgs/epnix/tools/phoebus/deps/default.nix b/pkgs/epnix/tools/phoebus/deps/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "sha256-tJMULUSwH0rCmNeKvesPqMVTBH3PQWInx6gzGxwdPwY=";
+  outputHash = "sha256-WPTw40NQQclYE3z283yVmd5epP01R0oMsI+1UuADGB4=";
 
   doCheck = false;
 

diff --git a/pkgs/epnix/tools/phoebus/olog/default.nix b/pkgs/epnix/tools/phoebus/olog/default.nix
@@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
     hash = "sha256-AHZowe4mmBpiFd5MMVRrnUHeTOJDwE6f0sZFUF+07lo=";
   };
 
-  mvnHash = "sha256-xaoaoL1a9VP7e4HdI2YuOUPOADnMYlPesVbkhgLz3+M=";
+  mvnHash = "sha256-puUnYIbBVVXfoIcK9lkmBOH3TBfFAK+MeN8vsoxB8w0=";
   mvnParameters = "-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pdeployable-jar -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
 
   nativeBuildInputs = [makeWrapper];

diff --git a/pkgs/tests/default.nix b/pkgs/tests/default.nix
@@ -6,5 +6,5 @@
 {pkgs, ...}: {
   channelfinder-default-python = pkgs.python3Packages.channelfinder;
   mrf-driver-default-linux = pkgs.linuxPackages.mrf;
-  recceiver-default-python = pkgs.python3Packages.recceiver;
+  recceiver-default-python = pkgs.python311Packages.recceiver;
 }
diff --git a/templates/top/flake.nix b/templates/top/flake.nix
@@ -2,7 +2,7 @@
   description = "EPICS IOC for <...>";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.epnix.url = "github:epics-extensions/epnix/nixos-24.05";
+  inputs.epnix.url = "github:epics-extensions/epnix/nixos-24.11";
 
   # If you have a support module as a separate EPNix repository,
   # add it as an input here: