From 30756bb4ff30a1f0cdd45fa280bc36a7c08b7ae9 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Tue, 9 Apr 2024 19:16:15 +0200 Subject: [PATCH 01/51] Maintainer renamed: luis -> qubasa. Removed vacant package rmount --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/by-name/im/imhex/package.nix | 2 +- .../compilers/kaitai-struct-compiler/default.nix | 2 +- pkgs/development/tools/analysis/hopper/default.nix | 1 - pkgs/tools/filesystems/rmount/default.nix | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d9715f9784b..c61e34c7a705 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11761,12 +11761,6 @@ githubId = 5767106; name = "Lukas Schmidt"; }; - luis = { - email = "luis.nixos@gmail.com"; - github = "Luis-Hebendanz"; - githubId = 22085373; - name = "Luis Hebendanz"; - }; luisdaranda = { email = "luisdomingoaranda@gmail.com"; github = "propet"; @@ -16300,6 +16294,12 @@ matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; }; + qubasa = { + email = "consulting@qube.email"; + github = "Qubasa"; + githubId = 22085373; + name = "Luis Hebendanz"; + }; queezle = { email = "git@queezle.net"; github = "queezle42"; diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 7ee075ae1888..5ff609bd3189 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; homepage = "https://github.com/WerWolv/ImHex"; license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ luis kashw2 cafkafk ]; + maintainers = with maintainers; [ kashw2 cafkafk ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/development/compilers/kaitai-struct-compiler/default.nix index 7d34bb312cf4..2fd4fba11e3b 100644 --- a/pkgs/development/compilers/kaitai-struct-compiler/default.nix +++ b/pkgs/development/compilers/kaitai-struct-compiler/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Compiler to generate binary data parsers in C++ / C# / Go / Java / JavaScript / Lua / Perl / PHP / Python / Ruby "; license = licenses.gpl3Only; - maintainers = with maintainers; [ luis ]; + maintainers = with maintainers; [ qubasa ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index d7b519b04c34..2d2804603346 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { description = "A macOS and Linux Disassembler"; license = licenses.unfree; maintainers = with maintainers; [ - luis Enteee ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index ec4bb1392712..257db9af80f6 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Luis-Hebendanz/rmount"; description = "Remote mount utility which parses a json file"; license = licenses.mit; - maintainers = [ maintainers.luis ]; + maintainers = [ maintainers.qubasa ]; platforms = platforms.linux; mainProgram = "rmount"; }; From 8628dda9b98fdd31e00afef07f664bb40d01869f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Wed, 10 Apr 2024 23:04:40 +0200 Subject: [PATCH 02/51] rPackages.FLAMES: fix build --- pkgs/development/r-modules/default.nix | 6 +++++- pkgs/development/r-modules/patches/FLAMES.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/r-modules/patches/FLAMES.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 096bfd6b1bdd..7dcc50d13e6f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -657,7 +657,7 @@ let rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ]; rawrr = [ pkgs.mono ]; HDF5Array = [ pkgs.zlib.dev ]; - FLAMES = [ pkgs.zlib.dev ]; + FLAMES = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; ncdfFlow = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj.dev ]; rtmpt = [ pkgs.gsl ]; @@ -1208,6 +1208,10 @@ let patches = [ ./patches/spMC.patch ]; }); + FLAMES = old.FLAMES.overrideAttrs (attrs: { + patches = [ ./patches/FLAMES.patch ]; + }); + openssl = old.openssl.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/r-modules/patches/FLAMES.patch b/pkgs/development/r-modules/patches/FLAMES.patch new file mode 100644 index 000000000000..334ea5156f9a --- /dev/null +++ b/pkgs/development/r-modules/patches/FLAMES.patch @@ -0,0 +1,17 @@ +diff --git a/src/Makevars b/src/Makevars +index 4f3fa42ce752..e48e45561292 100755 +--- a/src/Makevars ++++ b/src/Makevars +@@ -24,12 +24,6 @@ FILES = $(CFILES) $(CPPFILES) + SOURCES = $(FILES) + OBJECTS = $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) + +-strippedLib: $(SHLIB) +- if test -e "/usr/bin/strip" & test -e "/bin/uname" & [[ `uname` == "Linux" ]] ; then /usr/bin/strip --strip-debug $(SHLIB); fi +-clean: +- rm $(OBJECTS) +-.phony: strippedLib clean +- + RHTSLIB_LIBS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \ + 'Rhtslib::pkgconfig("PKG_LIBS")') + RHTSLIB_CPPFLAGS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \ From ffb3c91dd16812053319085566b7ee72bd6ccab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 11 Apr 2024 12:02:06 +0200 Subject: [PATCH 03/51] cert-viewer: 0.9.0 -> 0.9.1 --- pkgs/by-name/ce/cert-viewer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/cert-viewer/package.nix b/pkgs/by-name/ce/cert-viewer/package.nix index ca7dde06c0b0..df9032dfbec7 100644 --- a/pkgs/by-name/ce/cert-viewer/package.nix +++ b/pkgs/by-name/ce/cert-viewer/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cert-viewer"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mgit-at"; repo = "cert-viewer"; rev = "refs/tags/v${version}"; - hash = "sha256-q4FLKH0ZA/79zLo7dt+CSOjfKyygTiQKSuungQTtue0="; + hash = "sha256-6IPr2BG3y/7cmc2WkeeFDpQ59GNU1eOhhm49HE2w0cA="; }; - vendorHash = "sha256-55zDUAe5s+03/OnDcK1DqmMUpFO2sBaVjEk6vbrHgzY="; + vendorHash = "sha256-jNT04bYH5L/Zcfvel673zr2UJLayCO443tvBGZjrBZk="; meta = { description = "Admin tool to view and inspect multiple x509 Certificates"; From 56b26ff8e7bcf800f6681531dd17a8cd6e6932f3 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Thu, 11 Apr 2024 09:54:57 -0400 Subject: [PATCH 04/51] libressl: 3.8.4 -> 3.9.1 --- pkgs/development/libraries/libressl/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 5c60dd3bba1b..59bcae1cd87a 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -114,4 +114,9 @@ in { version = "3.8.4"; hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; }; + + libressl_3_9 = generic { + version = "3.9.1"; + hash = "sha256-baC5VGlffuYrA/ZCAKik8Cr5Nxe2DM4Eq2yN8mLAelE="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 151530685e71..71757e737c6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23905,9 +23905,10 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_3_6 libressl_3_7 - libressl_3_8; + libressl_3_8 + libressl_3_9; - libressl = libressl_3_8; + libressl = libressl_3_9; boringssl = callPackage ../development/libraries/boringssl { }; From 8a71dbd3999e2f3ba0a24423acec6d919a52dc5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 16:43:06 +0000 Subject: [PATCH 05/51] imgui: 1.90.4 -> 1.90.5 --- pkgs/development/libraries/imgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 275d44e88dd9..ed15d6229d9e 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.4"; + version = "1.90.5"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; + sha256 = "sha256-iTs8bcCAR8lvN1tcKmwyB3CcFmqR1QpqdGqdER920rM="; }; dontBuild = true; From 8c0f4ca85a61fc22493857d5ceb7caa8095be8b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 16:43:10 +0000 Subject: [PATCH 06/51] python311Packages.clarifai-grpc: 10.2.3 -> 10.3.0 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index abea00d20798..4651dda2c02f 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.2.3"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-Dim0ZRYNzmlBqrqqs0CG+I/XQYpH9DuPISXoYxi92Dc="; + hash = "sha256-JdRqZCDU5ScI3ZUTsWnFHYQ7Zog6V2xcbBDvFcHPnCk="; }; build-system = [ From 4f83d87e435bf93dd5d886eed4c35153b3654004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 18:26:09 +0000 Subject: [PATCH 07/51] python311Packages.robotframework-requests: 0.9.6 -> 0.9.7 --- .../python-modules/robotframework-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 6d009c61a80c..d1b6f21df06b 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework-requests"; - version = "0.9.6"; + version = "0.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MarketSquare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TuKfR+pUcQ4kf9HsX6s9WYukhwLBbJkwModoreAgo60="; + hash = "sha256-NRhf3delcqUw9vWRPL6pJzpcmRMDou2pHmUHMstF8hw="; }; propagatedBuildInputs = [ From c904aafde9dcac79a8848ebec9f0d451c91f6e33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 19:54:04 +0000 Subject: [PATCH 08/51] readarr: 0.3.21.2475 -> 0.3.22.2499 --- pkgs/servers/readarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 511493bc9998..912db6f5ec3b 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-dPiavOh69pFWgzM533P7Cv0IUa3YOmCBROjdXflya0s="; - arm64-linux_hash = "sha256-dzGdOm4Uj1RavpwLQ5PmeeCBELoTZz7VCtuv9+cZPxQ="; - x64-osx_hash = "sha256-i5KKY1r2zlIRPggoo9Ju7WSkHA44x42thVQswnXYAp4="; + x64-linux_hash = "sha256-Oq8kxHfVG34qiBOOgsXy/qblrKbndrNAMzyDLMcwko0="; + arm64-linux_hash = "sha256-0IOyLZwWBJQ1c+IOLuI6TXLSPNNaWLMbuBXOOmn5PlI="; + x64-osx_hash = "sha256-Q+qgmrko7DoUTW3B8NDWi7Rw80GYLaKyK/fq7y6eq7Q="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.21.2475"; + version = "0.3.22.2499"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 0cd92c3790a331204942a9385c914f2a1b8fc1aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 21:03:02 +0000 Subject: [PATCH 09/51] spglib: 2.3.1 -> 2.4.0 --- pkgs/development/libraries/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index e33f18e50b7b..fe585e9d6ea2 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.3.1"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.4.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-MOre1LGf7Li+tAqtzpuEvAX6q/P0ueDlMXhhmtiE+jw="; + hash = "sha256-Y6WkN3Q1q4h2TqrlKSKFmFxQZQWKmleRHV74PmYyw2A="; }; nativeBuildInputs = [ cmake gfortran gtest ]; From 24e6e4d6e0dae644ec9163b857a85bbbb59334b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 22:49:12 +0000 Subject: [PATCH 10/51] vulkan-cts: 1.3.8.1 -> 1.3.8.2 --- pkgs/tools/graphics/vulkan-cts/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-cts/sources.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 58444354666f..670d2108f820 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.8.1"; + version = "1.3.8.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-lDMaJjAusK+Hva4BZnrXNmuGdSL04rh1W9PYsjxF3c8="; + hash = "sha256-0Yyk7o5RSo1pzo1+oCi0TqEf62CLBURvZWgwELXDKKA="; }; prePatch = '' diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index e0a197188d66..d8dfdd6faaf6 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -11,8 +11,8 @@ rec { glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "9fd0fcd737f1369e89fb3aa8b2e62bad57ac46c6"; - hash = "sha256-A3IFW3kOuOGj4AfpdDfAHIySDLdIB9IK+wk8TSBcPrk="; + rev = "bada5c87ec6db4441db129d8506742c4a72bd610"; + hash = "sha256-GayYjvJ935arbe4GUg8l6KhfImBCpqWRe8xSqlxXLYQ="; }; jsoncpp = fetchFromGitHub { From 7af1be6d39d34e498518a0b4c08b835a0bf68994 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 00:32:37 +0000 Subject: [PATCH 11/51] boogie: 3.1.3 -> 3.1.4 --- pkgs/by-name/bo/boogie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index c1ffcb79b0f1..784a21cbd82c 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-vGlRexnYdL14iMOJvGcavI/ZQjAlGu08VeeE2SXujOw="; + sha256 = "sha256-XKggNmyhY3ZwbmMvi78MPz36iulW1QPJRENW/LGgdts="; }; projectFile = [ "Source/Boogie.sln" ]; From a4b7371c708aeb17e39948c3b635e7e262d7e33c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 00:52:18 +0000 Subject: [PATCH 12/51] fishPlugins.done: 1.19.2 -> 1.19.3 --- pkgs/shells/fish/plugins/done.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index f53840743bd2..4e5aa8e9a090 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-VSCYsGjNPSFIZSdLrkc7TU7qyPVm8UupOoav5UqXPMk="; + hash = "sha256-DMIRKRAVOn7YEnuAtz4hIxrU93ULxNoQhW6juxCoh4o="; }; checkPlugins = [ fishtape ]; From bc840c4c4be73c81babf6d5ca083a114375a15a3 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 12 Apr 2024 08:50:39 +0530 Subject: [PATCH 13/51] tailscale: 1.62.1 -> 1.64.0 Diff: https://github.com/tailscale/tailscale/compare/v1.62.1...1.64.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 7da355cf4a92..c2abec9d1f8e 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.62.1"; + version = "1.64.0"; in buildGoModule { pname = "tailscale"; @@ -22,9 +22,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-gV1k+8n6vuL9q4hNaMdQLf6083Em+CC7/uTdUpehbUU="; + hash = "sha256-qBZoiqhBMBNbeytDBH+sOxxsVjOcH6vnSgIufx+Op04="; }; - vendorHash = "sha256-jyRjT/CQBlmjHzilxJvMuzZQlGyJB4X/yISgWjBVDxc="; + vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 38e238915e9c5df62149f8d0a5a67e1748019452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 03:48:23 +0000 Subject: [PATCH 14/51] cockpit: 314 -> 315 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 9ad68d2bf1e2..f9a18b8a36fc 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "314"; + version = "315"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-6iLfUqzBG/pvGNnzMJzMQqnNjPvKJtTHHCSBWtSwwFM="; + hash = "sha256-N6MDqhYQky80r9wSiDIPusg6iOpDh4S52pf337nojyY="; fetchSubmodules = true; }; From 9de6ca85c9e3b322653c0df19cb818fcc117c291 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:15:34 +0200 Subject: [PATCH 15/51] python311Packages.clarifai-grpc: format with nixfmt --- .../python-modules/clarifai-grpc/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 4651dda2c02f..ce7929e5a345 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, googleapis-common-protos -, grpcio -, protobuf -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + googleapis-common-protos, + grpcio, + protobuf, + requests, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-JdRqZCDU5ScI3ZUTsWnFHYQ7Zog6V2xcbBDvFcHPnCk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ googleapis-common-protos From defc52f44275959f854eea82faff1f713fd7465e Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:09:51 +0300 Subject: [PATCH 16/51] raycast: 1.71.1 -> 1.71.3 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 9280ebe8fa8b..e28a8c347eac 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.71.1"; + version = "1.71.3"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-TJBBguUMgH0QM8h6GMHrQmfmREB1O8k4tp3YMywYeXY="; + hash = "sha256-jiGo4H38qAiGMh4ckswyeDcijYL2wbcjs+IubDFjobU="; }; dontPatch = true; From f12904d21d5032815a951c7bdddc4169676c9eaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 10:24:12 +0000 Subject: [PATCH 17/51] vunnel: 0.21.2 -> 0.22.0 --- pkgs/by-name/vu/vunnel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index f1ab50fee7c0..c6a5256fdf57 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.21.2"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-pd8mvNxlkfHKNr8Ce1wLy3r6THW/w/FkojdmMVVCXD0="; + hash = "sha256-+L1MUD9IKPnbh/yjRuF3aOszeMvkILuqHHWj949SrMo="; }; pythonRelaxDeps = [ From 11f3e0c15d7e4792985b93ce932f285c5bfe7b4d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:06:24 +0200 Subject: [PATCH 18/51] mongodb-4_4: drop --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/services/networking/unifi.nix | 4 +- nixos/modules/services/video/unifi-video.nix | 2 +- nixos/tests/mongodb.nix | 2 - pkgs/servers/nosql/mongodb/4.4.nix | 20 ---- .../fix-build-with-boost-1.79-4_4.patch | 93 ------------------- pkgs/servers/nosql/mongodb/mongodb.nix | 21 ++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 -- 9 files changed, 12 insertions(+), 140 deletions(-) delete mode 100644 pkgs/servers/nosql/mongodb/4.4.nix delete mode 100644 pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 7b315157494f..fb978d92d2d4 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -219,6 +219,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `unifiLTS`, `unifi5` and `unifi6` have been removed, as they require MongoDB versions which are end-of-life. All these versions can be upgraded to `unifi7` directly. +- `mongodb-4_4` has been removed as it has reached end of life. Consequently, `unifi7` and `unifi8` now use MongoDB 5.0 by default. + - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details. - `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously. diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8eb29f2bcdb6..569f39969450 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -39,10 +39,10 @@ in services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi5" { }; services.unifi.mongodbPackage = lib.mkPackageOption pkgs "mongodb" { - default = "mongodb-4_4"; + default = "mongodb-5_0"; extraDescription = '' ::: {.note} - unifi7 officially only supports mongodb up until 3.6 but works with 4.4. + unifi7 officially only supports mongodb up until 4.4 but works with 5.0. ::: ''; }; diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 518977e49bae..1eb29fb0fd84 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -108,7 +108,7 @@ in unifiVideoPackage = mkPackageOption pkgs "unifi-video" { }; mongodbPackage = mkPackageOption pkgs "mongodb" { - default = "mongodb-4_4"; + default = "mongodb-5_0"; }; logDir = mkOption { diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 68be6926865e..97729e38864c 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes = { node = {...}: { environment.systemPackages = with pkgs; [ - mongodb-4_4 mongodb-5_0 ]; }; @@ -42,7 +41,6 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' node.start() '' - + runMongoDBTest pkgs.mongodb-4_4 + runMongoDBTest pkgs.mongodb-5_0 + '' node.shutdown() diff --git a/pkgs/servers/nosql/mongodb/4.4.nix b/pkgs/servers/nosql/mongodb/4.4.nix deleted file mode 100644 index 933e9136aee0..000000000000 --- a/pkgs/servers/nosql/mongodb/4.4.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, callPackage, lib, fetchpatch, sasl, boost, Security, CoreFoundation, cctools }: - -let - buildMongoDB = callPackage ./mongodb.nix { - inherit sasl boost Security CoreFoundation cctools; - }; -in -buildMongoDB { - version = "4.4.28"; - sha256 = "sha256-aq4dJl2FOTOhQ3bzVj0L/0CE3obE7lCx2ecjGNYC8X4="; - patches = [ - ./forget-build-dependencies-4-4.patch - ./fix-build-with-boost-1.79-4_4.patch - (fetchpatch { - name = "mongodb-4.4.15-adjust-the-cache-alignment-assumptions.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch.arm64?h=mongodb44"; - sha256 = "Ah4zdSFgXUJ/HSN8VRLJqDpNy3CjMCBnRqlpALXzx+g="; - }) - ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ]; -} diff --git a/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch b/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch deleted file mode 100644 index 72da249f2380..000000000000 --- a/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch +++ /dev/null @@ -1,93 +0,0 @@ -From f0c7e9190e9d61515ab3f95c6665754d3b972cd1 Mon Sep 17 00:00:00 2001 -From: Et7f3 -Date: Tue, 19 Jul 2022 22:11:11 +0200 -Subject: [PATCH] build: Upgrade boost to 1.79.0 - -We can see in src/third_party/boost-1.70.0/boost/version.hpp that vendored -version of boost is BOOST_LIB_VERSION "1_70" - -We can also see the doc desbribe 2 headers to use filesystems lib: One is -src/third_party/boost/boost/filesystem/fstream.hpp that contains (175-177) - typedef basic_ifstream ifstream; - typedef basic_ofstream ofstream; - typedef basic_fstream fstream; - -So this mean they mostly forgot to include a header and include-what-you-use -would catch this error. - -In upstream they fixed in a simmilar way -https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a - -Co-Authored-By: Adrian Pistol ---- - src/mongo/db/storage/storage_repair_observer.cpp | 1 + - src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 + - src/mongo/shell/shell_utils_extended.cpp | 1 + - src/mongo/util/processinfo_linux.cpp | 2 +- - src/mongo/util/stacktrace_threads.cpp | 1 + - 5 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp -index 22b76a6a39c..453f48229cd 100644 ---- a/src/mongo/db/storage/storage_repair_observer.cpp -+++ b/src/mongo/db/storage/storage_repair_observer.cpp -@@ -42,6 +42,7 @@ - #endif - - #include -+#include - - #include "mongo/db/dbhelpers.h" - #include "mongo/db/operation_context.h" -diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -index ee87aca4723..bde2c1b2b83 100644 ---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -37,6 +37,7 @@ - - #include - #include -+#include - #include - - #include "mongo/base/simple_string_data_comparator.h" -diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp -index 8cd7f035f1d..cd672eb513f 100644 ---- a/src/mongo/shell/shell_utils_extended.cpp -+++ b/src/mongo/shell/shell_utils_extended.cpp -@@ -37,6 +37,7 @@ - #endif - - #include -+#include - #include - - #include "mongo/bson/bson_validate.h" -diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp -index 9063f140988..d74949d45fc 100644 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -33,7 +33,7 @@ - - #include "processinfo.h" - --#include -+#include - #include - #include - #include -diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp -index 4667a261ab7..73a36015bd6 100644 ---- a/src/mongo/util/stacktrace_threads.cpp -+++ b/src/mongo/util/stacktrace_threads.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.39.2 - diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index a51144c48d4e..801ee28303f0 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ] ++ lib.optional stdenv.isLinux net-snmp - ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; + ++ [ xz ]; # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. @@ -98,24 +98,15 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," - '' + lib.optionalString (versionAtLeast version "4.4") '' + '' + '' # Fix debug gcc 11 and clang 12 builds on Fedora # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include ' '#include #include ' substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include #include ' - '' + lib.optionalString (versionOlder version "5.0") '' - # remove -march overriding, we know better. - sed -i 's/env.Append.*-march=.*$/pass/' SConstruct '' + lib.optionalString (stdenv.isDarwin && versionOlder version "6.0") '' substituteInPlace src/third_party/mozjs-${mozjsVersion}/extract/js/src/jsmath.cpp --replace '${mozjsReplace}' 0 - '' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") '' - substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder - substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder - substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder - substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder - substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder '' + lib.optionalString stdenv.isi686 '' # don't fail by default on i686 @@ -135,7 +126,8 @@ in stdenv.mkDerivation rec { "--use-sasl-client" "--disable-warnings-as-errors" "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld - ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ] + "--link-model=static" + ] ++ map (lib: "--use-system-${lib}") system-libraries; # This seems to fix mongodb not able to find OpenSSL's crypto.h during build @@ -167,10 +159,9 @@ in stdenv.mkDerivation rec { installTargets = if (versionAtLeast version "6.0") then "install-devcore" - else if (versionAtLeast version "4.4") then "install-core" - else "install"; + else "install-core"; - prefixKey = if (versionAtLeast version "4.4") then "DESTDIR=" else "--prefix="; + prefixKey = "DESTDIR="; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae25b6b53e69..4ec1068b6010 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -808,6 +808,7 @@ mapAliases ({ moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 + mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 moz-phab = mozphab; # Added 2022-08-09 mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45f166400973..5f251c99f758 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26409,13 +26409,6 @@ with pkgs; mongodb = hiPrio mongodb-6_0; - mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix { - sasl = cyrus_sasl; - boost = boost179.override { enableShared = false; }; - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix { sasl = cyrus_sasl; boost = boost179.override { enableShared = false; }; From c6a0404e3e1ec5fe3705d5f3cf16562763d6f513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Apr 2024 21:34:44 +0200 Subject: [PATCH 19/51] nixos/display-managers: add renamed option missed in #291913 --- nixos/modules/services/display-managers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 7f5db9fbb509..7e808d0d6383 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -173,11 +173,14 @@ in imports = [ (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "autoLogin" ] [ "services" "displayManager" "autoLogin" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "defaultSession" ] [ "services" "displayManager" "defaultSession" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "hiddenUsers" ] [ "services" "displayManager" "hiddenUsers" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "environment" ] [ "services" "displayManager" "environment" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "execCmd" ] [ "services" "displayManager" "execCmd" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logToFile" ] [ "services" "displayManager" "logToFile" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logToJournal" ] [ "services" "displayManager" "logToJournal" ]) (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "preStart" ] [ "services" "displayManager" "preStart" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "sessionData" ] [ "services" "displayManager" "sessionData" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "sessionPackages" ] [ "services" "displayManager" "sessionPackages" ]) ]; config = lib.mkIf cfg.enable { From 4615f4dea24be56ccec141189ef2e043265940ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:40:44 +0200 Subject: [PATCH 20/51] python312Packages.aioeafm: refactor --- .../python-modules/aioeafm/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index f1535eb07d90..6f33e5ca4f94 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -5,24 +5,26 @@ , fetchpatch , poetry-core , pytest-aiohttp -, pytest-asyncio -, pytest-cov , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioeafm"; version = "1.0.0"; - format = "pyproject"; + pyproject =true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Jc2k"; - repo = pname; - rev = version; - sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; + repo = "aioeafm"; + rev = "refs/tags/${version}"; + hash = "sha256-bL59EPvFd5vjay2sqBPGx+iL5sE/0n/EtR4K7obtDBE="; }; patches = [ + # Switch to poetry-core, https://github.com/Jc2k/aioeafm/pull/4 (fetchpatch { name = "use-poetry-core.patch"; url = "https://github.com/Jc2k/aioeafm/commit/549590e2ed465be40e2406416d89b8a8cd8c6185.patch"; @@ -30,14 +32,12 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp - pytest-asyncio - pytest-cov pytestCheckHook ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for access the Real Time flood monitoring API"; homepage = "https://github.com/Jc2k/aioeafm"; + changelog = "https://github.com/Jc2k/aioeafm/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 06d8f3e3b8c8676adffb498b031b21a452a1c375 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:41:07 +0200 Subject: [PATCH 21/51] python312Packages.aioeafm: format with nixfmt --- .../python-modules/aioeafm/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index 6f33e5ca4f94..170ff6308f40 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pytest-aiohttp -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aioeafm"; version = "1.0.0"; - pyproject =true; + pyproject = true; disabled = pythonOlder "3.7"; From b701934eaaa6adbd6821f68a90ba96cb769e6233 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 Apr 2024 18:12:44 +0200 Subject: [PATCH 22/51] garage: 0.9.4 -> 1.0.0 Release notes: https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/tools/filesystems/garage/default.nix | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index a5e8ab4addfa..d36318c0ba70 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -456,6 +456,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0. +- Garage has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade. + - The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. - The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`: diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index b0cf599ea4f1..311661a804e3 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -49,7 +49,7 @@ let buildFeatures = [ "kubernetes-discovery" "bundled-libs" - "sled" + ] ++ lib.optional (lib.versionOlder version "1.0") "sled" ++ [ "metrics" "k2v" "telemetry-otlp" @@ -65,7 +65,7 @@ let "k2v" "kubernetes-discovery" "bundled-libs" - "sled" + ] ++ lib.optional (lib.versionOlder version "1.0") "sled" ++ [ "lmdb" "sqlite" ]; @@ -110,7 +110,16 @@ rec { broken = stdenv.isDarwin; }; + garage_1_0_0 = generic { + version = "1.0.0"; + sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; + cargoSha256 = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0="; + broken = stdenv.isDarwin; + }; + garage_0_9 = garage_0_9_4; - garage = garage_0_9; + garage_1_x = garage_1_0_0; + + garage = garage_1_x; } From b93a93de03a601d4b95cbf06963155e6ef065981 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:45:43 +0200 Subject: [PATCH 23/51] python312Packages.aioasuswrt: refactor --- .../python-modules/aioasuswrt/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index b496c9ac2593..719e66121fc0 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -5,21 +5,35 @@ , pytest-asyncio , pytest-mock , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioasuswrt"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kennedyshead"; - repo = pname; - rev = "V${version}"; - sha256 = "1iv9f22v834g8wrjcynjn2azpzk8gsczv71jf7dw8aix0n04h325"; + repo = "aioasuswrt"; + rev = "refs/tags/V${version}"; + hash = "sha256-RQxIgAU9KsTbcTKc/Zl+aP77lbDSeiYzR48MtIVwacc="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov-report html" "" \ + --replace-fail "--cov-report term-missing" "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ asyncssh ]; @@ -29,12 +43,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html" "" \ - --replace "--cov-report term-missing" "" - ''; - pythonImportsCheck = [ "aioasuswrt" ]; @@ -42,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Asuswrt"; homepage = "https://github.com/kennedyshead/aioasuswrt"; + changelog = "https://github.com/kennedyshead/aioasuswrt/releases/tag/V${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From c9d195fd7d9c4e6d121aa3170268a87c1a71dcc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 12:46:00 +0200 Subject: [PATCH 24/51] python312Packages.aioasuswrt: format with nixfmt --- .../python-modules/aioasuswrt/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index 719e66121fc0..5847da65b28b 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -1,12 +1,13 @@ -{ lib -, asyncssh -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + asyncssh, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -29,13 +30,9 @@ buildPythonPackage rec { --replace-fail "--cov-report term-missing" "" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - asyncssh - ]; + dependencies = [ asyncssh ]; nativeCheckInputs = [ pytest-asyncio @@ -43,9 +40,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "aioasuswrt" - ]; + pythonImportsCheck = [ "aioasuswrt" ]; meta = with lib; { description = "Python module for Asuswrt"; From 6268a5fdf239e4cca6c91ae649cc2611702f98a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 13:02:40 +0200 Subject: [PATCH 25/51] python312Packages.batinfo: refactor - enable tests - add pythonImportsCheck --- .../python-modules/batinfo/default.nix | 51 +++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index c4fdc9ee92cf..bd8af6fbbf7e 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -1,23 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "batinfo"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "497e29efc9353ec52e71d43bd040bdfb6d685137ddc2b9143cded4583af572f5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nicolargo"; + repo = "batinfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-GgAJJA8bzQJLAU+nxmkDa5LFTHc4NGi+nj9PfKyw8/M="; }; - # No tests included - doCheck = false; + postPatch = '' + substituteInPlace test_batinfo.py \ + --replace-fail "self.assertEquals" "self.assertEqual" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "batinfo" + ]; + + disabledTests = [ + # Tests are a bit outdated + "test_batinfo_capacity" + "test_batinfo_charge_now" + "test_batinfo_name_default" + ]; meta = with lib; { + description = "Module to retrieve battery information"; homepage = "https://github.com/nicolargo/batinfo"; - description = "A simple Python lib to retrieve battery information"; - license = licenses.lgpl3; - platforms = platforms.linux; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ koral ]; + platforms = platforms.linux; }; } From 13251c32947e0cf454f714c8e3766a8ca1efb91f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 13:03:19 +0200 Subject: [PATCH 26/51] python312Packages.batinfo: format with nixfmt --- .../python-modules/batinfo/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index bd8af6fbbf7e..cfe0b5d35680 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -25,17 +26,11 @@ buildPythonPackage rec { --replace-fail "self.assertEquals" "self.assertEqual" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "batinfo" - ]; + pythonImportsCheck = [ "batinfo" ]; disabledTests = [ # Tests are a bit outdated From afc09f49b83806c5a51173189c202570f40e5ad5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 12 Apr 2024 13:25:12 +0200 Subject: [PATCH 27/51] cope: remove --- pkgs/tools/misc/cope/default.nix | 28 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/tools/misc/cope/default.nix diff --git a/pkgs/tools/misc/cope/default.nix b/pkgs/tools/misc/cope/default.nix deleted file mode 100644 index 7e65c854f288..000000000000 --- a/pkgs/tools/misc/cope/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchFromGitHub, perl, perlPackages }: - -perlPackages.buildPerlPackage rec { - pname = "cope"; - version = "unstable-2015-01-29"; - - src = fetchFromGitHub { - owner = "lotrfan"; - repo = pname; - rev = "0dc82a939a9498ff80caf472841c279dfe03efae"; - sha256 = "sha256-Tkv26M6YnaUB0nudjKGG482fvUkCobPk0VF1manBCoY="; - }; - - buildInputs = with perlPackages; [ EnvPath FileShareDir IOPty IOStty ListMoreUtils RegexpCommon RegexpIPv6 ]; - - postInstall = '' - mkdir -p $out/bin - mv $out/lib/perl5/site_perl/${perl.version}/auto/share/dist/Cope/* $out/bin/ - rm -r $out/lib/perl5/site_perl/${perl.version}/auto - ''; - - meta = with lib; { - description = "A colourful wrapper for terminal programs"; - homepage = "https://github.com/lotrfan/cope"; - license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae25b6b53e69..1939bf3df4e3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -179,6 +179,7 @@ mapAliases ({ clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 + cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c4603e87907..501bfd0bd1f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1752,8 +1752,6 @@ with pkgs; configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { }; - cope = callPackage ../tools/misc/cope { }; - crypto-tracker = callPackage ../tools/misc/crypto-tracker { }; ejs = callPackage ../development/tools/ejs { }; From 8d3a38e8b19bdd6bf2a2274c91697cd315de0403 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Fri, 12 Apr 2024 13:41:27 +0200 Subject: [PATCH 28/51] NixOS Integration tests: Re-enable for macOS --- nixos/lib/testing/meta.nix | 2 +- pkgs/build-support/trivial-builders/test/default.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 529fe714fcf6..bdf313e5b119 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -36,7 +36,7 @@ in }; platforms = lib.mkOption { type = types.listOf types.raw; - default = lib.platforms.linux; + default = lib.platforms.linux ++ lib.platforms.darwin; description = '' Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation. ''; diff --git a/pkgs/build-support/trivial-builders/test/default.nix b/pkgs/build-support/trivial-builders/test/default.nix index f41372d922bb..e1ed0be72bf3 100644 --- a/pkgs/build-support/trivial-builders/test/default.nix +++ b/pkgs/build-support/trivial-builders/test/default.nix @@ -20,11 +20,7 @@ recurseIntoAttrs { concat = callPackage ./concat-test.nix {}; linkFarm = callPackage ./link-farm.nix {}; overriding = callPackage ../test-overriding.nix {}; - # VM test not supported beyond linux yet - references = - if stdenv.hostPlatform.isLinux - then references - else {}; + inherit references; writeCBin = callPackage ./writeCBin.nix {}; writeClosure-union = callPackage ./writeClosure-union.nix { inherit (references) samples; From b8f8bafed101d4e5a47cd37e19bb4d35cd4fa66d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 12:21:42 +0000 Subject: [PATCH 29/51] aliyun-cli: 3.0.201 -> 3.0.202 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index e4ca2a611c3f..217724e89dfa 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.201"; + version = "3.0.202"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-gI+D65wBnuexSJF89KjWJ5p4RJXs64Zg23V9RGwUTws="; + sha256 = "sha256-tZBAu8LiqsWZE12UQcUdAr+6HkOOb7Au6Mg5lo0DXTQ="; }; vendorHash = "sha256-t9ukiREUEmW6KK7m5Uv5Ce6n/1GsBLom9H35eEyOBys="; From 15e2b9da42d469611fea7bc53ccaec1c31928eec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 12:24:12 +0000 Subject: [PATCH 30/51] automatic-timezoned: 2.0.10 -> 2.0.11 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index a63b18194a0e..36f5ea2ed7de 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NAnVPTH1pRFVsEPg4NV+TLBjMEFOmmBOP90z88TGZ9s="; + sha256 = "sha256-3F9VgLrk+P/KWYI8uY12XrXxHWCXoBR6zhP6xDp0EO0="; }; - cargoHash = "sha256-60CuoGqDSwb5YPeM+ueeU80R7F86eVS2SH2bY91yfu0="; + cargoHash = "sha256-YjGuGvwDTGrPObxttgBOga3pYLVbNh2lBauOyIdHiLw="; meta = with lib; { description = "Automatically update system timezone based on location"; From 19afc01e857c02a13ded2d88796afe99f0d493f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 12:25:27 +0000 Subject: [PATCH 31/51] cargo-deny: 0.14.20 -> 0.14.21 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index cfeec591f672..421559b347be 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.20"; + version = "0.14.21"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-KThJynV/LrT1CYHIs/B3yS6ylNr9AezoHhVPe1m/eiU="; + hash = "sha256-d5qgljNuEfh9kYQU+jP4tgyly6i7hETFC5tEY67Yq8g="; }; - cargoHash = "sha256-S5aRucNq5vgUIsu4ToRqLVZZ8/IXkbniJXInhnybTNY="; + cargoHash = "sha256-u1cayvVatGg03Q3xShC/0ymE8EGHyYFrZD3Q8UD8Mm8="; nativeBuildInputs = [ pkg-config From 2c35581d1df90df767241f03236b9790b0dfa6ae Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Apr 2024 08:11:07 -0400 Subject: [PATCH 32/51] qt6: 6.6.3 -> 6.7.0 --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/modules/qtmqtt.nix | 4 +- pkgs/development/libraries/qt-6/srcs.nix | 312 +++++++++--------- 3 files changed, 159 insertions(+), 159 deletions(-) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 52c6fb5f1b2e..a9c84b483238 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index a9660b73710b..fc12a5fb1112 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.2"; + version = "6.7.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; + hash = "sha256-LUYb4Wb1fLUwIvDOsVU/iSOyx9pcfPrmiFnQskbT2d8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 5edd42d3004e..767755fcbd87 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "0v6zprw9r4z4inj7mg364n959c6japklm7ji2952nm3i01zp8jd5"; - name = "qt3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "0934i5b90hyxk8s58ji7mc062wdsxlvb45y79ygvfcl6psl84fw0"; + name = "qt3d-everywhere-src-6.7.0.tar.xz"; }; }; qt5compat = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt5compat-everywhere-src-6.6.3.tar.xz"; - sha256 = "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"; - name = "qt5compat-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz"; + sha256 = "1x8r9rjkyxhn2fzhj53z7biqd0hxkka5rdp0cc5s9n25hgyx8jcx"; + name = "qt5compat-everywhere-src-6.7.0.tar.xz"; }; }; qtactiveqt = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtactiveqt-everywhere-src-6.6.3.tar.xz"; - sha256 = "0balhrmzmjrqn6h2r3rr00776vxhdpqzwhk9knrlvix8i1kr86x1"; - name = "qtactiveqt-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtactiveqt-everywhere-src-6.7.0.tar.xz"; + sha256 = "1cyh6h4829pjsklks1agym6gzz7pz2hbydvfqd190izv2fi8a125"; + name = "qtactiveqt-everywhere-src-6.7.0.tar.xz"; }; }; qtbase = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz"; - sha256 = "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"; - name = "qtbase-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz"; + sha256 = "0m5jp0rh5965d242s68wdvrxy3x1a6z3p89y8lxhxysj5sgf5chi"; + name = "qtbase-everywhere-src-6.7.0.tar.xz"; }; }; qtcharts = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtcharts-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rbz2nm8wrdf060cssvs69b5kqv0ybxjqw1clm5mdllg2j38i5jh"; - name = "qtcharts-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz"; + sha256 = "193w5grxndh0gfnyfipn7jdlskfz5b43h97zwbyh3yqvr6c597c9"; + name = "qtcharts-everywhere-src-6.7.0.tar.xz"; }; }; qtconnectivity = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtconnectivity-everywhere-src-6.6.3.tar.xz"; - sha256 = "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"; - name = "qtconnectivity-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz"; + sha256 = "0k14f7fqhychxj9j6xwad9yp7wjf7ps5f427l65krxwzq6mddbq7"; + name = "qtconnectivity-everywhere-src-6.7.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdatavis3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1gyz83hkmjin3fr3brg00qchbb0awprwx99idysrc6chckj825wv"; - name = "qtdatavis3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdatavis3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "1a8v150bva3v9njhma7424jbczjb76l7pgzw61b0qyck326j94ss"; + name = "qtdatavis3d-everywhere-src-6.7.0.tar.xz"; }; }; qtdeclarative = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdeclarative-everywhere-src-6.6.3.tar.xz"; - sha256 = "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"; - name = "qtdeclarative-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz"; + sha256 = "0b4yz9c4lba9p5xgzaymz3a8fwl8s1p8cb0nh6jwrmvlk9bkj32s"; + name = "qtdeclarative-everywhere-src-6.7.0.tar.xz"; }; }; qtdoc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdoc-everywhere-src-6.6.3.tar.xz"; - sha256 = "1j7awdbg7c0slbyhld8cdbx4dic7hhqv3g1qka809bjcxa2hb188"; - name = "qtdoc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdoc-everywhere-src-6.7.0.tar.xz"; + sha256 = "0h4w06rc8xz31iy5g8cmxs9d0p9pd6nxlyjp2k6bbr2dq085w7lr"; + name = "qtdoc-everywhere-src-6.7.0.tar.xz"; }; }; qtgraphs = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgraphs-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ppdas6bl22z69w8wdy7xl0f1kyqja2gwjd4cn6kjmsslws5rhi2"; - name = "qtgraphs-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgraphs-everywhere-src-6.7.0.tar.xz"; + sha256 = "15clif3warl4hbgdjbpnpfgy4mi2y8hkj5sc4afhzbv2gsbd2dab"; + name = "qtgraphs-everywhere-src-6.7.0.tar.xz"; }; }; qtgrpc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgrpc-everywhere-src-6.6.3.tar.xz"; - sha256 = "11q9cqqk8bs3k6n5pxys2r4fisbs3xvv8d8lsi7wm25rqh5qv1kj"; - name = "qtgrpc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgrpc-everywhere-src-6.7.0.tar.xz"; + sha256 = "18gsi9sb4v4q2g0ccmf6nkj37vzixaaha3mk882p3qys250b26dp"; + name = "qtgrpc-everywhere-src-6.7.0.tar.xz"; }; }; qthttpserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qthttpserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"; - name = "qthttpserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qthttpserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1ylvz3cny3g68lqdcy2bqii1820nyaspn28dybp7wlr15f5y7qn2"; + name = "qthttpserver-everywhere-src-6.7.0.tar.xz"; }; }; qtimageformats = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtimageformats-everywhere-src-6.6.3.tar.xz"; - sha256 = "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"; - name = "qtimageformats-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz"; + sha256 = "19r9q233pwiqqf57khdv1qfnjkqxnzfk7zhnk32i2nnxr1zf0v2i"; + name = "qtimageformats-everywhere-src-6.7.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlanguageserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"; - name = "qtlanguageserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1z69fqgqbbipwfhlabs0z6axx4br1a1qjk404jnbgxxx58scp7m9"; + name = "qtlanguageserver-everywhere-src-6.7.0.tar.xz"; }; }; qtlocation = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlocation-everywhere-src-6.6.3.tar.xz"; - sha256 = "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"; - name = "qtlocation-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlocation-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snl7a8fax0771hqaa0g653f0428x7c546zc4vsrinqppik4s15v"; + name = "qtlocation-everywhere-src-6.7.0.tar.xz"; }; }; qtlottie = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlottie-everywhere-src-6.6.3.tar.xz"; - sha256 = "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"; - name = "qtlottie-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlottie-everywhere-src-6.7.0.tar.xz"; + sha256 = "1vd27g93kjala7849ny3n4nw0xg2j7ba2i682fyhdq4r7kggn3ww"; + name = "qtlottie-everywhere-src-6.7.0.tar.xz"; }; }; qtmultimedia = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtmultimedia-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"; - name = "qtmultimedia-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtmultimedia-everywhere-src-6.7.0.tar.xz"; + sha256 = "0w4c0yyzgfhm6vd4qkxllh2cqw5q3giybqf9n2iyckixkvjbm57k"; + name = "qtmultimedia-everywhere-src-6.7.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtnetworkauth-everywhere-src-6.6.3.tar.xz"; - sha256 = "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"; - name = "qtnetworkauth-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtnetworkauth-everywhere-src-6.7.0.tar.xz"; + sha256 = "0iaalz7kpbjzjcrf5nmcw7322mq381s4jakfh8yks8phdxhhaccr"; + name = "qtnetworkauth-everywhere-src-6.7.0.tar.xz"; }; }; qtpositioning = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtpositioning-everywhere-src-6.6.3.tar.xz"; - sha256 = "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"; - name = "qtpositioning-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtpositioning-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pwxc2fhwvmq0mwrv9fak3d1bh23b7maxshyp0fs1j167jj1nq0x"; + name = "qtpositioning-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1qls5cydhm7p1g3gqzvnism8k0h6wjzi8x12gn51dapvnzq2cxlr"; - name = "qtquick3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "046rgvvf4a37b0anqn1h814231ibw8kxk4yd9yvk7ab57yzl7fcb"; + name = "qtquick3d-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; - sha256 = "0ipma4qdmzyyajs5inp7d3znh2hfx42gia7x9ahqpb515r49pqb7"; - name = "qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; + sha256 = "1rh41sadi5l2yypskhwrcjii0llkdq2msh0bgj0g7wq924k5y140"; + name = "qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; - sha256 = "0mr350c9kj74g48lavq5z5c604cdgcyycfdpwv5z8bmbr49jl95w"; - name = "qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; + sha256 = "1m84pjw4d2gvypgajz21xcl9di1vmswqwb0nd763bjk181kfq3rx"; + name = "qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquicktimeline-everywhere-src-6.6.3.tar.xz"; - sha256 = "0b266w7al90fbbp16w506klba50d4izf6nfcmmp5fpr6h5pxvcyk"; - name = "qtquicktimeline-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquicktimeline-everywhere-src-6.7.0.tar.xz"; + sha256 = "1gc96jva2nm7a3zv5zwmhrvifjlngngddm3kaivmfpbbdiy6aigb"; + name = "qtquicktimeline-everywhere-src-6.7.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtremoteobjects-everywhere-src-6.6.3.tar.xz"; - sha256 = "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"; - name = "qtremoteobjects-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtremoteobjects-everywhere-src-6.7.0.tar.xz"; + sha256 = "15f6wjszl5mxjrjd8r36l3x3p1nzhgib33bb7743ywf94pb61fm0"; + name = "qtremoteobjects-everywhere-src-6.7.0.tar.xz"; }; }; qtscxml = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtscxml-everywhere-src-6.6.3.tar.xz"; - sha256 = "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"; - name = "qtscxml-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtscxml-everywhere-src-6.7.0.tar.xz"; + sha256 = "0z15m5l44asp4masjxmkxqcc4x93v6n8i12qswrzfvbnp2xrfnvj"; + name = "qtscxml-everywhere-src-6.7.0.tar.xz"; }; }; qtsensors = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsensors-everywhere-src-6.6.3.tar.xz"; - sha256 = "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"; - name = "qtsensors-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsensors-everywhere-src-6.7.0.tar.xz"; + sha256 = "1axwywwgygcri1pfjyaiqa7hd7kivya0gr0q11v4z9ih18h1ac0w"; + name = "qtsensors-everywhere-src-6.7.0.tar.xz"; }; }; qtserialbus = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialbus-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yyh1bh5pjlilcq84fgfw6wd0jak55wndwf0sn92lbhsp3y5lghl"; - name = "qtserialbus-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pbnpfazgpaqzi1sz141sh9sqygibb25crk7byjzhr06hslr70a9"; + name = "qtserialbus-everywhere-src-6.7.0.tar.xz"; }; }; qtserialport = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialport-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"; - name = "qtserialport-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz"; + sha256 = "1jc1g46pgjy39vyk7inzx0kx6iziy54kgjkwz8pvmj4wihyjmw5i"; + name = "qtserialport-everywhere-src-6.7.0.tar.xz"; }; }; qtshadertools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtshadertools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"; - name = "qtshadertools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz"; + sha256 = "1bwqg5gn2nfm61950yhcv9q93qd2fb2cnm77074ia21gqrkzj4ry"; + name = "qtshadertools-everywhere-src-6.7.0.tar.xz"; }; }; qtspeech = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtspeech-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"; - name = "qtspeech-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtspeech-everywhere-src-6.7.0.tar.xz"; + sha256 = "048z7lqvpqi4073lx7s83d9kqbfg59banapi7qiw4j3xhfx8wxj4"; + name = "qtspeech-everywhere-src-6.7.0.tar.xz"; }; }; qtsvg = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsvg-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"; - name = "qtsvg-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz"; + sha256 = "0bcjpwzggrqp2gf9a1xp8g0klh9kn2amnvp2lr9n2ppz107g860m"; + name = "qtsvg-everywhere-src-6.7.0.tar.xz"; }; }; qttools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"; - name = "qttools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz"; + sha256 = "0yzfmfqwn0y534z47yyk71236nnsq0v0kgsw8qiixzl2kqinpnn8"; + name = "qttools-everywhere-src-6.7.0.tar.xz"; }; }; qttranslations = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttranslations-everywhere-src-6.6.3.tar.xz"; - sha256 = "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"; - name = "qttranslations-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttranslations-everywhere-src-6.7.0.tar.xz"; + sha256 = "0mjbx9n8fh4xp9r0r4p9ynjy1iirzn3bwlyr3g6vm91c0r3q1z16"; + name = "qttranslations-everywhere-src-6.7.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; - sha256 = "0d517x60birlf8xb3sphchvgm235f8q1868q98kg76plzfhq57wq"; - name = "qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snbl1wd5s76c8ab76bsqi3bp94h1isdwavbjm6gc1hvifhv46yn"; + name = "qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; }; }; qtwayland = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwayland-everywhere-src-6.6.3.tar.xz"; - sha256 = "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"; - name = "qtwayland-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz"; + sha256 = "1sks2m2phf841zl0d4sn7krm6f1ppgl7wl9arpc8i8vx47j70d6p"; + name = "qtwayland-everywhere-src-6.7.0.tar.xz"; }; }; qtwebchannel = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebchannel-everywhere-src-6.6.3.tar.xz"; - sha256 = "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"; - name = "qtwebchannel-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebchannel-everywhere-src-6.7.0.tar.xz"; + sha256 = "1zzg49ii59sw64m98phsbhf97kx7nxp7k0ggxazbz0hc9r0bvgr6"; + name = "qtwebchannel-everywhere-src-6.7.0.tar.xz"; }; }; qtwebengine = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebengine-everywhere-src-6.6.3.tar.xz"; - sha256 = "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"; - name = "qtwebengine-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebengine-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pj7q5r8wa49faxijljfnbmzbpmqc7bwcal0mcwz9haxcd1s8nqs"; + name = "qtwebengine-everywhere-src-6.7.0.tar.xz"; }; }; qtwebsockets = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebsockets-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"; - name = "qtwebsockets-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz"; + sha256 = "0dlp2ck0pkg9say92qism438i5j3ybxs0xf90j7g3k9ndgd7gz2z"; + name = "qtwebsockets-everywhere-src-6.7.0.tar.xz"; }; }; qtwebview = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebview-everywhere-src-6.6.3.tar.xz"; - sha256 = "00jcxzi9wcbviscn5y0h0mkbac88lpjammg3zvfvjih7avgn6r10"; - name = "qtwebview-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebview-everywhere-src-6.7.0.tar.xz"; + sha256 = "1yawx8vd7blky5b8mxpby4k1zwgm91jvl98y17xf47yc71qy069n"; + name = "qtwebview-everywhere-src-6.7.0.tar.xz"; }; }; } From abf354c5e5f1c8ec9f725a7db9c2e084be956ac1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 7 Mar 2024 21:20:28 -0500 Subject: [PATCH 33/51] qt6.qtbase: refresh patches --- pkgs/development/libraries/qt-6/default.nix | 15 +++--- ...ays-use-libname-instead-of-absolute-.patch | 9 ++-- ...-qtbase-qmake-fix-mkspecs-for-darwin.patch | 20 ++++---- ...x-includedir-in-generated-pkg-config.patch | 9 ++-- ...-a-font-face-at-index-0-as-Regular-f.patch | 26 ---------- ...-qt-cmake-always-use-cmake-from-path.patch | 48 +++++++++++++++++++ ...h => 0005-qtbase-find-tools-in-PATH.patch} | 11 ++--- ...-qt-cmake-always-use-cmake-from-path.patch | 32 ------------- ...limportscanner-the-QML2_IMPORT_PATH.patch} | 11 ++--- ...e-allow-translations-outside-prefix.patch} | 8 ++-- ...portscanner-in-macdeployqt-via-envi.patch} | 12 ++--- ...he-QML-folder-of-this-library-does-.patch} | 13 ++--- ...e-derive-plugin-load-path-from-PATH.patch} | 11 ++--- 13 files changed, 96 insertions(+), 129 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch create mode 100644 pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch rename pkgs/development/libraries/qt-6/patches/{0006-qtbase-find-tools-in-PATH.patch => 0005-qtbase-find-tools-in-PATH.patch} (89%) delete mode 100644 pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch rename pkgs/development/libraries/qt-6/patches/{0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch => 0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch} (79%) rename pkgs/development/libraries/qt-6/patches/{0008-qtbase-allow-translations-outside-prefix.patch => 0007-qtbase-allow-translations-outside-prefix.patch} (80%) rename pkgs/development/libraries/qt-6/patches/{0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch => 0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch} (84%) rename pkgs/development/libraries/qt-6/patches/{0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch => 0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch} (81%) rename pkgs/development/libraries/qt-6/patches/{0011-qtbase-derive-plugin-load-path-from-PATH.patch => 0010-qtbase-derive-plugin-load-path-from-PATH.patch} (82%) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index ea65e5f3ae82..43c5c19b516e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -51,14 +51,13 @@ let ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch - ./patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch - ./patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0006-qtbase-find-tools-in-PATH.patch - ./patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch - ./patches/0008-qtbase-allow-translations-outside-prefix.patch - ./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch - ./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch - ./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch + ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch + ./patches/0005-qtbase-find-tools-in-PATH.patch + ./patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0007-qtbase-allow-translations-outside-prefix.patch + ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch + ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch # Revert "macOS: Silence warning about supporting secure state restoration" # fix build with macOS sdk < 12.0 (fetchpatch2 { diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index de35178f7929..a8bb8f71cdbf 100644 --- a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,8 +1,8 @@ -From 90734859d2f9e6b9a1754c3e694ceb1a3c870bce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute - path in qmake files +Subject: [PATCH] qtbase: qmake: always use libname instead of absolute path in + qmake files In generated qmake files, absolute paths to qt libraries are embedded and then used in linker flags. However as the libraries can be provided @@ -45,6 +45,3 @@ index 3ffe354fd8d..441332d4582 100644 list(APPEND out_list "${lib_name_with_link_flag}") else() list(APPEND out_list "${library_path}") --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 6cdbec5abfc7..1e548950a2a6 100644 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,19 +1,19 @@ -From a804a9b1efdab0a71b9947e5c2bf9f6f5e316e0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin +Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin --- mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 263 -------------------------- + mkspecs/features/mac/default_post.prf | 264 -------------------------- mkspecs/features/mac/default_pre.prf | 58 ------ mkspecs/features/mac/sdk.mk | 27 --- mkspecs/features/mac/sdk.prf | 61 ------ mkspecs/features/mac/toolchain.prf | 5 - - 6 files changed, 1 insertion(+), 415 deletions(-) + 6 files changed, 1 insertion(+), 416 deletions(-) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 +index 61bea952b22..9909dae7260 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,7 +26,7 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b9..3b40328304 100644 +index 0b64a586b93..3b40328304d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -311,7 +311,7 @@ index 0b64a586b9..3b40328304 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index e3534561a56..3b01424e67b 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -376,7 +376,7 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6c..e69de29bb2 100644 +index a32ceacb6ce..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -408,7 +408,7 @@ index a32ceacb6c..e69de29bb2 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 +index 3a9c2778bbe..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -474,7 +474,7 @@ index 3a9c2778bb..e69de29bb2 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c..e69de29bb2 100644 +index df191eb13c4..e69de29bb2d 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ diff --git a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 53f226254a19..f2f9425841a8 100644 --- a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,14 +1,14 @@ -From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Apr 2023 09:34:46 +0800 -Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config +Subject: [PATCH] qtbase: qmake: fix includedir in generated pkg-config --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 11d2f0ff7df..c78ed0d3485 100644 +index 482ef2e2697..49217e62cda 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() @@ -21,6 +21,3 @@ index 11d2f0ff7df..c78ed0d3485 100644 if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") && libDir != QLatin1String("/Library/Frameworks")) { t << " -F${libdir}"; --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch deleted file mode 100644 index ccd0fb02fcd8..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82e243f326aea40e7f3da935d8166979b11e8063 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 04/11] qtbase: deal with a font face at index 0 as Regular for - Variable fonts - -Reference: https://bugreports.qt.io/browse/QTBUG-111994 ---- - src/gui/text/unix/qfontconfigdatabase.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp -index 474644b871f..c7a117fd134 100644 ---- a/src/gui/text/unix/qfontconfigdatabase.cpp -+++ b/src/gui/text/unix/qfontconfigdatabase.cpp -@@ -556,6 +556,7 @@ void QFontconfigDatabase::populateFontDatabase() - FcObjectSetAdd(os, *p); - ++p; - } -+ FcPatternAddBool(pattern, FC_VARIABLE, FcFalse); - fonts = FcFontList(nullptr, pattern, os); - FcObjectSetDestroy(os); - FcPatternDestroy(pattern); --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch b/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch new file mode 100644 index 000000000000..56d19e0bb817 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Wed, 12 Apr 2023 10:13:50 +0800 +Subject: [PATCH] qtbase: qt-cmake: always use cmake from path + +The generated qt-cmake scripts embeds the absolute path of cmake used +during the build of qtbase, bloating the runtime closure of qtbase. +--- + bin/qt-cmake-create.in | 7 +------ + bin/qt-cmake.in | 7 +------ + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in +index 7865d0fe91b..884dc4aba93 100755 +--- a/bin/qt-cmake-create.in ++++ b/bin/qt-cmake-create.in +@@ -7,12 +7,7 @@ HELP_MESSAGE="Usage + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + if [ "$#" -gt 1 ]; then + echo "Invalid number of arguments" +diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in +index f719257f602..571ffe788fa 100755 +--- a/bin/qt-cmake.in ++++ b/bin/qt-cmake.in +@@ -4,12 +4,7 @@ + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" + diff --git a/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch b/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch similarity index 89% rename from pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch rename to pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch index 1d60684e0700..df1b67654b61 100644 --- a/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH 06/11] qtbase-find-tools-in-PATH +Subject: [PATCH] qtbase: find tools in PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix @@ -19,10 +19,10 @@ Subject: [PATCH 06/11] qtbase-find-tools-in-PATH 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake -index 48ed5a324bf..91d8d41fb1f 100644 +index 8b631e88ca5..922639a9985 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake -@@ -47,9 +47,14 @@ function(qt_internal_add_docs) +@@ -72,9 +72,14 @@ function(qt_internal_add_docs) set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") endif() @@ -40,6 +40,3 @@ index 48ed5a324bf..91d8d41fb1f 100644 get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch b/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch deleted file mode 100644 index ad30ebc71413..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b480022b364b262d5ff63738c02318da925f5c79 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 05/11] qtbase: qt-cmake: always use cmake from path - -The generated qt-cmake scripts embeds the absolute path of cmake used -during the build of qtbase, bloating the runtime closure of qtbase. ---- - bin/qt-cmake.in | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in -index f719257f602..571ffe788fa 100755 ---- a/bin/qt-cmake.in -+++ b/bin/qt-cmake.in -@@ -4,12 +4,7 @@ - script_dir_path=`dirname $0` - script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` - --# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. --original_cmake_path="@CMAKE_COMMAND@" --cmake_path=$original_cmake_path --if ! test -f "$cmake_path"; then -- cmake_path="cmake" --fi -+cmake_path="cmake" - - toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" - --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch similarity index 79% rename from pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch rename to pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index 7bf2193bc208..de4c12ef0448 100644 --- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,17 +1,17 @@ -From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 10 Oct 2023 10:12:56 -0400 -Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH +Subject: [PATCH] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 2ae4f998944..ba10ae02bcd 100644 +index b7ee93f6fc1..57b68627eba 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); @@ -25,6 +25,3 @@ index 2ae4f998944..ba10ae02bcd 100644 // run qmlimportscanner QProcess qmlImportScanner; qmlImportScanner.start(qmlImportScannerPath, argumentList); --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch similarity index 80% rename from pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch rename to pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch index 07f1973d7607..d8061f1610e9 100644 --- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch @@ -1,14 +1,14 @@ -From 79da6bb6ff075e8cf972be8a462630f1ec86bf0a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH 08/11] qtbase: allow translations outside prefix +Subject: [PATCH] qtbase: allow translations outside prefix --- - cmake/QtBuild.cmake | 2 +- + cmake/QtBuildPathsHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index edc43f2f14..78fa219515 100644 +index 18082ac6a5f..e16aea7d7c6 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) diff --git a/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch similarity index 84% rename from pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch rename to pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index fb17a539f053..597dd7e6550d 100644 --- a/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch +++ b/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,8 +1,7 @@ -From d503be89320f0b89b80acb19769971e855be6ae1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 09/11] qtbase: find qmlimportscanner in macdeployqt via - environment +Subject: [PATCH] qtbase: find qmlimportscanner in macdeployqt via environment The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual @@ -17,10 +16,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index ba10ae02bcd..320095a972d 100644 +index 57b68627eba..2b972a76c49 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1277,6 +1277,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1280,6 +1280,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; @@ -31,6 +30,3 @@ index ba10ae02bcd..320095a972d 100644 // Verify that we found a qmlimportscanner binary if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch similarity index 81% rename from pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch rename to pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index ed749cb238a5..890c68a97f77 100644 --- a/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch +++ b/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,8 +1,8 @@ -From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 10 Oct 2023 10:17:00 -0400 -Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does - actually exist +Subject: [PATCH] qtbase: check in the QML folder of this library does actually + exist In a modularized installation, this folder will be the location where `qtbase` itself is installed, but `qtbase` does not have any QML @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 320095a972d..87ba0d4e24b 100644 +index 2b972a76c49..96c61b3824a 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,9 +1300,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; @@ -30,6 +30,3 @@ index 320095a972d..87ba0d4e24b 100644 // In a modularized installation of qt as we have in Nix, instead, we will // read the paths from the environment, as they are spread in multiple --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch similarity index 82% rename from pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch rename to pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch index cae39e879120..b950b7d4ac79 100644 --- a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch @@ -1,17 +1,17 @@ -From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 10 May 2020 12:47:28 +0200 -Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH +Subject: [PATCH] qtbase: derive plugin load path from PATH --- src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index a80efbb5622..0d41dabeed3 100644 +index 1ce2642cf2d..48fd91a0d7f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked() +@@ -3038,6 +3038,15 @@ QStringList QCoreApplication::libraryPathsLocked() app_libpaths->append(installPathPlugins); } @@ -27,6 +27,3 @@ index a80efbb5622..0d41dabeed3 100644 // If QCoreApplication is not yet instantiated, // make sure we add the application path when we construct the QCoreApplication if (self) self->d_func()->appendApplicationPathToLibraryPaths(); --- -2.43.1 - From 54fe58fae236271e0b922274c3bcd24814acb3b9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 7 Feb 2024 11:52:44 -0500 Subject: [PATCH 34/51] qt6.qtdeclarative: refresh patches --- .../libraries/qt-6/modules/qtdeclarative.nix | 4 ++-- ...0001-qtdeclarative-disable-qml-disk-cache.patch} | 9 +++------ ...tdeclarative-also-use-versioned-qml-paths.patch} | 13 +++++++++++-- 3 files changed, 16 insertions(+), 10 deletions(-) rename pkgs/development/libraries/qt-6/patches/{qtdeclarative-default-disable-qmlcache.patch => 0001-qtdeclarative-disable-qml-disk-cache.patch} (82%) rename pkgs/development/libraries/qt-6/patches/{qtdeclarative-qml-paths.patch => 0002-qtdeclarative-also-use-versioned-qml-paths.patch} (53%) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 697556e30edc..37be72729852 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -11,8 +11,8 @@ qtModule { propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; patches = [ # prevent headaches from stale qmlcache data - ../patches/qtdeclarative-default-disable-qmlcache.patch + ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch # add version specific QML import path - ../patches/qtdeclarative-qml-paths.patch + ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch ]; } diff --git a/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch b/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch similarity index 82% rename from pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch rename to pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch index a204d52c9f0c..9afcc8240ab3 100644 --- a/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +++ b/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch @@ -1,4 +1,4 @@ -From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 10 Oct 2023 11:12:27 -0400 Subject: [PATCH] qtdeclarative: disable qml disk cache @@ -8,10 +8,10 @@ Subject: [PATCH] qtdeclarative: disable qml disk cache 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index d1b4c4fff6..50f8a07420 100644 +index 506b920142..3cadb4fe06 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const +@@ -2202,11 +2202,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { if (forceDiskCache()) return DiskCache::Enabled; @@ -24,6 +24,3 @@ index d1b4c4fff6..50f8a07420 100644 } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch b/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch similarity index 53% rename from pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch rename to pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch index 39b7a30892cf..d857d7ac1bba 100644 --- a/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch @@ -1,8 +1,17 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Wed, 7 Feb 2024 11:49:04 -0500 +Subject: [PATCH] qtdeclarative: also use versioned qml paths + +--- + src/qml/qml/qqmlimport.cpp | 1 + + 1 file changed, 1 insertion(+) + diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 2e482c220d..4873809bec 100644 +index f9cc8da240..f8cb033be0 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp -@@ -1517,6 +1517,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) +@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) // env import paths addEnvImportPath("QML_IMPORT_PATH"); addEnvImportPath("QML2_IMPORT_PATH"); From ddad7ac4e22727db401da63441427a11c9c1bced Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Feb 2024 14:21:58 -0500 Subject: [PATCH 35/51] qt6.qtwebengine: drop outdated patches --- .../libraries/qt-6/modules/qtwebengine.nix | 3 - ...ine-darwin-no-copy-certificate-chain.patch | 16 ----- ...webengine-darwin-no-low-latency-flag.patch | 61 ------------------- 3 files changed, 80 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch delete mode 100644 pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index f07aeefa0be0..e6f785cd833c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -122,9 +122,6 @@ qtModule { hardeningDisable = [ "format" ]; patches = [ - # removes macOS 12+ dependencies - ../patches/qtwebengine-darwin-no-low-latency-flag.patch - ../patches/qtwebengine-darwin-no-copy-certificate-chain.patch # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch deleted file mode 100644 index c7e461945c04..000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/3rdparty/chromium/net/cert/x509_util_apple.cc b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -index ae69948dfca..7062a9a9b97 100644 ---- a/src/3rdparty/chromium/net/cert/x509_util_apple.cc -+++ b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -@@ -139,11 +139,6 @@ SHA256HashValue CalculateFingerprint256(SecCertificateRef cert) { - - base::ScopedCFTypeRef CertificateChainFromSecTrust( - SecTrustRef trust) { -- if (__builtin_available(macOS 12.0, iOS 15.0, *)) { -- return base::ScopedCFTypeRef( -- SecTrustCopyCertificateChain(trust)); -- } -- - base::ScopedCFTypeRef chain( - CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks)); - const CFIndex chain_length = SecTrustGetCertificateCount(trust); diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch deleted file mode 100644 index 3df917edf5cc..000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -index d4b0161b2e..e5a0eb1967 100644 ---- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -+++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -@@ -29,12 +29,6 @@ - #include "media/base/video_types.h" - #include "media/video/video_encode_accelerator.h" - --// This is a min version of macOS where we want to support SVC encoding via --// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, --// but there we see frame drops even with ample bitrate budget. Excessive frame --// drops were fixed in 12.0.1. --#define LOW_LATENCY_FLAG_AVAILABLE_VER 12.0.1 -- - namespace media { - - namespace { -@@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { - profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | - VideoEncodeAccelerator::kVariableMode; - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) -- profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); - - for (const auto& supported_profile : kSupportedProfiles) { - if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { -@@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( - encoder_values.push_back(kCFBooleanFalse); - } - -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- // Remove the validation once HEVC SVC mode is supported on macOS. -- if (require_low_delay_ && codec == VideoCodec::kH264) { -- encoder_keys.push_back( -- kVTVideoEncoderSpecification_EnableLowLatencyRateControl); -- encoder_values.push_back(kCFBooleanTrue); -- } -- } - base::ScopedCFTypeRef encoder_spec = - video_toolbox::DictionaryWithKeysAndValues( - encoder_keys.data(), encoder_values.data(), encoder_keys.size()); -@@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { - - // Remove the validation once HEVC SVC mode is supported on macOS. - if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- if (!session_property_setter.IsSupported( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { -- DLOG(ERROR) << "BaseLayerFrameRateFraction is not supported"; -- return false; -- } -- rv &= session_property_setter.Set( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction, 0.5); -- DLOG_IF(ERROR, !rv) << " Setting BaseLayerFrameRate property failed."; -- } else { - DLOG(ERROR) << "SVC encoding is not supported on this OS version."; - rv = false; -- } - } - - return rv; From 1763b81ae5bb398326b81ebb5114f0d476192aab Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 3 Apr 2024 13:12:43 -0400 Subject: [PATCH 36/51] qt6.{callPackage,qtModule}: raise darwinMinVersion from 10.13 to 11.0 --- pkgs/development/libraries/qt-6/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 43c5c19b516e..96741ee8ae67 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -32,7 +32,10 @@ let callPackage = self.newScope ({ inherit (self) qtModule; inherit srcs python3; - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = + if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } + else stdenv; }); in { @@ -167,7 +170,7 @@ let ({ qtModule }: qtModule.override { stdenv = if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } else stdenv; }) { }; From 30f9a9540b60bcfd4e27ddadc4903dd7b8635ed3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 3 Apr 2024 15:16:53 -0400 Subject: [PATCH 37/51] python311Packages.pyqt6: 6.6.1 -> 6.7.0.dev2404081550 --- pkgs/development/python-modules/pyqt/6.x.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 92984dadc796..a568257c5900 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchurl , pkg-config , dbus , lndir @@ -23,15 +23,17 @@ buildPythonPackage rec { pname = "pyqt6"; - version = "6.6.1"; + version = "6.7.0.dev2404081550"; format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchPypi { - pname = "PyQt6"; - inherit version; - hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k="; + src = fetchurl { + urls = [ + "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" + "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" + ]; + hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ="; }; patches = [ @@ -44,11 +46,15 @@ buildPythonPackage rec { ]; # be more verbose + # and normalize version postPatch = '' cat >> pyproject.toml < Date: Fri, 12 Apr 2024 08:32:07 -0400 Subject: [PATCH 38/51] python311Packages.shiboken6: 6.6.0 -> 6.7.0 --- .../python-modules/shiboken6/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index b2e8362be8b9..57b7e64273d6 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , llvmPackages , python , cmake @@ -13,25 +12,18 @@ let in stdenv'.mkDerivation rec { pname = "shiboken6"; - version = "6.6.0"; + version = "6.7.0"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "sha256-LdAC24hRqHFzNU84qoxuxC0P8frJnqQisp4t/OUtFjg="; + hash = "sha256-gurjcHN99ez1OcFl0J18gdX8YVOlQbjT03sRJ1+ePo8="; }; - sourceRoot = "pyside-setup-everywhere-src-${lib.removeSuffix ".0" version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; patches = [ ./fix-include-qt-headers.patch - # TODO: remove after bumping above 6.6.0 - (fetchpatch { - name = "shiboken6-improve-api-extractor-argument-parsing.patch"; - url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=6abde77c3df60ccac25089660df5797de7f6e68c"; - hash = "sha256-uctp5rjY16X37BYzsZzg9AAgM2hwNVkcNxT1bCobb0I="; - stripLen = 2; - }) ]; nativeBuildInputs = [ @@ -57,7 +49,7 @@ stdenv'.mkDerivation rec { # We intentionally use single quotes around `${BASH}` since it expands from a CMake # variable available in this file. postPatch = '' - substituteInPlace cmake/ShibokenHelpers.cmake --replace '#!/bin/bash' '#!''${BASH}' + substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}' ''; # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.6 in the build tree, From fc323b7d238232194fda746e52e4af0159f47815 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 12 Apr 2024 08:35:15 -0400 Subject: [PATCH 39/51] python311Packages.pyside6: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/pyside6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 5a484637768b..bfc34a23fcd5 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${lib.removeSuffix ".0" version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. postPatch = lib.optionalString stdenv.isLinux '' # Don't ignore optional Qt modules substituteInPlace cmake/PySideHelpers.cmake \ - --replace \ + --replace-fail \ 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ 'set (found_basepath 0)' ''; From 9f30349f00c8b4f861f136b8c675befe7f7dd456 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 12 Apr 2024 08:53:36 -0400 Subject: [PATCH 40/51] gammaray: fix build with qt 6.7 --- pkgs/development/tools/gammaray/default.nix | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix index 29ab4973c994..3b9f57806477 100644 --- a/pkgs/development/tools/gammaray/default.nix +++ b/pkgs/development/tools/gammaray/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -21,6 +22,27 @@ stdenv.mkDerivation rec { hash = "sha256-C8bej0q4p8F27hiJUye9G+sZbkAYaV8hW1GKWZyHAis="; }; + patches = [ + # Qt 6.7 temp fix, change to Qt needed to fully fix + # https://github.com/KDAB/GammaRay/pull/921 + (fetchpatch { + url = "https://github.com/KDAB/GammaRay/commit/d76e73696800bbeda1273e04c6ec42d081fd55e4.patch"; + hash = "sha256-BEbNVfP6TDX07RHD5wo1O6na0ku3E04Bzo2z2bUBvuc="; + }) + # Fix build on 6.7 for after QDeferredDeleteEvent export reversion + # https://github.com/KDAB/GammaRay/pull/957 + (fetchpatch { + url = "https://github.com/KDAB/GammaRay/commit/cf8f77f0d5e881368240a0647368757abdd6334e.patch"; + hash = "sha256-qbaB9eTJiogpszj6KY1PgfZtp5leUaQemmKGGhLxZb4="; + }) + # Fix Qt 6.6+ build + # https://github.com/KDAB/GammaRay/issues/827 + (fetchpatch { + url = "https://github.com/KDAB/GammaRay/commit/9978a0a7c4f4d122477f4f14755e55196365d8ce.patch"; + hash = "sha256-l7GsHNDcT2gAL5zCSLSuLD+Pkr72VnKtiC1WOvTlxqU="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 57386bcc420665636ace1c41565f803d098c0e0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 13:08:20 +0000 Subject: [PATCH 41/51] kmon: 1.6.4 -> 1.6.5 --- pkgs/tools/system/kmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index df7ccfa4cf25..a54f835d7b9f 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-61HLWSGACnonjp/n14sVo8DdVOUbOpIQHpPL0PmKmpI="; + sha256 = "sha256-1OsQT3RMNLQMjr4aA2u5knp/HhOUOJ/oZYHG/+cTQFQ="; }; - cargoSha256 = "sha256-yxpM4aUPVfaMuYwj50C/Uwh/diraJLON1mNjuYJR6Ck="; + cargoHash = "sha256-9xRlm5pWWRRPq6MMwiMADmm8Bg2FqKNSfv7tm1ONiiQ="; nativeBuildInputs = [ installShellFiles ]; From ae70b81b72495f1f16d830e9000f72c3db9acd9e Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Fri, 12 Apr 2024 10:06:44 -0400 Subject: [PATCH 42/51] bear: add DieracDelta as maintainer --- pkgs/development/tools/build-managers/bear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 0e8b20c7a9d4..2b8d3106f3ce 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ babariviere ]; + maintainers = with maintainers; [ babariviere DieracDelta ]; }; } From eb17291c0de7829be5b00addd5972a85e96abddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 14:18:54 +0000 Subject: [PATCH 43/51] python312Packages.midea-beautiful-air: 0.10.4 -> 0.10.5 --- .../python-modules/midea-beautiful-air/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/midea-beautiful-air/default.nix b/pkgs/development/python-modules/midea-beautiful-air/default.nix index aad82049890b..1fde2c7a34f4 100644 --- a/pkgs/development/python-modules/midea-beautiful-air/default.nix +++ b/pkgs/development/python-modules/midea-beautiful-air/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "midea-beautiful-air"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "nbogojevic"; repo = pname; - rev = "v${version}"; - hash = "sha256-1IOv9K8f69iRpYaCx3k0smVrCKPmDxlT/1uVoTyvIjU="; + rev = "refs/tags/v${version}"; + hash = "sha256-786Q085bv8Zsm0c55I4XalRhEfwElRTJds5qnb0cWhk="; }; build-system = [ From 69ef9cc676557248466a1195a96aa797f7af6112 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Apr 2024 14:06:12 +0200 Subject: [PATCH 44/51] luaPackages.dkjson: 2.6-1 -> 2.7-1 --- pkgs/development/lua-modules/generated-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fc312a599bb3..75053c1356fc 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -437,21 +437,21 @@ buildLuarocksPackage { dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; - version = "2.6-1"; + version = "2.7-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/dkjson-2.6-1.rockspec"; - sha256 = "1hhmgz2nixqg23shfnl0kq6wxdadx36z6hhsrz33g7idbm6rbwm1"; + url = "mirror://luarocks/dkjson-2.7-1.rockspec"; + sha256 = "sha256-rVMDFF/yY7fTlY4Icj4LWt72qmKMCwedbgoigqx/+U0="; }).outPath; src = fetchurl { - url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.6.tar.gz?uuid=release_2_6"; - sha256 = "0wwpdz20fvg5j36902892mnb99craf22697r6v7xdblqnd7fw1xx"; + url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz"; + sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw="; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; + homepage = "http://dkolf.de/dkjson-lua/"; description = "David Kolf's JSON module for Lua"; license.fullName = "MIT/X11"; }; From c069b1b7bdd853410a8f236b9d0683d5e673efd7 Mon Sep 17 00:00:00 2001 From: Johannes Maier Date: Fri, 12 Apr 2024 10:03:32 +0200 Subject: [PATCH 45/51] ocamlPackages.landmarks{,-ppx}: init at 1.4 --- .../ocaml-modules/landmarks-ppx/default.nix | 18 +++++++++++++++ .../ocaml-modules/landmarks/default.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/landmarks-ppx/default.nix create mode 100644 pkgs/development/ocaml-modules/landmarks/default.nix diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix new file mode 100644 index 000000000000..c55836a9b75e --- /dev/null +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -0,0 +1,18 @@ +{ lib, fetchFromGitHub, buildDunePackage, ocaml, landmarks, ppxlib }: + +buildDunePackage { + pname = "landmarks-ppx"; + minimalOCamlVersion = "4.08"; + + inherit (landmarks) src version; + + buildInputs = [ ppxlib ]; + propagatedBuildInputs = [ landmarks ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08" + && lib.versionOlder ocaml.version "5.0"; + + meta = landmarks.meta // { + description = "Preprocessor instrumenting code using the landmarks library"; + }; +} diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix new file mode 100644 index 000000000000..d501e4e3c51a --- /dev/null +++ b/pkgs/development/ocaml-modules/landmarks/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: + +buildDunePackage { + pname = "landmarks"; + version = "1.4"; + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "LexiFi"; + repo = "landmarks"; + rev = "b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7"; + hash = "sha256-Wpr76JURUFrj7v39rdM/2Lr7boa7nL/bnPEz1vMrmQo"; + }; + + doCheck = lib.versionAtLeast ocaml.version "4.08" + && lib.versionOlder ocaml.version "5.0"; + + meta = with lib; { + description = "A Simple Profiling Library for OCaml"; + maintainers = [ maintainers.kenran ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 50fcac2c0767..be47100086ea 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -930,6 +930,10 @@ let inherit (pkgs) lame; }; + landmarks = callPackage ../development/ocaml-modules/landmarks { }; + + landmarks-ppx = callPackage ../development/ocaml-modules/landmarks-ppx { }; + lastfm = callPackage ../development/ocaml-modules/lastfm { }; lem = callPackage ../development/ocaml-modules/lem { }; From f4d58e6a1bd011db4b86a0cacab01786678c4794 Mon Sep 17 00:00:00 2001 From: mgt Date: Fri, 12 Apr 2024 23:21:01 +0800 Subject: [PATCH 46/51] typstyle: 0.11.12 -> 0.11.13 --- pkgs/by-name/ty/typstyle/Cargo.lock | 2 +- pkgs/by-name/ty/typstyle/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock index 93a854da23e7..47ae5437f5b9 100644 --- a/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3649,7 +3649,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.12" +version = "0.11.13" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 437100646c82..aa44d1de31c8 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-fAby71wgySMeZ1rDQdaKMn53nxMc9RszmzCWKBdHkZg="; + hash = "sha256-xJoL/YgdkORQf+U/1E2OVk6pD/IuXxJJTw+Xufonjd0="; }; cargoLock = { From 3aeec8f017e8297f7c4de182674f50346eb73825 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 16:21:45 +0000 Subject: [PATCH 47/51] werf: 1.2.305 -> 1.2.307 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index d43989f0357c..0a33c8f689a5 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.305"; + version = "1.2.307"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-WbSGbwm3/GXRZBvnleJYXxXBhIj+NwKAMLBZdUkf4PE="; + hash = "sha256-jT0QZIMHFhhMIhBj2kliRP0/B8BLYGZdojZ7THXnUmg="; }; - vendorHash = "sha256-BN2baLI91tJyGFEuuS9lAzKsKwPPpKm0eUK7Hxwbvkk="; + vendorHash = "sha256-2ZRyRgW42W/z6G5DfSMqbdXnW5TNcMdz385Dt7PWj6k="; proxyVendor = true; From 1b6555792933d0340bb55376023c204aa7aacf4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 16:23:32 +0000 Subject: [PATCH 48/51] pineapple-pictures: 0.7.3 -> 0.7.4 --- pkgs/applications/graphics/pineapple-pictures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index cb7e1310a066..86e85e0efad2 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-UZVpyrUFf/uJNs2GHLYXpb81e7yzC8EFuoD+0Bzj6xQ="; + hash = "sha256-aiQlcTID8mfrT4MEx4s5K+QmMHBlHOu2HfsValiH5qU="; }; nativeBuildInputs = [ From 528149bf41a14963e13741ad8d89b4f5cf9c5434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Fri, 12 Apr 2024 14:23:14 +0100 Subject: [PATCH 49/51] feishin: build from source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Addresses #296939 (build from source). Continues the work started by @dotlambda in #288210. Co-authored-by: Robert Schütz --- pkgs/applications/audio/feishin/darwin.nix | 41 ------ pkgs/applications/audio/feishin/default.nix | 137 +++++++++++++++++--- pkgs/applications/audio/feishin/linux.nix | 71 ---------- 3 files changed, 120 insertions(+), 129 deletions(-) delete mode 100644 pkgs/applications/audio/feishin/darwin.nix delete mode 100644 pkgs/applications/audio/feishin/linux.nix diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix deleted file mode 100644 index 5da2fa6ee025..000000000000 --- a/pkgs/applications/audio/feishin/darwin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv -, lib -, meta -, fetchurl -, unzip -, mpv -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/{Applications/${appname}.app,bin} - cp -R . $out/Applications/${appname}.app - makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index c89d5163c2a6..6cbd30244b52 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -1,27 +1,130 @@ -{ lib -, stdenv -, callPackage -, ... -}@args: - +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron_25, + copyDesktopItems, + makeDesktopItem, + ... +}: let - extraArgs = removeAttrs args [ "callPackage" ]; - pname = "feishin"; version = "0.5.1"; - appname = "Feishin"; + + src = fetchFromGitHub { + owner = "jeffvli"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7L1KufMiwqWgTvv7E1bDNL+epvNb5iLXI4Gee8w17qs="; + }; + + electron = electron_25; +in +buildNpmPackage { + pname = "feishin"; + inherit version; + + inherit src; + npmDepsHash = "sha256-TuNkVhNNOB23QnMXiGBWhDI0JXWnWdfI9MLvMq5xzJ8="; + + npmFlags = [ "--legacy-peer-deps" ]; + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ copyDesktopItems ]; + + postPatch = '' + # release/app dependencies are installed on preConfigure + substituteInPlace package.json \ + --replace-fail "electron-builder install-app-deps &&" "" + + # https://github.com/electron/electron/issues/31121 + substituteInPlace src/main/main.ts \ + --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" + ''; + + preConfigure = + let + releaseAppDeps = buildNpmPackage { + pname = "${pname}-release-app"; + inherit version; + + src = "${src}/release/app"; + npmDepsHash = "sha256-2tkds65buiT/p0fsuLk+vemvFYsmExanyJPiJOqlwP4="; + + npmFlags = [ "--ignore-scripts" ]; + dontNpmBuild = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + }; + releaseNodeModules = "${releaseAppDeps}/lib/node_modules/feishin/node_modules"; + in + '' + for release_module_path in "${releaseNodeModules}"/*; do + rm -rf node_modules/"$(basename "$release_module_path")" + ln -s "$release_module_path" node_modules/ + done + ''; + + postBuild = '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/feishin + pushd release/build/*/ + cp -r locales resources{,.pak} $out/share/feishin + popd + + # Code relies on checking app.isPackaged, which returns false if the executable is electron. + # Set ELECTRON_FORCE_IS_PACKAGED=1. + # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 + makeWrapper ${lib.getExe electron} $out/bin/feishin \ + --add-flags $out/share/feishin/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set ELECTRON_FORCE_IS_PACKAGED=1 \ + --inherit-argv0 + + for size in 32 64 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + ln -s \ + $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "feishin"; + desktopName = "Feishin"; + comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + icon = pname; + exec = "feishin %u"; + categories = [ + "Audio" + "AudioVideo" + ]; + mimeTypes = [ "x-scheme-handler/feishin" ]; + }) + ]; meta = with lib; { description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; homepage = "https://github.com/jeffvli/feishin"; changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "feishin"; maintainers = with maintainers; [ onny ]; }; - -in -if stdenv.isDarwin -then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; }) -else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; }) +} diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix deleted file mode 100644 index d503492adfc9..000000000000 --- a/pkgs/applications/audio/feishin/linux.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, meta -, lib -, fetchurl -, mpv -, graphicsmagick -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -let - icon = fetchurl { - url = - "https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png"; - sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I="; - }; - - desktopItem = makeDesktopItem { - name = "feishin"; - desktopName = "Feishin"; - comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - icon = "feishin"; - exec = "feishin %u"; - categories = [ "Audio" "AudioVideo" ]; - mimeTypes = [ "x-scheme-handler/feishin" ]; - }; -in - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; - }; - - - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - cp -r resources $out/share/${pname}/ - cp -r locales $out/share/${pname}/ - - makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/app.asar - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png - done - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} From 623ac957cb99a5647c9cf127ed6b5b9edfbba087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Fri, 12 Apr 2024 15:09:28 +0100 Subject: [PATCH 50/51] feishin: 0.5.1 -> 0.6.1 Diff: https://github.com/jeffvli/feishin/compare/v0.5.1...v0.6.1 Changelog: https://github.com/jeffvli/feishin/releases/tag/v0.6.1 Feishin now depends on electron_27; electron_25 has been marked as EOL since 9652f98. Fixes #287765 (package update request) and addresses #295770 (outdated Electron). --- pkgs/applications/audio/feishin/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index 6cbd30244b52..5168d084af72 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -2,30 +2,30 @@ lib, buildNpmPackage, fetchFromGitHub, - electron_25, + electron_27, copyDesktopItems, makeDesktopItem, ... }: let pname = "feishin"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = pname; rev = "v${version}"; - hash = "sha256-7L1KufMiwqWgTvv7E1bDNL+epvNb5iLXI4Gee8w17qs="; + hash = "sha256-Nj8GwrH49ph14xvJldj5GQR4mlt9unCPEcgLrsH/sx8="; }; - electron = electron_25; + electron = electron_27; in buildNpmPackage { pname = "feishin"; inherit version; inherit src; - npmDepsHash = "sha256-TuNkVhNNOB23QnMXiGBWhDI0JXWnWdfI9MLvMq5xzJ8="; + npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -51,7 +51,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-2tkds65buiT/p0fsuLk+vemvFYsmExanyJPiJOqlwP4="; + npmDepsHash = "sha256-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; From 28555cdd35486369c3e0d20060428d47999fe51e Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 12 Apr 2024 15:54:25 +0200 Subject: [PATCH 51/51] luaPackages.toml-edit: 0.1.5-1 -> 0.3.6-1 --- .../lua-modules/generated-packages.nix | 27 +++++++------------ pkgs/development/lua-modules/overrides.nix | 12 +++++++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 75053c1356fc..dea99a7a0f64 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3636,30 +3636,21 @@ buildLuarocksPackage { }; }) {}; -toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: +toml-edit = callPackage({ buildLuarocksPackage, fetchzip, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "toml-edit"; - version = "0.1.5-1"; + version = "0.3.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-edit-0.1.5-1.rockspec"; - sha256 = "1xgjh8x44kn24vc29si811zq2a7pr24zqj4w07pys5k6ccnv26qz"; + url = "mirror://luarocks/toml-edit-0.3.6-1.rockspec"; + sha256 = "18fw256vzvfavfwrnzm507k4h3x2lx9l93ghr1ggsi4mhsnjki46"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/vhyrro/toml-edit.lua", - "rev": "34f072d8ff054b3124d9d2efc0263028d7425525", - "date": "2023-12-29T15:53:36+01:00", - "path": "/nix/store/z1gn59hz9ypk3icn3gmafaa19nzx7a1v-toml-edit.lua", - "sha256": "0jzzp4sd48haq1kmh2k85gkygfq39i10kvgjyqffcrv3frdihxvx", - "hash": "sha256-fXcYW3ZjZ+Yc9vLtCUJMA7vn5ytoClhnwAoi0jS5/0s=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchzip { + url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.3.6.zip"; + sha256 = "19v6axraj2n22lmilfr4x9nr40kcjb6wnpsfhf1mh2zy9nsd6ji6"; + }; disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/vhyrro/toml-edit.lua"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a793f56f99d0..31ff2e6e3c58 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -685,10 +685,18 @@ in cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-gvUqkLOa0WvAK4GcTkufr0lC2BOs2FQ2bgFpB0qa47k="; + hash = "sha256-2P+mokkjdj2PccQG/kAGnIoUPVnK2FqNfYpHPhsp8kw="; }; - nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + nativeBuildInputs = let + # HACK: luarocks-nix doesn't pick up rockspec build dependencies, + # so we have to pass the correct package in here. + lua = lib.head oa.propagatedBuildInputs; + in oa.nativeBuildInputs ++ [ + cargo + rustPlatform.cargoSetupHook + lua.pkgs.luarocks-build-rust-mlua + ]; });