diff --git a/common/default.nix b/common/default.nix index 5fbf46a..a600ff3 100644 --- a/common/default.nix +++ b/common/default.nix @@ -181,7 +181,7 @@ in # Flatpak support 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`. users.users.spiollinux = { diff --git a/common/packages.nix b/common/packages.nix index ec4f22b..9634e2a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -40,7 +40,7 @@ exfat iotop cifs-utils - dool + dstat lsof macchanger borgbackup diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index 7323b57..ed94170 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Enable sound. - services.pulseaudio = { + hardware.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; # decouple pulseaudio application and sink volumes diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 307836f..fc577ec 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../common/nix-settings.nix ]; nix = { enable = true; + package = pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "os" @@ -20,6 +21,9 @@ }; }; + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -34,7 +38,6 @@ # system-wide SSH configuration, used by nix-daemon for remote builders # show hidden files - system.primaryUser = "os"; system.defaults.NSGlobalDomain.AppleShowAllFiles = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/flake.lock b/flake.lock index 57216c2..8ee8ebd 100644 --- a/flake.lock +++ b/flake.lock @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1748373722, - "narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1748942041, - "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -243,27 +243,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748889542, - "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748973087, - "narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", + "lastModified": 1747261242, + "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=", "owner": "nix-community", "repo": "NUR", - "rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", + "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 20809d2..470ae9b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS system flake"; 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-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.05"; + url = "github:LnL7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; + patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/home/common.nix b/home/common.nix index c2c5264..9cb8df9 100644 --- a/home/common.nix +++ b/home/common.nix @@ -51,7 +51,9 @@ merge.tool = "vimdiff"; # provide `git mergetool -t 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; }; core.excludesfile = toString ( @@ -103,7 +105,7 @@ enable = true; syntaxHighlighting.enable = true; history.ignoreSpace = true; - initContent = '' + initExtra = '' # Uncomment following line if you want red dots to be displayed while waiting for completion COMPLETION_WAITING_DOTS="true" ### Fix slowness of pastes with zsh-syntax-highlighting.zsh diff --git a/home/desktop.nix b/home/desktop.nix index 1e089e7..212debf 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -72,7 +72,7 @@ services.gpg-agent = { enable = true; #enableSshSupport = true; - pinentry.package = pkgs.pinentry-qt; + pinentryPackage = pkgs.pinentry-qt; }; programs.ssh = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c44170e..79052c5 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,19 +17,16 @@ let inkscape darktable exiftool + gimp ] - ++ (with gimp3Plugins; [ - #fourier # broken - #lqrPlugin # broken + ++ (with gimpPlugins; [ + fourier + lqrPlugin ]) ++ lib.optionals pkgs.stdenv.isLinux [ - gimp3 hugin - #luminanceHDR # FIXME, build failure - xournalpp - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp + luminanceHDR + xournal ]; multimediaApps = @@ -37,12 +34,11 @@ let mpv yt-dlp ] - ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] ++ lib.optionals pkgs.stdenv.isLinux [ vlc amarok clementine - kdePackages.elisa + elisa musescore tenacity soundkonverter @@ -56,7 +52,6 @@ let htop tmux httpie - rsync ponysay gti tree @@ -127,7 +122,7 @@ let ]; pythonTools = with python3Packages; [ - python # to shadow old macOS python + python3 # to shadow old macOS python ipython uv pip @@ -147,12 +142,13 @@ let desktopCommon = [ keepassxc + tigervnc ]; desktopLinux = [ firefox chromium - kdePackages.falkon + falkon thunderbird calibre dino @@ -168,14 +164,15 @@ let seafile-client alacritty libreoffice-qt6 # still with KDE integration + backintime-common anki signal-desktop (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) - tigervnc pdfpc + quaternion nheko gpxsee subsurface @@ -186,7 +183,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - logseq + unstable.logseq # for Hibiscus banking software jameica diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index a42b7ec..76b4c8d 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -11,110 +11,112 @@ enable = true; package = pkgs.vscodium; mutableExtensionsDir = true; - profiles.default = { - extensions = - with pkgs.vscode-extensions; - [ - ms-python.python - charliermarsh.ruff - vscodevim.vim - yzhang.markdown-all-in-one - bungcip.better-toml - eamodio.gitlens - jnoortheen.nix-ide - mkhl.direnv - editorconfig.editorconfig - ] - ++ 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 = "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 + extensions = + with pkgs.vscode-extensions; + [ + ms-python.python + vscodevim.vim + yzhang.markdown-all-in-one + bungcip.better-toml + eamodio.gitlens + jnoortheen.nix-ide + mkhl.direnv + editorconfig.editorconfig + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { - "editor.fontLigatures" = true; - "editor.accessibilitySupport" = false; # prevent asking - "editor.cursorBlinking" = "phase"; - "editor.stickyScroll.enabled" = true; - "workbench.editor.highlightModifiedTabs" = true; - "window.autoDetectColorScheme" = true; - "workbench.preferredDarkColorTheme" = "Default Dark Modern"; - "workbench.preferredLightColorTheme" = "Default Light Modern"; - "[nix]" = { - "editor.insertSpaces" = true; - "editor.tabSize" = 2; - # for now, disable automatic formatting to prevent disruption of existing code bases - "editor.formatOnPaste" = false; - "editor.formatOnSave" = false; - "editor.formatOnType" = false; - }; - "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" = "charliermarsh.ruff"; - "editor.formatOnSave" = true; - }; - "python.experiments.enabled" = false; - "python.languageServer" = "Jedi"; # don't use proprietary pylance server - "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; - "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; - "mypy-type-checker.importStrategy" = "fromEnvironment"; - "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; - "ruff.path" = [ (lib.getExe pkgs.ruff) ]; - "ruff.importStrategy" = "fromEnvironment"; - "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; + 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; + "editor.accessibilitySupport" = false; # prevent asking + "editor.cursorBlinking" = "phase"; + "editor.stickyScroll.enabled" = true; + "workbench.editor.highlightModifiedTabs" = true; + "window.autoDetectColorScheme" = true; + "workbench.preferredDarkColorTheme" = "Default Dark Modern"; + "workbench.preferredLightColorTheme" = "Default Light Modern"; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 2; + # for now, disable automatic formatting to prevent disruption of existing code bases + "editor.formatOnPaste" = false; + "editor.formatOnSave" = false; + "editor.formatOnType" = false; }; - }; + "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; + }; }; } diff --git a/home/workmac.nix b/home/workmac.nix index 5227db0..f2b7969 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -89,7 +89,7 @@ in }; # some extra shell scripts - programs.zsh.initContent = lib.mkAfter ( + programs.zsh.initExtra = lib.mkAfter ( import ./scripts/reporsync.nix { inherit pkgs lib; } + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index f1e62cd..166f4ee 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -23,6 +23,9 @@ in # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; + # try newer kernels + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = [ # powersave "amd_pstate=active" diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index 74708b5..e60ac46 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -21,6 +21,7 @@ boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ]; diff --git a/nixremotebuildermachines b/nixremotebuildermachines deleted file mode 100644 index 82800d1..0000000 --- a/nixremotebuildermachines +++ /dev/null @@ -1 +0,0 @@ -ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test - diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch deleted file mode 100644 index 3684a24..0000000 --- a/patches/keepassxc-fix-darwin-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 -From: Fernando Rodrigues -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 ---- - 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 diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch new file mode 100644 index 0000000..dbaf9ee --- /dev/null +++ b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch @@ -0,0 +1,26 @@ +From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +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 +(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; + }