diff --git a/default.nix b/default.nix index 1c88619b..b96a8e79 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,8 @@ # How to upgrade to a newer version +# - On the june and december release, you'll have to update nixpkgs to the current branch +# Change `nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";` +# to the latest release (see https://nixos.org/) +# - Run `$ nix flake update` # - Comment `src.hash` # - Change `version` # - Run `$ nix build` diff --git a/docs/release_checklist.md b/docs/release_checklist.md index e265f992..f09dfbd1 100644 --- a/docs/release_checklist.md +++ b/docs/release_checklist.md @@ -11,6 +11,8 @@ - upload the artifacts - upload the AppImage and zsyncmake - nix + - june and december: update release version + - run `nix flake update` - comment out the hash in default.nix - update the version - run `nix-build` diff --git a/flake.lock b/flake.lock index d5391e93..6732940a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717281328, - "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "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 5c1144e8..ea046b7d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Tilde Friends is a platform for making, running, and sharing web applications."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; flake-utils.url = "github:numtide/flake-utils"; };