From 5f7d0d4deb6864a16321bacf9e29607c99755503 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 23 Apr 2025 17:19:16 +0100 Subject: [PATCH] Rename `nixpkgs-2411` to `nixpkgs-stable` --- flake.lock | 34 ++++++++++++++++---------------- flake.nix | 2 +- modules/home-manager/cli/git.nix | 2 +- overlays/default.nix | 3 +-- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c637942d..d077f26c 100644 --- a/flake.lock +++ b/flake.lock @@ -194,22 +194,6 @@ "type": "github" } }, - "nixpkgs-2411": { - "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-master": { "locked": { "lastModified": 1745424269, @@ -226,6 +210,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1742937945, @@ -302,8 +302,8 @@ "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_3", - "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-master": "nixpkgs-master", + "nixpkgs-stable": "nixpkgs-stable", "nur": "nur" } }, diff --git a/flake.nix b/flake.nix index b70c366b..2aa8e30e 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,8 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-2411.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; diff --git a/modules/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix index 9d9496c0..76292a73 100644 --- a/modules/home-manager/cli/git.nix +++ b/modules/home-manager/cli/git.nix @@ -168,7 +168,7 @@ in }; home = { - packages = with pkgs; [ nixpkgs-2411.git-instafix ]; + packages = with pkgs; [ stable.git-instafix ]; sessionVariables = { GIT_INSTAFIX_UPSTREAM = "origin/main"; diff --git a/overlays/default.nix b/overlays/default.nix index 09fb101a..07f3a2ac 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,8 +14,7 @@ }; stable-packages = final: _prev: { - nixpkgs-2411 = import inputs.nixpkgs-2411 { - config.allowUnfree = true; + stable = import inputs.nixpkgs-stable { system = final.system; }; };