From 8ccaf3b9d71ce70066e3d1ee25b0db89f6c11784 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 21 Jan 2025 20:51:57 +0100 Subject: [PATCH] nix: nixpkgs-unstable -> nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit that was a bad idea 😆 --- flake.lock | 40 ++++++++++++++++++++-------------------- flake.nix | 12 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index d7a70d0..04ea1e1 100644 --- a/flake.lock +++ b/flake.lock @@ -217,7 +217,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -298,7 +298,7 @@ "nix-index-database": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -379,22 +379,6 @@ "type": "github" } }, - "nixpkgs-unstable_2": { - "locked": { - "lastModified": 1737370608, - "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "300081d0cc72df578b02d914df941b8ec62240e6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1737370608, @@ -411,6 +395,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1737370608, + "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "300081d0cc72df578b02d914df941b8ec62240e6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "ghostty": "ghostty", @@ -418,8 +418,8 @@ "jujutsu": "jujutsu", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", - "nixpkgs-stable": "nixpkgs-stable_2", - "nixpkgs-unstable": "nixpkgs-unstable_2" + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable_2" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 6388658..99e7a36 100644 --- a/flake.nix +++ b/flake.nix @@ -18,31 +18,31 @@ jujutsu.url = "github:dln/jj/openssh"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ self, nix-index-database, - nixpkgs-unstable, + nixpkgs, home-manager, ... }: let inherit (self) outputs; system = "x86_64-linux"; - pkgs = nixpkgs-unstable.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; mkHost = modules: - nixpkgs-unstable.lib.nixosSystem { + nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; };