From 60b84f242ed5a1d70c1b7444805bf858212a6bee Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 11 Jun 2024 07:40:51 +0100 Subject: [PATCH] Switch from NixOS unstable to 24.05 by default --- flake.lock | 27 ++++++++++++++++++++++----- flake.nix | 5 ++++- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e90f607..f150a65 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717952948, + "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -32,10 +32,27 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-2305": "nixpkgs-2305" + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index dc51802..ae9bc9f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,10 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05"; + + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; }; outputs =