From a90e123fbb9787d286639878730dde47c87d7999 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 8 Nov 2023 20:34:06 +0800 Subject: [PATCH] config: make nixpkgs properly follow nixos-unstable branch --- flake.lock | 20 +++----------------- flake.nix | 2 +- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 11f53301..72cf95e8 100644 --- a/flake.lock +++ b/flake.lock @@ -662,22 +662,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1698968727, @@ -711,7 +695,9 @@ "nixos-stable": "nixos-stable", "nixos-unstable": "nixos-unstable", "nixos-unstable-small": "nixos-unstable-small", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixos-unstable" + ], "nur": "nur", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index ddfcac34..16e2176a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ # I know NixOS can be stable but we're going cutting edge, baybee! While # `nixpkgs-unstable` branch could be faster delivering updates, it is # looser when it comes to stability for the entirety of this configuration. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.follows = "nixos-unstable"; # Here are the nixpkgs variants used for creating the system configuration # in `mkHost`.