From 2ed0cfbb20f13960979fde0c84a8c26d542394fe Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 21 Nov 2024 10:32:41 +0000
Subject: [PATCH] Remove the old nixpkgs-unstable input
This is not needed as I'm now using unstable by default.
---
flake.lock | 19 +------------------
flake.nix | 2 --
nix/lib/nixos/configuration.nix | 1 -
nix/lib/wsl2/default.nix | 1 -
nix/modules/home-manager/git.nix | 2 +-
nix/overlays/default.nix | 7 -------
6 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
index 1942ee43..b1cc7ea1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,29 +69,12 @@
"type": "github"
}
},
- "nixpkgs-unstable": {
- "locked": {
- "lastModified": 1729665710,
- "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
- "nixpkgs-2405": "nixpkgs-2405",
- "nixpkgs-unstable": "nixpkgs-unstable"
+ "nixpkgs-2405": "nixpkgs-2405"
}
}
},
diff --git a/flake.nix b/flake.nix
index 2c9f9e8a..afc61a12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,6 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-
nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05";
};
diff --git a/nix/lib/nixos/configuration.nix b/nix/lib/nixos/configuration.nix
index c096ec8f..1d2dc8ac 100644
--- a/nix/lib/nixos/configuration.nix
+++ b/nix/lib/nixos/configuration.nix
@@ -23,7 +23,6 @@ in
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
- outputs.overlays.unstable-packages
];
};
diff --git a/nix/lib/wsl2/default.nix b/nix/lib/wsl2/default.nix
index b69dcfca..b2d2ad45 100644
--- a/nix/lib/wsl2/default.nix
+++ b/nix/lib/wsl2/default.nix
@@ -13,7 +13,6 @@ let
overlays = [
outputs.overlays.additions
outputs.overlays.modifications
- outputs.overlays.unstable-packages
];
};
diff --git a/nix/modules/home-manager/git.nix b/nix/modules/home-manager/git.nix
index f62e73d4..c54b26af 100644
--- a/nix/modules/home-manager/git.nix
+++ b/nix/modules/home-manager/git.nix
@@ -146,7 +146,7 @@
};
};
- home.packages = with pkgs.unstable; [ git-instafix ];
+ home.packages = [ pkgs.git-instafix ];
home.sessionVariables = {
GIT_INSTAFIX_UPSTREAM = "origin/main";
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
index f3fb4e37..6308c47e 100644
--- a/nix/overlays/default.nix
+++ b/nix/overlays/default.nix
@@ -17,11 +17,4 @@
system = final.system;
};
};
-
- unstable-packages = final: _prev: {
- unstable = import inputs.nixpkgs-unstable {
- config.allowUnfree = true;
- system = final.system;
- };
- };
}