From b3ba35694bae2a30f9a474f1a8e297485b31c383 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Thu, 3 Aug 2023 17:44:22 +0200 Subject: [PATCH 01/28] airwindows-lv2: 20.0 -> 22.0 --- pkgs/applications/audio/airwindows-lv2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index c479ebe7ee65..f46f3053a284 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }: +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, lv2 }: stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "20.0"; - src = fetchFromGitHub { - owner = "hannesbraun"; + version = "22.0"; + src = fetchFromSourcehut { + owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU="; + sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Airwindows plugins (ported to LV2)"; - homepage = "https://github.com/hannesbraun/airwindows-lv2"; + homepage = "https://sr.ht/~hannes/airwindows-lv2"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; From 8894e03cbb9abde664518f65971cbaf02fd67672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 07:01:44 +0000 Subject: [PATCH 02/28] dataexplorer: 3.7.9 -> 3.8.0 --- .../applications/science/electronics/dataexplorer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 596978fc9280..128a5f62eeaa 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.7.9"; + version = "3.8.0"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-CdIWAde7mytXP9U1PfI9d/rFK7Agy5biIq5tMTW9RD4="; + sha256 = "sha256-ZluT/jCjcOrlh2nqe0j56shmtGqfm11BCnsp6mWDXkQ="; }; nativeBuildInputs = [ ant makeWrapper ]; From 299d1451d802cb1041a79e486ae4378834126629 Mon Sep 17 00:00:00 2001 From: dinkypumpkin Date: Mon, 21 Aug 2023 00:16:51 +0100 Subject: [PATCH 03/28] get_iplayer: removed unnecessary dependencies Removed unnecessary dependencies as described below flvstreamer: not used by get_iplayer rtmpdump: not used by get_iplayer perlPackages: HTMLParser: pulled in by LWP HTMLCookies: pulled in by LWP XMLSimple: not used by get_iplayer Also updated meta.description and meta.homepage - old site is defunct. --- pkgs/applications/misc/get_iplayer/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 884ee44098bf..2483cc000f01 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -7,8 +7,6 @@ , perl , atomicparsley , ffmpeg -, flvstreamer -, rtmpdump }: perlPackages.buildPerlPackage rec { @@ -25,7 +23,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ - HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious + LWP LWPProtocolHttps XMLLibXML Mojolicious ]; preConfigure = "touch Makefile.PL"; @@ -36,7 +34,7 @@ perlPackages.buildPerlPackage rec { runHook preInstall mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 runHook postInstall ''; @@ -46,9 +44,9 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { - description = "Downloads TV and radio from BBC iPlayer"; + description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds"; license = licenses.gpl3Plus; - homepage = "https://squarepenguin.co.uk/"; + homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; maintainers = with maintainers; [ rika jgarcia ]; }; From ad88501d2d2fce65ce6bb8e8d53cb415d9c3b285 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 23 Aug 2023 00:42:08 -0700 Subject: [PATCH 04/28] lsp-plugins: 1.2.8 -> 1.2.10 --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 564324c6a4a0..e459e10b6db9 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-udVYyR6rDOCAKggpvY58jjpoLmB6wXiivvdzYylkE9c="; + sha256 = "sha256-2Yf+4TYGWF/AMI1kNvVOx9g6CSIoeZKY63qC/zJNilc="; }; outputs = [ "out" "dev" "doc" ]; From 84429dd7b2cfd6d34c7d9423f1136c0512c575ec Mon Sep 17 00:00:00 2001 From: Wietse de Vries Date: Wed, 23 Aug 2023 11:54:08 +0200 Subject: [PATCH 05/28] readarr: 0.2.4.1999 -> 0.3.3.2171 --- 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 3703618d29a4..609d0cacddf2 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-46BfIsJEgtZMKQdiCqSFdM2whaYRwRLycv0pmY2InDk="; - arm64-linux_hash = "sha256-zTDqbQz966RYV3FSBxmtN9JMe0j0AA21GCz4f0+NnHw="; - x64-osx_hash = "sha256-EKy8vOvCHCcC5PheIdKyr5tWZ18Q+XeKh3mCrqcG7oA="; + x64-linux_hash = "sha256-0q+MHdNRzq7gmv5jiArU1q+1UBWNZx0JRgiIy2pnIAc="; + arm64-linux_hash = "sha256-NtbzzbWfEE1thyGOuJhTYXPxhTpw9lqXcvvlfmvCMqM="; + x64-osx_hash = "sha256-oz2Sbvr8fky0mpBUXRKYki3UL0ewA/a2hEtPISBV8Ko="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.2.4.1999"; + version = "0.3.3.2171"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 2635e1bfa3e66f3c4fbf60858e3916f457e53f69 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 23 Aug 2023 12:38:40 +0200 Subject: [PATCH 06/28] morgen: 2.7.5 -> 3.0.0 Fixes #250796 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 559474b7417a..9edacf7b3de8 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.5"; + version = "3.0.0"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; + sha256 = "sha256-6d1KYUlXv+bHPITt2zs++AtyaAT8SSCG9T8ZsgOKDiw="; }; nativeBuildInputs = [ From e52d122d77e985b681100e767b86adfa86bf46b2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 23 Aug 2023 14:21:33 +0100 Subject: [PATCH 07/28] protoc-gen-connect-go: 1.9.0 -> 1.11.0 Diff: https://github.com/connectrpc/connect-go/compare/refs/tags/v1.9.0...v1.11.0 Changelog: https://github.com/bufbuild/connect-go/releases/tag/v1.11.0 --- .../tools/protoc-gen-connect-go/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index 123573401dae..0147913cca63 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { - owner = "bufbuild"; + owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-2U5f+VUXZ8J9K27RccKvEY7FJs57XMasKMk+xgy0LuI="; + hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM="; }; vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY="; @@ -20,11 +20,16 @@ buildGoModule rec { "cmd/protoc-gen-connect-go" ]; + preCheck = '' + # test all paths + unset subPackages + ''; + meta = with lib; { - description = "library for building browser and gRPC-compatible HTTP APIs"; - homepage = "https://github.com/bufbuild/connect-go"; - changelog = "https://github.com/bufbuild/connect-go/releases/tag/v${version}"; + description = "Simple, reliable, interoperable, better gRPC"; + homepage = "https://github.com/connectrpc/connect-go"; + changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kilimnik ]; + maintainers = with maintainers; [ kilimnik jk ]; }; } From 81d6ce3d289ab99ea7ecb139518e3ef722cf3037 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Wed, 23 Aug 2023 23:19:45 +0530 Subject: [PATCH 08/28] kotlin{-native}: 1.9.0 -> 1.9.10 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 89474f27614f..6fd5b8801927 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.0"; + version = "1.9.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z"; + sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 9236809b5761..4f6dddb3fa13 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.0"; + version = "1.9.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh"; - "macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww"; - "linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q"; + "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; + "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; + "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; }.${arch}; in fetchurl { From d4dce223ef61347d32f0ad1d1bf03c4939048ed1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 25 Aug 2023 10:30:04 +0800 Subject: [PATCH 09/28] julia_19: 1.9.2 -> 1.9.3 Diff: https://github.com/JuliaLang/julia/compare/v1.9.2...v1.9.3 --- pkgs/development/compilers/julia/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 810a03152527..002cca08aac5 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80="; + hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; }; patches = [ From 84f4cad1ec5ae9ab026ce8bf601363ac4498f488 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 25 Aug 2023 10:35:17 +0800 Subject: [PATCH 10/28] julia_19-bin: 1.9.2 -> 1.9.3 --- pkgs/development/compilers/julia/1.9-bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index 9bae485b34d1..85c0d7043efd 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.2"; + version = "1.9.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383"; + sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c"; + sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb"; + sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76"; + sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 38e03d3df5ff9a0180ebfefc1714a9a1f503a64a Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 25 Aug 2023 15:03:58 -0700 Subject: [PATCH 11/28] python3Packages.streamlit: 1.24.1 -> 1.26.0 --- .../python-modules/streamlit/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 2ab4d11e640d..95a11c70592b 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -18,10 +18,12 @@ , pympler , python-dateutil , pythonOlder +, pythonRelaxDepsHook , requests , rich , tenacity , toml +, tornado , typing-extensions , tzlocal , validators @@ -30,16 +32,23 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.24.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version format; - hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; + hash = "sha256-JUdfsVo8yfsYSUXz/JNvARmYvYOG4MiS/r4UyWJb9Ho="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ + "pillow" + "pydeck" + ]; + propagatedBuildInputs = [ altair blinker @@ -60,6 +69,7 @@ buildPythonPackage rec { rich tenacity toml + tornado typing-extensions tzlocal validators From 832412e6001aaf90038a90b3a8c507791cf9fd23 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 26 Aug 2023 09:28:05 +0800 Subject: [PATCH 12/28] planify: 4.1 -> 4.1.1 https://github.com/alainm23/planify/compare/4.1...adf3629bcacfc9978f6dde5b87eff0278533ab3e --- pkgs/applications/office/planify/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 59f603a1ae36..e4cca46bbd63 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -23,13 +23,16 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; - rev = version; - sha256 = "sha256-H8TPuqKRwbcB+2NTC5ZIK7y6uiYbTT4svtx21FbTzME="; + # The commit is named as "Release 4.1.1", published to Flathub, but not tags + # https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa + # https://github.com/alainm23/planify/issues/1002 + rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e"; + hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo="; }; nativeBuildInputs = [ From 8ff2f9c05fe09ee97d69fc27d6a337a2e56ae217 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 26 Aug 2023 04:20:00 +0000 Subject: [PATCH 13/28] buildkit: 0.12.1 -> 0.12.2 Diff: https://github.com/moby/buildkit/compare/v0.12.1...v0.12.2 Changelog: https://github.com/moby/buildkit/releases/tag/v0.12.2 --- pkgs/development/tools/buildkit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 93b8b38ec9c2..6787ca6b07dd 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM="; + hash = "sha256-u85Yrg3aMG6Tx8onivSy1p7yB4lZxsBWF4bxnwO68EE="; }; vendorHash = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; + changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam developer-guy ]; mainProgram = "buildctl"; From 8cf934e9df04f9b8b1f7d82cf11863d052477b53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 05:36:11 +0000 Subject: [PATCH 14/28] insomnia: 2023.4.0 -> 2023.5.5 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index abf2ff4b4327..99843767d906 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.4.0"; + version = "2023.5.5"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk="; + sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY="; }; nativeBuildInputs = [ From d75758279f1a3588ddeb0439b975ae277606fa31 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 23 Aug 2023 16:48:59 +0800 Subject: [PATCH 15/28] linuxPackages.nvidiaPackages.production: 535.98 -> 535.104.05 Release note: https://www.nvidia.com/download/driverResults.aspx/210649/en-us/ --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3ad2b8f0fa0b..cc7c47bb46a5 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,12 +27,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.98"; - sha256_64bit = "sha256-E1DAmVLTe+L5DWCONq47BQtE/Rb22akZMHGhK/0FTsM="; - sha256_aarch64 = "sha256-ikqj7bvSvCGlkDviaqagyoSZhpf6ZU3TiKKxNDZm3RU="; - openSha256 = "sha256-dgc5Z70NSpBARelNy6XaZ4e7Tz9vWJWeNek3TSztJus="; - settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; - persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; + version = "535.104.05"; + sha256_64bit = "sha256-L51gnR2ncL7udXY2Y1xG5+2CU63oh7h8elSC4z/L7ck="; + sha256_aarch64 = "sha256-J4uEQQ5WK50rVTI2JysBBHLpmBEWQcQ0CihgEM6xuvk="; + openSha256 = "sha256-0ng4hyiUt0rHZkNveFTo+dSaqkMFO4UPXh85/js9Zbw="; + settingsSha256 = "sha256-pS9W5LMenX0Rrwmpg1cszmpAYPt0Mx+apVQmOmLWTog="; + persistencedSha256 = "sha256-uqT++w0gZRNbzyqbvP3GBqgb4g18r6VM3O8AMEfM7GU="; }; latest = selectHighestVersion production (generic { From 857610bcd1b5c57ae157bc4e49122e14329215d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 06:40:18 +0000 Subject: [PATCH 16/28] mox: 0.0.5 -> 0.0.6 --- pkgs/servers/mail/mox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix index 2dd7712c2c88..897f6ffc7a5b 100644 --- a/pkgs/servers/mail/mox/default.nix +++ b/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-f5/K6cPqJJkbdiVCNGOTd9Fjx2/gvSZCxeR6nnEaeJw="; + hash = "sha256-RNzjDAvyz0RfD4GV6hT9RNJOfHSUXCLfwN4+V5acX28="; }; # set the version during buildtime From 1ebb37fbe83600601096cdadb13569be3861f315 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 06:57:05 +0000 Subject: [PATCH 17/28] nwg-dock-hyprland: 0.1.4 -> 0.1.5 --- pkgs/applications/misc/nwg-dock-hyprland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index b953a0376f19..dfc91f82c591 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPCz9m2Qnge8XhEbvpXb2U/eT5xvJkaSoorkkoY3gp0="; + sha256 = "sha256-DDHKEGb7ghZwrMKrFtplTz7Hi1CITW6oxa/EJM4JDA8="; }; - vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q="; + vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0="; ldflags = [ "-s" "-w" ]; From 8a418f166f9a8d2da58ff205d6348d4f3d997e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 10:26:44 +0000 Subject: [PATCH 18/28] gh-dash: 3.10.0 -> 3.11.0 --- pkgs/tools/misc/gh-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 6f0d3d77ce5b..1fc865feef82 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-ypYM/FXp+BObR2fjVCV8nDJhRuuu2Y7213haAJnzRIE="; + hash = "sha256-XvNc68pVwqBLthkr3jb578Avpnr1NKT1XWUD4aazBHw="; }; - vendorHash = "sha256-lOIONv+7cUUC0mGCwYkOkDn3zHreYpFeqmTbp2Ob3yM="; + vendorHash = "sha256-COPEgRqogRkGuJm56n9Cqljr7H8QT0RSKAdnXbHm+nw="; ldflags = [ "-s" From d22022e15463ba25c3e10d1964a5633937fcf178 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 16:58:21 +0200 Subject: [PATCH 19/28] python311Packages.python-bsblan: 0.5.13 -> 0.5.14 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.5.13...v0.5.14 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.5.14 --- pkgs/development/python-modules/python-bsblan/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 647906511a17..16353b15ce4a 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aresponses +, backoff , buildPythonPackage , fetchFromGitHub , packaging @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.12"; + version = "0.5.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k="; + hash = "sha256-UCl5M9UbsUcroNF2iYzTLD9uIJF7PdxwrVt3PNI3iRc="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff packaging pydantic yarl From 0de3c547e13a727533491522cf3ad7b471d176c2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 26 Aug 2023 12:07:18 -0400 Subject: [PATCH 20/28] cargo-bundle: unstable-2023-03-17 -> unstable-2023-08-18 Diff: https://github.com/burtonageo/cargo-bundle/compare/eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4...c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43 --- pkgs/development/tools/rust/cargo-bundle/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/development/tools/rust/cargo-bundle/default.nix index f29d9aba8294..73924d1c599a 100644 --- a/pkgs/development/tools/rust/cargo-bundle/default.nix +++ b/pkgs/development/tools/rust/cargo-bundle/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage { pname = "cargo-bundle"; # the latest stable release fails to build on darwin - version = "unstable-2023-03-17"; + version = "unstable-2023-08-18"; src = fetchFromGitHub { owner = "burtonageo"; repo = "cargo-bundle"; - rev = "eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4"; - hash = "sha256-alO+Q9IK5Hz09+TqHWsbjuokxISKQfQTM6QnLlUNydw="; + rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43"; + hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; }; - cargoHash = "sha256-h+QPbwYTJk6dieta/Q+VAhYe8/YH/Nik6gslzUn0YxI="; + cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; nativeBuildInputs = [ pkg-config From 9a74a042e101594d203988994dda7342ae0070c7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 26 Aug 2023 12:15:32 -0400 Subject: [PATCH 21/28] complgen: unstable-2023-08-17 -> unstable-2023-08-22 Diff: https://github.com/adaszko/complgen/compare/4f01c04184b31804009e0002ff6ba1c777439798...8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b --- pkgs/development/tools/misc/complgen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index ad83f8f2078a..c9685d53511e 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage { pname = "complgen"; - version = "unstable-2023-08-17"; + version = "unstable-2023-08-22"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "4f01c04184b31804009e0002ff6ba1c777439798"; - hash = "sha256-KQFMWVHTlkf65ghgv3oR2Jz4QtXkdz6CNIC3eeyBgBg="; + rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b"; + hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I="; }; - cargoHash = "sha256-m/eFpwMZOOVGVeXjQwNZheuPeGkJd0mAF903ML/Kr90="; + cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; From 3d476abe820600be3895f9889f722183d2d17e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Aug 2023 12:39:44 -0700 Subject: [PATCH 22/28] python310Packages.pykeepass: 4.0.5 -> 4.0.6 Diff: https://github.com/libkeepass/pykeepass/compare/v4.0.5...v4.0.6 Changelog: https://github.com/libkeepass/pykeepass/blob/v4.0.6/CHANGELOG.rst --- .../development/python-modules/pykeepass/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 69e55805993d..2b482295e422 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2-cffi, python-dateutil, future +, argon2-cffi, python-dateutil , python }: buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.5"; + version = "4.0.6"; format = "setuptools"; @@ -14,16 +14,12 @@ buildPythonPackage rec { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-IdILcIhrxcTDddoxiK257II0V7ctVb1CTLfTPmuwjTQ="; + hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs="; }; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - propagatedBuildInputs = [ lxml pycryptodomex construct - argon2-cffi python-dateutil future + argon2-cffi python-dateutil ]; propagatedNativeBuildInputs = [ argon2-cffi ]; From 1550c8247ac24ad794d24336337260f03b865f34 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 26 Aug 2023 16:50:12 -0400 Subject: [PATCH 23/28] rustypaste: 0.12.1 -> 0.13.0 Diff: https://github.com/orhun/rustypaste/compare/v0.12.1...v0.13.0 Changelog: https://github.com/orhun/rustypaste/blob/v0.13.0/CHANGELOG.md --- pkgs/servers/rustypaste/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index bae1b5232c7d..b1777fa0c5c1 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AdcoyBtPgTK94VDBsCGozPU5enqCquY7r5IuEm3oW/g="; + sha256 = "sha256-dyj5Zg49APsRLaOOCvyZ7X8qNLgzRcBZBCS5IR0dDCs="; }; - cargoHash = "sha256-VJjXwvMDSnDedcxJTjg6tVjPUxjRGTSOnx2nXgXCdzI="; + cargoHash = "sha256-yw1ldacFxTKV1/A2XxZAZ2DpC0gJFjeGz5Yduw3RZEU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From cc85ec87da069dd5e7fb7e584767cee5181a341a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 23:30:14 +0200 Subject: [PATCH 24/28] python311Packages.aioaseko: 0.1.0 -> 0.1.1 Diff: https://github.com/milanmeu/aioaseko/compare/refs/tags/v0.1.0...v0.1.1 Changelog: https://github.com/milanmeu/aioaseko/releases/tag/v0.1.1 --- .../python-modules/aioaseko/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index e1781a9bf324..beea7e05a750 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , setuptools , pyjwt @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "aioaseko"; - version = "0.1.0"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,18 +18,9 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RgIwA5/W7qtgI9ZTF4oDPuzSc+r04ZV3JOaNNFjS0pU="; + hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc="; }; - patches = [ - # Remove time, https://github.com/milanmeu/aioaseko/pull/6 - (fetchpatch { - name = "remove-time.patch"; - url = "https://github.com/milanmeu/aioaseko/commit/07d7ca43a2edd060e95a64737f072d98ba938484.patch"; - hash = "sha256-67QaqSy5mGY/22jWHOkymr0pFoiizVQAXlrqXRb3tG0="; - }) - ]; - nativeBuildInputs = [ setuptools ]; From a8cbbd96fcccde6e5553d7554d52e3ea66b802a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 23:02:59 +0000 Subject: [PATCH 25/28] lxgw-neoxihei: 1.103.1 -> 1.104 --- pkgs/data/fonts/lxgw-neoxihei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 3632656ade81..5bb0924f0a12 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.103.1"; + version = "1.104"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-z9SzSt+GXV+9GLtzjY6EQQa6bKrixYo03kEfzGfug90="; + hash = "sha256-R2b3zc+BwX9RvabqxXbRRHV3kKh5G1bnGg0ZP4BnBMI="; }; dontUnpack = true; From 6e8985702ca9896dd6badc74a408db62bf175136 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 26 Aug 2023 19:08:53 -0400 Subject: [PATCH 26/28] Revert "qt5.qtbase: fix cross" --- .../libraries/qt-5/5.15/default.nix | 3 +-- .../libraries/qt-5/hooks/qtbase-setup-hook.sh | 2 -- .../libraries/qt-5/modules/qtbase.nix | 20 ------------------- pkgs/development/libraries/qt-5/qtModule.nix | 12 ++--------- 4 files changed, 3 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 59198a636bba..04fdf5298257 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -207,8 +207,7 @@ let import ../qtModule.nix { inherit perl; - inherit lib stdenv; - inherit buildPackages; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 0e23ec143218..1b57d676e1fc 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,5 +1,4 @@ if [[ -n "${__nix_qtbase-}" ]]; then - if [ -z "${dontWorryAboutQtMismatch-}" ]; then # Throw an error if a different version of Qt was already set up. if [[ "$__nix_qtbase" != "@dev@" ]]; then echo >&2 "Error: detected mismatched Qt dependencies:" @@ -7,7 +6,6 @@ if [[ -n "${__nix_qtbase-}" ]]; then echo >&2 " $__nix_qtbase" exit 1 fi - fi else # Only set up Qt once. __nix_qtbase="@dev@" diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index ed280cc0151a..de73bcbe2772 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -28,15 +28,10 @@ , developerBuild ? false , decryptSslTraffic ? false , testers -, buildPackages }: let debugSymbols = debug || developerBuild; - qtPlatformCross = plat: with plat; - if isLinux - then "linux-generic-g++" - else throw "Please add a qtPlatformCross entry for ${plat.config}"; in stdenv.mkDerivation (finalAttrs: { @@ -87,11 +82,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - # `qtbase` expects to find `cc` (with no prefix) in the - # `$PATH`, so the following is needed even if - # `stdenv.buildPlatform.canExecute stdenv.hostPlatform` - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedNativeBuildInputs = [ lndir ]; # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked @@ -171,11 +161,6 @@ stdenv.mkDerivation (finalAttrs: { export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ./bin/syncqt.pl -version $version - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - # QT's configure script will refuse to use pkg-config unless these two environment variables are set - export PKG_CONFIG_SYSROOT_DIR=/ - export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib - echo 'QMAKE_PKG_CONFIG=''$''${CROSS_COMPILE}pkg-config' >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf ''; postConfigure = '' @@ -223,8 +208,6 @@ stdenv.mkDerivation (finalAttrs: { # To prevent these failures, we need to override PostgreSQL detection. PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - # do not pass --host and --build to configureFlags as QT's configure script doesn't understand them - configurePlatforms = [ ]; # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ "-plugindir $(out)/$(qtPluginPrefix)" @@ -251,9 +234,6 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-device ${qtPlatformCross stdenv.hostPlatform}" - "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optional debugSymbols "-debug" ++ lib.optionals developerBuild [ diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 75deee58ea60..9abd9fabc957 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -1,8 +1,4 @@ -{ lib -, stdenv -, mkDerivation, perl -, buildPackages -}: +{ lib, mkDerivation, perl }: let inherit (lib) licenses maintainers platforms; in @@ -21,8 +17,7 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); - depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; @@ -79,7 +74,4 @@ mkDerivation (args // { maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; } // (args.meta or {}); - -} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - dontWorryAboutQtMismatch = true; }) From 3d6dd9b4afb10ae8bf05f802922baef6fea516d8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 26 Aug 2023 11:06:45 -0300 Subject: [PATCH 27/28] stacktile: init at 1.0.0 --- pkgs/tools/wayland/stacktile/default.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/wayland/stacktile/default.nix diff --git a/pkgs/tools/wayland/stacktile/default.nix b/pkgs/tools/wayland/stacktile/default.nix new file mode 100644 index 000000000000..073794e42b98 --- /dev/null +++ b/pkgs/tools/wayland/stacktile/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromSourcehut +, wayland +, wayland-scanner +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "stacktile"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = "stacktile"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IOFxgYMjh92jx2CPfBRZDL/1ucgfHtUyAL5rS2EG+Gc="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + wayland-scanner + ]; + + buildInputs = [ + wayland + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "MANDIR=${placeholder "man"}/share/man" + ]; + + strictDeps = true; + + meta = { + homepage = "https://sr.ht/~leon_plickat/stacktile/"; + description = "Layout generator for the river Wayland compositor"; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "stacktile"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 163827b33264..33d96d0b5248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1304,6 +1304,8 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; + stacktile = callPackage ../tools/wayland/stacktile { }; + sirula = callPackage ../tools/wayland/sirula { }; sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { }; From a61f1915d4f4d0c0cc2f46438a8fff5f6593eaa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 22:23:09 +0000 Subject: [PATCH 28/28] h: 1.0.3 -> 1.0.4 --- pkgs/tools/misc/h/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 8f44ed1b210b..6e4ae6381e75 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; + hash = "sha256-eitUKOo2c1c+SyctkUW/SUb2RCKUoU6nJplfJVdwBSs="; }; buildInputs = [ ruby ];