From a711606443a94644fadbb999795182645c7cc36a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 6 Nov 2024 12:00:11 -0500 Subject: [PATCH 01/98] ytt: 0.50.0 -> 0.51.0 Diff: https://github.com/carvel-dev/ytt/compare/v0.50.0...v0.51.0 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index a2de21fd7a2b..45a7b65e97d8 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "ytt"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "ytt"; rev = "v${version}"; - sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4="; + sha256 = "sha256-7PN6ejI7Ov0O3oJW71P3s3RWeRrX6M4+GTqsVlr8+7w="; }; vendorHash = null; From 738d2fee793735852743a3f57b5920bc3a6f1e12 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:44:17 +0100 Subject: [PATCH 02/98] nightfox-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/ni/nightfox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index a19fcea686f0..fd2a32f20c5e 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "14decf0378650b7a960f4761fd6178cda0d07aac"; - hash = "sha256-TWJyj5MlQtNqCuh1GD1LoXEQ4wcobhyKPQXZ31ALcMM="; + rev = "d9534b5275eb4bc588890c7bd8b30cf2b535c8e0"; + hash = "sha256-VVro8kkQisLkTyQVIBDSf55Qfnwb85glWOYWVfJbueI="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From cbf06c0be6bf210de35c4875db75e6d354d2becf Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:51:02 +0100 Subject: [PATCH 03/98] gruvbox-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 2605f504889d..72a3e999840b 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "eed38589ce90aaca4c278e13087c2babaccea4da"; - hash = "sha256-FXzD7wHqh9pZgjGXFYko43yaFCn+Y317N8xRsgt6RhE="; + rev = "d064cd480a1e4802851b35bf051e48c808802c2a"; + hash = "sha256-LOizbRbPj3X0B0bED6fRcwxYeRFY8vtLk0i64pqyIyY="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 76ac69177ae3095d794a4dcae91043b0976bdbe7 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 20:57:52 +0100 Subject: [PATCH 04/98] tokyonight-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 588125ede99e..346b4d69a03d 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Tokyonight-GTK-Theme"; - rev = "6c8f79f841550a463039e313535c6bc0d55dbde8"; - hash = "sha256-KVUcMffz/ZdCg5ivXC82WczodkckLH3XX73qm418pcE="; + rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64"; + hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From f748977943928c649202ae43aadc8dc3486363f9 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 6 Nov 2024 21:03:07 +0100 Subject: [PATCH 05/98] matrix-gtk-theme: 0-unstable-2024-10-29 -> 0-unstable-2024-11-06 --- pkgs/by-name/ma/matrix-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 62f290fa70d1..00a3f052847e 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-29"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "Matrix-GTK-Theme"; - rev = "15a799b6e2bd7f3ad89eaffa7d26beebf09b9e68"; - hash = "sha256-gyKHOS3hEppOvc10u8T5wGWlVrFSC29MofMHjEcf8i4="; + rev = "a91254e5827f5fb331308ecf893881bc9643f01a"; + hash = "sha256-XiXKzXzzWcJIfEV8ngczovyjCqH7uX8tToihq66q+jo="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 5adfde47ad0706f4ed9a514342680159433f2311 Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Wed, 6 Nov 2024 22:28:20 -0500 Subject: [PATCH 06/98] prometheus-klipper-exporter: 0.11.2 -> 0.12.0 --- .../pr/prometheus-klipper-exporter/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix index 4b8d9c16c9ec..db41ced6fd45 100644 --- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -2,26 +2,30 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, nixosTests, }: buildGoModule rec { pname = "prometheus-klipper-exporter"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "scross01"; repo = "prometheus-klipper-exporter"; rev = "v${version}"; - sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU="; + sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY="; }; vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0="; doCheck = true; - passthru.tests = { - inherit (nixosTests.prometheus-exporters) process; + passthru = { + tests = { + inherit (nixosTests.prometheus-exporters) process; + }; + updateScript = nix-update-script { }; }; meta = with lib; { From ee21904f1f302b9430af46fa4e102267c0358aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 08:31:54 +0000 Subject: [PATCH 07/98] huggle: 3.4.12 -> 3.4.13 --- pkgs/applications/misc/huggle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 381804c2b8de..6a63e64134aa 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "huggle"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; - sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE="; + sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY="; fetchSubmodules = true; }; From 00c5d680a4a67bac32cf491ac9db225f410e0b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 7 Nov 2024 10:22:21 +0100 Subject: [PATCH 08/98] eza: 0.20.6 -> 0.20.7 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.7 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index be058ca16f25..9925e54a85b2 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-uck/FwVwl9CEqy7zuKgzAahNqNc3DiGSVAsr7rDuk9Y="; + hash = "sha256-1yObVsCUGh2TwZesNNOseFR86oPh+w1q2knQkQ2vjLE="; }; - cargoHash = "sha256-lhVkmSTmFhmg2Pqju79ghooyzjd7b2AJrGaHtATHJcI="; + cargoHash = "sha256-k9zSchHFF2t30ca15eadEhnO0aFH5KIc1i0uuBKZZtc="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From ebf44e2f703f79f05add36465861d53f1d4a5970 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 09:49:34 +0000 Subject: [PATCH 09/98] tpi: 1.0.6 -> 1.0.7 --- pkgs/by-name/tp/tpi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix index bd9965029ea6..7ccd26716664 100644 --- a/pkgs/by-name/tp/tpi/package.nix +++ b/pkgs/by-name/tp/tpi/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tpi"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "turing-machines"; repo = "tpi"; rev = "v${version}"; - hash = "sha256-rkqkb3iJL4obHjTkGEUbVPJmUmfT9KKP4yoQ71cbpKs="; + hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA="; }; - cargoHash = "sha256-hSWDr1XuD6x96QV2QIdhGPQ00Sg7G5O5bkFNTdUx0ug="; + cargoHash = "sha256-5TfLAMPl3I9gkd3SSjPlBeBJzANK9u5XjY0ReHVSTJw="; meta = { description = "CLI tool to control your Turing Pi 2 board"; From 3736f5fa6fb4ebb0665fe2b0ebc508c0f2e18be7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 09:52:47 +0000 Subject: [PATCH 10/98] python312Packages.go2rtc-client: 0.0.1b2 -> 0.1.0 --- pkgs/development/python-modules/go2rtc-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix index e370d262b090..8d110afbbee3 100644 --- a/pkgs/development/python-modules/go2rtc-client/default.nix +++ b/pkgs/development/python-modules/go2rtc-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "go2rtc-client"; - version = "0.0.1b2"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-go2rtc-client"; rev = "refs/tags/${version}"; - hash = "sha256-q1NDHauYy8C3tlIpt6J0iMj0TNtBv2j9aU/IE5CgBjg="; + hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ="; }; postPatch = '' From 52bf1163fadb7ee5e21ee0b8e5cf266acb3e74e9 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 7 Nov 2024 09:43:39 +0000 Subject: [PATCH 11/98] treewide: use getLib when accessing clang / libclang / stdenv.cc.cc In preparation to eliminate the lib output for the unwrapped clang, use `lib.getLib` to access the `lib` output. --- nixos/tests/vscode-remote-ssh.nix | 2 +- .../audio/bitwig-studio/bitwig-studio3.nix | 2 +- .../audio/bitwig-studio/bitwig-studio4.nix | 2 +- .../audio/bitwig-studio/bitwig-studio5.nix | 2 +- .../audio/galaxy-buds-client/default.nix | 2 +- pkgs/applications/audio/midas/generic.nix | 2 +- pkgs/applications/audio/pianoteq/default.nix | 2 +- pkgs/applications/audio/reaper/default.nix | 4 ++-- pkgs/applications/audio/redux/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/rymcast/default.nix | 2 +- .../audio/tonelib-gfx/default.nix | 2 +- .../audio/tonelib-jam/default.nix | 2 +- .../audio/tonelib-metal/default.nix | 2 +- .../audio/tonelib-noisereducer/default.nix | 2 +- .../audio/tonelib-zoom/default.nix | 2 +- pkgs/applications/audio/touchosc/default.nix | 2 +- .../audio/virtual-ans/default.nix | 2 +- pkgs/applications/audio/vital/default.nix | 2 +- .../blockchains/sparrow/default.nix | 2 +- .../blockchains/terra-station/default.nix | 2 +- .../blockchains/wasabibackend/default.nix | 2 +- .../blockchains/wasabiwallet/default.nix | 2 +- .../editors/android-studio/common.nix | 2 +- .../emacs/elisp-packages/melpa-packages.nix | 4 ++-- .../jetbrains/plugins/specialPlugins.nix | 8 ++++---- pkgs/applications/editors/rstudio/default.nix | 4 ++-- .../editors/standardnotes/default.nix | 2 +- .../editors/sublime/2/default.nix | 2 +- .../applications/editors/sublime/3/common.nix | 6 +++--- .../applications/editors/sublime/4/common.nix | 2 +- .../editors/vim/plugins/overrides.nix | 4 ++-- .../editors/vscode/extensions/default.nix | 6 +++--- .../extensions/ms-vscode.cpptools/default.nix | 2 +- .../extensions/sourcery.sourcery/default.nix | 2 +- .../applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/fiji/default.nix | 2 +- .../graphics/kodelife/default.nix | 2 +- pkgs/applications/graphics/pencil/default.nix | 2 +- .../graphics/pixinsight/default.nix | 4 ++-- .../sane/backends/dsseries/default.nix | 2 +- pkgs/applications/kde/kdevelop/kdevelop.nix | 2 +- .../applications/misc/1password-gui/linux.nix | 2 +- .../misc/avalonia-ilspy/default.nix | 2 +- .../misc/azuredatastudio/default.nix | 2 +- pkgs/applications/misc/bloodhound/default.nix | 2 +- pkgs/applications/misc/hubstaff/default.nix | 2 +- pkgs/applications/misc/koreader/default.nix | 2 +- pkgs/applications/misc/sidequest/default.nix | 2 +- .../networking/browsers/firefox/common.nix | 2 +- .../networking/browsers/opera/default.nix | 2 +- .../networking/browsers/palemoon/bin.nix | 2 +- .../browsers/yandex-browser/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 2 +- .../instant-messengers/bluejeans/default.nix | 2 +- .../instant-messengers/franz/generic.nix | 2 +- .../instant-messengers/slack/default.nix | 2 +- .../networking/p2p/transgui/default.nix | 2 +- .../networking/scaleft/default.nix | 2 +- .../office/banana-accounting/default.nix | 2 +- .../applications/office/softmaker/generic.nix | 2 +- pkgs/applications/office/trilium/server.nix | 4 ++-- pkgs/applications/radio/sdrplay/default.nix | 2 +- .../science/biology/quast/default.nix | 2 +- .../science/electronics/eagle/eagle.nix | 2 +- .../science/electronics/picoscope/default.nix | 2 +- .../science/logic/saw-tools/default.nix | 2 +- .../science/logic/verifast/default.nix | 2 +- .../science/math/wolfram-engine/default.nix | 8 ++++---- .../version-management/bcompare/default.nix | 2 +- .../version-management/gitkraken/default.nix | 2 +- .../sublime-merge/common.nix | 2 +- .../addons/inputstream-adaptive/default.nix | 2 +- .../build-dotnet-module/hooks/default.nix | 2 +- pkgs/build-support/libredirect/default.nix | 2 +- .../rust/default-crate-overrides.nix | 2 +- pkgs/build-support/rust/hooks/default.nix | 2 +- pkgs/by-name/am/am2rlauncher/package.nix | 2 +- pkgs/by-name/am/amdenc/package.nix | 2 +- pkgs/by-name/am/amdvlk/package.nix | 2 +- pkgs/by-name/ap/aphorme/package.nix | 2 +- pkgs/by-name/aw/aws-workspaces/package.nix | 2 +- pkgs/by-name/bl/blendfarm/package.nix | 2 +- pkgs/by-name/ca/caligula/package.nix | 2 +- pkgs/by-name/ca/casadi/package.nix | 2 +- pkgs/by-name/cc/ccache/package.nix | 2 +- pkgs/by-name/ch/chatd/package.nix | 2 +- pkgs/by-name/dy/dyalog/package.nix | 2 +- pkgs/by-name/ec/ecc/package.nix | 2 +- pkgs/by-name/eq/equibop/package.nix | 2 +- .../er/erlang-language-platform/package.nix | 2 +- pkgs/by-name/fe/fedimint/package.nix | 4 ++-- pkgs/by-name/gi/github-runner/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/gu/guile-lib/package.nix | 2 +- pkgs/by-name/ig/igir/package.nix | 2 +- pkgs/by-name/in/inko/package.nix | 2 +- pkgs/by-name/in/intune-portal/package.nix | 2 +- pkgs/by-name/is/isabelle/package.nix | 4 ++-- pkgs/by-name/iv/ivm/package.nix | 2 +- pkgs/by-name/je/jextract-21/package.nix | 2 +- pkgs/by-name/je/jextract/package.nix | 2 +- pkgs/by-name/lo/logseq/package.nix | 2 +- pkgs/by-name/lu/lunarvim/package.nix | 2 +- pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +- pkgs/by-name/mi/mihomo-party/package.nix | 2 +- pkgs/by-name/mi/misskey/package.nix | 2 +- pkgs/by-name/mo/modrinth-app/package.nix | 2 +- pkgs/by-name/mo/mongodb-ce/package.nix | 2 +- .../by-name/ms/msalsdk-dbusclient/package.nix | 2 +- pkgs/by-name/ne/neothesia/package.nix | 2 +- pkgs/by-name/nu/nufmt/package.nix | 2 +- .../pa/passmark-performancetest/package.nix | 2 +- pkgs/by-name/ph/pharo/package.nix | 2 +- pkgs/by-name/ph/photonvision/package.nix | 2 +- pkgs/by-name/pl/plasticity/package.nix | 2 +- pkgs/by-name/po/pocl/package.nix | 2 +- pkgs/by-name/po/portablemc/package.nix | 2 +- pkgs/by-name/pr/prismlauncher/package.nix | 2 +- pkgs/by-name/pu/pulsar/package.nix | 2 +- pkgs/by-name/pu/pupdate/package.nix | 2 +- pkgs/by-name/ra/rainbowcrack/package.nix | 2 +- pkgs/by-name/se/segger-jlink/qt4-bundled.nix | 2 +- pkgs/by-name/se/servo/package.nix | 2 +- pkgs/by-name/sk/skypeforlinux/package.nix | 2 +- pkgs/by-name/sl/slimserver/package.nix | 2 +- pkgs/by-name/st/starpls-bin/package.nix | 2 +- pkgs/by-name/st/staruml/package.nix | 2 +- .../st/styluslabs-write-bin/package.nix | 2 +- pkgs/by-name/su/surfer/package.nix | 2 +- pkgs/by-name/sv/svp/package.nix | 2 +- pkgs/by-name/tp/tplay/package.nix | 2 +- pkgs/by-name/tr/tradingview/package.nix | 2 +- pkgs/by-name/ve/vesktop/package.nix | 2 +- pkgs/by-name/wa/warp-terminal/package.nix | 2 +- pkgs/by-name/wi/windmill/package.nix | 4 ++-- .../wl/wl-gammarelay-applet/package.nix | 2 +- pkgs/by-name/ya/yarg/package.nix | 2 +- .../compilers/computecpp/default.nix | 2 +- .../compilers/emscripten/default.nix | 2 +- pkgs/development/compilers/fpc/lazarus.nix | 2 +- .../community-edition/buildGraalvm.nix | 2 +- .../community-edition/buildGraalvmProduct.nix | 2 +- .../compilers/inklecate/default.nix | 2 +- .../development/compilers/llvm/12/default.nix | 2 +- .../compilers/llvm/common/default.nix | 4 ++-- .../compilers/llvm/common/lldb.nix | 2 +- .../compilers/temurin-bin/jdk-linux-base.nix | 2 +- .../generic-builders/manifest.nix | 2 +- pkgs/development/libraries/libcef/default.nix | 2 +- .../development/libraries/libkrun/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 4 ++-- .../libraries/opencl-clang/default.nix | 2 +- .../oracle-instantclient/default.nix | 2 +- .../development/libraries/rocksdb/default.nix | 2 +- .../astronomy/indilib/indi-3rdparty.nix | 16 +++++++-------- .../libraries/science/math/libtorch/bin.nix | 4 ++-- pkgs/development/misc/juce/default.nix | 2 +- .../mobile/androidenv/ndk-bundle/default.nix | 2 +- .../mobile/androidenv/platform-tools.nix | 2 +- .../python-modules/ifcopenshell/default.nix | 2 +- .../development/python-modules/jaxlib/bin.nix | 2 +- .../python-modules/pyside6/default.nix | 2 +- .../python-modules/pythran/default.nix | 2 +- .../python-modules/tensorflow/bin.nix | 2 +- .../tools/analysis/codeql/default.nix | 2 +- .../azure-static-sites-client/default.nix | 2 +- .../tools/build-managers/bloop/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 4 ++-- .../tools/electron/binary/generic.nix | 2 +- .../tools/electron/chromedriver/generic.nix | 2 +- pkgs/development/tools/electron/common.nix | 2 +- .../tools/gauge/plugins/dotnet/default.nix | 2 +- .../tools/glamoroustoolkit/default.nix | 2 +- pkgs/development/tools/hotdoc/default.nix | 4 ++-- pkgs/development/tools/iaca/2.1.nix | 2 +- .../tools/mblock-mlink/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- .../tools/misc/netcoredbg/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 6 +++--- .../tools/misc/segger-ozone/default.nix | 2 +- pkgs/development/tools/misc/yakut/default.nix | 2 +- pkgs/development/tools/replay-io/default.nix | 6 +++--- .../tools/rust/bindgen/default.nix | 4 ++-- .../tools/rust/bindgen/unwrapped.nix | 4 ++-- pkgs/development/web/postman/linux.nix | 2 +- pkgs/games/airshipper/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/arena/default.nix | 2 +- pkgs/games/clonehero/default.nix | 2 +- pkgs/games/dwarf-fortress/game.nix | 2 +- pkgs/games/everspace/default.nix | 2 +- pkgs/games/oilrush/default.nix | 20 +++++++++---------- pkgs/games/planetaryannihilation/default.nix | 6 +++--- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/kde/gear/kdevelop/default.nix | 2 +- pkgs/misc/cups/drivers/canon/default.nix | 10 +++++----- .../cups/drivers/samsung/1.00.36/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- pkgs/misc/drivers/epkowa/default.nix | 2 +- .../firmware/ipu6-camera-bins/default.nix | 2 +- .../linux/intel-compute-runtime/default.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 2 +- pkgs/os-specific/linux/scx/default.nix | 2 +- pkgs/os-specific/linux/uhk-agent/default.nix | 2 +- .../xp-pen-drivers/deco-01-v2/default.nix | 2 +- .../linux/xp-pen-drivers/g430/default.nix | 2 +- pkgs/servers/blockbook/default.nix | 2 +- pkgs/servers/meteor/default.nix | 4 ++-- pkgs/servers/networkaudiod/default.nix | 2 +- pkgs/servers/photoprism/libtensorflow.nix | 2 +- pkgs/servers/roon-bridge/default.nix | 2 +- pkgs/servers/roon-server/default.nix | 2 +- pkgs/servers/search/opensearch/default.nix | 2 +- pkgs/servers/urserver/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 6 +++--- pkgs/tools/admin/pulumi-bin/default.nix | 2 +- pkgs/tools/admin/pulumi/default.nix | 2 +- pkgs/tools/archivers/rar/default.nix | 2 +- pkgs/tools/audio/stt/default.nix | 2 +- .../tools/filesystems/yandex-disk/default.nix | 4 ++-- pkgs/tools/games/opentracker/default.nix | 2 +- pkgs/tools/misc/esphome/default.nix | 2 +- pkgs/tools/misc/geekbench/5.nix | 2 +- pkgs/tools/misc/geekbench/6.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- .../networking/cloudflare-warp/default.nix | 2 +- .../networking/mqttmultimeter/default.nix | 2 +- pkgs/tools/package-management/lix/common.nix | 2 +- pkgs/tools/package-management/nix/common.nix | 2 +- pkgs/tools/security/ghidra/default.nix | 2 +- .../system/dell-command-configure/default.nix | 2 +- 233 files changed, 289 insertions(+), 289 deletions(-) diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 278f2308cc16..305f931d4df1 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -28,7 +28,7 @@ in { networking.interfaces.eth1.ipv4.addresses = [ { address = serverAddress; prefixLength = 24; } ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; - virtualisation.additionalPaths = with pkgs; [ patchelf bintools stdenv.cc.cc.lib ]; + virtualisation.additionalPaths = with pkgs; [ patchelf bintools (lib.getLib stdenv.cc.cc) ]; }; client = { ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 71243f677460..2bc9a28b961f 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor (lib.getLib stdenv.cc.cc) ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 6e0643b270d1..efbeb091e210 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxkbcommon pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 0ab023e2300c..2c5911cfda0e 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pango pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) vulkan-loader xcb-imdkit xcbutil diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index a1ac12d00757..f5019ba29c30 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -30,7 +30,7 @@ buildDotnetModule rec { graphicsmagick ]; - buildInputs = [ stdenv.cc.cc.lib fontconfig ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig ]; runtimeDeps = [ libglvnd diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index fa5a7b5e46a3..6e71620ad444 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libXext # libXext.so.6 alsa-lib # libasound.so.2 freetype # libfreetype.so.6 - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 ]; in '' patchelf \ diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 908c667253d1..13b179331215 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -45,7 +45,7 @@ let ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 # libX11.so.6 xorg.libXext # libXext.so.6 alsa-lib # libasound.so.2 diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index db5d74810bee..91b6598ece94 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ - stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. # Note that libcurl and libxml2 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index a21202ebd5ba..1ddf62dd2ca2 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libX11 libXext alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7e178728c2dd..dd350e02249a 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { ln -s $path/lib/*.so* $out/lib/ done - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ mkdir $out/bin ln -s $out/renoise $out/bin/renoise diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 4fecaf373726..ddd9c751083f 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ]; + buildInputs = [ alsa-lib curl gtk3 (lib.getLib stdenv.cc.cc) webkitgtk_4_0 zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 032706e47f46..5e076f77ca6b 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 289f8b92a189..293e8885626a 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index aee3c383ae68..f337e59c2274 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix index f2f01b9326bc..df86ff86aabb 100644 --- a/pkgs/applications/audio/tonelib-noisereducer/default.nix +++ b/pkgs/applications/audio/tonelib-noisereducer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index af5dd750c50a..9f07141437fe 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib freetype libglvnd diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index e63be43fe6b5..a212a5122907 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib ]; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 22e18502866a..4a7467da125d 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libX11 libXi libGL diff --git a/pkgs/applications/audio/vital/default.nix b/pkgs/applications/audio/vital/default.nix index 84c910eecb95..8a794925a7f3 100644 --- a/pkgs/applications/audio/vital/default.nix +++ b/pkgs/applications/audio/vital/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libGL xorg.libSM xorg.libICE diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index e43e628f0ec4..ec5bea453502 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -136,7 +136,7 @@ let sparrow-modules = stdenvNoCC.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook (lib.getLib stdenv.cc.cc) zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index fef54f6844fa..f5365f29b2f1 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # patch pre-built node modules asar e $out/share/${pname}/resources/app.asar asar-unpacked find asar-unpacked -name '*.node' -exec patchelf \ - --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \ {} \; asar p asar-unpacked $out/share/${pname}/resources/app.asar diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 59a3c1689b07..394c6fc744ee 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - buildInputs = [stdenv.cc.cc.lib zlib]; + buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; runtimeDeps = [openssl zlib]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index b010eb1184e7..ad05e27385a6 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -16,7 +16,7 @@ let runtimeLibs = [ fontconfig.lib openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libICE xorg.libSM diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 28d9f496ae8c..04887dd80868 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -137,7 +137,7 @@ let e2fsprogs # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index f963b626fa6e..670b6faa51b5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -153,8 +153,8 @@ let # https://github.com/Golevka/emacs-clang-complete-async/issues/90 auto-complete-clang-async = (addPackageRequires super.auto-complete-clang-async [ self.auto-complete ]).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; - CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; - LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; + CFLAGS = "-I${lib.getLib pkgs.llvmPackages.libclang}/include"; + LDFLAGS = "-L${lib.getLib pkgs.llvmPackages.libclang}/lib"; }); # part of a larger package diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 513f0e3d74f9..1ba1e0f38c1f 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -5,17 +5,17 @@ "631" = { # Python nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "7322" = { # Python community edition nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "8182" = { # Rust (deprecated) nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin @@ -66,7 +66,7 @@ "22407" = { # Rust nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 55998bcbe3c9..ff0c468fc509 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -146,8 +146,8 @@ in --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ - --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \ + --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ --replace-fail '@pandoc@' ${pandoc} \ diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 70b5900ccde8..ff52167dd344 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libsecret glib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; in '' diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index a57fc8d7de90..1a62b1256cca 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 7eff7d9bf4df..7c5e9aef1ea1 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -65,7 +65,7 @@ let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index b594633ea3cb..8390a004b1f4 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -88,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 755751ac5741..2c677d1c250b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -293,7 +293,7 @@ in --replace "let g:clang_library_path = '' + "''" + '' - " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" + " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'" substituteInPlace "$out"/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -302,7 +302,7 @@ in clighter8 = super.clighter8.overrideAttrs { preFixup = '' - sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ + sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/plugin/clighter8.vim ''; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b3a4bc513f00..0296d6d68b88 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1072,7 +1072,7 @@ let } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; @@ -1349,7 +1349,7 @@ let buildInputs = [ zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; postInstall = '' @@ -3245,7 +3245,7 @@ let // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index fd3358e99f6d..e652e80fb068 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -71,7 +71,7 @@ vscode-utils.buildVscodeMarketplaceExtension { lttng-ust libkrb5 zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontAutoPatchelf = isx86Linux; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index c6b0f26aa5c6..cc1d7af92f2f 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -23,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index e9ab27660605..0878d91bba8a 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; libPath = lib.makeLibraryPath (with xorg; [ - stdenv.cc.cc.lib + stdenv.cc.cc at-spi2-core.out gdk-pixbuf glib diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 3d8cf49711c8..18a2ebb15d21 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontBuild = true; nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 35ec592d24cc..564be8f10593 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib gstreamer gst-plugins-base diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 4b7b6f9b6a47..96d9ddd0ab21 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -37,7 +37,7 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc.cc ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index c034e23d4a78..a6692b350f3c 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc libGL libpulseaudio @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchelf ./installer \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.cc.cc.lib}/lib + --set-rpath ${lib.getLib stdenv.cc.cc}/lib ''; dontConfigure = true; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 93e179d867d9..941db899721c 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in `find $out/lib/sane/ -type f`; do # Make it possible to find libstdc++.so.6 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:$out/lib/sane $f + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib:$out/lib/sane $f # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path. # We can directly modify the binary to force a relative lookup instead. diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 3c7be8d6172a..f62d71726b22 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -35,7 +35,7 @@ mkDerivation rec { # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b # required as nixos seems to be unable to find CLANG_BUILTIN_DIR cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include" + "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include" ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 3361d4e92d9c..5b9af43cc169 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { pango systemd ] - + ":${stdenv.cc.cc.lib}/lib64"; + + ":${lib.getLib stdenv.cc.cc}/lib64"; in '' runHook preInstall diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index d8ae98e66acd..fd1ad1a5237a 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -44,7 +44,7 @@ buildDotnetModule rec { buildInputs = [ # Dependencies of nuget packages w/ native binaries - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 86d50c030e17..62ddf238f703 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + stdenv.cc.cc systemd ]) targetPath diff --git a/pkgs/applications/misc/bloodhound/default.nix b/pkgs/applications/misc/bloodhound/default.nix index 175b293c9d88..f4e67ecacf12 100644 --- a/pkgs/applications/misc/bloodhound/default.nix +++ b/pkgs/applications/misc/bloodhound/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { nss pango systemd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) udev xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index e642cecf69d6..e9b8d07a7e9e 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -10,7 +10,7 @@ let rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft - libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 + libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3 curl libXfixes libXScrnSaver ]; in diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 014bc216b40b..4d4f2332995e 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; find $out -xtype l -print -delete wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc ] } ''; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index c90a7116b6df..ef8e0a20560b 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -82,7 +82,7 @@ libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) systemd ]; in '' diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 52165b672179..dc52606f24b7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -384,7 +384,7 @@ buildStdenv.mkDerivation { "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" "--enable-system-pixman" "--with-distribution-id=org.nixos" - "--with-libclang-path=${llvmPackagesBuildBuild.libclang.lib}/lib" + "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib" "--with-system-ffi" "--with-system-icu" "--with-system-jpeg" diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 73dc8ccc6913..a6f2cf3d4f08 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { nspr nss pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) qt6.qtbase ]; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 7f70a49e1a06..66a0f65c2b76 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { dbus-glib gtk2-x11 libXt - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ] ++ lib.optionals withGTK3 [ gtk3 ]; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 06d4251b9faa..21469edcbca9 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { nspr nss pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libqt5pas qt6.qtbase ]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 02acad93a315..1fdcbd5e5649 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -45,7 +45,7 @@ let nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 732f121f9dfa..62655ada43a9 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { freetype nspr glib - stdenv.cc.cc.lib + stdenv.cc.cc nss libX11 libXrandr diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index dcbb29e61afc..5009ab5af0df 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation (rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; + runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 14fef76ef438..7640d72c670d 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -138,7 +138,7 @@ let xorg.libXtst xorg.libxkbfile xorg.libxshmfence - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64"; buildInputs = [ gtk3 # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index e39bbee5cd88..6985ee6770b1 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; NIX_LDFLAGS = '' - -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 + -L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto ''; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 942cad0d42fe..a184e0488692 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath - [ stdenv.cc stdenv.cc.cc.lib ]; + [ stdenv.cc stdenv.cc.cc ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index 8afc96eaf88c..cd00995f13d9 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { e2fsprogs gmp gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libGL libX11 libgcrypt diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 0cdbe16e1133..ab47d26f9862 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { libXmu libXrandr libXrender - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontBuild = true; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4d6dbaa0f7cf..125c23050d74 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -1,4 +1,4 @@ -{ stdenv, autoPatchelfHook, fetchurl, nixosTests +{ lib, stdenv, autoPatchelfHook, fetchurl, nixosTests , metaCommon }: let @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = [ diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index d19ed4b02794..b3259412da24 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ libusb1 udev stdenv.cc.cc.lib ]; + buildInputs = [ libusb1 udev (lib.getLib stdenv.cc.cc) ]; unpackPhase = '' sh "$src" --noexec --target source diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index f280f81fae84..e390b5d3ec67 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -35,7 +35,7 @@ pythonPackages.buildPythonApplication rec { postFixup = '' for file in $(find $out -type f -type f -perm /0111); do old_rpath=$(patchelf --print-rpath $file) && \ - patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true + patchelf --set-rpath $old_rpath:${lib.getLib stdenv.cc.cc}/lib $file || true done # Link to the master program ln -s $out/bin/quast.py $out/bin/quast diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 6302c2dbfa38..a8da40bd070b 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -47,7 +47,7 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \ + --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \ "$out"/eagle-${version}/eagle mkdir -p "$out"/bin diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 27e527a01d87..7fc737eb1d38 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -28,7 +28,7 @@ let inherit (sources.libpicoipp) version; src = fetchurl { inherit (sources.libpicoipp) url sha256; }; nativeBuildInputs = [ dpkg autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; sourceRoot = "."; unpackCmd = "dpkg-deb -x $src ."; installPhase = '' diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index b6291bfae369..ca2e3d303571 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -7,7 +7,7 @@ let gmp4 ncurses zlib - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64"; url = "https://github.com/GaloisInc/saw-script/releases/download"; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 9515bda467cf..3f990a6fb554 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -6,7 +6,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index c7a1b585379a..5eff7513953c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ncurses opencv4 openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) unixODBC xkeyboard_config libxml2 @@ -113,15 +113,15 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/${dirName}/Executables for path in MathKernel math mcc wolfram; do - makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done for path in WolframKernel wolframscript; do - makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \ - --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ + --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \ diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 5a60f9a1d546..6b1be920833e 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -51,7 +51,7 @@ let nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) gtk2 pango cairo diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 5f2003e84617..3347a8cebbbb 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -107,7 +107,7 @@ let dontConfigure = true; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc curlWithGnuTls udev libX11 diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 84f41e6e26c6..3c6edb20297f 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -85,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1a82cd1c19b9..2e407ba094bf 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -28,7 +28,7 @@ buildKodiBinaryAddon rec { extraBuildInputs = [ pugixml rapidjson ]; - extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + extraRuntimeDependencies = [ glib nspr nss (lib.getLib stdenv.cc.cc) ]; extraInstallPhase = let n = namespace; in '' ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 377f027910bc..98a52aee2fe6 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -17,7 +17,7 @@ substitutions = { dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc stdenv.cc.libc dotnet-sdk.passthru.icu zlib diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index c30f4c90e2e6..24754041a1b6 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -42,7 +42,7 @@ else stdenv.mkDerivation rec { PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \ clang -arch x86_64 -arch arm64 -arch arm64e \ -isystem "$SDKROOT/usr/include" \ - -isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \ + -isystem ${lib.getLib llvmPackages.libclang}/lib/clang/*/include \ "-L$SDKROOT/usr/lib" \ -Wl,-install_name,$out/lib/$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 21ca75357fbb..407f7e652c38 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -232,7 +232,7 @@ in nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; openssl = attrs: { diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 7b55af079ee8..37d1b6686255 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -92,7 +92,7 @@ bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); inherit clang; }; } diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index cf2f5ebc7167..02a97b5ad008 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -26,7 +26,7 @@ let multiArch = true; multiPkgs = pkgs: with pkgs; [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libXext xorg.libXrandr diff --git a/pkgs/by-name/am/amdenc/package.nix b/pkgs/by-name/am/amdenc/package.nix index 4887dc53000d..3953ac7beb69 100644 --- a/pkgs/by-name/am/amdenc/package.nix +++ b/pkgs/by-name/am/amdenc/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index 2c7b0c918e16..f0d60c42a33a 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { [ libdrm openssl - stdenv.cc.cc.lib + stdenv.cc.cc zlib ] ++ (with xorg; [ diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 153de3c7b74c..37b06b0f0d64 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # No tests exist doCheck = false; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; runtimeDependencies = [ diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index fad93e74d47f..9598f6118cb1 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libkrb5 curl lttng-ust diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index 4eeabc18efaf..26b00115c2a2 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -64,7 +64,7 @@ buildDotnetModule rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig openssl libkrb5 diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index d957b2c79a92..b423fa01beca 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 891b423d9e7a..37bd4b1f567e 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # nix provide lib/clang headers in libclang, not in llvm. substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ '$'{CLANG_LLVM_LIB_DIR} \ - ${llvmPackages_17.libclang.lib}/lib + ${lib.getLib llvmPackages_17.libclang}/lib # help casadi find its own libs substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index c30543cdbdd1..25753bd55557 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { isGNU = unwrappedCC.isGNU or false; isCcache = true; }; - inherit (unwrappedCC) lib; + lib = lib.getLib unwrappedCC; nativeBuildInputs = [ makeWrapper ]; # Unwrapped clang does not have a targetPrefix because it is multi-target # target is decided with argv0. diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 59e36a2f298c..28a3f6d5cf3e 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -37,7 +37,7 @@ buildNpmPackage rec { ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs buildInputs = [ - stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime + (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime vips # or it will try to download from the Internet ]; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1833320dd13e..b983a88b5656 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib # Used by Conga and .NET Bridge + (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge ncurses5 # Used by the dyalog binary to correctly display in the terminal ] ++ lib.optionals htmlRendererSupport [ diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index cf91d52875cc..df4c9f4c4e59 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram $out/bin/ecc-rs \ - --prefix LIBCLANG_PATH : ${llvmPackages.libclang.lib}/lib \ + --prefix LIBCLANG_PATH : ${lib.getLib llvmPackages.libclang}/lib \ --prefix PATH : ${lib.makeBinPath (with llvmPackages; [clang bintools-unwrapped])} ''; diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 95c5d372fba6..27658012b324 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 0c100c35700f..33a8f8a7d1be 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; sourceRoot = "."; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index f55bbbf14763..a3d2d5c7f97a 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -39,7 +39,7 @@ buildRustPackage rec { protobuf pkg-config clang - libclang.lib + (lib.getLib libclang) ]; buildInputs = [ @@ -79,7 +79,7 @@ buildRustPackage rec { PROTOC = "${buildPackages.protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; OPENSSL_DIR = openssl.dev; - LIBCLANG_PATH = "${libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 93997cb01d62..392edeb7abfe 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -119,7 +119,7 @@ buildDotnetModule rec { darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 92d46adbd7d6..65160701b52a 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; pnpmDeps = pnpm'.fetchDeps { diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix index 5143c959ccd5..4d32bbb04614 100644 --- a/pkgs/by-name/gu/guile-lib/package.nix +++ b/pkgs/by-name/gu/guile-lib/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + "$(dirname $(echo ${lib.getLib stdenv.cc.cc}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; meta = with lib; { diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 4ad62dff661a..25d968c19975 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -28,7 +28,7 @@ buildNpmPackage rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node # Irrelevant to our use diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 70abc78b0fe3..a623379d0915 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { libz libxml2 ncurses - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index f9ff4b6119ca..0e4d2947643b 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { let libPath = { intune = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc libuuid xorg.libX11 curlMinimal diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 1012d06542ec..504213a29ad0 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -151,10 +151,10 @@ in stdenv.mkDerivation (finalAttrs: rec { done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do - patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so + patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${lib.getLib stdenv.cc.cc}/lib" ]}" $d/*.so done '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3 ''; buildPhase = '' diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 705bbf14a041..15644f2710b5 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0="; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix index ec2ad3b1485d..485f5e47de80 100644 --- a/pkgs/by-name/je/jextract-21/package.nix +++ b/pkgs/by-name/je/jextract-21/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pjdk21_home=${jdk21}" ]; diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index c6fd96de393a..a20c5d03baef 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pjdk22_home=${jdk23}" ]; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index c99e04a36bf6..0f56d5def56d 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -41,7 +41,7 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dontUnpack = stdenv.hostPlatform.isLinux; dontConfigure = true; diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix index 6050010bdbb5..df4b07ff14ce 100644 --- a/pkgs/by-name/lu/lunarvim/package.nix +++ b/pkgs/by-name/lu/lunarvim/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \ - --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \ + --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \ --prefix CC : ${stdenv.cc.targetPrefix}cc '' + lib.optionalString finalAttrs.nvimAlias '' ln -s $out/bin/lvim $out/bin/nvim diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index ea066fc7ba3d..e5f9fcafc412 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -39,7 +39,7 @@ let runtimeLibs = lib.makeLibraryPath [ libGL - stdenv.cc.cc.lib + stdenv.cc.cc ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 80df07cd6cb1..1a879e408e93 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { alsa-lib openssl webkitgtk_4_0 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6c23db392279..db8a687cdda2 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeLibraryPath [ jemalloc ffmpeg-headless - stdenv.cc.cc.lib + stdenv.cc.cc ] } diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index 8f17cd3c9e7c..2e25bc8f0489 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -48,7 +48,7 @@ symlinkJoin rec { xorg.libXxf86vm # lwjgl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # narrator support flite diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index a7ee195c9874..3b7802b8178a 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl.dev openssl.dev - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix index b06f097c76d8..5fd09f0035f8 100644 --- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix +++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib install -m 755 usr/lib/libmsal_dbus_client.so $out/lib/ - patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc.lib sdbus-cpp ]} $out/lib/libmsal_dbus_client.so + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc sdbus-cpp ]} $out/lib/libmsal_dbus_client.so runHook postInstall ''; diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index fbf3624ee0f6..f474a82d2bf1 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { ''; env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; meta = { diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 6e0140d79556..f91ce84fc683 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { apple-sdk_11 ]; - env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib"; + env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib"; cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k="; diff --git a/pkgs/by-name/pa/passmark-performancetest/package.nix b/pkgs/by-name/pa/passmark-performancetest/package.nix index 72914a647126..1d021281f154 100644 --- a/pkgs/by-name/pa/passmark-performancetest/package.nix +++ b/pkgs/by-name/pa/passmark-performancetest/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip autoPatchelfHook makeWrapper ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) curl ncurses5 ]; diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index 8e6d7bf31127..f05cf2752522 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let libPath = lib.makeLibraryPath (finalAttrs.buildInputs ++ [ - stdenv.cc.cc.lib + stdenv.cc.cc "$out" ]); in '' diff --git a/pkgs/by-name/ph/photonvision/package.nix b/pkgs/by-name/ph/photonvision/package.nix index 408dfb123f30..09330c9c442b 100644 --- a/pkgs/by-name/ph/photonvision/package.nix +++ b/pkgs/by-name/ph/photonvision/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { install -D $src $out/lib/photonvision.jar makeWrapper ${temurin-jre-bin-11}/bin/java $out/bin/photonvision \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib suitesparse ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc suitesparse ]} \ --prefix PATH : ${lib.makeBinPath [ temurin-jre-bin-11 bash.out ]} \ --add-flags "-jar $out/lib/photonvision.jar" diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index fb477ce07f2a..cc17a083f913 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { nss openssl pango - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) trash-cli xdg-utils ]; diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index d3c58c00e21e..795a3893d873 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -30,7 +30,7 @@ let rm -f $out/bin/$BASENAME makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ --add-flags "-L$LIBGCC_DIR" \ - --add-flags "-L${stdenv.cc.cc.lib}/lib" + --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" done ''; in diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 12872711f56a..3b3c399d4a9e 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -35,7 +35,7 @@ let libGL glfw openal - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # oshi udev diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index ab9b7144b922..03c1f0421530 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -78,7 +78,7 @@ symlinkJoin { let runtimeLibs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ## native versions glfw3-minecraft openal diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 8e5f9d295fb7..b50947419c23 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -70,7 +70,7 @@ let libxkbcommon xorg.libxkbfile pango - stdenv.cc.cc.lib + stdenv.cc.cc systemd ]; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index 2c3121a39ba1..b537d4c1b834 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -20,7 +20,7 @@ buildDotnetModule rec { }; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib openssl ]; diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix index bc138dbc9c74..40ddf8df8963 100644 --- a/pkgs/by-name/ra/rainbowcrack/package.nix +++ b/pkgs/by-name/ra/rainbowcrack/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dontConfigure = true; diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix index b1cce1f4a351..76fb252afe25 100644 --- a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix +++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig xorg.libXrandr xorg.libXfixes diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index fc586d5ddcd9..af6fb95d9585 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -142,7 +142,7 @@ rustPlatform.buildRustPackage { --prefix LD_LIBRARY_PATH : ${runtimePaths} ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; meta = { description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index fa58fd862638..16822a140032 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -96,7 +96,7 @@ let xorg.libXScrnSaver xorg.libxcb ] - + ":${stdenv.cc.cc.lib}/lib64"; + + ":${lib.getLib stdenv.cc.cc}/lib64"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index abdb045e7ced..0fd579e7a3b8 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -28,7 +28,7 @@ let ); libPath = lib.makeLibraryPath [ zlib - stdenv.cc.cc.lib + stdenv.cc.cc ]; in perlPackages.buildPerlPackage rec { diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix index ada91ae6bc42..a41e194615c0 100644 --- a/pkgs/by-name/st/starpls-bin/package.nix +++ b/pkgs/by-name/st/starpls-bin/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = lib.optionals stdenv.hostPlatform.isElf [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 634bdf0eb474..84703b0c8c88 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/opt/StarUML/staruml" "$out/bin/staruml" mkdir -p $out/lib - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf \ diff --git a/pkgs/by-name/st/styluslabs-write-bin/package.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix index 4e5ca2af4942..d15875494d79 100644 --- a/pkgs/by-name/st/styluslabs-write-bin/package.nix +++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libsForQt5.qtbase # libQt5PrintSupport.so.5 libsForQt5.qtsvg # libQt5Svg.so.5 - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 libglvnd # libGL.so.1 libX11 # libX11.so.6 libXi # libXi.so.6 diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 08fba6bdb0ce..ff820885e643 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index 0978a9e64f69..41c20ed0a48f 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -53,7 +53,7 @@ let libusb1 mpvForSVP ocl-icd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) vapoursynth xdg-utils xorg.libX11 diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 39204176b534..600e61fa7795 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev alsa-lib.dev - libclang.lib + (lib.getLib libclang) ffmpeg.dev opencv ]; diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 9c7fb11aa345..958e0f4135e4 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib atk at-spi2-atk diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index aa43c93ba98e..02b11d55baa3 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index adb2b2614e82..646750978bc9 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -48,7 +48,7 @@ linux = stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl fontconfig - stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so zlib ]; diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix index b6f4d07bd649..ec030845cc00 100644 --- a/pkgs/by-name/wi/windmill/package.nix +++ b/pkgs/by-name/wi/windmill/package.nix @@ -144,7 +144,7 @@ rustPlatform.buildRustPackage { openssl rustfmt lld - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ @@ -170,7 +170,7 @@ rustPlatform.buildRustPackage { bash ] } \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]} \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix index 64388cf0b7be..7da62ca22f87 100644 --- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix +++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = [ diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix index 47c179af860f..8bf3447b9ac5 100644 --- a/pkgs/by-name/ya/yarg/package.nix +++ b/pkgs/by-name/ya/yarg/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { # Load-time libraries (loaded from DT_NEEDED section in ELF binary) alsa-lib gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib # Run-time libraries (loaded with dlopen) diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 4e6e7ad43416..d6835ba05f78 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dontStrip = true; - buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ocl-icd zlib ]; nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; installPhase = '' diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2d94880976d7..7779bbbc670b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped) lld llvm ]; }; nodeModules = buildNpmPackage { diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index ba2eeada5e46..4cd1dd9ab2f0 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { LCL_PLATFORM = if withQt then "qt5" else "gtk2"; NIX_LDFLAGS = lib.concatStringsSep " " ([ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lX11" "-lXext" "-lXi" diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index f5b18d196ff5..6db4e4312f29 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -112,7 +112,7 @@ let buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 2c8220d89a0a..39b4136698c7 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation ({ ++ extraNativeBuildInputs; buildInputs = [ - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index 52c278a1bd30..629b2f38ccfa 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -16,7 +16,7 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; projectFile = "inklecate/inklecate.csproj"; nugetDeps = ./deps.nix; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 4e2754def4de..352cf8313d67 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -199,7 +199,7 @@ let ({ substituteAll, libclang }: substituteAll { src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }) { }; in diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index eaba6f45edfe..1826215ba3ef 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -355,7 +355,7 @@ let mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommandsBasicRt = @@ -649,7 +649,7 @@ let { substituteAll, libclang }: (substituteAll { src = metadata.getVersionFile "lldb/resource-dir.patch"; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }).overrideAttrs (_: _: { name = "resource-dir.patch"; }) ) { }; diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index dafecdd709bd..1e2233790738 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ - "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" + "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}" ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 29cdf778f541..9d9033506aac 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -59,7 +59,7 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index eccc7c2d216f..26f4f1b972ae 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -215,7 +215,7 @@ backendStdenv.mkDerivation (finalAttrs: { # one that is compatible with the rest of nixpkgs, even when # nvcc forces us to use an older gcc # NB: We don't actually know if this is the right thing to do - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; # Picked up by autoPatchelf diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ce83c3c22cd4..9595efc1c1b9 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -31,7 +31,7 @@ let gl_rpath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc ]; rpath = lib.makeLibraryPath [ diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 222d8320026d..0da33d028e1c 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSound pipewire ++ lib.optional sevVariant openssl; - env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so"; + env.LIBCLANG_PATH = "${lib.getLib llvmPackages.clang-unwrapped}/lib/libclang.so"; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f5d44ff4623a..fb5f6b1d817c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -170,7 +170,7 @@ in stdenv.mkDerivation { # Needed to discover llvm-config for cross preConfigure = '' - PATH=${llvmPackages.libllvm.dev}/bin:$PATH + PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH ''; mesonFlags = [ @@ -204,7 +204,7 @@ in stdenv.mkDerivation { # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) - (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") + (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index a4d2f115cc67..ecd22f70b772 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" + "-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/" "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 4d6a605bf084..c97b17a60a89 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { inherit pname version srcs; - buildInputs = [ stdenv.cc.cc.lib ] + buildInputs = [ (lib.getLib stdenv.cc.cc) ] ++ optional stdenv.hostPlatform.isLinux libaio ++ optional odbcSupport unixODBC; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d2f3c320997e..c08f38accaf0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) '' - ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} + ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {} ''; # Old version doesn't ship the .pc file, new version puts wrong paths in there. diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 50ec95ee2f8f..72a9c747eeb4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -171,7 +171,7 @@ let pname = "libasi"; buildInputs = [ libusb1 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { @@ -182,7 +182,7 @@ let libastroasis = buildIndi3rdParty { pname = "libastroasis"; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { license = licenses.unfreeRedistributable; @@ -193,7 +193,7 @@ let libatik = buildIndi3rdParty { pname = "libatik"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd libdc1394 @@ -247,7 +247,7 @@ let libinovasdk = buildIndi3rdParty { pname = "libinovasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -348,7 +348,7 @@ let ''; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd ]; @@ -377,7 +377,7 @@ let cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -404,7 +404,7 @@ let libricohcamerasdk = buildIndi3rdParty { pname = "libricohcamerasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -447,7 +447,7 @@ let libsvbony = buildIndi3rdParty { pname = "libsvbony"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index ee24908eb512..8cbe481207e2 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -23,7 +23,7 @@ let device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc); in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -59,7 +59,7 @@ in stdenv.mkDerivation { ''; postFixup = let - rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + rpath = lib.makeLibraryPath [ stdenv.cc.cc ]; in lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 610434dfe624..476913f0e7ca 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype # libfreetype.so curl # libcurl.so - stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so pcre # libpcre2.pc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b9c11cb46e97..f72fa0c8bd4a 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -12,7 +12,7 @@ deployAndroidPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ]; patchElfBnaries = '' # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 4ed98e7a7d7f..05542ae6dc02 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc.lib pkgs.zlib pkgs.ncurses5 ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 80acaeb1f10d..c9b5183e4f9e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { buildInputs = [ # ifcopenshell needs stdc++ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) boost179 cgal eigen diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index a08264849770..5b7fb2d88a93 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -189,7 +189,7 @@ buildPythonPackage { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # jaxlib contains shared libraries that open other shared libraries via dlopen # and these implicit dependencies are not recognized by ldd or diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 088f4e785af6..9464034178b2 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; + LLVM_INSTALL_DIR = "${lib.getLib llvmPackages.libclang}/lib"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index c1fce200011b..2146c8c02245 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${ - if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib + if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc) }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index c187737eeead..7a5127582a64 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -154,7 +154,7 @@ buildPythonPackage { ]; libpaths = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 632d2c4a9153..c981487935c5 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { xorg.libXrender freetype jdk17 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) curl ]; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 126eaf1ec68e..18b80555833e 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { libkrb5 lttng-ust openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index b6db8634c06e..3e7ab2d44af5 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dontUnpack = true; nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) zlib ]; propagatedBuildInputs = [ jre ]; installPhase = '' diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a2a1c1115a53..e1087a476c5c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -112,7 +112,7 @@ rec { for variant in "" "-ncurses5" "-ncurses6"; do autoPatchelfInJar \ $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done # The file-events library _seems_ to follow the native-platform version, but @@ -120,7 +120,7 @@ rec { fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" autoPatchelfInJar \ $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 585b5d947263..6835c8a6263e 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -97,7 +97,7 @@ let xorg.libxkbfile pango pciutils - stdenv.cc.cc.lib + stdenv.cc.cc systemd ] ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index 1eb1a8d870b8..6ee587b26ef9 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -51,7 +51,7 @@ let src = fetcher version (get tags platform) (get hashes platform); buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) glib xorg.libxcb nspr diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index bed48f725649..bd4843edbcca 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -193,7 +193,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { libPath = lib.makeLibraryPath [ libnotify pipewire - stdenv.cc.cc.lib + stdenv.cc.cc libsecret libpulseaudio speechd-minimal diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix index 2b79004073ec..dbac34acdac7 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix +++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -12,7 +12,7 @@ makeGaugePlugin { releasePrefix = "gauge-dotnet-"; isCrossArch = true; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Gauge plugin that lets you write tests in C#"; diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 3fb6aed7f031..cd55899e6c9f 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz # libWebView.so libsoup_3 # libWebView.so webkitgtk_4_1 # libWebView.so - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; binPath = lib.makeBinPath [ zenity # File selection dialog diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 8dcee1b730dd..9a1bfe9ded9e 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -101,8 +101,8 @@ buildPythonApplication rec { substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 584b8856e89f..e368d608d593 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix index 0b6ec3252ef5..d2bdb21ec930 100644 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ b/pkgs/development/tools/mblock-mlink/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 40808bcdb439..f936ae7c89eb 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -15,7 +15,7 @@ # $debugdir:$datadir/auto-load are whitelisted by default by GDB "$debugdir" "$datadir/auto-load" # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb - targetPackages.stdenv.cc.cc.lib + (lib.getLib targetPackages.stdenv.cc.cc) ] , writeScript }: diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 3fd8c3eeaa94..a225d814aae2 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { src = managed; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' mkdir -p $out/share/netcoredbg $out/bin cp ${unmanaged}/* $out/share/netcoredbg diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index d4f17fb595d0..27b01dc5ffe1 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -16,7 +16,7 @@ let libPath = lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 - libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib + libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc dbus libGL ]; @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { "$out/libQt5Gui.so.5" \ "$out/libQt5Core.so.5" \ "$out/libQt5Network.so.5" ; do - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" done - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix index 8109c1e42a36..ea8ddd53c09f 100644 --- a/pkgs/development/tools/misc/segger-ozone/default.nix +++ b/pkgs/development/tools/misc/segger-ozone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libXfixes libXrandr libXrender - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index c4589eefb4de..c4f5d4e051c6 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { }; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) click coloredlogs psutil diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix index 51daef23b527..4f65c853da4a 100644 --- a/pkgs/development/tools/replay-io/default.nix +++ b/pkgs/development/tools/replay-io/default.nix @@ -8,7 +8,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz" metadata.recordreplay.url); nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib openssl zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) openssl zlib ]; src = (fetchzip metadata.recordreplay); dontBuild = true; @@ -73,7 +73,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url); nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; src = (fetchurl metadata.replay-node); dontUnpack = true; @@ -114,7 +114,7 @@ in rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib nodejs ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) nodejs ]; dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 462eb6022c5a..1e2af744f9bc 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: +{ lib, rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: let clang = rust-bindgen-unwrapped.clang; self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" @@ -6,7 +6,7 @@ let #for substituteAll inherit bash; unwrapped = rust-bindgen-unwrapped; - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); meta = rust-bindgen-unwrapped.meta // { longDescription = rust-bindgen-unwrapped.meta.longDescription + '' This version of bindgen is wrapped with the required compiler flags diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index a862878c9f7a..a45754a6b70c 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage rec { cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; - buildInputs = [ clang.cc.lib ]; + buildInputs = [ (lib.getLib clang.cc) ]; preConfigure = '' - export LIBCLANG_PATH="${clang.cc.lib}/lib" + export LIBCLANG_PATH="${lib.getLib clang.cc}/lib" ''; doCheck = true; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index bc1119103c44..4ef52b253205 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) atk at-spi2-atk at-spi2-core diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 0d55a703c0d5..bf66cbbfa81b 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -31,7 +31,7 @@ let runtimeLibs = [ udev alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libxkbcommon libxcb libX11 diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index ecd1dfc9b3cd..c9e8a0695ba2 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{opt/andyetitmoves,bin} cp -r * $out/opt/andyetitmoves/ - fullPath=${stdenv.cc.cc.lib}/lib64 + fullPath=${lib.getLib stdenv.cc.cc}/lib64 for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index 9b31c41ea68a..c0bbc364617e 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way? - buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib]; + buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 (lib.getLib stdenv.cc.cc)]; unpackPhase = '' # This is is a tar bomb, i.e. it extract a dozen files and directories to diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index daebe74e30b4..7af6a21199f2 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # Load-time libraries (loaded from DT_NEEDED section in ELF binary) alsa-lib gtk3 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib # Run-time libraries (loaded with dlopen) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 02dfd89f636d..820b6def9d17 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation { buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck - ++ [ stdenv.cc.cc.lib ]; + ++ [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/games/everspace/default.nix b/pkgs/games/everspace/default.nix index abf568d6acab..3d5ddad7b8c6 100644 --- a/pkgs/games/everspace/default.nix +++ b/pkgs/games/everspace/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pango gtk2-x11 openal - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = [ diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 5715c5e029b9..d3a66ea95fb8 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -26,25 +26,25 @@ stdenv.mkDerivation { do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libNetwork_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtGuiUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtWebKitUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libQtXmlUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ OilRush_$arch ''; installPhase = '' diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index e99f5541f284..23cd996dfcf1 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f done ''; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index a54cea0ae9f9..16d3e67e892c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; sourceRoot = pname; - libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer + libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc SDL2 SDL2_mixer libogg libvorbis ]; unpackPhase = '' diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix index cf506b1f91cc..5a2b02b41530 100644 --- a/pkgs/kde/gear/kdevelop/default.nix +++ b/pkgs/kde/gear/kdevelop/default.nix @@ -39,7 +39,7 @@ mkKdeDerivation { ]; extraCmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include" + "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include" "-DAPR_CONFIG_PATH=${apr.dev}/bin" "-DAPU_CONFIG_PATH=${aprutil.dev}/bin" ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index afee42090329..e39bcf05e427 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -147,15 +147,15 @@ stdenv.mkDerivation rec { ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 ) ( cd $out/bin - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 wrapProgram $out/bin/cnrsdrvufr2 \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index a76ecd6dcbf6..0a09bdb272e6 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ''; # all binaries are already stripped diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 59a210e6f534..326106b38878 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ''; # all binaries are already stripped diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index eaba99839f61..b822fa140bb0 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -24,7 +24,7 @@ let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; - libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index b29572b436bd..bb0e1eb7b6fd 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -385,7 +385,7 @@ let plugins = { # for the version, look for the driver of XP-750 in the search page version = "2.30.4"; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 873e0c971d67..8ea3d96157a4 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ autoPatchelfHook - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) expat zlib ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 312d008cf5b6..872281f6c9d0 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc ]} \ $out/lib/intel-opencl/libigdrcl.so ''; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 3b83b16cb09e..ad5699ab2f55 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc ncurses5 numactl zlib diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix index 881bf7a6add4..52fd174546cf 100644 --- a/pkgs/os-specific/linux/scx/default.nix +++ b/pkgs/os-specific/linux/scx/default.nix @@ -39,7 +39,7 @@ let zlib ] ++ (args.buildInputs or [ ]); - env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${llvmPackages.libclang.lib}/lib"; + env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${lib.getLib llvmPackages.libclang}/lib"; # Needs to be disabled in BPF builds hardeningDisable = [ diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 8177c7d1efda..d2a4078a8957 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index 18aa86282567..ba3dc3b37351 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libXinerama glibc libGL - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) qtx11extras ]; diff --git a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix index 10169ff3fe4e..9381463c8fa1 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { libXtst qtbase libglvnd - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 47eb65bf70d2..2dfde248b9b9 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { tags = [ "rocksdb_7_10" ]; CGO_LDFLAGS = [ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lrocksdb" "-lz" "-lbz2" diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 1454f4994c15..31491c8b5846 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { # Patch node. patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${lib.getLib stdenv.cc.cc}/lib" \ $out/dev_bundle/bin/node # Patch mongo. @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Patch node dlls. for p in $(find $out/packages -name '*.node'); do patchelf \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ + --set-rpath "$(patchelf --print-rpath $p):${lib.getLib stdenv.cc.cc}/lib" \ $p || true done ''; diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index a6a858637fe3..c2566f4451ea 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontConfigure = true; diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/servers/photoprism/libtensorflow.nix index e1c8f9338cc8..db1be8d95e24 100644 --- a/pkgs/servers/photoprism/libtensorflow.nix +++ b/pkgs/servers/photoprism/libtensorflow.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # Patch library to use our libc, libstdc++ and others patchPhase = let - rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; + rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc ]; in '' chmod -R +w lib diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 4e37f52bbd60..876702f6beb7 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index cb78bb675310..de90d8b8e040 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { krb5 libtasn1 lttng-ust_2_12 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 7a9cf1ce2efc..a537d2a6bfd8 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { wrapProgram $out/bin/opensearch \ --prefix PATH : "${lib.makeBinPath [ gnugrep coreutils ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/plugins/opensearch-knn/lib/" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/plugins/opensearch-knn/lib/" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 0e73bebe71fb..1df9c40aee32 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) bluez libX11 libXtst diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5a3ef15e392d..4d6fd822db78 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -129,7 +129,7 @@ let rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc" + ln -s "$(clangResourceRootIncludePath "${lib.getLib clang-unwrapped}")" "$rsrc" ln -s "${compiler-rt.out}/lib" "$rsrc/lib" ln -s "${compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags @@ -1036,7 +1036,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check extraBuildCommands = '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share" @@ -1211,7 +1211,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ++ (with prevStage.llvmPackages; [ bintools-unwrapped clang-unwrapped - clang-unwrapped.lib + (lib.getLib clang-unwrapped) compiler-rt compiler-rt.dev libcxx diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix index ec61e5aef2d0..5c152d4d008c 100644 --- a/pkgs/tools/admin/pulumi-bin/default.nix +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * '' + lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib" '' + '' installShellCompletion --cmd pulumi \ --bash <($out/bin/pulumi completion bash) \ diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e79000e70217..f46f3c25775e 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -132,7 +132,7 @@ buildGoModule rec { mkdir -p $out/bin makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \ --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \ - --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib" ''; }; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index fe378514adea..fb95f4de5650 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { dontBuild = true; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 89ed5f983973..8d3cb54d614b 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 xz - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; installPhase = '' diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6e7a19ad8ee8..b0056602c387 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -3,13 +3,13 @@ let p = if stdenv.hostPlatform.is64bit then { arch = "x86_64"; - gcclib = "${stdenv.cc.cc.lib}/lib64"; + gcclib = "${lib.getLib stdenv.cc.cc}/lib64"; sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0="; webarchive = "20220519080155"; } else { arch = "i386"; - gcclib = "${stdenv.cc.cc.lib}/lib"; + gcclib = "${lib.getLib stdenv.cc.cc}/lib"; sha256 = "sha256-28dmdnJf+qh9r3F0quwlYXB/UqcOzcHzuzFq8vt2bf0="; webarchive = "20220519080430"; }; diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 459541ddb1d0..2946ff08b2f0 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -47,7 +47,7 @@ buildDotnetModule rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig gtk3 icu diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index b30cc6101209..3a80e8e0d556 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -102,7 +102,7 @@ python.pkgs.buildPythonApplication rec { # inetutils is used in esphome/dashboard/status/ping.py "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}" "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}" "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/tools/misc/geekbench/5.nix index 0c23877ee847..c7504585dc0f 100644 --- a/pkgs/tools/misc/geekbench/5.nix +++ b/pkgs/tools/misc/geekbench/5.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 2f1d2d0b6be1..6b78d65b39a1 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index b198b030f3ea..37d9616446f1 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib \ $out/opt/MegaRAID/MegaCli/MegaCli64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index fb03bee688a6..ea789e9b52f9 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libpcap openssl nss - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; desktopItems = [ diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index 1374dbc119dd..191bc642d7c7 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -32,7 +32,7 @@ buildDotnetModule rec { copyDesktopItems ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*} diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 521c27b7e7bc..2970b421fd5f 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation { rm -f $out/lib/*.a ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* ''} ${lib.optionalString stdenv.hostPlatform.isDarwin '' for LIB in $out/lib/*.dylib; do diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 07e58a41e400..5c913f681275 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -184,7 +184,7 @@ self = stdenv.mkDerivation { rm -f $out/lib/*.a ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* ''} '' + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 8f39076b4eec..a2e1399a2fd9 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) pam ]; diff --git a/pkgs/tools/system/dell-command-configure/default.nix b/pkgs/tools/system/dell-command-configure/default.nix index cd313751c7b6..c69bc0d63f90 100644 --- a/pkgs/tools/system/dell-command-configure/default.nix +++ b/pkgs/tools/system/dell-command-configure/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { inherit version; pname = "dell-command-configure"; - buildInputs = [ openssl stdenv.cc.cc.lib ]; + buildInputs = [ openssl (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; dontConfigure = true; From 99a3481c2228d908fa3b68216c2ffe4e3efbe32f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 11:03:19 +0000 Subject: [PATCH 12/98] slackdump: 2.5.11 -> 2.6.0 --- pkgs/by-name/sl/slackdump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index b3c9f9558556..734d8de262b6 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "slackdump"; - version = "2.5.11"; + version = "2.6.0"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; rev = "refs/tags/v${version}"; - hash = "sha256-othSIR+KyekUt+/LWhaM5Y6LGsujDCZTfLJotTcPXc0="; + hash = "sha256-hdSsvV1mQet61pWeo5icDhFxAVNP5QU1fdb1YgyXVWU="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -30,7 +30,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-6GVXzaJ5Lrt4fF0c9cbx6AqpgCwlYgKf6jUJkUyxc0s="; + vendorHash = "sha256-LjZP00YL0Coc7yY0Bm7AaYoAP37vQVJpVYPxuEnVEp4="; meta = { homepage = "https://github.com/rusq/slackdump"; From d04df75f40a526596d67335dbed65a9190f22694 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 4 Nov 2024 12:02:20 +0100 Subject: [PATCH 13/98] zellij: 0.40.1 -> 0.41.1 https://github.com/zellij-org/zellij/releases/tag/v0.41.0 https://github.com/zellij-org/zellij/releases/tag/v0.41.1 --- pkgs/tools/misc/zellij/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2097787f4855..4559d83d41e3 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,18 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.40.1"; + version = "0.41.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-n8cwsCeKWzTw/psvLL3chBr8EcwGoeKB8JeiLSLna1k="; + hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw="; }; - cargoHash = "sha256-TyIQaovmpiu7USURA//+IQWNT95rrVk0x9TRspXYUNk="; + cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I="; + + env.OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ mandown @@ -32,8 +34,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 64721203dfb18421f385537608ee3be3ca0ed1af Mon Sep 17 00:00:00 2001 From: Jan Weitz Date: Mon, 4 Nov 2024 13:40:11 +0100 Subject: [PATCH 14/98] powerpipe: 0.4.4 -> 1.0.0 --- pkgs/by-name/po/powerpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index b64c4a39ad78..99807e5cfe26 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "powerpipe"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; rev = "refs/tags/v${version}"; - hash = "sha256-B88Kc4cCadsyN/sx3TimFX3ad6WZqn/Qaw39ms8b+HE="; + hash = "sha256-ou24M5S6GfrQxmcmESzhU52ZQqdb+1s2ExLBljM0RR0="; }; - vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk="; + vendorHash = "sha256-CveNSjZCdV8YEis0PNP8F9+ht+Q9vz0VWCEp9lCJsTs="; proxyVendor = true; nativeBuildInputs = [ From b3415064825f1b7be3247fb9ab85aee2ed6dd27d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 12:42:27 +0000 Subject: [PATCH 15/98] python312Packages.pythonqwt: 0.12.7 -> 0.14.1 --- pkgs/development/python-modules/pythonqwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix index 1eb3e3e2aedc..8888d8d1e1e3 100644 --- a/pkgs/development/python-modules/pythonqwt/default.nix +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pythonqwt"; - version = "0.12.7"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PythonQwt"; rev = "refs/tags/v${version}"; - hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4="; + hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k="; }; build-system = [ From 4833d9711d947d2997f58196e056b81301fa6fc2 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 13:43:54 +0100 Subject: [PATCH 16/98] zellij: adapt to new darwin SDK pattern --- pkgs/tools/misc/zellij/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 4559d83d41e3..5aa3aabf8afb 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,10 +4,7 @@ , stdenv , installShellFiles , pkg-config -, libiconv , openssl -, DiskArbitration -, Foundation , mandown , zellij , testers @@ -36,10 +33,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - DiskArbitration - Foundation ]; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf056feef01..b0c8e2f6b1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,9 +13877,7 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; + zellij = callPackage ../tools/misc/zellij { }; zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; From 21de802c9f23bb75a02a737aaf928200c10fba3d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:06:13 +0100 Subject: [PATCH 17/98] zellij: make sure to link to our provided curl --- pkgs/tools/misc/zellij/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 5aa3aabf8afb..adc720ec3f66 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -4,6 +4,7 @@ , stdenv , installShellFiles , pkg-config +, curl , openssl , mandown , zellij @@ -25,13 +26,21 @@ rustPlatform.buildRustPackage rec { env.OPENSSL_NO_VENDOR = 1; + # Workaround for https://github.com/zellij-org/zellij/issues/3720 + postPatch = '' + substituteInPlace zellij-utils/Cargo.toml \ + --replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }' + ''; + nativeBuildInputs = [ mandown installShellFiles pkg-config + (lib.getDev curl) ]; buildInputs = [ + curl openssl ]; @@ -39,6 +48,16 @@ rustPlatform.buildRustPackage rec { HOME=$TMPDIR ''; + # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs + doInstallCheck = stdenv.hostPlatform.libc == "glibc"; + installCheckPhase = '' + runHook preInstallCheck + + ldd "$out/bin/zellij" | grep libcurl.so + + runHook postInstallCheck + ''; + postInstall = '' mandown docs/MANPAGE.md > zellij.1 installManPage zellij.1 From 10c96e20677472ec3851d3c2ef1ac3ceb136d1d9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:08 +0100 Subject: [PATCH 18/98] zellij: move to by-name --- .../misc/zellij/default.nix => by-name/ze/zellij/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/zellij/default.nix => by-name/ze/zellij/package.nix} (100%) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/by-name/ze/zellij/package.nix similarity index 100% rename from pkgs/tools/misc/zellij/default.nix rename to pkgs/by-name/ze/zellij/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0c8e2f6b1a3..eaa654e80121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,8 +13877,6 @@ with pkgs; zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { }; - zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; }; From b00e0d4b1d2793a1b73734116adeee2660144d53 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 7 Nov 2024 10:10:38 +0100 Subject: [PATCH 19/98] zellij: format --- pkgs/by-name/ze/zellij/package.nix | 50 +++++++++++++++++------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index adc720ec3f66..5d7b348bc1f8 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -1,14 +1,15 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, stdenv -, installShellFiles -, pkg-config -, curl -, openssl -, mandown -, zellij -, testers +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + installShellFiles, + pkg-config, + curl, + openssl, + mandown, + zellij, + testers, }: rustPlatform.buildRustPackage rec { @@ -58,16 +59,18 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - postInstall = '' - mandown docs/MANPAGE.md > zellij.1 - installManPage zellij.1 + postInstall = + '' + mandown docs/MANPAGE.md > zellij.1 + installManPage zellij.1 - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij setup --generate-completion bash) \ - --fish <($out/bin/zellij setup --generate-completion fish) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) - ''; + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd $pname \ + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) + ''; passthru.tests.version = testers.testVersion { package = zellij; }; @@ -76,7 +79,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh _0x4A6F abbe pyrox0 ]; + maintainers = with maintainers; [ + therealansh + _0x4A6F + abbe + pyrox0 + ]; mainProgram = "zellij"; }; } From 9527546079f16dfbfad224ff7877b3ca8a30dee6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 13:50:41 +0000 Subject: [PATCH 20/98] python312Packages.ssort: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/ssort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix index 71a950b98bd7..6a60f6ab1e53 100644 --- a/pkgs/development/python-modules/ssort/default.nix +++ b/pkgs/development/python-modules/ssort/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ssort"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "bwhmather"; repo = "ssort"; rev = "refs/tags/${version}"; - hash = "sha256-P/FUayCC7KfXjtzclTPLhLw5o0bV4L98tes69w+038o="; + hash = "sha256-TINktjuTdyRYkqIs3Jyv6vobSBqV1iPoHrG36sBHah8="; }; build-system = [ setuptools ]; From a235f519bc00dfb439258508e9a7e59f145ed5e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 14:07:48 +0000 Subject: [PATCH 21/98] git-backup-go: 1.6.0 -> 1.6.1 --- pkgs/by-name/gi/git-backup-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix index 761912e118c3..41fa743ccc5d 100644 --- a/pkgs/by-name/gi/git-backup-go/package.nix +++ b/pkgs/by-name/gi/git-backup-go/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "git-backup-go"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ChappIO"; repo = "git-backup"; rev = "v${version}"; - hash = "sha256-C/ha/GuRvqxmgrbOgkhup1tNoDT3pDIbE+nO5eMZGlY="; + hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks="; }; - vendorHash = "sha256-wzivnTe9Rx3YLz6lvrzsLiJIbxX7QE059Kzb4rUfD+s="; + vendorHash = "sha256-BLnnwwCrJJd8ihpgfdWel7l8aAIVVJBIpE+97J9ojPo="; ldflags = [ "-X main.Version=${version}" ]; From fa80238cb1d22b5ba061d849fb6aed14eadd317c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 14:45:46 +0000 Subject: [PATCH 22/98] zizmor: 0.1.4 -> 0.2.1 --- pkgs/by-name/zi/zizmor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 3ce77d3d1667..c16ecd20e9d3 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "0.1.4"; + version = "0.2.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; rev = "v${version}"; - hash = "sha256-S2B4GQAqx4t9AZf3QDUhzku68j0buZdW0cLhmOiRssk="; + hash = "sha256-3W5S49eHZZfKXTI2xdB32kLoTnCVKYtwLbJwempnXCc="; }; - cargoHash = "sha256-hoZXR+zYuK/r4/r3QwIhTmMTCs5M0lMACH4QPEq07ZU="; + cargoHash = "sha256-ZCCmdnSj6u+k+dRUHFyKuDvnVNBtMAkmcz6TMQ1i7zs="; buildInputs = [ openssl ]; From 7284119ae2f42947bf77ef4e0b4fa52cd71d90a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 15:24:48 +0000 Subject: [PATCH 23/98] python312Packages.huum: 0.7.10 -> 0.7.11 --- pkgs/development/python-modules/huum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 7e8d4ff033b7..8eb7b4567459 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "huum"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frwickst"; repo = "pyhuum"; rev = "refs/tags/${version}"; - hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY="; + hash = "sha256-anYVrisn68EFpMsZXQb4PMsDKpRzUomoaJpOFtYVzhc="; }; nativeBuildInputs = [ poetry-core ]; From 5a919f979447220f10544058fe6242fa298d7e52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 15:41:15 +0000 Subject: [PATCH 24/98] python312Packages.ttp-templates: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/ttp-templates/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index e22190ff82d9..b4297f30fb97 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; From 34d1552a83d57b488467ea3aa7302313f9cd5ff2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:45:10 +0100 Subject: [PATCH 25/98] signal-desktop: 7.31.0 -> 7.32.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index eba218c54994..f1fc184a8b12 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.31.0"; + version = "7.32.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-7UumNusnexW3ujA65SzxKAdRrWxmKrgZFzK0GMlURaM="; + hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU="; } From 550ae7093ebe8d4863988c0c701d2e7b29bc622c Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:50:28 +0100 Subject: [PATCH 26/98] signal-desktop-(generic): add libpulseaudio to bui ldInputs --- .../networking/instant-messengers/signal-desktop/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 85e9b9c9f667..ab5ec2a53391 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -157,6 +157,7 @@ stdenv.mkDerivation rec { libXrender libXtst libappindicator-gtk3 + libpulseaudio libnotify libuuid mesa # for libgbm From e630ab066e270a522e817985cbee640b8299e6be Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:51:25 +0100 Subject: [PATCH 27/98] signal-desktop-beta:7.32.0-beta.1 -> 7.33.0-beta.1 --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index a0d752151b96..fa07e2d1e477 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.32.0-beta.1"; + version = "7.33.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-WrHF7Y8OcEOr+W/Jhc+Hj5jCtOjKigZ02N9N/hE+XLA="; + hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0="; } From 614795583f3a13d4b1e055425898c4e5c2c2b5b8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:52:36 +0100 Subject: [PATCH 28/98] signal-desktop-(generic): use --replace-fail --- .../networking/instant-messengers/signal-desktop/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index ab5ec2a53391..77754a0122e1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -237,7 +237,7 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace-fail "/opt/${dir}/${pname}" $out/bin/${pname} \ --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" # Note: The following path contains bundled libraries: From ef10762159e9d37397ac252a8f4669a149c1c885 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:41:56 -0800 Subject: [PATCH 29/98] atuin: migrate to new darwin SDK pattern --- pkgs/by-name/at/atuin/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index e50cdde161ef..f863e578a076 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -3,9 +3,8 @@ , fetchFromGitHub , installShellFiles , rustPlatform -, libiconv , buildPackages -, darwin +, apple-sdk_11 , nixosTests }: @@ -36,10 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration + apple-sdk_11 ]; preBuild = '' From cf03e22456c092e6bf822e807efcae95633a8adf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Nov 2024 20:47:43 +0100 Subject: [PATCH 30/98] python312Packages.aioairzone-cloud: 0.6.7 -> 0.6.10 (#351282) Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.6.7...0.6.10 Changelog: - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.8 - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.9 - https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.10 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 5e5499e2bcaa..685e50650602 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.7"; + version = "0.6.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs="; + hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM="; }; build-system = [ setuptools ]; From aed1f3d336bf5e8442b9c3ec13e93bd76c96f233 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:49:02 +0100 Subject: [PATCH 31/98] python312Packages.aioautomower: 2024.10.0 -> 2024.10.3 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.1 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.2 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.3 --- .../python-modules/aioautomower/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 8884f0ef904f..9caf6af5bbbf 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -9,14 +9,16 @@ poetry-core, pyjwt, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, + tzlocal, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.10.0"; + version = "2024.10.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,14 +27,13 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY="; + hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ poetry-core ]; @@ -42,11 +43,13 @@ buildPythonPackage rec { ical mashumaro pyjwt + tzlocal ]; nativeCheckInputs = [ freezegun pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; From 4a55bd85c832303e70c333a4f9305c73559f2a26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:52:52 +0100 Subject: [PATCH 32/98] python312Packages.aioesphomeapi: 27.0.0 -> 27.0.1 https://github.com/esphome/aioesphomeapi/releases/tag/v27.0.1 --- .../development/python-modules/aioesphomeapi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 4d6f597fb2a9..461fe2c4ff43 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "27.0.0"; + version = "27.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM="; + hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; }; build-system = [ @@ -70,6 +70,11 @@ buildPythonPackage rec { "test_start_connection_can_only_increase_buffer_size_to_262144" ]; + disabledTestPaths = [ + # benchmarking requires pytest-codespeed + "tests/test_bluetooth_benchmarks.py" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; meta = with lib; { From d5031e726e03fc7d97dfae9681f54619a62e0b85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:26:40 +0100 Subject: [PATCH 33/98] python312Packages.aiohasupervisor: 0.1.0 -> 0.2.1 --- pkgs/development/python-modules/aiohasupervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 969e72889da6..2f906fef1954 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM="; + hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; }; postPatch = '' From 36dd3d5662037996f82cd44af8bfb9c382d4025c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 20:55:19 +0100 Subject: [PATCH 34/98] python312Packages.aiohomekit: 3.2.4 -> 3.2.6 https://github.com/Jc2k/aiohomekit/releases/tag/3.2.5 https://github.com/Jc2k/aiohomekit/releases/tag/3.2.6 --- .../python-modules/aiohomekit/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index eb6524e1d2fb..1887ed1cebf1 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.4"; + version = "3.2.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-9TvpdsWmNXz7UAh0BCgjdRWLKCP2FdE8TIjvyDXydLU="; + hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks="; }; build-system = [ poetry-core ]; @@ -49,8 +49,6 @@ buildPythonPackage rec { zeroconf ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook @@ -61,17 +59,6 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; - disabledTests = [ - # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' - "test_discover_find_one_unpaired" - "test_find_device_id_case_lower" - "test_find_device_id_case_upper" - "test_discover_missing_csharp" - "test_discover_csharp_case" - "test_discover_device_id_case_lower" - "test_discover_device_id_case_upper" - ]; - pythonImportsCheck = [ "aiohomekit" ]; meta = with lib; { From 7aa60361f455ced1153fdeeedb1c6b9789a90889 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Oct 2024 09:25:41 +0100 Subject: [PATCH 35/98] python312Packages.aioshelly: 11.4.2 -> 12.0.1 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/12.0.1 --- pkgs/development/python-modules/aioshelly/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a7d2a5349852..34f6b0d45677 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, bluetooth-data-tools, buildPythonPackage, fetchFromGitHub, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.4.2"; + version = "12.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; + hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; @@ -48,7 +50,7 @@ buildPythonPackage rec { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From da4dc05e620906a89d6998e4fbf819424c974309 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:01:36 +0100 Subject: [PATCH 36/98] python312Packages.aioswitcher: 4.3.0 -> 4.4.1 https://github.com/TomerFi/aioswitcher/releases/tag/4.4.1 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index e2c08fc5ba7c..08cbff77d200 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "4.3.0"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-NQm3mKjXsv+0xFuRY3w7f4RmMhOjdb8wGVYcXoto8ZE="; + hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY="; }; __darwinAllowLocalNetworking = true; From b6f0d7af1133312f17edcb1a0818a9882beafc1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 09:02:28 +0200 Subject: [PATCH 37/98] python312Packages.async-upnp-client: 0.40.0 -> 0.41.0 Diff: https://github.com/StevenLooman/async_upnp_client/compare/refs/tags/0.40.0...0.41.0 Changelog: https://github.com/StevenLooman/async_upnp_client/blob/0.41.0/CHANGES.rst --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index d1719497d7ba..a19d99c2f8ac 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM="; + hash = "sha256-36pMEyLnyl8PS8ZVt+yNdpJGAVpoWTxfTxr+WQw/Go8="; }; pythonRelaxDeps = [ "defusedxml" ]; From dbe3e84d346a1b69043117c9afb2cada9f14006b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 02:29:34 +0000 Subject: [PATCH 38/98] python312Packages.axis: 62 -> 63 --- pkgs/development/python-modules/axis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index e0a316317ef3..766e8ff1026a 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "axis"; - version = "62"; + version = "63"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A="; + hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o="; }; postPatch = '' From efe25a55efd36bec4020bf5e3437f00aba49c746 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:06:08 +0100 Subject: [PATCH 39/98] python312Packages.ayla-iot-unofficial: 1.4.2 -> 1.4.3 https://github.com/rewardone/ayla-iot-unofficial/releases/tag/v1.4.3 --- .../python-modules/ayla-iot-unofficial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 462a9f1130b4..df170b4e7992 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc="; + hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU="; }; build-system = [ setuptools ]; From 53a2c709facca4e39055359cdd7c028f091f15af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 23:14:58 +0100 Subject: [PATCH 40/98] python312Packages.cached-ipaddress: 0.6.0 -> 0.8.0 Diff: https://github.com/bdraco/cached-ipaddress/compare/refs/tags/v0.6.0...v0.8.0 Changelog: https://github.com/bdraco/cached-ipaddress/blob/refs/tags/v0.8.0/CHANGELOG.md --- .../python-modules/cached-ipaddress/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index de17cb4106b4..b00a6b5df4ef 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -8,11 +8,12 @@ pytestCheckHook, pythonOlder, setuptools, + propcache, }: buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs="; + hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo="; }; build-system = [ @@ -30,6 +31,8 @@ buildPythonPackage rec { setuptools ]; + dependencies = [ propcache ]; + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook From cc882676aa2b0f93850fcc7b510b6dbb8e25ba27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:09:22 +0100 Subject: [PATCH 41/98] python312Packages.dbus-fast: 2.24.2 -> 2.24.3 https://github.com/Bluetooth-Devices/dbus-fast/blob/refs/tags/v2.24.3/CHANGELOG.md --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 878e560a583b..89358afbf5f0 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.24.2"; + version = "2.24.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-3kgNr7kTKsgjLhxXZddyMs9VjxbWaHqdYYGaHc7NXq0="; + hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk="; }; # The project can build both an optimized cython version and an unoptimized From 03849651829c043b3ed3e2c6e8970d669f4070db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:14:18 +0100 Subject: [PATCH 42/98] python312Packages.doorbirdpy: 3.0.5 -> 3.0.8 --- pkgs/development/python-modules/doorbirdpy/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index b0ae8cfcea08..1c6034c8e2e4 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "3.0.5"; + version = "3.0.8"; pyproject = true; src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; rev = "refs/tags/${version}"; - hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs="; + hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0="; }; build-system = [ setuptools ]; @@ -35,11 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # connection error on mock host - "test_info_auth_fails" - ]; - pythonImportsCheck = [ "doorbirdpy" ]; meta = with lib; { From 3b43e3a2b3e71db33c2e626e98531bdb30b55452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Aug 2024 12:57:29 -0700 Subject: [PATCH 43/98] python312Packages.fritzconnection: 1.13.2 -> 1.14.0 Diff: https://github.com/kbr/fritzconnection/compare/refs/tags/1.13.2...1.14.0 Changelog: https://fritzconnection.readthedocs.io/en/1.14.0/sources/version_history.html --- .../python-modules/fritzconnection/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 9e49e8c420c8..84afd730f495 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -6,23 +6,26 @@ pytestCheckHook, requests, segno, + setuptools, }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.2"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; - repo = pname; + repo = "fritzconnection"; rev = "refs/tags/${version}"; - hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; + hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; optional-dependencies = { qr = [ segno ]; From 636bb54e4f987e6f4c2ddb778983636689d53871 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:20:25 +0100 Subject: [PATCH 44/98] python312Packages.go2rtc-client: 0.0.1b2 -> 0.1.0 https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/0.1.0 --- pkgs/development/python-modules/go2rtc-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix index e370d262b090..8d110afbbee3 100644 --- a/pkgs/development/python-modules/go2rtc-client/default.nix +++ b/pkgs/development/python-modules/go2rtc-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "go2rtc-client"; - version = "0.0.1b2"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-go2rtc-client"; rev = "refs/tags/${version}"; - hash = "sha256-q1NDHauYy8C3tlIpt6J0iMj0TNtBv2j9aU/IE5CgBjg="; + hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ="; }; postPatch = '' From 9763290b8fb0db7134653ab3dd70eee55402919e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:20:54 +0100 Subject: [PATCH 45/98] python312Packages.google-nest-sdm: 6.1.0 -> 6.1.3 https://github.com/allenporter/python-google-nest-sdm/releases/tag/6.1.3 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 0c2664caa51c..1f4e2ef3cdc4 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.0"; + version = "6.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; + hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo="; }; build-system = [ setuptools ]; From 56aec06b4cc44125e5dcd804a5d5dd113e1676c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:21:36 +0100 Subject: [PATCH 46/98] python312Packages.habitipy: 0.3.1 -> 0.3.3 https://github.com/ASMfreaK/habitipy/compare/faaca8840575fe8b807bf17acea6266d5ce92a99...v0.3.3 --- pkgs/development/python-modules/habitipy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 980dc0726991..44548561b349 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "habitipy"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - # TODO: https://github.com/ASMfreaK/habitipy/issues/27 - rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; - hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; + rev = "refs/tags/v${version}"; + hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A="; }; build-system = [ setuptools ]; From c67bf93d906a9870a5cc83d268ed935168939b74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:25:20 +0100 Subject: [PATCH 47/98] python312Packages.habluetooth: 3.4.1 -> 3.6.0 https://github.com/Bluetooth-Devices/habluetooth/blob/v3.6.0/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index f6deb6625535..fb5757ae114f 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.4.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-pJ294WnJjZXYFlezjfNXmUS+ouaZUGPLxUqj2sMQdU0="; + hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; }; build-system = [ From 060c517baef227aa614c69227e3ef0f92a9627f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:26:51 +0100 Subject: [PATCH 48/98] python312Packages.hass-nabucasa: 0.82.0 -> 0.83.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.83.0 --- .../development/python-modules/hass-nabucasa/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index d814bf89fb3d..bfe31c016bc3 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,7 +8,6 @@ ciso8601, cryptography, fetchFromGitHub, - fetchpatch2, pycognito, pyjwt, pytest-aiohttp, @@ -18,21 +17,22 @@ setuptools, snitun, syrupy, + webrtc-models, xmltodict, }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.82.0"; + version = "0.83.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I="; + hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; }; pythonRelaxDeps = [ "acme" ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { pycognito pyjwt snitun + webrtc-models ]; nativeCheckInputs = [ From c5b33821281a34e39847502f1b832f22e2e03d20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:30:47 +0100 Subject: [PATCH 49/98] home-assistant.intents: 2024.10.2 -> 2024.11.4 https://github.com/home-assistant/intents/releases/tag/2024.11.4 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index a7360dd7e2e5..57598ad2b0f5 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.10.2"; + version = "2024.11.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-bVKsZvQ4JhVpwILkRR/+lUzchBGwG2D4TTdBD7lDRcY="; + hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA="; }; build-system = [ From 549e4ee5a41ca5210528f338f8697a038bef1e62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:31:16 +0100 Subject: [PATCH 50/98] python312Packages.lcn-frontend: 0.1.7 -> 0.2.1 https://github.com/alengwenus/lcn-frontend/releases/tag/0.2.1 --- pkgs/development/python-modules/lcn-frontend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix index 310d407fa70a..206f6720f634 100644 --- a/pkgs/development/python-modules/lcn-frontend/default.nix +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lcn-frontend"; - version = "0.1.7"; + version = "0.2.1"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; inherit version; - hash = "sha256-S/7NUduAiekQ5CDOw8JRCTO9mbvLW6MmB/n8iQQPkok="; + hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4="; }; postPatch = '' From be3b1aa9d5c25ac04e226db173922a387f6fdb5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 00:48:01 +0200 Subject: [PATCH 51/98] python312Packages.mozart-api: 3.4.1.8.8 -> 4.1.1.116.0 Changelog: https://github.com/bang-olufsen/mozart-open-api/releases/tag/4.1.1.116.0 --- pkgs/development/python-modules/mozart-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 053b922c148b..f84ad7a37a86 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.8"; + version = "4.1.1.116.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; + hash = "sha256-QVh1MplzUL0LO3gPvxC/5uJjFoK57j2WdT2oMsneIkA="; }; build-system = [ poetry-core ]; From 626f11a9932666c8be0c871aa79479c48a723871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 02:21:06 +0000 Subject: [PATCH 52/98] python312Packages.py-aosmith: 1.0.8 -> 1.0.10 --- pkgs/development/python-modules/py-aosmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix index 199011b934b1..0a7ad4b872cb 100644 --- a/pkgs/development/python-modules/py-aosmith/default.nix +++ b/pkgs/development/python-modules/py-aosmith/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-aosmith"; - version = "1.0.8"; + version = "1.0.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdr99"; repo = "py-aosmith"; rev = "refs/tags/${version}"; - hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; + hash = "sha256-6wgPj3e3nbv0LM4qgZsj70F4nKy9LmY3RCvs++n1KbE="; }; build-system = [ poetry-core ]; From fcec352722b5b1edaf3166388ed1d8bbfdfdc353 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:56:06 +0100 Subject: [PATCH 53/98] python312Packages.pyfibaro: 0.7.8 -> 0.8.0 https://github.com/rappenze/pyfibaro/releases/tag/0.8.0 --- pkgs/development/python-modules/pyfibaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 1ce5d605f020..ec974f24f6e9 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.8"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = "pyfibaro"; rev = "refs/tags/${version}"; - hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM="; + hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA="; }; build-system = [ setuptools ]; From 503844b0f84ce175d1cba8469c4fed7d8c3c8b10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:57:37 +0100 Subject: [PATCH 54/98] python312Packages.pyopenweathermap: 0.1.1 -> 0.2.1 https://github.com/freekode/pyopenweathermap/compare/refs/tags/v0.1.1...v0.2.1 --- pkgs/development/python-modules/pyopenweathermap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index 6b316dd72cc7..4076913dc9e5 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.1.1"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; + hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; }; build-system = [ poetry-core ]; From 9fe18a87243e20b0e25902d73855583d4bc0f4f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:07:54 +0100 Subject: [PATCH 55/98] python312Packages.pysuez: 0.2.0 -> 0.2.2 Fixes to the pySuezV2 (pypi name) fork. --- .../python-modules/pysuez/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index e78c7f36d81e..8c04887f758c 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -10,26 +10,21 @@ buildPythonPackage rec { pname = "pysuez"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "ooii"; + owner = "jb101010-2"; repo = "pySuez"; - rev = "refs/tags/v${version}"; - hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + rev = "refs/tags/${version}"; + hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'datetime'" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ regex requests ]; @@ -42,8 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; - homepage = "https://github.com/ooii/pySuez"; - changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + homepage = "https://github.com/jb101010-2/pySuez"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 57d9c48c4459281f86610882934effaa4f61f077 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 21:58:07 +0100 Subject: [PATCH 56/98] python312Packages.pyswitchbot: 0.50.1 -> 0.51.0 https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.51.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 7c5b303c70a8..a5da6bc33006 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.50.1"; + version = "0.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA="; + hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s="; }; build-system = [ setuptools ]; @@ -40,11 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # mismatch in expected data structure - "test_parse_advertisement_data_curtain" - ]; - pythonImportsCheck = [ "switchbot" ]; meta = with lib; { From fa6db55a556dfb9f12faf7d888f06b39647cb363 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 23:51:20 +0200 Subject: [PATCH 57/98] python312Packages.python-bsblan: 0.6.2 -> 0.6.4 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.6.2...v0.6.4 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.6.4 --- .../python-modules/python-bsblan/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index b6312d2c0178..42e9abe85c3b 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -6,9 +6,10 @@ backoff, buildPythonPackage, fetchFromGitHub, + mashumaro, + orjson, packaging, poetry-core, - mashumaro, pytest-asyncio, pytest-cov-stub, pytest-mock, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ="; + hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI="; }; postPatch = '' @@ -43,8 +44,9 @@ buildPythonPackage rec { aiohttp async-timeout backoff - packaging mashumaro + orjson + packaging yarl ]; From 5c9763316b42e1d9ecdf7bba955f80043c84b8c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:02:42 +0100 Subject: [PATCH 58/98] python312Packages.python-homeassistant-analytics: 0.7.0 -> 0.8.0 https://github.com/joostlek/python-homeassistant-analytics/releases/tag/v0.8.0 --- .../python-modules/python-homeassistant-analytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index b4626a8d02db..4433e441b6cb 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; + hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw="; }; postPatch = '' From e46c24420aa18d7ff18831f422b9c3322a9ad3e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Nov 2024 19:31:48 +0100 Subject: [PATCH 59/98] python312Packages.python-kasa: 0.7.5 -> 0.7.7 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.7.5...0.7.7 Changelog: https://github.com/python-kasa/python-kasa/blob/0.7.7/CHANGELOG.md --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 51772d90f942..796b3e601f38 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.5"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; + hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc="; }; build-system = [ hatchling ]; From 080c47b6e775a668ddaa0c49d71cddfdb591bc61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:04:39 +0100 Subject: [PATCH 60/98] python312Packages.python-linkplay: 0.0.16 -> 0.0.17 https://github.com/Velleman/python-linkplay/releases/tag/v0.0.17 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 3efb6a31b201..37ccb0932569 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk="; + hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8="; }; build-system = [ setuptools ]; From e4c3f0240987eb06cbcf7b181529ddffb856f32c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:05:36 +0100 Subject: [PATCH 61/98] python312Packages.pytibber: 0.30.3 -> 0.30.4 https://github.com/Danielhiversen/pyTibber/releases/tag/0.30.4 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1b7af821ade9..fe2802278269 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.30.3"; + version = "0.30.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU="; + hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8="; }; build-system = [ setuptools ]; From a7a5e75d6b72935232efd2dab3ac38fbe06ad236 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:06:51 +0100 Subject: [PATCH 62/98] python312Packages.reolink-aio: 0.10.3 -> 0.10.4 https://github.com/starkillerOG/reolink_aio/releases/tag/0.10.4 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0fdeac33b67f..a42a2b432e6a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-qyz5i4379OelXI+uQwhpeuE4/1mZhPrNnxZ3KAD7JWs="; + hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w="; }; build-system = [ setuptools ]; From da8ca0e58ee33ea9cc4fba34eba8c8aad28ca0de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:07:12 +0100 Subject: [PATCH 63/98] python312Packages.spotifyaio: 0.8.2 -> 0.8.5 https://github.com/joostlek/python-spotify/releases/tag/v0.8.5 --- pkgs/development/python-modules/spotifyaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index 53be565a94ee..de088932713e 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.2"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y="; + hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU="; }; build-system = [ poetry-core ]; From c1c212da04bb9dcceb63cb9e56af24c6995896bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:10:25 +0100 Subject: [PATCH 64/98] python312Packages.zigpy: 0.67.0 -> 0.71.0 https://github.com/zigpy/zigpy/releases/tag/0.71.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9edb65707b9f..f20c1a004406 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.67.0"; + version = "0.71.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E="; + hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s="; }; postPatch = '' From 77cf737ba85a246598fcd9c11086b57a57bf0749 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:11:40 +0100 Subject: [PATCH 65/98] python312Packages.zigpy-deconz: 0.23.3 -> 0.24.1 https://github.com/zigpy/zigpy-deconz/releases/tag/0.24.1 --- .../python-modules/zigpy-deconz/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 04b8efb6f27f..edbba6c73050 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pyserial, pyserial-asyncio, pytest-asyncio, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.3"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,20 +22,13 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k="; + hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch"; - hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ setuptools ]; From bae5b4681ce16e66e22abb91ad7cbd30e7596b37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:15:46 +0100 Subject: [PATCH 66/98] python312Packages.zigpy-xbee: 0.20.2 -> 0.21.0 https://github.com/zigpy/zigpy-xbee/releases/tag/0.21.0 --- pkgs/development/python-modules/zigpy-xbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 0a3c11635f48..449632991f89 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA="; + hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ="; }; postPatch = '' From 024dd5383c949bb2581c281250dfa7ad56e7ffe6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:19:13 +0100 Subject: [PATCH 67/98] python312Packages.zigpy-zigate: 0.13.1 -> 0.13.2 https://github.com/zigpy/zigpy-zigate/releases/tag/0.13.2 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index fc7d291bd2a9..a48feefb0730 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs="; + hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno="; }; postPatch = '' From a357900923d9d7d4158d39c07c74503d280d1655 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:11:58 +0100 Subject: [PATCH 68/98] python312Packages.zigpy-znp: 0.12.4 -> 0.13.1 https://github.com/zigpy/zigpy-znp/releases/tag/v0.13.1 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 98a7661f0483..628a688f0875 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.4"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4="; + hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I="; }; postPatch = '' From fd8401d7f09118fbe40a0713bd86c57c13caaa23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:14:41 +0100 Subject: [PATCH 69/98] python312Packages.zha-quirks: 0.0.122 -> 0.0.124 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.124 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 05040663a579..8946613f81b9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.122"; + version = "0.0.124"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48="; + hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8="; }; postPatch = '' From 2da2f84b9947e72700958807abe82ccdb130fae0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:12:39 +0100 Subject: [PATCH 70/98] python312Packages.bellows: 0.40.6 -> 0.42.0 https://github.com/zigpy/bellows/releases/tag/0.42.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e75685b74768..cbfea2399312 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.40.6"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; + hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE="; }; postPatch = '' From a1718d6bbc51196b566d893bca41c1d0c877d118 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:13:28 +0100 Subject: [PATCH 71/98] python312Packages.universal-silabs-flasher: 0.0.22 -> 0.0.25 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.23 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.24 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.25 --- .../python-modules/universal-silabs-flasher/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index b09942f1beec..025eec125099 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -14,6 +14,7 @@ coloredlogs, crc, libgpiod, + pyserial-asyncio-fast, typing-extensions, zigpy, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.22"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA="; + hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { click coloredlogs crc + pyserial-asyncio-fast typing-extensions zigpy ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; From 74bffdfec9a722dd6e39454d8efb5d83fd780df9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:20:27 +0100 Subject: [PATCH 72/98] python312Packages.zha: 0.0.34 -> 0.0.37 https://github.com/zigpy/zha/releases/tag/0.0.35 https://github.com/zigpy/zha/releases/tag/0.0.36 https://github.com/zigpy/zha/releases/tag/0.0.37 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 1847b2c49d8e..2da990de3650 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.34"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg="; + hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0="; }; postPatch = '' From 1283b540f51238e5401b165866bb83de9e997727 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 12:13:00 +0200 Subject: [PATCH 73/98] python312Packages.zeroconf: 0.135.0 -> 0.136.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.135.0...0.136.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.136.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index b06ccc46b0ad..e9910213140e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.135.0"; + version = "0.136.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs="; + hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4="; }; build-system = [ From 3ad113ef5d50a9992c8c580fdea4bf0ce6d61621 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:28:54 +0100 Subject: [PATCH 74/98] python312Packages.thinqconnect: 0.9.9 -> 1.0.0 --- pkgs/development/python-modules/thinqconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index ec85761f7d05..657eac221a47 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thinqconnect"; - version = "0.9.9"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thinq-connect"; repo = "pythinqconnect"; rev = "refs/tags/${version}"; - hash = "sha256-G6fg+mXrUnSkfpeJAvDXEu57UgkYEObErEnds2PK13Y="; + hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg="; }; build-system = [ setuptools ]; From 2a48297883f7708e922ea7b7ee037c868e6d53f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:34:17 +0100 Subject: [PATCH 75/98] python312Packages.webexpythonsdk: rename from webexteamssdk In version 2.0 the module name was changed. --- .../{webexteamssdk => webexpythonsdk}/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{webexteamssdk => webexpythonsdk}/default.nix (88%) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix similarity index 88% rename from pkgs/development/python-modules/webexteamssdk/default.nix rename to pkgs/development/python-modules/webexpythonsdk/default.nix index 373f06b6d046..fb14d7ab164c 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "webexteamssdk"; + pname = "webexpythonsdk"; version = "2.0.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CiscoDevNet"; - repo = "webexteamssdk"; + repo = "WebexPythonSDK"; rev = "refs/tags/v${version}"; hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; - homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + homepage = "https://github.com/WebexCommunity/WebexPythonSDK"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e31ff8139b6a..9432bbf2ce1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17580,7 +17580,7 @@ self: super: with self; { webencodings = callPackage ../development/python-modules/webencodings { }; - webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; + webexpythonsdk = callPackage ../development/python-modules/webexpythonsdk { }; webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { }; From 9657b7e87e46a4544ee68467f924f9e0654ee932 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:38:23 +0100 Subject: [PATCH 76/98] python312Packages.webexteamssdk: reinit at 1.6.1 Still required by opsdroid. --- .../python-modules/webexteamssdk/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/webexteamssdk/default.nix diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix new file mode 100644 index 000000000000..30eeb64d83a1 --- /dev/null +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + setuptools, + versioneer, +}: + +buildPythonPackage rec { + pname = "webexteamssdk"; + version = "1.6.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "CiscoDevNet"; + repo = "webexteamssdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; + }; + + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + future + pyjwt + requests + requests-toolbelt + ]; + + # Tests require a Webex Teams test domain + doCheck = false; + + pythonImportsCheck = [ "webexteamssdk" ]; + + meta = with lib; { + description = "Python module for Webex Teams APIs"; + homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9432bbf2ce1b..0d4b3e63579c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17582,6 +17582,8 @@ self: super: with self; { webexpythonsdk = callPackage ../development/python-modules/webexpythonsdk { }; + webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; + webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { }; weblate-language-data = callPackage ../development/python-modules/weblate-language-data { }; From 4acbaa55d23d7395b0a3ef638e611eec2eda7fab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:47:22 +0100 Subject: [PATCH 77/98] yt-dlp: expose optional-dependencies This is required so that other packages, that want to consume them can resolve them. --- pkgs/by-name/yt/yt-dlp/package.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 2590f7136eb9..c3149189b538 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -30,17 +30,25 @@ python3Packages.buildPythonApplication rec { hatchling ]; - dependencies = with python3Packages; [ - brotli - certifi - curl-cffi - mutagen - pycryptodomex - requests - secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` - urllib3 - websockets - ]; + # expose optional-dependencies, but provide all features + dependencies = lib.flatten (lib.attrValues optional-dependencies); + + optional-dependencies = { + default = with python3Packages; [ + brotli + certifi + mutagen + pycryptodomex + requests + urllib3 + websockets + ]; + curl-cffi = [ python3Packages.curl-cffi ]; + secretstorage = with python3Packages; [ + cffi + secretstorage + ]; + }; pythonRelaxDeps = [ "websockets" ]; From 10877199d013a5001dfe7ac456e205b1f6b80282 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:55:42 +0100 Subject: [PATCH 78/98] Revert "python312Packages.pyvicare: drop" This reverts commit 6d51ba74705d9a834fbc43e01480a1e28baf9039. Restore pyvicare, as home-assistant switched back to it. --- .../python-modules/pyvicare/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 2 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pyvicare/default.nix diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 000000000000..69edcefbb4a0 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -0,0 +1,50 @@ +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + pkce, + pytestCheckHook, + pythonOlder, + simplejson, +}: + +buildPythonPackage rec { + pname = "pyvicare"; + version = "2.32.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "somm15"; + repo = "PyViCare"; + rev = "refs/tags/${version}"; + hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version_config=True," 'version="${version}",' \ + --replace "'setuptools-git-versioning<1.8.0'" "" + ''; + + propagatedBuildInputs = [ + authlib + pkce + ]; + + nativeCheckInputs = [ + pytestCheckHook + simplejson + ]; + + pythonImportsCheck = [ "PyViCare" ]; + + meta = with lib; { + description = "Python Library to access Viessmann ViCare API"; + homepage = "https://github.com/somm15/PyViCare"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f95a421d109f..102bc381b20a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -549,7 +549,6 @@ mapAliases ({ pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 - pyvicare = pyvicare-neo; # added 2024-08-31 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d4b3e63579c..0a054c262d98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13213,6 +13213,8 @@ self: super: with self; { pyvex = callPackage ../development/python-modules/pyvex { }; + pyvicare = callPackage ../development/python-modules/pyvicare { }; + pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; From 38cc849365c328f6fd998e7712102f59d6bd428c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:59:32 +0100 Subject: [PATCH 79/98] python312Packages.pyvicare: 2.32.0 -> 2.35.0 https://github.com/openviess/PyViCare/releases/tag/2.33.0 https://github.com/openviess/PyViCare/releases/tag/2.33.1 https://github.com/openviess/PyViCare/releases/tag/2.34.0 https://github.com/openviess/PyViCare/releases/tag/2.34.1 https://github.com/openviess/PyViCare/releases/tag/2.35.0 --- .../python-modules/pyvicare/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 69edcefbb4a0..2d60fc3af1f2 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -3,45 +3,46 @@ authlib, buildPythonPackage, fetchFromGitHub, - pkce, + poetry-core, + requests, + pytest-cov-stub, pytestCheckHook, - pythonOlder, simplejson, }: buildPythonPackage rec { pname = "pyvicare"; - version = "2.32.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.35.0"; + pyproject = true; src = fetchFromGitHub { - owner = "somm15"; + owner = "openviess"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; + hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "version_config=True," 'version="${version}",' \ - --replace "'setuptools-git-versioning<1.8.0'" "" + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.1.0"' 'version = "${version}"' ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ authlib - pkce + requests ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook - simplejson ]; pythonImportsCheck = [ "PyViCare" ]; meta = with lib; { + changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}"; description = "Python Library to access Viessmann ViCare API"; homepage = "https://github.com/somm15/PyViCare"; license = with licenses; [ asl20 ]; From 01714b8905078859c9ad259cdc15b69b223cb2d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:52:20 +0100 Subject: [PATCH 80/98] python312Packages.teslemetry-stream: init at 0.4.2 --- .../teslemetry-stream/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/teslemetry-stream/default.nix diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix new file mode 100644 index 000000000000..1154f0380442 --- /dev/null +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "teslemetry-stream"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Teslemetry"; + repo = "python-teslemetry-stream"; + rev = "v${version}"; + hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "teslemetry_stream" ]; + + meta = { + changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}"; + description = "Python library for the Teslemetry Streaming API"; + homepage = "https://github.com/Teslemetry/python-teslemetry-stream"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a054c262d98..e79a9727c83d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15640,6 +15640,8 @@ self: super: with self; { teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; + teslemetry-stream = callPackage ../development/python-modules/teslemetry-stream { }; + tess = callPackage ../development/python-modules/tess { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; From c50bfd50d3acc85b447b878f1e8e9e0514710475 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 22:52:38 +0100 Subject: [PATCH 81/98] home-assistant: 2024.10.04 -> 2024.11.0 https://www.home-assistant.io/blog/2024/11/06/release-202411/ --- .../home-assistant/component-packages.nix | 106 ++++++++++++++---- pkgs/servers/home-assistant/default.nix | 39 +++++-- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 15 +++ .../update-component-packages.py | 1 + 5 files changed, 132 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 07cc7ecb0e62..f72064a46c0f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.10.4"; + version = "2024.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -145,6 +145,7 @@ asmog ]; "analytics" = ps: with ps; [ + aiohasupervisor fnv-hash-fast psutil-home-assistant sqlalchemy @@ -273,6 +274,7 @@ asyncarve ]; "arwn" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "aseko_pool_live" = ps: with ps; [ @@ -345,6 +347,7 @@ botocore ]; "axis" = ps: with ps; [ + aiohasupervisor axis paho-mqtt_1 ]; @@ -404,8 +407,6 @@ ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api - "bloomsky" = ps: with ps; [ - ]; "blue_current" = ps: with ps; [ bluecurrent-api ]; @@ -605,6 +606,7 @@ py-canary ]; "cast" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -638,6 +640,9 @@ "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; + "cisco_webex_teams" = ps: with ps; [ + webexpythonsdk + ]; "citybikes" = ps: with ps; [ ]; "clementine" = ps: with ps; [ @@ -651,6 +656,7 @@ "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -782,6 +788,7 @@ cached-ipaddress dbus-fast fnv-hash-fast + go2rtc-client ha-ffmpeg habluetooth hass-nabucasa @@ -936,6 +943,7 @@ dremel3dpy ]; "drop_connect" = ps: with ps; [ + aiohasupervisor dropmqttapi paho-mqtt_1 ]; @@ -943,6 +951,7 @@ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "dte_energy_bridge" = ps: with ps; [ @@ -1353,7 +1362,7 @@ forecast-solar ]; "forked_daapd" = ps: with ps; [ - spotipy + spotifyaio ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi @@ -1404,6 +1413,7 @@ ayla-iot-unofficial ]; "fully_kiosk" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 python-fullykiosk ]; @@ -1497,6 +1507,10 @@ "glances" = ps: with ps; [ glances-api ]; + "go2rtc" = ps: with ps; [ + go2rtc-client + pyturbojpeg + ]; "goalzero" = ps: with ps; [ goalzero ]; @@ -1512,6 +1526,7 @@ oauth2client ]; "google_assistant" = ps: with ps; [ + aiohasupervisor python-matter-server pyturbojpeg ]; @@ -1522,8 +1537,6 @@ google-cloud-speech google-cloud-texttospeech ]; - "google_domains" = ps: with ps; [ - ]; "google_generative_ai_conversation" = ps: with ps; [ google-generativeai ha-ffmpeg @@ -1701,6 +1714,7 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + aiohasupervisor ]; "homeassistant_green" = ps: with ps; [ aiohasupervisor @@ -1820,6 +1834,31 @@ "husqvarna_automower" = ps: with ps; [ aioautomower ]; + "husqvarna_automower_ble" = ps: with ps; [ + aioesphomeapi + aioruuvigateway + aioshelly + automower-ble + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + pyudev + zeroconf + ]; "huum" = ps: with ps; [ huum ]; @@ -2042,6 +2081,7 @@ ]; # missing inputs: pyirishrail "iron_os" = ps: with ps; [ aioesphomeapi + aiogithubapi aioruuvigateway aioshelly bleak @@ -2379,6 +2419,9 @@ "lg_soundbar" = ps: with ps; [ temescal ]; + "lg_thinq" = ps: with ps; [ + thinqconnect + ]; "lidarr" = ps: with ps; [ aiopyarr ]; @@ -2462,6 +2505,7 @@ aiolookin ]; "loqed" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2510,12 +2554,8 @@ "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - paho-mqtt_1 - ]; - "map" = ps: with ps; [ aiohasupervisor - home-assistant-frontend - pillow + paho-mqtt_1 ]; "marantz" = ps: with ps; [ ]; @@ -2531,6 +2571,7 @@ pillow ]; "matter" = ps: with ps; [ + aiohasupervisor python-matter-server ]; "maxcube" = ps: with ps; [ @@ -2570,7 +2611,8 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ yt-dlp - ]; + ] + ++ yt-dlp.optional-dependencies.default; "media_player" = ps: with ps; [ ]; "media_source" = ps: with ps; [ @@ -2695,6 +2737,7 @@ zeroconf ]; "mobile_app" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2799,18 +2842,23 @@ mpd2 ]; "mqtt" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_eventstream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_json" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_room" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_statestream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "msteams" = ps: with ps; [ @@ -2830,6 +2878,7 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 pymysensors ]; @@ -2868,6 +2917,7 @@ ha-ffmpeg ]; "netatmo" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3158,6 +3208,7 @@ ovoenergy ]; "owntracks" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3173,6 +3224,8 @@ "p1_monitor" = ps: with ps; [ p1monitor ]; + "palazzetti" = ps: with ps; [ + ]; # missing inputs: pypalazzetti "panasonic_bluray" = ps: with ps; [ panacotta ]; @@ -3187,11 +3240,6 @@ home-assistant-frontend pillow ]; - "panel_iframe" = ps: with ps; [ - aiohasupervisor - home-assistant-frontend - pillow - ]; "pcs_lighting" = ps: with ps; [ ]; "peco" = ps: with ps; [ @@ -3242,6 +3290,7 @@ "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3429,6 +3478,7 @@ zeroconf ]; "rachio" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3444,6 +3494,7 @@ aiopyarr ]; "radio_browser" = ps: with ps; [ + pycountry radios ]; "radiotherm" = ps: with ps; [ @@ -3948,6 +3999,7 @@ "smarther" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3982,6 +4034,7 @@ snapcast ]; "snips" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "snmp" = ps: with ps; [ @@ -4046,7 +4099,7 @@ plexwebsocket soco sonos-websocket - spotipy + spotifyaio zeroconf ]; "sony_projector" = ps: with ps; [ @@ -4064,13 +4117,12 @@ speedtest-cli ]; "spider" = ps: with ps; [ - spiderpy ]; "splunk" = ps: with ps; [ hass-splunk ]; "spotify" = ps: with ps; [ - spotipy + spotifyaio ]; "sql" = ps: with ps; [ sqlalchemy @@ -4253,6 +4305,7 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ + aiohasupervisor hatasmota paho-mqtt_1 ]; @@ -4304,6 +4357,7 @@ ]; "teslemetry" = ps: with ps; [ tesla-fleet-api + teslemetry-stream ]; "tessie" = ps: with ps; [ tesla-fleet-api @@ -4440,6 +4494,7 @@ pytomorrowio ]; "toon" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4650,7 +4705,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ - pyvicare-neo + pyvicare ]; "vilfo" = ps: with ps; [ vilfo-api-client @@ -4766,6 +4821,7 @@ "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ + aiohasupervisor aiowithings ha-ffmpeg hass-nabucasa @@ -4865,6 +4921,7 @@ "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4987,6 +5044,7 @@ zm-py ]; "zwave_js" = ps: with ps; [ + aiohasupervisor pyserial pyudev zwave-js-server-python @@ -5268,6 +5326,7 @@ "gios" "github" "glances" + "go2rtc" "goalzero" "gogogate2" "goodwe" @@ -5275,7 +5334,6 @@ "google_assistant" "google_assistant_sdk" "google_cloud" - "google_domains" "google_generative_ai_conversation" "google_mail" "google_photos" @@ -5332,6 +5390,7 @@ "humidifier" "hunterdouglas_powerview" "husqvarna_automower" + "husqvarna_automower_ble" "huum" "hvv_departures" "hydrawise" @@ -5408,6 +5467,7 @@ "lektrico" "lg_netcast" "lg_soundbar" + "lg_thinq" "lidarr" "life360" "lifx" @@ -5439,7 +5499,6 @@ "mailgun" "manual" "manual_mqtt" - "map" "mastodon" "matrix" "matter" @@ -5558,7 +5617,6 @@ "p1_monitor" "panasonic_viera" "panel_custom" - "panel_iframe" "peco" "pegel_online" "permobil" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0b56bf3763b0..915f4bf10287 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -161,6 +161,15 @@ let doCheck = false; # no tests }); + plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec { + version = "1.4.4"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-dlDytOSp/7npanxXH5uaDv29AP21UciEzIzDlMf6jf8="; + }; + }); + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -226,6 +235,15 @@ let }; }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { + version = "3.6.9"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; + }; + }); + pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { version = "0.1.12"; src = fetchFromGitHub { @@ -335,6 +353,15 @@ let ]; }; + voip-utils = super.voip-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.1.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -403,7 +430,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.4"; + hassVersion = "2024.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -421,13 +448,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-uaGGt5qCdyFXuEtg20MzmFd4PXkdPP8h4HJBvRV6sz8="; + hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-al45WS8SIgOM2TqGPIptZU7iNMapYUg+fK2MLh68lxs="; + hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw="; }; build-system = with python.pkgs; [ @@ -474,12 +501,9 @@ in python.pkgs.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace tests/test_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" - - substituteInPlace pyproject.toml --replace-fail "wheel~=0.43.0" wheel + substituteInPlace tests/test_core_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml - sed -i 's/wheel[~=]/wheel>/' pyproject.toml ''; dependencies = with python.pkgs; [ @@ -509,6 +533,7 @@ in python.pkgs.buildPythonApplication rec { orjson packaging pillow + propcache psutil-home-assistant pyjwt pyopenssl diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bb9cc204bf59..1ee12aaf46f3 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241002.4"; + version = "20241106.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-b1/VrN0r/7rvSCjSn9HugKLaA40yl4AsFugzmCZKzd8="; + hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 4f1ae7204fad..a9d12c4e43cb 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -8,10 +8,12 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { axis = getComponentDeps "deconz"; + gardena_bluetooth = getComponentDeps "husqvarna_automower_ble"; govee_ble = [ ibeacon-ble ]; hassio = getComponentDeps "homeassistant_yellow"; + husqvarna_automower_ble = getComponentDeps "gardena_bluetooth"; lovelace = [ pychromecast ]; @@ -35,6 +37,7 @@ let system_log = [ isal ]; + tesla_fleet = getComponentDeps "teslemetry"; xiaomi_miio = [ arrow ]; @@ -69,6 +72,10 @@ let # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; + honeywell = [ + # Failed: Unused ignore translations: component.honeywell.config.abort.reauth_successful. Please remove them from the ignore_translations fixture. + "--deselect=tests/components/honeywell/test_config_flow.py::test_reauth_flow" + ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" @@ -76,10 +83,18 @@ let # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; + jewish_calendar = [ + # Failed: Unused ignore translations: component.jewish_calendar.config.abort.reconfigure_successful. Please remove them from the ignore_translations fixture. + "--deselect tests/components/jewish_calendar/test_config_flow.py::test_reconfigure" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + nina = [ + # Failed: Unused ignore translations: component.nina.options.error.unknown. Please remove them from the ignore_translations fixture. + "--deselect tests/components/nina/test_config_flow.py::test_options_flow_unexpected_exception" + ]; sql = [ "-W" "ignore::sqlalchemy.exc.SAWarning" diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 1c68331d1c1c..5d8dbacd91bc 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -45,6 +45,7 @@ PKG_PREFERENCES = { "numpy": "numpy_1", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt_1", + "pysuezV2": "pysuez", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", From 5fd3b7e32d803c7fa4672ce52a3d5aaea5c8c3d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:02:35 +0100 Subject: [PATCH 82/98] python312Packages.pyvicare-neo: drop As home-assistant migrated back to pyvicare, this package has become obsolete. --- .../python-modules/pyvicare-neo/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/pyvicare-neo/default.nix diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix deleted file mode 100644 index 5980fca223f2..000000000000 --- a/pkgs/development/python-modules/pyvicare-neo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - authlib, - buildPythonPackage, - fetchFromGitHub, - lib, - poetry-core, - pytestCheckHook, - requests, - types-requests, -}: - -buildPythonPackage rec { - pname = "pyvicare-neo"; - version = "0.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "CFenner"; - repo = "PyViCare"; - rev = "refs/tags/v${version}"; - hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes="; - }; - - build-system = [ poetry-core ]; - - propagatedBuildInputs = [ - authlib - requests - types-requests - ]; - - pythonImportsCheck = [ "PyViCare" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}"; - description = "Library to communicate with the Viessmann ViCare API"; - homepage = "https://github.com/CFenner/PyViCare"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 102bc381b20a..d33cb84c62c2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -548,6 +548,7 @@ mapAliases ({ pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 + pyvicare-neo = pyvicare; # Added 2024-11-06 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e79a9727c83d..453d627ff5ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13215,8 +13215,6 @@ self: super: with self; { pyvicare = callPackage ../development/python-modules/pyvicare { }; - pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; - pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; pyvis = callPackage ../development/python-modules/pyvis { }; From f3e4138399f644a9c840131eaede18f10bd0daf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:51:33 +0100 Subject: [PATCH 83/98] python312Packages.devolo-plc-api: disable failing tests The pytest-httpx upgrade caused a few request mismatches here and there. --- pkgs/development/python-modules/devolo-plc-api/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index da12ca39dbd0..d88de025c3fe 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "protobuf>=4.22.0" "protobuf" + --replace-fail "protobuf>=4.22.0" "protobuf" ''; nativeBuildInputs = [ setuptools-scm ]; @@ -53,6 +53,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # pytest-httpx compat issue + "test_wrong_password_type" + ]; + pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { From 9e96929a3e672d146169c8391096f71ba43a5821 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Nov 2024 23:57:54 +0100 Subject: [PATCH 84/98] ytdl-sub: 2024.10.27.post5 -> 2024.11.6 https://github.com/jmbannon/ytdl-sub/releases/tag/2024.11.6 --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 5e43a0548088..7e3a59cdb392 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.10.27.post5"; + version = "2024.11.6"; pyproject = true; src = fetchPypi { inherit version; pname = "ytdl_sub"; - hash = "sha256-NVIQOoRAyiFtc83r7z7DfDiIdWIPmUwylNzG3KSyOXw="; + hash = "sha256-YMki+1rC726RtbZceoVbcpk/Gi3F81xxERQjpqLjn+A="; }; build-system = with python3Packages; [ From d8bdd0cfae6d01a0d25f93fabac21a85f313efd8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 00:48:46 +0100 Subject: [PATCH 85/98] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.172 -> 0.13.180 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.180/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 499b4b823ea8..fefbf501f1d2 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.172"; + version = "0.13.180"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo="; + hash = "sha256-OLCGoZ5C39D4yYJagowO914qJlQcJVScm/a1ZbR2alM="; }; build-system = [ setuptools ]; From a71792511cbf1f8ac7fae85c2ef47eac8aedad94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 01:07:26 +0100 Subject: [PATCH 86/98] python312Packages.directv: disable failing test Test is outdated and does not work with recent aiohttp versions. --- pkgs/development/python-modules/directv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 66526a2d0975..43a1a1d0e655 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Host '#' cannot contain '#' (at position 0) + "test_client_error" + ]; + pythonImportsCheck = [ "directv" ]; meta = with lib; { From 11f23199bd0779ccfda411a8cc23cf38d111ef79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 02:41:36 +0100 Subject: [PATCH 87/98] python312Packages.aiomodernforms: disable failing tests --- pkgs/development/python-modules/aiomodernforms/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 4727fa2b46a5..97e7f60eadf5 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/wonderslug/aiomodernforms/issues/273 + "test_connection_error" + "test_empty_response" + ]; + pythonImportsCheck = [ "aiomodernforms" ]; meta = with lib; { From 6e95221e2e76a75bda0395238623295b363f68fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:05:18 +0100 Subject: [PATCH 88/98] python312Packages.homeassistant-stubs: 2024.10.4 -> 2024.11.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.11.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index efd82a902f22..44cff2d2d7ba 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.10.4"; + version = "2024.11.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-MjHqX1OP1mEEypAxZ8Xc+ZWBsfj4yiFG9oItFnf/svk="; + hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc="; }; build-system = [ From e40b41cc5f790ae2d609aba2aa37ffc0f578ee5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:16:33 +0100 Subject: [PATCH 89/98] python312Packages.denonavr: fix tests Makes the tests compatible with pytest-httpx 0.32.0. --- pkgs/development/python-modules/denonavr/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 771e615eca46..4c668367fb00 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, defusedxml, fetchFromGitHub, + fetchpatch2, ftfy, httpx, netifaces, @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/ol-iver/denonavr/commit/5320aadae91135a8c208c83d82688ddf26eb6498.patch"; + hash = "sha256-F9R5GJ1XK3lHWLY+OgzKu3+xCosK3nX4EII9J1jhlys="; + }) + ]; + pythonRelaxDeps = [ "defusedxml" ]; build-system = [ setuptools ]; From f1678e98bd8f2fc1c96deec3b9f86ad957ff2e0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 03:36:43 +0100 Subject: [PATCH 90/98] python312Packages.glances-api: fix tests --- pkgs/development/python-modules/glances-api/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bceb44eb0b6f..0f0f22280579 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, httpx, poetry-core, pytest-asyncio, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch"; + hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8="; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ httpx ]; From d1dcf229be67e06c201880ef6e1586996ce73584 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:34:00 +0100 Subject: [PATCH 91/98] python312Packages.tesla-powerwall: disable failing test The URL representation changed somewhere between yarl 1.9 and 1.10. --- pkgs/development/python-modules/tesla-powerwall/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 8677ae389af6..b5ce22702ae0 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # yarl compat issue https://github.com/jrester/tesla_powerwall/issues/68 + "test_parse_endpoint" + ]; + pytestFlagsArray = [ "tests/unit" ]; pythonImportsCheck = [ "tesla_powerwall" ]; From 4d69655157fc559a9e1e125cf3896bb864220fdb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:44:17 +0100 Subject: [PATCH 92/98] python312Packagse.aioskybell: disable failing tests Newer aiohttp version (3.10.6+) removed an attribute on an object. --- pkgs/development/python-modules/aioskybell/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 922d60f4c33c..d67a770f18fd 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -47,6 +47,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp compat issues + "test_get_devices" + "test_errors" + "test_async_change_setting" + ]; + pythonImportsCheck = [ "aioskybell" ]; meta = with lib; { From 157d63ef922d9fc3d040ce5ebf30f5046c74eae4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 04:57:32 +0100 Subject: [PATCH 93/98] python312Packages.pytomorrowio: disable failing test --- pkgs/development/python-modules/pytomorrowio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index b749a805eb27..2e3a5f4afbc3 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp 3.10.6 compat + "test_errors" + ]; + pythonImportsCheck = [ "pytomorrowio" ]; meta = { From 327821b9c0cf465e60a5277223a92c5579b90f69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Nov 2024 05:30:32 +0100 Subject: [PATCH 94/98] Revert "python3Packages.pytubefix: 6.4.2 -> 6.17.0" This reverts commit feeaf70c4d207045565b7c375086cdf5ee25c0ca. API breakage in the testsuite. --- pkgs/development/python-modules/pytubefix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 3610c50b3a00..343bcca0a965 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "6.17.0"; + version = "6.4.2"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; rev = "refs/tags/v${version}"; - hash = "sha256-7AHmRAJ8wL8/V5uQyjdsEUxHQz0n+3pxi9FpMsM1l4U="; + hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM="; }; build-system = [ setuptools ]; From d29b9af649d82fee24795e505fe478e405cea73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Nov 2024 22:22:21 -0800 Subject: [PATCH 95/98] python312Packages.pybase64: use pep517 builder, modernize, fix tests --- .../python-modules/pybase64/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index f41685c71150..5af9c6561a0d 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,33 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pybase64"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cU8CHD6qKHwQl87Wjy30xbLs0lBFUcLnHIQ/VDZaygM="; + src = fetchFromGitHub { + owner = "mayeut"; + repo = "pybase64"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; pythonImportsCheck = [ "pybase64" ]; - meta = with lib; { + meta = { description = "Fast Base64 encoding/decoding"; mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; - changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; - license = licenses.bsd2; + changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.bsd2; maintainers = [ ]; }; } From 27cff3021567389c8633d0ea96d5af04dcb263c7 Mon Sep 17 00:00:00 2001 From: Zuruh Date: Thu, 7 Nov 2024 19:49:58 +0100 Subject: [PATCH 96/98] phpactor: 2024.06.30.0 -> 2024.11.05.0 (#354051) --- pkgs/by-name/ph/phpactor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index dbd86adc44cc..7a171733b480 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2024.06.30.0"; + version = "2024.11.05.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM="; + hash = "sha256-/h7Apqo0N4aQvLfzfV/v35npo1wwOOZksokJKhCp8oA="; }; - vendorHash = "sha256-Q72EeGeVqjaOZeW8VAB59OY0E/wvL8Ljq/9XC4iK/rg="; + vendorHash = "sha256-nfy2H6isjW7m0UdPaX9Kqt2iwA2IwOhHE+xmqJ2t1qo="; nativeBuildInputs = [ installShellFiles ]; From 955ec32efc94de5ae082c02834d74262c352c810 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 7 Nov 2024 06:43:17 +0000 Subject: [PATCH 97/98] warzone2100: 4.5.3 -> 4.5.4 Changes: https://github.com/Warzone2100/warzone2100/releases/tag/4.5.4 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 81ab98e67bc9..e7377243ab3d 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-7tSfLkVth9nbGSwn1uNWeFrHx5ac+jaO3Gk9Bb+hLIk="; + hash = "sha256-v7Odn5UJwNxdr6Pm959VgtdkFJYpN6e9f30bVXqIr8I="; }; buildInputs = [ From 9d4343b7b27a3e6f08fc22ead568233ff24bbbde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 10:19:28 +0000 Subject: [PATCH 98/98] ladybird: 0-unstable-2024-10-22 -> 0-unstable-2024-11-06 --- pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1e445f9dd56d..1a61d7cf77a3 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-10-22"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "648fac7215e1841e3714d4c72c7aee75152da522"; - hash = "sha256-OB9dV+dNr5eA4h1+telYitrI62m+XSK/SYc9UPs7D4M="; + rev = "ad1ba30b27ff2802b6e743c6b8970e4bd1309dfc"; + hash = "sha256-vrRkUTWHm+2GTJ3axO2oPJ0gKyMSH8Reh3TjYYze/Io="; }; postPatch = ''