From 9c5e258a9d29e687aa3a33a56c3347a4ab77bf04 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 23 Apr 2025 15:48:15 +0100 Subject: [PATCH] Revert "Remove `nixpkgs-2411`" This reverts commit 631b1ffa66346fa73aed9773177d180f5c1637c6. --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + modules/home-manager/cli/git.nix | 2 +- overlays/default.nix | 4 ++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 7e8b3e61..c3d8b889 100644 --- a/flake.lock +++ b/flake.lock @@ -194,6 +194,22 @@ "type": "github" } }, + "nixpkgs-2411": { + "locked": { + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1745310023, @@ -286,6 +302,7 @@ "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_3", + "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-master": "nixpkgs-master", "nur": "nur" } diff --git a/flake.nix b/flake.nix index 8fceb3ea..b70c366b 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ 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"; 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 c845b0bf..9d9496c0 100644 --- a/modules/home-manager/cli/git.nix +++ b/modules/home-manager/cli/git.nix @@ -168,7 +168,7 @@ in }; home = { - packages = with pkgs; [ git-instafix ]; + packages = with pkgs; [ nixpkgs-2411.git-instafix ]; sessionVariables = { GIT_INSTAFIX_UPSTREAM = "origin/main"; diff --git a/overlays/default.nix b/overlays/default.nix index eaca29a1..09fb101a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,5 +14,9 @@ }; stable-packages = final: _prev: { + nixpkgs-2411 = import inputs.nixpkgs-2411 { + config.allowUnfree = true; + system = final.system; + }; }; }