From 5975b8ccd2031b393dc790469b02594cf87a6e06 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 1 Aug 2024 15:03:20 -0700 Subject: [PATCH] fix: switch easyeffects to latest unstable by fixing build issue pins lsp-plugins to latest master commit to avoid build failure in php81Extensions.simplexml --- flake.lock | 17 +++++++++++++++++ flake.nix | 9 ++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 55adb62..37543ec 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "bleedingpkgs": { + "locked": { + "lastModified": 1722549472, + "narHash": "sha256-ODPyXo5ip1Y1YBn6q97m/GVwfTUBprmp7W2Ov9bgO7w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "56a2c695a4a02834f0705ae7072d2f4f4a96ad2a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1721784420, @@ -289,6 +305,7 @@ }, "root": { "inputs": { + "bleedingpkgs": "bleedingpkgs", "catppuccin": "catppuccin", "home-manager": "home-manager", "lanzaboote": "lanzaboote", diff --git a/flake.nix b/flake.nix index a7688cf..5505518 100755 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + bleedingpkgs.url = "github:nixos/nixpkgs/master"; catppuccin.url = "github:catppuccin/nix"; # zimfw.url = "github:joedevivo/zimfw.nix"; lanzaboote = { @@ -24,7 +25,7 @@ }; outputs = { self, nixpkgs, home-manager, catppuccin, lanzaboote, stablepkgs - , lix-module, ... }@inputs: { + , bleedingpkgs, lix-module, ... }@inputs: { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; @@ -58,8 +59,10 @@ { nixpkgs.overlays = [ (self: super: { - easyeffects = - stablepkgs.legacyPackages.${self.system}.easyeffects; + # php81Extensions.simplexml = + # stablepkgs.legacyPackages.${self.system}.php82Extensions.simplexml; + lsp-plugins = + bleedingpkgs.legacyPackages.${self.system}.lsp-plugins; }) ]; }