From 9a6e8e814be30803f33e075ea64496bcb0255f26 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 4 Nov 2024 20:56:42 -0800 Subject: [PATCH] fix: 7zz build failure --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 +- overlays/default.nix | 10 ++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 3db110d..f6f4d64 100755 --- a/flake.lock +++ b/flake.lock @@ -104,6 +104,22 @@ "type": "github" } }, + "bleedingpkgs": { + "locked": { + "lastModified": 1730781761, + "narHash": "sha256-/0gVcFiZaQAROSySTXXblCzGZc6ZvQQzLpxuF40AoJ0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "aa689c679c90ea9a84c99cfb1ef5a7ab4ddbbf9b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "blink-cmp": { "inputs": { "fenix": "fenix", @@ -850,6 +866,7 @@ "inputs": { "apple-firmware": "apple-firmware", "apple-silicon": "apple-silicon", + "bleedingpkgs": "bleedingpkgs", "flake-parts": "flake-parts", "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", diff --git a/flake.nix b/flake.nix index c9ccd0c..d89c226 100755 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - # bleedingpkgs.url = "github:nixos/nixpkgs/master"; + bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; home-manager = { diff --git a/overlays/default.nix b/overlays/default.nix index a08b365..2ed005c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,16 +4,14 @@ ... }: let + bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system}; in # stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system}; -# bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system}; # nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; { nixpkgs.overlays = [ - ( - self: super: - { - } - ) + (self: super: { + _7zz = bleedingpkgs._7zz; + }) ]; }