From 360f7de65dd256536c029e4e0a9f60498a14ad9c Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 2 Jun 2024 11:48:20 +0200 Subject: [PATCH] nix: Update global nixpkgs definition Nixpkgs 24.05 now sets a registry entry and NIX_PATH by default. --- modules/nix.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/nix.nix b/modules/nix.nix index 2c7a0f4..fb1fa4a 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2023 Simon Bruder +# SPDX-FileCopyrightText: 2020-2024 Simon Bruder # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -25,14 +25,15 @@ let in { nix = { + channel.enable = false; + registry = with inputs; { - nixpkgs.flake = nixpkgs; nixpkgs-unstable.flake = nixpkgs-unstable; }; nixPath = [ - "nixpkgs=${inputs.nixpkgs}" "nixpkgs-overlays=${overlaysCompat}" + "nixpkgs-unstable=flake:nixpkgs-unstable" ]; settings = {