diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index d35fb5d0..ae848f08 100644 --- 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/index.rst b/docs/index.rst index b21dc460..3740fb8b 100644 --- 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 index cd784c41..8386330b 100644 --- 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 index fefca4c6..b3e57b3a 100644 --- 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 index e93abbfa..8742ff26 100644 --- a/flake.lock +++ b/flake.lock @@ -144,16 +144,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7ecdb450..6b61f5c0 100644 --- 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"; diff --git a/pkgs/docs/default.nix b/pkgs/docs/default.nix index c5578cf5..0386f767 100644 --- 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/templates/top/flake.nix b/templates/top/flake.nix index fa1efd70..2a9c4366 100644 --- 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: