diff --git a/flake.lock b/flake.lock index 42e1782..7c4e982 100644 --- a/flake.lock +++ b/flake.lock @@ -270,6 +270,18 @@ "type": "indirect" } }, + "melpa2nix-patch": { + "flake": false, + "locked": { + "narHash": "sha256-19bZ5w/81o7gmeGj/ePw6BQiFQqT4JOVtmLpivgPbyc=", + "type": "file", + "url": "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/276943.patch" + }, + "original": { + "type": "file", + "url": "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/276943.patch" + } + }, "nixpkgs": { "locked": { "lastModified": 1704842529, @@ -308,6 +320,7 @@ "emacs-snapshot": "emacs-snapshot", "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "melpa2nix-patch": "melpa2nix-patch", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 80ab2e6..f435515 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,8 @@ "emacs-29-1" = { url = "https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.xz"; flake = false; }; emacs-snapshot = { url = "github:emacs-mirror/emacs"; flake = false; }; emacs-release-snapshot = { url = "github:emacs-mirror/emacs?ref=emacs-29"; flake = false; }; + + melpa2nix-patch = { url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/276943.patch"; flake = false; }; }; nixConfig = { @@ -93,9 +95,16 @@ checks = builtins.mapAttrs (system: builtins.mapAttrs (_name: ciEmacs: - nixpkgs.legacyPackages.${system}.callPackage ./tests { - inherit ciEmacs; - }) + let + patchedNixpkgs = system: import (nixpkgs.legacyPackages.${system}.applyPatches { + name = "nixpkgs-patched"; + src = nixpkgs; + patches = inputs.melpa2nix-patch; + }) { inherit system; }; + in + (patchedNixpkgs system).callPackage ./tests { + inherit ciEmacs; + }) ) self.packages;