From b5ac5c9612f2c21661c2f4ad536762754a5c8756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 4 Dec 2023 08:18:21 -0800 Subject: [PATCH 01/16] libsForQt5.mauiPackages: 3.0.1 -> 3.0.2 --- pkgs/applications/maui/srcs.nix | 192 ++++++++++++++++---------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 6473b9607bfd..7de3325e4d96 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,59 +4,59 @@ { agenda = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; - sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; - name = "agenda-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.2/agenda-0.5.2.tar.xz"; + sha256 = "160y0pq3mj72wxyfnnl45488j4kpl26xpf83vlnfshiwvc6c0m3y"; + name = "agenda-0.5.2.tar.xz"; }; }; arca = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; - sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; - name = "arca-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.2/arca-0.5.2.tar.xz"; + sha256 = "0l0x24m55hc20yc40yjj0zx910yzh31qn911swdli39iy4c6mxk2"; + name = "arca-0.5.2.tar.xz"; }; }; bonsai = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/bonsai/1.0.0/bonsai-2.2.0.tar.xz"; - sha256 = "0gpqdj30brqv9nsiis93w9lad4xn7d301gxncj04pcpybmbksg4r"; - name = "bonsai-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/bonsai/1.1.2/bonsai-1.1.2.tar.xz"; + sha256 = "0nzp0ixxap3q1llv42l71rygxv98hvcmqwqdw7690w650hja7zvj"; + name = "bonsai-1.1.2.tar.xz"; }; }; booth = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; - sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; - name = "booth-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.2/booth-1.1.2.tar.xz"; + sha256 = "06gg4zgpn8arnzmi54x7xbdg5wyc3a86v9z5x6y101imh6cwbhyw"; + name = "booth-1.1.2.tar.xz"; }; }; buho = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; - sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; - name = "buho-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.2/buho-3.0.2.tar.xz"; + sha256 = "0sllffddngzxc2wi2wszjxzb75rca0a42bdylm7pxmr5p8mafn1l"; + name = "buho-3.0.2.tar.xz"; }; }; clip = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; - sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; - name = "clip-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.2/clip-3.0.2.tar.xz"; + sha256 = "0pjqk1l1cwkvwrlv1lb113cl8kggppxqhdsild83wrzbfqx9nrva"; + name = "clip-3.0.2.tar.xz"; }; }; communicator = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; - sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; - name = "communicator-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.2/communicator-3.0.2.tar.xz"; + sha256 = "0hmapwsgrlaiwvprpmllfy943w0sclnk4vg7sb6rys1i96f3yz6r"; + name = "communicator-3.0.2.tar.xz"; }; }; era = { @@ -68,139 +68,139 @@ }; }; fiery = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; - sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; - name = "fiery-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.2/fiery-1.1.2.tar.xz"; + sha256 = "0ba3bxhvfzkpwrrnfyhbvprlhdv2vmgmi41lpq2pian0d3nkc05s"; + name = "fiery-1.1.2.tar.xz"; }; }; index-fm = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.1/index-fm-3.0.1.tar.xz"; - sha256 = "046in0bqblpqcxp4rz417pjpy1m57p611wlzdsw8hp4dl1l2qmn9"; - name = "index-fm-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/index/3.0.2/index-fm-3.0.2.tar.xz"; + sha256 = "08ncjliqzx71scmfxl3h24w9s8dgrp6gd7nf6pczyn5arqf96d81"; + name = "index-fm-3.0.2.tar.xz"; }; }; mauikit = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; - sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; - name = "mauikit-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.2/mauikit-3.0.2.tar.xz"; + sha256 = "19317xfbyy3cg9nm1dqknvypsj9kq8phz36srwvwfyxd26kaqs2s"; + name = "mauikit-3.0.2.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.1/mauikit-accounts-3.0.1.tar.xz"; - sha256 = "1b6nmnh5fh6gis7r56s41204g9y7cp5g2qmsk0r6b3a3x0ndwmqj"; - name = "mauikit-accounts-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.2/mauikit-accounts-3.0.2.tar.xz"; + sha256 = "1h876vz9vfyl44pryhf5s4lkzik00zwhjvyrv7f4b1zwjz3xbqai"; + name = "mauikit-accounts-3.0.2.tar.xz"; }; }; mauikit-calendar = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/3.0.1/mauikit-calendar-3.0.1.tar.xz"; - sha256 = "1s95nkbyc4k8999hsnr5aw80qhr66q4z51wq2ail3h0df7p1f700"; - name = "mauikit-calendar-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.2/mauikit-calendar-3.0.2.tar.xz"; + sha256 = "098d2alw1dnhpqwkdy0wrl6cvanyb6vg8qy5aqmgmsk0hil1s8x1"; + name = "mauikit-calendar-3.0.2.tar.xz"; }; }; mauikit-documents = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/3.0.1/mauikit-documents-3.0.1.tar.xz"; - sha256 = "1w2dszggxbqla5ab3739l1j79l2qa3br8drvkidivir8vwxifj3v"; - name = "mauikit-documents-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.2/mauikit-documents-3.0.2.tar.xz"; + sha256 = "1ln8nk6n2wcqdjd4l5pzam9291rx52mal7rdxs06f6fwszwifhyr"; + name = "mauikit-documents-3.0.2.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.1/mauikit-filebrowsing-3.0.1.tar.xz"; - sha256 = "0z8070p1m2c2mv3xdhsz4scnasbwxf698mql0svqzmjiy8vjfnn2"; - name = "mauikit-filebrowsing-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.2/mauikit-filebrowsing-3.0.2.tar.xz"; + sha256 = "03dcmpw8l19mziswhhsvyiiid07qx0c4ddh8986llsz6xngdnlib"; + name = "mauikit-filebrowsing-3.0.2.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.1/mauikit-imagetools-3.0.1.tar.xz"; - sha256 = "0aayhmmk6bd3n5p1mgm9k1jycsw8li5fs1xq7x42h93zhvxcw1va"; - name = "mauikit-imagetools-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.2/mauikit-imagetools-3.0.2.tar.xz"; + sha256 = "1xryms7mc3lq8p67m2h3cxffyd9dk8m738ap30aq9ym62qq76psl"; + name = "mauikit-imagetools-3.0.2.tar.xz"; }; }; mauikit-terminal = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/3.0.1/mauikit-terminal-3.0.1.tar.xz"; - sha256 = "1w7d04cdq2b4mkjl7ngj1v580dlhrpvr1n0gy5jcfv6x4ia3g8k3"; - name = "mauikit-terminal-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.2/mauikit-terminal-3.0.2.tar.xz"; + sha256 = "0abywv56ljxbmsi5y3x9agbgbhvscnkznja9adwjj073pavvaf1g"; + name = "mauikit-terminal-3.0.2.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.1/mauikit-texteditor-3.0.1.tar.xz"; - sha256 = "063zxzc530zgamr6fm5brm2rqpmq4rx4wsq7cx7sxfgyknag52m6"; - name = "mauikit-texteditor-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.2/mauikit-texteditor-3.0.2.tar.xz"; + sha256 = "09wdvjy8c0b5lka0fj28kl99w5y3w0nvz2mnr3ic5kn825ay1wmy"; + name = "mauikit-texteditor-3.0.2.tar.xz"; }; }; mauiman = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; - sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; - name = "mauiman-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.2/mauiman-3.0.2.tar.xz"; + sha256 = "0aqzgdkcs6cdlsbsyiyhadambcwwa0xj2q2yj5hv5d42q25ibfs1"; + name = "mauiman-3.0.2.tar.xz"; }; }; nota = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; - sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; - name = "nota-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.2/nota-3.0.2.tar.xz"; + sha256 = "11lqdxwsdvf1vz9y1d9r38vxfsz4jfnin3c1ipsvjl0f0zn1glr6"; + name = "nota-3.0.2.tar.xz"; }; }; pix = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; - sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; - name = "pix-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.2/pix-3.0.2.tar.xz"; + sha256 = "0wlpqqbf4j7dlylxhfixrcjz0yz9csni4vnbqv9l5vkxxwf0mq4k"; + name = "pix-3.0.2.tar.xz"; }; }; shelf = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; - sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; - name = "shelf-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.2/shelf-3.0.2.tar.xz"; + sha256 = "1x27grdn9qa7ysxh4fb35h5376crpbl39vpd6hn0a7c3fk74w95q"; + name = "shelf-3.0.2.tar.xz"; }; }; station = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; - sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; - name = "station-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.2/station-3.0.2.tar.xz"; + sha256 = "14i4z5lkj2rg7p5nkglqpzvrrxmf7b07kf49hh1jdk08753abc76"; + name = "station-3.0.2.tar.xz"; }; }; strike = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/strike/1.0.0/strike-2.2.0.tar.xz"; - sha256 = "159l1i0mi3q5avcg45aq5ixz8wjfryhip61h9gynxr1m77qdpfnc"; - name = "strike-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/strike/1.1.2/strike-1.1.2.tar.xz"; + sha256 = "01ak3h6n0z3l346nbzfabkgbzwbx1fm3l9g7myiip4518cb2n559"; + name = "strike-1.1.2.tar.xz"; }; }; vvave = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; - sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; - name = "vvave-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.2/vvave-3.0.2.tar.xz"; + sha256 = "1py46ryi57757wyqfvxc2h02x33n11g1v04f0hac0zkjilp5l21k"; + name = "vvave-3.0.2.tar.xz"; }; }; } From 2e38c42cbb60da4446e82b13dafe393fab031c8c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 5 Dec 2023 08:34:06 +0000 Subject: [PATCH 02/16] vlang: weekly.2023.44 -> 0.4.3 --- pkgs/development/compilers/vlang/default.nix | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 2a8ea72b9f5b..66b871559057 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "weekly.2023.44"; + version = "0.4.3"; ptraceSubstitution = '' #include #include ''; - # Required for bootstrap. + # vc is the V compiler's source translated to C (needed for boostrap). + # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "unstable-2023-10-30"; + version = "0.4.3"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b"; - hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak="; + rev = "5e691a82c01957870b451e06216a9fb3a4e83a18"; + hash = "sha256-Ti2b88NDG1pppj34BeK8+UsT2HiG/jcAF2mHgiBBRaI="; }; # patch the ptrace reference for darwin @@ -30,8 +31,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca"; - hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM="; + rev = "0c280130cb7ec410b7d21810d1247956c15b72fc"; + hash = "sha256-Fmhkrg9DBiWxInostNp+WfA3V5GgEIs5+KIYrqZosqY="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -45,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg="; + hash = "sha256-ZFBQD7SP38VnEMoOnwr/n8zZuLtR7GR3OCYhvfz3apI="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -76,11 +77,6 @@ stdenv.mkDerivation { cp -r ${boehmgcStatic}/lib/* ./thirdparty/tcc/lib ''; - # vcreate_test.v requires git, so we must remove it when building the tools. - preInstall = '' - mv cmd/tools/vcreate/vcreate_test.v $HOME/vcreate_test.v - ''; - installPhase = '' runHook preInstall @@ -102,11 +98,6 @@ stdenv.mkDerivation { runHook postInstall ''; - # Return vcreate_test.v and vtest.v, so the user can use it. - postInstall = '' - cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v - ''; - meta = with lib; { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; From de5adfc28509f3f383af56c045611af1fd220330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Dec 2023 12:27:21 -0800 Subject: [PATCH 03/16] qutebrowser: 3.0.2 -> 3.1.0 Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.0.2...v3.1.0 Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.1.0/doc/changelog.asciidoc --- .../networking/browsers/qutebrowser/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c8b315893a52..62465e5efd2f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -18,15 +18,15 @@ let isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let - version = "3.9.179"; + version = "4.0.269"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-QoJFb7MlZN6lDe2Yalsd10sseukL6+tNRi6JzLPVBYw="; + hash = "sha256-8gwJUxygcdvERDni/k6WIx3tzk7yb+qHZ4NsfkP0VDo="; stripRoot = false; }; - version = "3.0.2"; + version = "3.1.0"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; + hash = "sha256-UA3MHMoI1rC4FPowbiII4lM1rL4OLPmZ+1GRbg9LLl8="; }; # Needs tox @@ -117,6 +117,7 @@ python3.pkgs.buildPythonApplication { --set-default QSG_RHI_BACKEND vulkan ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} + --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources" ) ''; From 4a8c4be3983322557da6a3b9e588c3b3825b0fe9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Dec 2023 23:44:39 +0000 Subject: [PATCH 04/16] turbovnc: 3.0.3 -> 3.1 --- pkgs/tools/admin/turbovnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 801fe1ba4a14..aaba4768a924 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.0.3"; + version = "3.1"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc="; + hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk="; }; # TODO: From 97fddea6268202698b2c321a5aa379baa2403023 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:43:41 +0100 Subject: [PATCH 05/16] libsForQt5.phonon: fix build on darwin --- pkgs/development/libraries/phonon/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index dc95b4ed8266..dd20b6dcebe6 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fPIC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); cmakeBuildType = if debug then "Debug" else "Release"; From f908761f4f40b51a71f325ede4859fb2edc0b8f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Dec 2023 09:18:30 +0100 Subject: [PATCH 06/16] python311Packages.awscrt: 0.19.18 -> 0.19.19 Changelog: https://github.com/awslabs/aws-crt-python/releases/tag/v0.19.19 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 9d739c81f700..dc499f2bcb6c 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.18"; + version = "0.19.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NQtu/Y6+4ILqPz5SxZo8PsWUza8B24tIU9zrn+yQyJ0="; + hash = "sha256-HBURU13uFGpsJqOC7T6tViWaEFs7fX2CNVOuVn0Djf4="; }; buildInputs = lib.optionals stdenv.isDarwin [ From 19c4cb1dd735aced526033902c8f5cd49b4c2d97 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:37:06 +0100 Subject: [PATCH 07/16] athens: 0.12.1 -> 0.13.0 --- pkgs/by-name/at/athens/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 0dfee342a3c2..e511bd98e8bd 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -4,16 +4,16 @@ }: buildGo121Module rec { pname = "athens"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gomods"; repo = pname; rev = "v${version}"; - hash = "sha256-m75Ut1UVwz7uWneBwPxUL7aPOXIpy6YPqIXMwczHOpY="; + hash = "sha256-27BBPDK5lGwEFsgLf+/lE9CM8g1AbGUgM1iOL7XZqsU="; }; - vendorHash = "sha256-zK4EE242Gbgew33oxAUNxylKdhRdPhqP0Hrpu4sYiFg="; + vendorHash = "sha256-5U9ql0wszhr5H3hAo2utONuEh4mUSiO71XQHkAnMhZU="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-buildid=" "-X github.com/gomods/athens/pkg/build.version=${version}" ]; From 0cdbeb740940453520856bb4e991e9337c01e4c0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Dec 2023 08:56:13 -0500 Subject: [PATCH 08/16] sing-box: 1.7.4 -> 1.7.5 Diff: https://github.com/SagerNet/sing-box/compare/v1.7.4...v1.7.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index a158f221894a..cc826474d3eb 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-I1c6zc/vnAoE97wESy3ZGITto4d5dfjpGNbw4vTeElc="; + hash = "sha256-6SWcepENdbkwv4qq4nuxSINAxXWZmLcj5NwJ3nBnKu8="; }; - vendorHash = "sha256-wK5gwj7UnQCHtRLim3S81n0T2N8jMP74K4TWxJYVuRA="; + vendorHash = "sha256-8R3bVwziiC9n10dA8Zus7L0VyjWYKkdSszb44HqR8tE="; tags = [ "with_quic" From ea93ca9c3a05f2f0d44aacce136a56762d9f0053 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Dec 2023 11:50:07 -0500 Subject: [PATCH 09/16] opentofu: 1.6.0-beta3 -> 1.6.0-beta4 Diff: https://github.com/opentofu/opentofu/compare/v1.6.0-beta3...v1.6.0-beta4 Changelog: https://github.com/opentofu/opentofu/blob/v1.6.0-beta4/CHANGELOG.md --- pkgs/applications/networking/cluster/opentofu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index ad63958d7695..068a34d29d4b 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-beta3"; + version = "1.6.0-beta4"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-71QJ6rhzFAE78v6RxO1nSroyjF0vrlKC3UIp9ksZolk="; + hash = "sha256-AFy7xg1UwVWlFZjelYhxfkhj4Tk93uVvF1i3PHa2jEM="; }; vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; From 5c640240561a332b97eb20121d098fb0146efe18 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 12 Dec 2023 10:49:42 -0700 Subject: [PATCH 10/16] matrix-synapse: 1.97.0 -> 1.98.0 https://github.com/matrix-org/synapse/releases/tag/v1.98.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 56f9b6c7af8f..a51ea5a9269c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.97.0"; + version = "1.98.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-KusCJj5MVmRbniI9aTjRInPMpIDZKWs5w+TImVKHrPc="; + hash = "sha256-irPExb8rwQjkPp0b3x5hJG4Ay6OnITWIGRPxBSoP/Dk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SImgV47EfKy70VmcBREu1aiZFvX0+h0Ezw+/rUZufAg="; + hash = "sha256-DHKhEFXquWfHfk54mTehjchg3KsB4CfzElXMt5Mp+Vg="; }; postPatch = '' From eb2f1aa391fd59f8013a83ad552bcc136f19630d Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Tue, 12 Dec 2023 13:02:03 -0500 Subject: [PATCH 11/16] remmina: Add `meta.mainProgram` Add a `meta.mainProgram` attribute for use with `lib.getExe`. --- pkgs/applications/networking/remote/remmina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5aedd89cb68d..0fd2de49dac3 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; + mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; platforms = platforms.linux ++ platforms.darwin; }; From 52af4c8c0f41daf6701eed2472bf377755920b7b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:32:47 +0100 Subject: [PATCH 12/16] gnome-extension-manager: unbreak on aarch64-linux --- pkgs/applications/misc/gnome-extension-manager/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index 1dfa17981e89..5a0a1c3cf682 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ foo-dogsquared ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } From e8d403b6974c41201a82cb8e2ea84095088c2f19 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 12 Dec 2023 21:48:59 +0100 Subject: [PATCH 13/16] htmlq: set meta.mainProgram --- pkgs/development/tools/htmlq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 1adcaf954d04..6a5015c600fc 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mgdm/htmlq"; license = licenses.mit; maintainers = with maintainers; [ siraben nerdypepper ]; + mainProgram = "htmlq"; }; } From 1f06e081c92baffb0e159819fee1f1d6db3352da Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 12 Dec 2023 21:49:17 +0100 Subject: [PATCH 14/16] restic: set meta.mainProgram --- pkgs/tools/backup/restic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index a3223c04e297..72220f17d26e 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm maintainers.dotlambda ]; + mainProgram = "restic"; }; } From ea9e108a0bafe81df7e0461f7286400e1db6c694 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Dec 2023 16:04:19 -0500 Subject: [PATCH 15/16] lhapdf: 6.5.3 -> 6.5.4 (#273276) --- .../libraries/physics/lhapdf/default.nix | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 00f548806fc5..0482846f077a 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,30 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; + sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4="; }; - patches = [ - # avoid silent compilation failures - (fetchpatch { - name = "lhapdf-propagate_returncode.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; - hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; - }) - - # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin - (fetchpatch { - name = "lhapdf-Wl_stack_size.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; - hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; - }) - ]; - # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' From 1a5412e14030d2a00281021d5f8ef05b31027912 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Dec 2023 16:04:33 -0500 Subject: [PATCH 16/16] toil: 5.7.1 -> 5.12.0 (#273274) --- pkgs/applications/science/misc/toil/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 7fc070f4f9f7..9142676fff48 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -6,21 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "toil"; - version = "5.7.1"; + version = "5.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "DataBiosphere"; repo = pname; rev = "refs/tags/releases/${version}"; - hash = "sha256-m+XvNyzd0ly2YqKhgxezgGaCXLs3CmupJMnp5RIZqNI="; + hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "docker>=3.7.2, <6" "docker" - ''; - propagatedBuildInputs = with python3.pkgs; [ addict dill @@ -42,7 +37,6 @@ python3.pkgs.buildPythonApplication rec { boto botocore flask - mypy-boto3-s3 pytestCheckHook stubserver ]); @@ -63,6 +57,10 @@ python3.pkgs.buildPythonApplication rec { "src/toil/test/src" "src/toil/test/wdl" "src/toil/test/utils/utilsTest.py" + "src/toil/test/cwl/cwlTest.py" + "src/toil/test/lib/test_ec2.py" + "src/toil/test/lib/aws/test_iam.py" + "src/toil/test/lib/aws/test_s3.py" ]; disabledTests = [