From dfd80c0e95c3046abe54558982c7a8205a30cc26 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 13 Sep 2023 12:38:12 +0200 Subject: [PATCH] Fix nvfetcher by using forked nixpkgs See upstream issue: https://github.com/NixOS/nixpkgs/issues/249962 --- flake.lock | 17 +++++++++++++++++ flake.nix | 3 +++ overlays/overrides.nix | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 12fc00b7..0ed605bd 100644 --- a/flake.lock +++ b/flake.lock @@ -197,6 +197,22 @@ "type": "github" } }, + "fork": { + "locked": { + "lastModified": 1692960587, + "narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=", + "owner": "teutat3s", + "repo": "nixpkgs", + "rev": "312709dd70684f52496580e533d58645526b1c90", + "type": "github" + }, + "original": { + "owner": "teutat3s", + "ref": "nvfetcher-fix", + "repo": "nixpkgs", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -288,6 +304,7 @@ "deploy": "deploy", "digga": "digga", "flake-compat": "flake-compat", + "fork": "fork", "home": "home", "latest": "latest", "nixos": "nixos", diff --git a/flake.nix b/flake.nix index f6594667..61085b21 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ nixos.url = "github:nixos/nixpkgs/nixos-23.05"; latest.url = "github:nixos/nixpkgs/nixos-unstable"; + fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix"; + flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; @@ -69,6 +71,7 @@ ]; }; latest = {}; + fork = {}; }; lib = import ./lib {lib = digga.lib // nixos.lib;}; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 7fa801d5..e1070df4 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -4,6 +4,10 @@ channels: final: prev: { inherit (channels.latest) nixd + ; + + inherit + (channels.fork) nvfetcher ;