Compare commits
No commits in common. "d6b3f85c3b0e9a34b327f9c02b50870d23cbe4f7" and "c118bebe15d2c54db57f9aeab9ada92f631745cf" have entirely different histories.
d6b3f85c3b
...
c118bebe15
3 changed files with 27 additions and 27 deletions
|
|
@ -53,7 +53,7 @@
|
||||||
(import nixpkgs { inherit system; }).applyPatches {
|
(import nixpkgs { inherit system; }).applyPatches {
|
||||||
name = "nixpkgs-patched";
|
name = "nixpkgs-patched";
|
||||||
src = nixpkgs;
|
src = nixpkgs;
|
||||||
patches = [ ./patches/keepassxc-fix-darwin-build.patch ];
|
patches = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# necessary to make the top-level inputs available to system configuration
|
# necessary to make the top-level inputs available to system configuration
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fernando Rodrigues <alpha@sigmasquadron.net>
|
|
||||||
Date: Wed, 28 May 2025 14:06:23 -0300
|
|
||||||
Subject: [PATCH] keepassxc: remove unecessary dependency
|
|
||||||
|
|
||||||
KIO no longer seems necessary for KeePassXC, so removing it should
|
|
||||||
decrease the closure size significantly.
|
|
||||||
|
|
||||||
Reported-by: chopper2000uk <>
|
|
||||||
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
|
|
||||||
---
|
|
||||||
pkgs/by-name/ke/keepassxc/package.nix | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
|
|
||||||
index 170cc7bfe8e384..40b6dc15170f5b 100644
|
|
||||||
--- a/pkgs/by-name/ke/keepassxc/package.nix
|
|
||||||
+++ b/pkgs/by-name/ke/keepassxc/package.nix
|
|
||||||
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|
||||||
libXi
|
|
||||||
libXtst
|
|
||||||
libargon2
|
|
||||||
- libsForQt5.kio
|
|
||||||
libsForQt5.qtbase
|
|
||||||
libsForQt5.qtsvg
|
|
||||||
minizip
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||||
|
Date: Mon, 7 Apr 2025 21:03:09 -0400
|
||||||
|
Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4
|
||||||
|
|
||||||
|
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||||
|
(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1)
|
||||||
|
---
|
||||||
|
pkgs/development/web/nodejs/v20.nix | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
|
||||||
|
index b9c9345c441afa..20cceb5b5d1cda 100644
|
||||||
|
--- a/pkgs/development/web/nodejs/v20.nix
|
||||||
|
+++ b/pkgs/development/web/nodejs/v20.nix
|
||||||
|
@@ -50,5 +50,10 @@ buildNodejs {
|
||||||
|
stripLen = 1;
|
||||||
|
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
|
||||||
|
})
|
||||||
|
+ # fix test failure on macos 15.4
|
||||||
|
+ (fetchpatch2 {
|
||||||
|
+ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
|
||||||
|
+ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
|
||||||
|
+ })
|
||||||
|
] ++ gypPatches;
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue