schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:2b06c59dd8438fbe18b528f1cf4d5a9cf8b610ea
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:4222e4ac66dad50111da7cfeb68a3dbfea70e50a
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "2b06c59dd8438fbe18b528f1cf4d5a9cf8b610ea" and "4222e4ac66dad50111da7cfeb68a3dbfea70e50a" have entirely different histories.
2b06c59dd8 ... 4222e4ac66

11 changed files with 156 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/default.nix
View file

@ -181,7 +181,7 @@ in
# Flatpak support # Flatpak support
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
# Define a user account. Don't forget to set a password with `passwd`. # Define a user account. Don't forget to set a password with `passwd`.
users.users.spiollinux = { users.users.spiollinux = {

2
common/packages.nix
View file

@ -40,7 +40,7 @@
exfat exfat
iotop iotop
cifs-utils cifs-utils
dool dstat
lsof lsof
macchanger macchanger
borgbackup borgbackup

2
common/pulseaudio.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# Enable sound. # Enable sound.
services.pulseaudio = { hardware.pulseaudio = {
enable = true; enable = true;
package = pkgs.pulseaudioFull; package = pkgs.pulseaudioFull;
# decouple pulseaudio application and sink volumes # decouple pulseaudio application and sink volumes

54
flake.lock generated
View file

@ -102,16 +102,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747556831, "lastModified": 1747020534,
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -163,27 +163,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747752302, "lastModified": 1743127615,
"narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "LnL7",
"ref": "nix-darwin-25.05", "ref": "nix-darwin-24.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747723695, "lastModified": 1747129300,
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1746904237,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,27 +243,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747610100, "lastModified": 1746957726,
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1746904237,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1747753144, "lastModified": 1747261242,
"narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=", "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8", "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747469671, "lastModified": 1746216483,
"narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View file

@ -2,11 +2,11 @@
description = "NixOS system flake"; description = "NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lanzaboote = { lanzaboote = {
@ -19,7 +19,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin/nix-darwin-25.05"; url = "github:LnL7/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -46,16 +46,6 @@
let let
# FIXME: allow different systems # FIXME: allow different systems
systems = utils.lib.system; systems = utils.lib.system;
# ability to extend nixpkgs with patches, e.g. from PRs or staging. See https://ertt.ca/nix/patch-nixpkgs/
mkNixpkgs-patched =
system:
(import nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-patched";
src = nixpkgs;
patches = [ ];
};
# necessary to make the top-level inputs available to system configuration # necessary to make the top-level inputs available to system configuration
# inspired by https://jade.fyi/blog/flakes-arent-real/ # inspired by https://jade.fyi/blog/flakes-arent-real/
inputInjection = inputInjection =
@ -88,7 +78,7 @@
mkHomeManager = mkHomeManager =
confName: user: system: # unfortunately, home-manager configs are still system-specific confName: user: system: # unfortunately, home-manager configs are still system-specific
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
pkgs = import (mkNixpkgs-patched system) { inherit system; }; pkgs = nixpkgs.legacyPackages.${system};
modules = [ modules = [
{ {
imports = [ imports = [

6
home/common.nix
View file

@ -51,7 +51,9 @@
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt` # provide `git mergetool -t nixfmt`
mergetool.nixfmt = { mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; cmd = "${
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true; trustExitCode = true;
}; };
core.excludesfile = toString ( core.excludesfile = toString (
@ -103,7 +105,7 @@
enable = true; enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
history.ignoreSpace = true; history.ignoreSpace = true;
initContent = '' initExtra = ''
# Uncomment following line if you want red dots to be displayed while waiting for completion # Uncomment following line if you want red dots to be displayed while waiting for completion
COMPLETION_WAITING_DOTS="true" COMPLETION_WAITING_DOTS="true"
### Fix slowness of pastes with zsh-syntax-highlighting.zsh ### Fix slowness of pastes with zsh-syntax-highlighting.zsh

2
home/desktop.nix
View file

@ -72,7 +72,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
#enableSshSupport = true; #enableSshSupport = true;
pinentry.package = pkgs.pinentry-qt; pinentryPackage = pkgs.pinentry-qt;
}; };
programs.ssh = { programs.ssh = {

21
home/modules/packages.nix
View file

@ -17,16 +17,16 @@ let
inkscape inkscape
darktable darktable
exiftool exiftool
gimp3 gimp
] ]
++ (with gimp3Plugins; [ ++ (with gimpPlugins; [
#fourier # broken fourier
#lqrPlugin # broken lqrPlugin
]) ])
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
hugin hugin
#luminanceHDR # FIXME, build failure luminanceHDR
xournalpp xournal
]; ];
multimediaApps = multimediaApps =
@ -38,7 +38,7 @@ let
vlc vlc
amarok amarok
clementine clementine
kdePackages.elisa elisa
musescore musescore
tenacity tenacity
soundkonverter soundkonverter
@ -122,7 +122,7 @@ let
]; ];
pythonTools = with python3Packages; [ pythonTools = with python3Packages; [
python # to shadow old macOS python python3 # to shadow old macOS python
ipython ipython
uv uv
pip pip
@ -148,7 +148,7 @@ let
desktopLinux = [ desktopLinux = [
firefox firefox
chromium chromium
kdePackages.falkon falkon
thunderbird thunderbird
calibre calibre
dino dino
@ -172,6 +172,7 @@ let
pulseaudioSupport = pkgs.stdenv.isLinux; pulseaudioSupport = pkgs.stdenv.isLinux;
}) })
pdfpc pdfpc
quaternion
nheko nheko
gpxsee gpxsee
subsurface subsurface
@ -182,7 +183,7 @@ let
#(pkgs.pidgin-with-plugins.override { #(pkgs.pidgin-with-plugins.override {
# plugins = [ pkgs.pidginotr ];}) # plugins = [ pkgs.pidginotr ];})
logseq unstable.logseq
# for Hibiscus banking software # for Hibiscus banking software
jameica jameica

212
home/modules/vscodium.nix
View file

@ -11,114 +11,112 @@
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
mutableExtensionsDir = true; mutableExtensionsDir = true;
profiles.default = { extensions =
extensions = with pkgs.vscode-extensions;
with pkgs.vscode-extensions; [
[ ms-python.python
ms-python.python vscodevim.vim
vscodevim.vim yzhang.markdown-all-in-one
yzhang.markdown-all-in-one bungcip.better-toml
bungcip.better-toml eamodio.gitlens
eamodio.gitlens jnoortheen.nix-ide
jnoortheen.nix-ide mkhl.direnv
mkhl.direnv editorconfig.editorconfig
editorconfig.editorconfig ]
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "Sync-Rsync";
publisher = "vscode-ext";
version = "0.36.0";
sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
}
# TODO: probably available in nixpkgs soonish?
{
name = "mypy-type-checker";
publisher = "ms-python";
version = "2023.3.12681020";
sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
}
{
name = "black-formatter";
publisher = "ms-python";
version = "2023.5.12771008";
sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
}
{
name = "vscode-pets";
publisher = "tonybaloney";
version = "1.25.1";
sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
}
];
userSettings =
let
defaultPython = pkgs.python3.withPackages (ps: [
ps.jedi
ps.jedi-language-server
ps.pip
ps.setuptools # for pkg_resources
ps.black
ps.mypy
]);
in
{ {
"editor.fontLigatures" = true; name = "Sync-Rsync";
"editor.accessibilitySupport" = false; # prevent asking publisher = "vscode-ext";
"editor.cursorBlinking" = "phase"; version = "0.36.0";
"editor.stickyScroll.enabled" = true; sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
"workbench.editor.highlightModifiedTabs" = true; }
"window.autoDetectColorScheme" = true; # TODO: probably available in nixpkgs soonish?
"workbench.preferredDarkColorTheme" = "Default Dark Modern"; {
"workbench.preferredLightColorTheme" = "Default Light Modern"; name = "mypy-type-checker";
"[nix]" = { publisher = "ms-python";
"editor.insertSpaces" = true; version = "2023.3.12681020";
"editor.tabSize" = 2; sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
# for now, disable automatic formatting to prevent disruption of existing code bases }
"editor.formatOnPaste" = false; {
"editor.formatOnSave" = false; name = "black-formatter";
"editor.formatOnType" = false; publisher = "ms-python";
}; version = "2023.5.12771008";
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
"nix.enableLanguageServer" = true; }
"nix.serverPath" = lib.getExe pkgs.nixd; {
"nix.serverSettings" = { }; name = "vscode-pets";
"editor.fontSize" = 13; publisher = "tonybaloney";
"editor.fontWeight" = "normal"; version = "1.25.1";
"git.detectSubmodulesLimit" = 30; sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
"[python]" = { }
"breadcrumbs.showClasses" = true; ];
"breadcrumbs.showFunctions" = true; userSettings =
"gitlens.codeLens.symbolScopes" = [ "!Module" ]; let
"editor.defaultFormatter" = "ms-python.black-formatter"; defaultPython = pkgs.python3.withPackages (ps: [
"editor.formatOnSave" = true; ps.jedi
}; ps.jedi-language-server
"python.languageServer" = "Jedi"; # don't use proprietary pylance server ps.pip
"python.defaultInterpreterPath" = "${defaultPython}/bin/python"; ps.setuptools # for pkg_resources
"black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; ps.black
"black-formatter.importStrategy" = "fromEnvironment"; ps.mypy
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; ]);
"mypy-type-checker.importStrategy" = "fromEnvironment"; in
"mypy-type-checker.args" = [ "--ignore-missing-imports" ]; {
"gitlens.telemetry.enabled" = false; "editor.fontLigatures" = true;
"vim.highlightedyank.enable" = true; "editor.accessibilitySupport" = false; # prevent asking
"vim.history" = 500; "editor.cursorBlinking" = "phase";
"vim.neovimUseConfigFile" = true; "editor.stickyScroll.enabled" = true;
"vim.enableNeovim" = true; "workbench.editor.highlightModifiedTabs" = true;
"git.suggestSmartCommit" = false; "window.autoDetectColorScheme" = true;
"editor.rulers" = [ 79 ]; "workbench.preferredDarkColorTheme" = "Default Dark Modern";
"vim.useSystemClipboard" = true; "workbench.preferredLightColorTheme" = "Default Light Modern";
"vim.smartRelativeLine" = true; "[nix]" = {
"diffEditor.ignoreTrimWhitespace" = false; "editor.insertSpaces" = true;
"files.associations" = { "editor.tabSize" = 2;
"*.py" = "python"; # for now, disable automatic formatting to prevent disruption of existing code bases
}; "editor.formatOnPaste" = false;
"editor.renderWhitespace" = "all"; "editor.formatOnSave" = false;
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; "editor.formatOnType" = false;
"vim.neovimPath" = lib.getExe pkgs.myVim;
"sync-rsync.options" = [ ];
"direnv.path.executable" = lib.getExe pkgs.direnv;
}; };
}; "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = { };
"editor.fontSize" = 13;
"editor.fontWeight" = "normal";
"git.detectSubmodulesLimit" = 30;
"[python]" = {
"breadcrumbs.showClasses" = true;
"breadcrumbs.showFunctions" = true;
"gitlens.codeLens.symbolScopes" = [ "!Module" ];
"editor.defaultFormatter" = "ms-python.black-formatter";
"editor.formatOnSave" = true;
};
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
"python.defaultInterpreterPath" = "${defaultPython}/bin/python";
"black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
"black-formatter.importStrategy" = "fromEnvironment";
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
"mypy-type-checker.importStrategy" = "fromEnvironment";
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
"gitlens.telemetry.enabled" = false;
"vim.highlightedyank.enable" = true;
"vim.history" = 500;
"vim.neovimUseConfigFile" = true;
"vim.enableNeovim" = true;
"git.suggestSmartCommit" = false;
"editor.rulers" = [ 79 ];
"vim.useSystemClipboard" = true;
"vim.smartRelativeLine" = true;
"diffEditor.ignoreTrimWhitespace" = false;
"files.associations" = {
"*.py" = "python";
};
"editor.renderWhitespace" = "all";
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
"vim.neovimPath" = lib.getExe pkgs.myVim;
"sync-rsync.options" = [ ];
"direnv.path.executable" = lib.getExe pkgs.direnv;
};
}; };
} }

2
home/workmac.nix
View file

@ -89,7 +89,7 @@ in
}; };
# some extra shell scripts # some extra shell scripts
programs.zsh.initContent = lib.mkAfter ( programs.zsh.initExtra = lib.mkAfter (
import ./scripts/reporsync.nix { inherit pkgs lib; } import ./scripts/reporsync.nix { inherit pkgs lib; }
+ import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
); );

26
patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch
View file

@ -1,26 +0,0 @@
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;
}