From 815ec0c6f29c01c209e731f599734dff28ca33e5 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 9 Nov 2024 12:00:00 +0000 Subject: [PATCH 01/13] nodejs: fix build on 32 bit platforms this test is failing on both armv7 and i686 and is related to year 2038 issue so it probably affects all 32 bit platforms --- pkgs/development/web/nodejs/nodejs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8881d608c95b..ab63e1e14a7a 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -321,6 +321,9 @@ let "test-watch-mode-files_watcher" ] ++ lib.optionals (!lib.versionAtLeast version "22") [ "test-tls-multi-key" + ] ++ lib.optionals stdenv.hostPlatform.is32bit [ + # utime (actually utimensat) fails with EINVAL on 2038 timestamp + "test-fs-utimes-y2K38" ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ # Disable tests that don’t work under macOS sandbox. "test-macos-app-sandbox" From 93b806da897ac4d96e01efbdb3ee6fa7929afaf9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Nov 2024 11:58:25 -0500 Subject: [PATCH 02/13] gamescope: fix cross compilation --- pkgs/by-name/ga/gamescope/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 0bbd15f9d071..e382b50ea875 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -33,7 +33,6 @@ , lib , makeBinaryWrapper , nix-update-script -, writeShellScriptBin , enableExecutable ? true , enableWsi ? true }: @@ -101,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { cmake # calls git describe to encode its own version into the build - (writeShellScriptBin "git" "echo ${finalAttrs.version}") + (buildPackages.writeShellScriptBin "git" "echo ${finalAttrs.version}") ] ++ lib.optionals enableExecutable [ makeBinaryWrapper glslang From 85540a4af0ce0706162b43b880c455df8ab2aa12 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Nov 2024 12:13:15 -0500 Subject: [PATCH 03/13] libevdevc: fix cross compilation, format with nixfmt --- pkgs/by-name/li/libevdevc/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libevdevc/package.nix b/pkgs/by-name/li/libevdevc/package.nix index 5e6b7cd47815..0eb423dd6720 100644 --- a/pkgs/by-name/li/libevdevc/package.nix +++ b/pkgs/by-name/li/libevdevc/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: +{ + lib, + stdenv, + fetchFromGitHub, + buildPackages, +}: stdenv.mkDerivation rec { pname = "libevdevc"; @@ -12,12 +17,15 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace common.mk \ - --replace /bin/echo ${coreutils}/bin/echo + --replace-fail /bin/echo ${buildPackages.coreutils}/bin/echo substituteInPlace include/module.mk \ - --replace /usr/include /include + --replace-fail /usr/include /include ''; - makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; + makeFlags = [ + "DESTDIR=$(out)" + "LIBDIR=/lib" + ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; From 96a405932dd2958facdc607b1a12f65692e63bbb Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Sat, 30 Nov 2024 21:29:17 -0600 Subject: [PATCH 04/13] lib/licenses: fix lens license URL --- lib/licenses.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 85b99f329162..11b0314e9d70 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -792,7 +792,7 @@ lib.mapAttrs mkLicense ({ lens = { fullName = "Lens Terms of Service Agreement"; - url = "https://k8slens.dev/licenses/tos"; + url = "https://k8slens.dev/legal/tos"; free = false; }; From 4e87a01cd02a0401914d7d0e59ee5666f1ddc521 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 1 Dec 2024 23:10:49 +0100 Subject: [PATCH 05/13] vscode: fix fhsenv version --- pkgs/applications/editors/vscode/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 6a23b4c2aeb5..84b9c5d70103 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -63,7 +63,8 @@ let # extension tooling without significant pain. fhs = { additionalPkgs ? pkgs: [ ] }: buildFHSEnv { # also determines the name of the wrapped command - name = executableName; + pname = executableName; + inherit version; # additional libraries which are commonly needed for extensions targetPkgs = pkgs: (with pkgs; [ From aeccc55bcb4563abb6c5985ee105a7acaf181e4d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 2 Dec 2024 05:55:52 -0800 Subject: [PATCH 06/13] zoom-us: 6.2.10 -> 6.2.11 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 3e30acbd820f..8cc0e23c6a8c 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -49,23 +49,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.2.10.43047"; - versions.x86_64-darwin = "6.2.10.43047"; - versions.x86_64-linux = "6.2.10.4983"; + versions.aarch64-darwin = "6.2.11.43613"; + versions.x86_64-darwin = "6.2.11.43613"; + versions.x86_64-linux = "6.2.11.5069"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-i6ZO6Gp0PL200oklp7NJ56jGKF/nvuo54EazyfBU0Eo="; + hash = "sha256-3W0ohT62vn6vdzGq4YVcaM1kEe9oRxWOavGP/+1fhZc="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-lqmRjIre20VG9gkd7ISosABwYdLaHQDnSPYFKJZKh4Q="; + hash = "sha256-NnnY31fj0Bl1DLEghajf1bH2/bCewzzWZGP4bvIvvyk="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-lPUKxkXI3yB/fCY05kQSJhTGSsU6v+t8nq5H6FLwhrk="; + hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw="; }; }; From e193a72e60325e2a1ef16089dbb2f26c2ae180fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 14:22:25 +0000 Subject: [PATCH 07/13] sums: 0.11 -> 0.13 --- pkgs/by-name/su/sums/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/sums/package.nix b/pkgs/by-name/su/sums/package.nix index bc0cc25d2c79..a719de19ae92 100644 --- a/pkgs/by-name/su/sums/package.nix +++ b/pkgs/by-name/su/sums/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sums"; - version = "0.11"; + version = "0.13"; src = fetchFromGitLab { owner = "leesonwai"; repo = "sums"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-D8BkrStS6IwkWy8J7YRHIhyJ68kX4Dky0Vbphn6CsVM="; + hash = "sha256-DztSQcaH/k5EOvsrVA/DdgNSEHtz4Nr938tIhC94Gu8="; }; nativeBuildInputs = [ From 2f6cdb78610c1a00ae982972591b5e547dd3a2ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 15:01:30 +0000 Subject: [PATCH 08/13] shairport-sync-airplay2: 4.3.4 -> 4.3.5 --- pkgs/by-name/sh/shairport-sync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 7c0eec703ff7..a667dbec0257 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -52,13 +52,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; rev = "refs/tags/${version}"; - hash = "sha256:1y8dh1gdffq38hgy6x1228l51l6p56iaiqlflw7w1dcbgw15llcd"; + hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g="; }; nativeBuildInputs = [ From 2596f0e21c134c219c70b059684275b052778789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 15:53:51 +0000 Subject: [PATCH 09/13] python312Packages.flask-allowed-hosts: 1.1.2 -> 1.2.0 --- .../python-modules/flask-allowed-hosts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-allowed-hosts/default.nix b/pkgs/development/python-modules/flask-allowed-hosts/default.nix index 0d50d9fda344..f621ee2b81fc 100644 --- a/pkgs/development/python-modules/flask-allowed-hosts/default.nix +++ b/pkgs/development/python-modules/flask-allowed-hosts/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "flask-allowed-hosts"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; src = fetchPypi { inherit version; pname = "flask_allowed_hosts"; - hash = "sha256-l25bZlJkOVI+S+HtAK22ZGULP95evx2NASA9ViIax7Q="; + hash = "sha256-LL0Vm33R0BYo8IKyjAzpvO7ls4EfcPx3cx3OU6OsE6s="; }; build-system = [ setuptools ]; From 6e3ba153f2cc943660cd84e9978fe9cb5701b4dc Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 2 Dec 2024 22:00:40 +0100 Subject: [PATCH 10/13] vscode-extensions.sas.sas-lsp: 1.11.0 -> 1.12.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1b92461c778c..8a0025feb8a5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4297,8 +4297,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.11.0"; - hash = "sha256-CJn5pSZB+f5Eo7DvkJbP0iEzBbuBQC3FSZwxbxlrq58="; + version = "1.12.0"; + hash = "sha256-go7H9DS1uJkzKowIQ2riSPOZRC737/Q0AWxzHIcBwg4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; From 2ae24b12461ece3c37f2fbe6e8674377ae8a330e Mon Sep 17 00:00:00 2001 From: Guilherme Baeta Fontes <48162143+gui-baeta@users.noreply.github.com> Date: Mon, 2 Dec 2024 12:48:39 +0000 Subject: [PATCH 11/13] nixos/gnupg: fix typo --- nixos/modules/programs/gnupg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index eb983d9ce78a..97cd47ba3eb8 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -58,7 +58,7 @@ in defaultText = lib.literalMD "matching the configured desktop environment or `pkgs.pinentry-curses`"; description = '' Which pinentry package to use. The path to the mainProgram as defined in - the package's meta attriutes will be set in /etc/gnupg/gpg-agent.conf. + the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf. If not set by the user, it'll pick an appropriate flavor depending on the system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce, gnome3 on all other systems with X enabled, curses otherwise). From 5f4e098fbdc5a05c76c79aa61b379962ec546efe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 00:32:13 +0100 Subject: [PATCH 12/13] typstyle: 0.12.5 -> 0.12.6 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.12.5...v0.12.6 Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.12.6/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index c4b1810ffac0..8cefde72fe2a 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-28+B7lov2sUBDZUGHKBL1XzOM9q43idllQ0CPlZEdOw="; + hash = "sha256-g7GudDxmTq7dRjrVrUAxJXaduQbX/g0By+hNhzicn+g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rSPXfGZXwrnCeG9RgjQdKQkacI4phzRF3AwfKu17Yvc="; + cargoHash = "sha256-e9//IvqACYErcxC7s4+PGyw6S+4xtrbfu1io0X4iR9k="; # Disabling tests requiring network access checkFlags = [ From afd9ca8bf0e032c3f364027e404b62d022fd72ce Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 2 Dec 2024 21:58:42 -0800 Subject: [PATCH 13/13] cargo-spellcheck: move to pkgs/by-name (#356513) --- .../default.nix => by-name/ca/cargo-spellcheck/package.nix} | 5 ++--- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools/rust/cargo-spellcheck/default.nix => by-name/ca/cargo-spellcheck/package.nix} (88%) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix similarity index 88% rename from pkgs/development/tools/rust/cargo-spellcheck/default.nix rename to pkgs/by-name/ca/cargo-spellcheck/package.nix index 6d6bfa5ae258..1ac4ec1265f9 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , stdenv -, Security -, SystemConfiguration +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -21,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce1de226f70..4fa01e74c2a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6957,9 +6957,6 @@ with pkgs; cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; };