diff --git a/devFlake/flake.lock b/devFlake/flake.lock index 02ef74978..93c9e927b 100644 --- a/devFlake/flake.lock +++ b/devFlake/flake.lock @@ -3,16 +3,16 @@ "clan-core-for-checks": { "flake": false, "locked": { - "lastModified": 1760213549, - "narHash": "sha256-XosVRUEcdsoEdRtXyz9HrRc4Dt9Ke+viM5OVF7tLK50=", - "ref": "main", - "rev": "9c8797e77031d8d472d057894f18a53bdc9bbe1e", + "lastModified": 1760368011, + "narHash": "sha256-mLK2nwbfklfOGIVAKVNDwGyYz8mPh4fzsAqSK3BlCiI=", + "ref": "clan-25.05", + "rev": "1b3c129aa9741d99b27810652ca888b3fbfc3a11", "shallow": true, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, "original": { - "ref": "main", + "ref": "clan-25.05", "shallow": true, "type": "git", "url": "https://git.clan.lol/clan/clan-core" @@ -105,16 +105,16 @@ }, "nixpkgs-dev": { "locked": { - "lastModified": 1760161054, - "narHash": "sha256-PO3cKHFIQEPI0dr/SzcZwG50cHXfjoIqP2uS5W78OXg=", + "lastModified": 1760309387, + "narHash": "sha256-e0lvQ7+B1Y8zjykYHAj9tBv10ggLqK0nmxwvMU3J0Eo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e18d8ec6fafaed55561b7a1b54eb1c1ce3ffa2c5", + "rev": "6cd95994a9c8f7c6f8c1f1161be94119afdcb305", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-25.05-small", "repo": "nixpkgs", "type": "github" } diff --git a/devFlake/flake.nix b/devFlake/flake.nix index 7d3ad5907..2326ed4a3 100644 --- a/devFlake/flake.nix +++ b/devFlake/flake.nix @@ -2,7 +2,7 @@ description = "private dev inputs"; # Dev dependencies - inputs.nixpkgs-dev.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + inputs.nixpkgs-dev.url = "github:NixOS/nixpkgs/nixos-25.05-small"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.inputs.systems.follows = "systems"; @@ -15,7 +15,7 @@ inputs.systems.url = "github:nix-systems/default"; - inputs.clan-core-for-checks.url = "git+https://git.clan.lol/clan/clan-core?ref=main&shallow=1"; + inputs.clan-core-for-checks.url = "git+https://git.clan.lol/clan/clan-core?ref=clan-25.05&shallow=1"; inputs.clan-core-for-checks.flake = false; inputs.test-fixtures.url = "git+https://git.clan.lol/clan/test-fixtures"; diff --git a/flake.lock b/flake.lock index 3a0c3eccd..f42fc6066 100644 --- a/flake.lock +++ b/flake.lock @@ -71,15 +71,16 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1759509947, + "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", "type": "github" }, "original": { "owner": "nix-darwin", + "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } @@ -114,15 +115,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-yDxtm0PESdgNetiJN5+MFxgubBcLDTiuSjjrJiyvsvM=", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "lastModified": 1760324802, + "narHash": "sha256-VWlJtLQ5EQQj45Wj0yTExtSjwRyZ59/qMqEwus/Exlg=", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre871443.d7f52a7a640b/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.811135.7e297ddff44a/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz" + "url": "https://nixos.org/channels/nixos-25.05/nixexprs.tar.xz" } }, "root": { diff --git a/flake.nix b/flake.nix index ee4859ac1..23b83ebd7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "clan.lol base operating system"; inputs = { - nixpkgs.url = "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs.url = "https://nixos.org/channels/nixos-25.05/nixexprs.tar.xz"; - nix-darwin.url = "github:nix-darwin/nix-darwin"; + nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts";