Skip to content

Commit

Permalink
flake: upgrade NixOS 24.05 -> 24.11
Browse files Browse the repository at this point in the history
and related changes to documentation and templates
  • Loading branch information
minijackson committed Jan 15, 2025
1 parent 2b01605 commit 5aadbd2
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions .github/workflows/update-flake-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
matrix:
branch:
- master
- nixos-24.11
- nixos-24.05
permissions:
contents: write # to create branch
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions docs/nixos-services/tutorials/archiver-appliance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions docs/nixos-services/user-guides/pre-requisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/docs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
in
stdenvNoCC.mkDerivation {
pname = "epnix-docs";
version = "24.05";
version = "24.11";

src = ../../docs;

Expand Down
2 changes: 1 addition & 1 deletion templates/top/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5aadbd2

Please sign in to comment.